Przeglądaj źródła

Show overdue status of reminders

Neal Wilson 9 lat temu
rodzic
commit
d42965abb4
1 zmienionych plików z 4 dodań i 8 usunięć
  1. 4
    8
      config/Reports/reminders.xml

+ 4
- 8
config/Reports/reminders.xml Wyświetl plik

@@ -45,13 +45,12 @@
45 45
                         if(reminder.value == 0 || (reminder.value < Number(dq.value(0))))
46 46
                         {
47 47
                             proportion = 1;
48
-                            remain = 0;
49 48
                         }
50 49
                         else
51 50
                         {
52 51
                             proportion = Number(dq.value(0)) / reminder.value;
53
-                            remain = (reminder.value - Number(dq.value(0))).toFixed(0);
54 52
                         }
53
+                        remain = (reminder.value - Number(dq.value(0))).toFixed(0);
55 54
                         reminder.completion = proportion;
56 55
                         reminder.detail = remain + unittext;
57 56
                         dq = dq.invalidate();
@@ -68,13 +67,12 @@
68 67
                         if(reminder.value == 0 || (reminder.value < Number(dq.value(0))))
69 68
                         {
70 69
                             proportion = 1;
71
-                            remain = 0;
72 70
                         }
73 71
                         else
74 72
                         {
75 73
                             proportion = Number(dq.value(0)) / reminder.value;
76
-                            remain = reminder.value - Number(dq.value(0));
77 74
                         }
75
+                        remain = reminder.value - Number(dq.value(0));
78 76
                         reminder.completion = proportion;
79 77
                         reminder.detail = remain + " Days";
80 78
                         dq = dq.invalidate();
@@ -91,13 +89,12 @@
91 89
                         if(reminder.value == 0 || (reminder.value < Number(dq.value(0))))
92 90
                         {
93 91
                             proportion = 1;
94
-                            remain = 0;
95 92
                         }
96 93
                         else
97 94
                         {
98 95
                             proportion = Number(dq.value(0)) / reminder.value;
99
-                            remain = reminder.value - Number(dq.value(0));
100 96
                         }
97
+                        remain = reminder.value - Number(dq.value(0));
101 98
                         reminder.completion = proportion;
102 99
                         reminder.detail = remain + " Batches";
103 100
                         dq = dq.invalidate();
@@ -114,13 +111,12 @@
114 111
                         if(reminder.value == 0 || (reminder.value < Number(dq.value(0))))
115 112
                         {
116 113
                             proportion = 1;
117
-                            remain = 0;
118 114
                         }
119 115
                         else
120 116
                         {
121 117
                             proportion = Number(dq.value(0)) / reminder.value;
122
-                            remain = reminder.value - Number(dq.value(0));
123 118
                         }
119
+                        remain = reminder.value - Number(dq.value(0));
124 120
                         reminder.completion = proportion;
125 121
                         reminder.detail = remain.toFixed(1) + " Hours";
126 122
                         dq = dq.invalidate();

Ładowanie…
Anuluj
Zapisz