diff --git a/js/interface.js b/js/interface.js index f64f523..089028d 100644 --- a/js/interface.js +++ b/js/interface.js @@ -97,7 +97,8 @@ function getNotifications() { order: 'createdAt', direction: 'DESC', limit: limit, - includeDeleted: true + includeDeleted: true, + includeScheduled: true } }).then(function (results) { return results.notifications || []; diff --git a/js/interface.templates.js b/js/interface.templates.js index c4e566c..225464e 100644 --- a/js/interface.templates.js +++ b/js/interface.templates.js @@ -53,7 +53,7 @@ this["Fliplet"]["Widget"]["Templates"]["templates.noPushNotifications"] = Handle },"useData":true}); this["Fliplet"]["Widget"]["Templates"]["templates.notificationEntries"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { - return "{{#each this}}\n \n {{moment createdAt calendar=null}}\n {{data.title}}{{#and data.title data.message}}
{{/and}}{{data.message}}\n {{statusText}}\n {{#compare status \"===\" \"published\"}}{{moment orderAt calendar=null}}{{else}}{{/compare}}\n {{#if pushNotificationPayload}}\n {{#or pushNotificationPayload.title pushNotificationPayload.message}}{{/or}}\n {{else}}\n \n {{/if}}\n {{#unless isDeleted}}\n \n {{else}}\n \n {{/unless}}\n \n{{/each}}"; + return "{{#each this}}\n \n {{moment createdAt calendar=null}}\n {{data.title}}{{#and data.title data.message}}
{{/and}}{{data.message}}\n {{statusText}}\n \n {{#compare status \"===\" \"published\"}}{{moment orderAt calendar=null}}{{else}}{{/compare}}\n {{#compare status \"===\" \"scheduled\"}} {{moment orderAt calendar=null}}{{else}}{{/compare}}\n \n {{#if pushNotificationPayload}}\n {{#or pushNotificationPayload.title pushNotificationPayload.message}}{{/or}}\n {{else}}\n \n {{/if}}\n {{#unless isDeleted}}\n \n {{else}}\n \n {{/unless}}\n \n{{/each}}"; },"useData":true}); this["Fliplet"]["Widget"]["Templates"]["templates.notifications"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { diff --git a/templates/notificationEntries.interface.hbs b/templates/notificationEntries.interface.hbs index 3647f01..86ff804 100644 --- a/templates/notificationEntries.interface.hbs +++ b/templates/notificationEntries.interface.hbs @@ -3,7 +3,10 @@ \{{moment createdAt calendar=null}} \{{data.title}}\{{#and data.title data.message}}
\{{/and}}\{{data.message}} \{{statusText}} - \{{#compare status "===" "published"}}\{{moment orderAt calendar=null}}\{{else}}\{{/compare}} + + \{{#compare status "===" "published"}}\{{moment orderAt calendar=null}}\{{else}}\{{/compare}} + \{{#compare status "===" "scheduled"}} \{{moment orderAt calendar=null}}\{{else}}\{{/compare}} + \{{#if pushNotificationPayload}} \{{#or pushNotificationPayload.title pushNotificationPayload.message}}\{{/or}} \{{else}}