Fix note feedback

This commit is contained in:
2019-09-20 23:28:56 +02:00
parent fdeae0b984
commit 4da07fa4e1
4 changed files with 13 additions and 7 deletions

View File

@@ -29,7 +29,7 @@ oCATC.pageInit = function(asHash, bFirstPage) {
self.tmp('id_course', asHash.items[0]); self.tmp('id_course', asHash.items[0]);
//Setup layout //Setup layout
self.setPageTitle('Course: '+self.consts.courses[self.tmp('id_course')].description); self.setPageTitle(self.consts.courses[self.tmp('id_course')].description);
//Setup Quill //Setup Quill
oEditor = new Editor('#notes'); oEditor = new Editor('#notes');
@@ -125,7 +125,7 @@ function noteFeedback(sType, sMsg) {
$Feedback.finish().fadeOut($Feedback.is(':empty')?0:'fast', function(){ $Feedback.finish().fadeOut($Feedback.is(':empty')?0:'fast', function(){
$(this) $(this)
.empty() .empty()
.append($('<div>', {'class':'alert alert-'+sType, role:'alert'}).text(sMsg)) .append($('<div>', {'class':'alert note-'+sType}).text(sMsg))
.fadeIn('fast') .fadeIn('fast')
.delay(5000) .delay(5000)
.fadeOut('fast'); .fadeOut('fast');
@@ -155,13 +155,15 @@ function save(bForce, bOnUnload) {
function(asData) { function(asData) {
self.tmp('saving', false); self.tmp('saving', false);
var sMsg = 'Note saved ('+asData.led_time+')'; var sMsg = 'Note saved ('+asData.led_time+')';
noteFeedback('notice', sMsg) || oCATC.feedback('success', sMsg); if($.type(noteFeedback)=='function') noteFeedback('notice', sMsg);
else oCATC.feedback('success', sMsg);
}, },
{id: self.tmp('id_course'), content: sContent}, {id: self.tmp('id_course'), content: sContent},
function(sError) { function(sError) {
var sMsg = 'Not saved! An error occured: '+sError;
noteFeedback('error', sMsg) || oCATC.feedback('error', sMsg);;
self.tmp('saving', false); self.tmp('saving', false);
var sMsg = 'Not saved! An error occured: '+sError;
if($.type(noteFeedback)=='function') noteFeedback('error', sMsg);
else oCATC.feedback('error', sMsg);
oSaveTimer = setTimeout(save, 1000); oSaveTimer = setTimeout(save, 1000);
}, },
false, false,

View File

@@ -46,6 +46,10 @@
font-size: 0.8em; font-size: 0.8em;
margin: 0; margin: 0;
padding-right: 0.5em; padding-right: 0.5em;
&.note-error {
color: $col_main_2;
}
} }
} }

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long