Merge pull request #190 from pepfar-datim/hide-submit

submitted by global
pepfar-datim · Apr 15, 2020 · 82b9446 · 82b9446
2 parents 659c78b + 4001a12
commit 82b9446
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/src/config/serverConfig.dev.json b/src/config/serverConfig.dev.json
@@ -1,5 +1,5 @@
 {
-  "baseUrl": "https://dev.datim.org/",
+  "baseUrl": "https://test.datim.org/",
   "sqlViewId": "rQZnEgCAhuI",
   "apiVersion": "30"
 }
diff --git a/src/modules/action/components/step/step.component.tsx b/src/modules/action/components/step/step.component.tsx
@@ -67,6 +67,7 @@ export default function Step({workflow, mechanismState, userType}:{workflow: str
     const classes = useStyles();
     if (!mechanismState) return <Loading message='Loading mechanism state...'/>;;
     if (!userType) return null;
+    if (mechanismState.status === 'submitted by global') return null;
     const workflowType = getWorkflowTypeById(workflow);
     return(
         <Stepper id='cy_actionPage_stepper' activeStep={getStepNr(mechanismState.status, workflowType)} alternativeLabel classes={{root:classes.root}}>

diff --git a/src/modules/action/services/mechanism.service.tsx b/src/modules/action/services/mechanism.service.tsx
@@ -108,9 +108,10 @@ export function getMechanismsInfo(mechanismIds: string[]):Promise<MechanismInfo[
 }
 
 function transformCOCToMechanismState(workflow, combo){
+    let status = getStatus(getWorkflowTypeById(workflow), combo.level.level, combo.accepted);
     return {
-        status: getStatus(getWorkflowTypeById(workflow), combo.level.level, combo.accepted),
-        actions: getPermittedActions(combo.permissions),
+        status: status,
+        actions: getPermittedActions(combo.permissions, status),
         view: combo.permissions.mayReadData
     }
 }

diff --git a/src/modules/list/services/mechanisms.service.tsx b/src/modules/list/services/mechanisms.service.tsx
@@ -1,5 +1,5 @@
 import api from "../../shared/services/api.service";
-import MechanismModel, {MechanismActions} from "../../shared/models/mechanism.model";
+import MechanismModel from "../../shared/models/mechanism.model";
 import getStatus from "../../shared/services/status.service";
 import Filters from "../models/filters.model";
 import {getWorkflowTypeById} from "../../shared/services/workflowService";
@@ -39,6 +39,7 @@ export function fetchMechanisms(filters:Filters):Promise<MechanismModel[]>{
                 if (infoResp.categoryOptions.filter(i=>i.id===mech.id).length>1) console.log(`Two info records per mechanism ${mech.id} ${mechInfo.name}`);
                 if (!mechInfo.organisationUnits[0]) return console.log(`No OU info for Mechanism ${mech.id} ${mechInfo.name}. Mechanism filtered out.`, mech, mechInfo);
                 if (mechInfo.organisationUnits[0].id!==filters.ou && filters.ou!=='ybg3MO3hcf4') return console.log(`OU info not matching for Mechanism ${mech.id} ${mechInfo.name}. Mechanism filtered out.`, mech, mechInfo);
+                let status = getStatus(getWorkflowTypeById(filters.workflow), mech.level.level, mech.accepted);
                 return {
                     info: {
                         name: mechInfo.name,
@@ -47,8 +48,8 @@ export function fetchMechanisms(filters:Filters):Promise<MechanismModel[]>{
                         agency: getInfoByGroupSet(mechInfo, agencyGroupSet),
                     },
                     state: {
-                        status: getStatus(getWorkflowTypeById(filters.workflow), mech.level.level, mech.accepted),
-                        actions: getPermittedActions(mech.permissions),
+                        status: status,
+                        actions: getPermittedActions(mech.permissions, status),
                         view: mech.permissions.mayReadData
                     },
                     meta: {

diff --git a/src/modules/shared/services/permittedActions.service.tsx b/src/modules/shared/services/permittedActions.service.tsx
@@ -18,8 +18,9 @@ function canReturn(dhis2Permissions:Dhis2Permissions):boolean{
     return false;
 }
 
-export default function getPermittedActions(dhis2permissions:Dhis2Permissions):MechanismActions {
+export default function getPermittedActions(dhis2permissions:Dhis2Permissions, currentStatus:string):MechanismActions {
     if (!dhis2permissions) return {};
+    if (currentStatus==='accepted by global') dhis2permissions.mayApprove = false;
     return {
         submit: dhis2permissions.mayApprove,
         accept: dhis2permissions.mayAccept,

diff --git a/src/modules/shared/services/status.service.tsx b/src/modules/shared/services/status.service.tsx
@@ -9,5 +9,6 @@ export default function  getStatus(workflowType:string, level:string, accepted:b
     if (level==='2' && !accepted && workflowType==='ER')  return 'submitted by agency hq';
     if (level==='2' && accepted && workflowType==='ER')  return 'accepted by global';
     if (level==='3' && accepted)  return 'accepted by global';
+    if (level==='1' && !accepted)  return 'submitted by global';
     return `${level} / ${accepted}`;
 }