dev (#1841)

* user admin * Update PULL_REQUEST_TEMPLATE.md * amend indicator radio creation * ch28658 Added Not Yet Due status on progress reports; changed status logic on sync * [ch28658]Not Yet Due - status (#1822) * Not Due Yet - status * Not Due Yet - status * not yet due * Update packages (#1817) * [ch31188] Flash of horizontal scroll (#1818) Co-authored-by: Mercea Emil <[email protected]> Co-authored-by: Trif Adriana <[email protected]> * [ch31343] [Intermittent] Continuous loading PD/SSFA Data in Programme Document (#1826) * [ch28888] Indicator calculation methods are not displayed sometimes * added piwik to frontend_cluster * update common submodule ref * updated common module ref * [ch31343] [Intermittent] Continuous loading PD/SSFA Data in Programme Document Co-authored-by: Adriana Trif <[email protected]> * submodule ref * Fixes after packages update (#1828) * [ch31172]Fixes after packages updates -Fix 'All' being selected in dropdown (#1829) * Fixes after packages update * Fix All being selected in dropdown * [ch31343] [Intermittent] Continuous loading PD/SSFA Data in Programme Document (#1830) * [ch28888] Indicator calculation methods are not displayed sometimes * added piwik to frontend_cluster * update common submodule ref * updated common module ref * [ch31343] [Intermittent] Continuous loading PD/SSFA Data in Programme Document * [ch31343] [Intermittent] Continuous loading PD/SSFA Data in Programme Document * adjustments * updated circleCi for this branch * adjustments * updated prp_common reference * Revert "[ch31343] [Intermittent] Continuous loading PD/SSFA Data in Programme Document (#1830)" (#1833) This reverts commit 613a635. * [ch31611] Progress Reports - Export buttons (XLS, PDF) to be visible only when Submitted, Accepted is selected from Filters * 31343 pd detail serializer * [ch31598] All should be selected by default in filters * [ch31343] [Intermittent] Continuous loading PD/SSFA Data in Programme Document * adjustments * Hotfix on process_due_reports * Latest for percentage (#1842) Co-authored-by: Domenico <[email protected]> Co-authored-by: Ema Ciupe <[email protected]> Co-authored-by: Ema Ciupe <[email protected]> Co-authored-by: Adriana Trif <[email protected]> Co-authored-by: merceaemil <[email protected]> Co-authored-by: Mercea Emil <[email protected]> Co-authored-by: Dan <[email protected]> Co-authored-by: dcioara <[email protected]>
unicef · Oct 28, 2022 · 2c5baa1 · 2c5baa1
1 parent dfda181
commit 2c5baa1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/django_api/etools_prp/apps/indicator/tasks.py b/django_api/etools_prp/apps/indicator/tasks.py
@@ -41,13 +41,13 @@ def process_due_reports():
             report.status = PROGRESS_REPORT_STATUS.overdue
             report.save(update_fields=['status'])
             updates.append(['Overdue', report])
-        elif (report.report_type != "SR" and report.end_date < today < due_date) \
+        elif (report.report_type != "SR" and report.end_date <= today < due_date) \
                 or (report.report_type == "SR" and due_date > today) \
                 and report.status != PROGRESS_REPORT_STATUS.due:
             report.status = PROGRESS_REPORT_STATUS.due
             report.save(update_fields=['status'])
             updates.append(['Due', report])
-        elif (report.report_type != "SR" and report.end_date < today) \
+        elif (report.report_type != "SR" and report.end_date > today) \
                 and report.status != PROGRESS_REPORT_STATUS.not_yet_due:
             report.status = PROGRESS_REPORT_STATUS.not_yet_due
             report.save(update_fields=['status'])

diff --git a/frontend_ip/src_ts/elements/ip-reporting/js/pd-details-calculation-methods-functions.ts b/frontend_ip/src_ts/elements/ip-reporting/js/pd-details-calculation-methods-functions.ts
@@ -36,7 +36,9 @@ export function computeFormattedData(data: GenericObject) {
 }
 
 export function computeSelected(data: GenericObject, scope: string) {
-  return (data.display_type === 'ratio' && scope === 'calculation_formula_across_periods') ? 'latest' : data[scope];
+  return ['ratio', 'percentage'].includes(data.display_type) && scope === 'calculation_formula_across_periods'
+    ? 'latest'
+    : data[scope];
 }
 
 export function computeDisabled(display_type: string) {

diff --git a/frontend_ip/src_ts/elements/ip-reporting/pd-details-calculation-methods.ts b/frontend_ip/src_ts/elements/ip-reporting/pd-details-calculation-methods.ts
@@ -196,7 +196,7 @@ class PdDetailsCalculationMethods extends LocalizeMixin(
                         </paper-radio-button>
                         <paper-radio-button
                           name="latest"
-                          hidden$="[[!_hasTypeRatio(item.data)]]"
+                          hidden$="[[!_hasTypeRatioOrPercentage(item.data)]]"
                           disabled="[[_computeDisabled(item.data.display_type)]]"
                         >
                           [[localize('latest')]]
@@ -280,7 +280,7 @@ class PdDetailsCalculationMethods extends LocalizeMixin(
     return computeDisabled(display_type);
   }
 
-  _hasTypeRatio(data: any) {
+  _hasTypeRatioOrPercentage(data: any) {
     return data.display_type === 'ratio';
   }