From 32d4917964ac57b184603f571ef249c0cc1bb7fb Mon Sep 17 00:00:00 2001 From: Franzz Date: Sat, 7 Sep 2019 13:09:26 +0200 Subject: [PATCH] last note update feedback --- inc/catc.php | 2 +- inc/note.php | 6 +++++- masks/course.html | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/inc/catc.php b/inc/catc.php index 0ddabc5..74acf45 100644 --- a/inc/catc.php +++ b/inc/catc.php @@ -159,7 +159,7 @@ class CATC extends Main $sError = $oNote->setNote($asOps); $bSuccess = ($sError==''); - $asData = ($bSuccess)?array('led' => $oNote->getNote()['led']):array(); + $asData = ($bSuccess)?array('led_time' => $oNote->getNote()['led_time']):array(); return self::getJsonResult($bSuccess, $sError, $asData); } diff --git a/inc/note.php b/inc/note.php index 596dffa..305dc89 100644 --- a/inc/note.php +++ b/inc/note.php @@ -37,7 +37,11 @@ class Note extends PhpObject { public function getNote() { $asCourse = $this->oDb->selectRow(self::NOTE_TABLE, $this->getNoteKeys()); - if(!empty($asCourse)) $asCourse['notes'] = json_decode($asCourse['notes'], true); + if(!empty($asCourse)) { + $asCourse['notes'] = json_decode($asCourse['notes'], true); + $asCourse['led_date'] = date('d/m/Y', strtotime($asCourse['led'])); + $asCourse['led_time'] = date('H:i'); + } return $asCourse; } diff --git a/masks/course.html b/masks/course.html index 9480b1a..42fe138 100644 --- a/masks/course.html +++ b/masks/course.html @@ -25,7 +25,7 @@ oCATC.pageInit = function(asHash, bFirstPage) { 'get_note', (asData) => { oEditor.setContent(asData.notes); - oCATC.feedback('notice', 'Last update on ('+asData.led.substr(11, 5)+')'); + oCATC.feedback('notice', 'Last update at '+asData.led_time+' on '+asData.led_date); }, {id: self.tmp('id_course')}, () => {console.log('Note not found for course ID = '+self.tmp('id_course'))} @@ -68,7 +68,7 @@ function save(bForce) getInfo( 'set_note', function(sDesc, asData) { - oCATC.feedback('notice', 'Note saved ('+asData.led.substr(11, 5)+')'); + oCATC.feedback('notice', 'Note saved ('+asData.led_time+')'); self.tmp('saving', false); }, {