MailTracker.js: set start of next day for end-time

[pmg-gui.git] / js / MailTracker.js

diff --git a/js/MailTracker.js b/js/MailTracker.js
index 7f4042e6a4ff9be736390d0f30a19efd61068eec..76fe949e5d1971996a247124c1d6010e48125eb9 100644 (file)
--- a/js/MailTracker.js
+++ b/js/MailTracker.js
@@ -9,7 +9,9 @@ Ext.define('pmg-mail-tracker', {
     proxy: {
        type: 'proxmox'
     },
-    idProperty: 'id'
+    // do not use field 'id', because "id/to" is the unique Id
+    // this way we display an entry for each receiver
+    idProperty: 'none'
 });
 
 
@@ -96,17 +98,28 @@ Ext.define('PMG.MailTrackerFilter', {
                    value: (function() {
                        var now = new Date();
                        return new Date(now.getTime() - 3600000);
-                   })(),
+                   }()),
                    xtype: 'promxoxDateTimeField'
                },
                {
                    fieldLabel: gettext('End'),
                    reference: 'endtime',
                    listeners: { change: 'onFilterChange' },
+                   value: (function() {
+                       var now = new Date();
+                       var tomorrow = new Date();
+                       tomorrow.setDate(now.getDate()+1);
+                       tomorrow.setHours(0);
+                       tomorrow.setMinutes(0);
+                       tomorrow.setSeconds(0);
+                       return tomorrow;
+                   }()),
                    xtype: 'promxoxDateTimeField'
                },
                {
-                   layout: 'hbox',
+                   layout: {
+                       type: 'hbox'
+                   },
                    border: false,
                    items: [
                        {
@@ -145,7 +158,9 @@ Ext.define('PMG.MaiLogWindow', {
     height: 400,
     scrollable: true,
 
-    layout: 'auto',
+    layout: {
+       type: 'auto'
+    },
     modal: true,
     bodyPadding: 5,
 
@@ -217,7 +232,7 @@ Ext.define('PMG.MailTracker', {
     plugins: [
        {
            ptype: 'rowexpander',
-           rowBodyTpl: '<p class="logs">{logs}</p>',
+           rowBodyTpl: '<p class="logs">{logs}</p>'
        }
     ],
 
@@ -328,10 +343,10 @@ Ext.define('PMG.MailTracker', {
                var icon = 'question-circle';
                var rstatus = rec.data.rstatus;
                if (v !== undefined && v !== '') {
-                   vtext = PMG.Utils.mail_status_map[v] || v;
+                   var vtext = PMG.Utils.mail_status_map[v] || v;
                    icon = v;
                    if (rstatus !== undefined && rstatus !== '') {
-                       rtext = PMG.Utils.mail_status_map[rstatus] || rstatus;
+                       var rtext = PMG.Utils.mail_status_map[rstatus] || rstatus;
                        returntext = vtext + '/' + rtext;
                        icon = rstatus;
                    } else if (rec.data.qid !== undefined) {