feat: add catcombo to selector

i18n/en.pot

@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2021-10-07T11:59:16.763Z\n"
-"PO-Revision-Date: 2021-10-07T11:59:16.763Z\n"
+"POT-Creation-Date: 2025-02-28T07:19:16.560Z\n"
+"PO-Revision-Date: 2025-02-28T07:19:16.560Z\n"
 
 msgid "Not authorized"
 msgstr "Not authorized"
@@ -68,8 +68,14 @@ msgstr "Unapproval failed: {{error}}"
 msgid "Unapprove"
 msgstr "Unapprove"
 
-msgid "This workflow does not contain any data sets."
-msgstr "This workflow does not contain any data sets."
+msgid ""
+"Workflow \"{{ workflowName }}\", organisation unit \"{{ orgunitName }}\" "
+"and attribute option combo \"{{ attrOptionComboName }}\" does not contain "
+"any data sets."
+msgstr ""
+"Workflow \"{{ workflowName }}\", organisation unit \"{{ orgunitName }}\" "
+"and attribute option combo \"{{ attrOptionComboName }}\" does not contain "
+"any data sets."
 
 msgid "Choose a data set to review"
 msgstr "Choose a data set to review"
@@ -81,6 +87,23 @@ msgstr ""
 "{{- workflowName}} has multiple data sets. Choose a data set from the tabs "
 "above."
 
+msgid "Could not load approval data"
+msgstr "Could not load approval data"
+
+msgid ""
+"The selected workflow \"{{workflowName}}\" does not have any associated "
+"data sets."
+msgstr ""
+"The selected workflow \"{{workflowName}}\" does not have any associated "
+"data sets."
+
+msgid ""
+"Please verify the workflow configuration or select a different workflow "
+"that includes data sets."
+msgstr ""
+"Please verify the workflow configuration or select a different workflow "
+"that includes data sets."
+
 msgid "Loading data set"
 msgstr "Loading data set"
 
@@ -229,6 +252,49 @@ msgstr "Financial year (Start July)"
 msgid "Financial year (Start April)"
 msgstr "Financial year (Start April)"
 
+msgid "Choose a period first"
+msgstr "Choose a period first"
+
+msgid "Choose an organisation unit first"
+msgstr "Choose an organisation unit first"
+
+msgid "1 selection"
+msgstr "1 selection"
+
+msgid "0 selections"
+msgstr "0 selections"
+
+msgid "{{amount}} selections"
+msgstr "{{amount}} selections"
+
+msgid "Category Option Combo"
+msgstr "Category Option Combo"
+
+msgid "Choose a category option combo"
+msgstr "Choose a category option combo"
+
+msgid "Choose a combination"
+msgstr "Choose a combination"
+
+msgid "Hide menu"
+msgstr "Hide menu"
+
+msgid "No available options"
+msgstr "No available options"
+
+msgid ""
+"There are no options for {{categoryName}} for the selected period or "
+"organisation unit."
+msgstr ""
+"There are no options for {{categoryName}} for the selected period or "
+"organisation unit."
+
+msgid "Search for {{categoryName}}"
+msgstr "Search for {{categoryName}}"
+
+msgid "No results found for {{searchQuery}}"
+msgstr "No results found for {{searchQuery}}"
+
 msgid "Clear selections"
 msgstr "Clear selections"
 
@@ -241,9 +307,6 @@ msgstr "Approved"
 msgid "Failed to load approval state"
 msgstr "Failed to load approval state"
 
-msgid "Choose a period first"
-msgstr "Choose a period first"
-
 msgid "Choose a workflow and period first"
 msgstr "Choose a workflow and period first"
 
@@ -253,6 +316,9 @@ msgstr "Organisation Unit"
 msgid "Choose an organisation unit"
 msgstr "Choose an organisation unit"
 
+msgid "Search by name"
+msgstr "Search by name"
+
 msgid "Period"
 msgstr "Period"
 
@@ -271,8 +337,8 @@ msgstr "Choose a workflow"
 msgid "No workflows found. None may exist, or you may not have access to any."
 msgstr "No workflows found. None may exist, or you may not have access to any."
 
-msgid "Could not load approval data"
-msgstr "Could not load approval data"
+msgid "Search"
+msgstr "Search"
 
 msgid "Retry loading approval data"
 msgstr "Retry loading approval data"

package.json

@@ -1,5 +1,5 @@
 {
-    "name": "approval-app",
+    "name": "approval-app-tran-dev",
     "version": "100.0.16",
     "description": "",
     "license": "BSD-3-Clause",
@@ -43,12 +43,15 @@
     },
     "dependencies": {
         "@dhis2/app-runtime": "^3.2.1",
+        "@dhis2/multi-calendar-dates": "^2.0.0",
         "@dhis2/prop-types": "^1.6.4",
         "@dhis2/ui": "^7.2.7",
         "dompurify": "^3.1.6",
         "history": "^5.0.1",
         "prop-types": "^15.7.2",
         "query-string": "^7.0.1",
+        "react-scripts": "^5.0.1",
+        "react-select": "^1.2.1",
         "use-debounce": "^7.0.0"
     }
 }

src/app-context/app-context.js

@@ -4,6 +4,7 @@ const AppContext = createContext({
     authorities: [],
     organisationUnits: [],
     dataApprovalWorkflows: [],
+    metadata: {},
 })
 
 export { AppContext }

src/app-context/app-provider.js

@@ -23,10 +23,23 @@ const query = {
                 'displayName',
                 'dataApprovalLevels',
                 'periodType',
-                'dataSets[id,displayName,periodType,formType]',
+                'dataSets[id,displayName,periodType,formType,categoryCombo[id],organisationUnits[id,path]]'
             ],
         },
     },
+    metadata: {
+        resource: 'categoryCombos',
+        params: {
+            paging: false,
+            fields: [
+                'id',
+                'displayName',
+                'isDefault',
+                'categories[displayName,name,id,categoryOptions[id,displayName,name,startDate,endDate,organisationUnits[id,path]]]',
+                'categoryOptionCombos[id,displayName,categoryOptions[id,displayName,name,startDate,endDate,organisationUnits[id,path]]]',
+            ],
+        },
+    }
 }
 
 const AppProvider = ({ children }) => {
@@ -51,10 +64,12 @@ const AppProvider = ({ children }) => {
 
     const { authorities, organisationUnits } = data.me
     const { dataApprovalWorkflows } = data.dataApprovalWorkflows
+    const { metadata } = data
     const providerValue = {
         authorities,
         organisationUnits,
         dataApprovalWorkflows,
+        metadata
     }
 
     return (

src/bottom-bar/accept-button/accept-button.js

@@ -6,7 +6,13 @@ import { useWorkflowContext } from '../../workflow-context/index.js'
 import { useAcceptData } from './use-accept-data.js'
 
 const AcceptButton = () => {
-    const [acceptData, { loading, error }] = useAcceptData()
+    const [acceptData, { loading, error }] = useAcceptData({
+            onComplete: () => {
+               refresh()
+            },
+            onError: (e) => console.log(e.message),
+        })
+
     const { params, refresh } = useWorkflowContext()
     const { show } = useAlert(
         i18n.t('Acceptance failed: {{error}}', {
@@ -16,20 +22,24 @@ const AcceptButton = () => {
     )
 
     useEffect(() => {
-        if (error?.message) {
-            show()
-        }
-    }, [error?.message])
-
+           if (error?.message) {
+               show()
+           }
+       }, [error?.message])
+
+    const onAccept =() => {
+        const { wf, pe, ou, aoc } = params
+
+        const acceptances = [{"ou": ou, "aoc": aoc}]
+        acceptData({ wf:[wf], pe:[pe], approvals: acceptances })
+    }
+
+
     return (
         <Button
             small
             disabled={loading}
-            onClick={async () => {
-                const { wf, pe, ou } = params
-                await acceptData({ wf, pe, ou })
-                refresh()
-            }}
+            onClick={onAccept}
         >
             {i18n.t('Accept')}
         </Button>

src/bottom-bar/accept-button/use-accept-data.js

@@ -1,9 +1,10 @@
 import { useDataMutation } from '@dhis2/app-runtime'
 
 export const ACCEPT_DATA_MUTATION = {
-    resource: 'dataAcceptances',
+    resource: 'dataAcceptances/acceptances',
     type: 'create',
-    params: ({ wf, pe, ou }) => ({ wf, pe, ou }),
+    data: ({ wf, pe, approvals }) => ({ wf, pe, approvals }),
 }
 
-export const useAcceptData = () => useDataMutation(ACCEPT_DATA_MUTATION)
+export const useAcceptData = ({ onComplete, onError }) =>
+    useDataMutation(ACCEPT_DATA_MUTATION, { onComplete, onError })

src/bottom-bar/approve-button/approve-button.js

@@ -17,8 +17,10 @@ const ApproveButton = ({ disabled }) => {
     const showApprovalDialog = () => setShowApproveModal(true)
     const hideApprovalDialog = () => setShowApproveModal(false)
     const onApprove = () => {
-        const { wf, pe, ou } = params
-        approveData({ wf, pe, ou })
+        const { wf, pe, ou, aoc } = params;
+
+        const approvals = [{"ou": ou, "aoc": aoc}];
+        approveData({ wf:[wf], pe:[pe], approvals })
     }
 
     // api
@@ -36,7 +38,7 @@ const ApproveButton = ({ disabled }) => {
 
     // derived state
     const error = approveError || unexpectedError
-
+    
     return (
         <>
             <Button

src/bottom-bar/approve-button/approve-modal/approve-modal.js

@@ -11,11 +11,14 @@ import {
 import PropTypes from 'prop-types'
 import React from 'react'
 import { useSelectionContext } from '../../../selection-context/index.js'
+import { filterDataSetsByAttributeOptionComboAndOrgUnit } from '../../../utils/category-combo-utils.js'
 import styles from './approve-modal.module.css'
+import { useAppContext } from '../../../app-context/use-app-context.js'
 
 const ApproveModal = ({ onApprove, onCancel, error }) => {
-    const { workflow } = useSelectionContext()
-    const { dataSets } = workflow
+    const { metadata } = useAppContext()
+    const { workflow, orgUnit, attributeOptionCombo} = useSelectionContext()
+    const dataSets = filterDataSetsByAttributeOptionComboAndOrgUnit(metadata, workflow, orgUnit, attributeOptionCombo)
     const count = dataSets.length
 
     return (

src/bottom-bar/approve-button/use-approve-data.js

@@ -1,9 +1,9 @@
 import { useDataMutation } from '@dhis2/app-runtime'
 
 export const APPROVE_DATA_MUTATION = {
-    resource: 'dataApprovals',
+    resource: 'dataApprovals/approvals',
     type: 'create',
-    params: ({ wf, pe, ou }) => ({ wf, pe, ou }),
+    data: ({ wf, pe, approvals }) => ({ wf, pe, approvals }),
 }
 
 export const useApproveData = ({ onComplete, onError }) =>

src/bottom-bar/bottom-bar.js

@@ -69,4 +69,4 @@ const BottomBar = () => {
     )
 }
 
-export { BottomBar }
+export { BottomBar }

src/bottom-bar/unaccept-button/unaccept-button.js

@@ -6,7 +6,12 @@ import { useWorkflowContext } from '../../workflow-context/index.js'
 import { useUnacceptData } from './use-unaccept-data.js'
 
 const UnacceptButton = () => {
-    const [unacceptData, { loading, error }] = useUnacceptData()
+    const [unacceptData, { loading, error }] = useUnacceptData({
+            onComplete: () => {
+                refresh()
+            },
+            onError: (e) => console.log(e.message),
+        })
     const { params, refresh } = useWorkflowContext()
     const { show } = useAlert(
         i18n.t('Unacceptance failed: {{error}}', {
@@ -21,15 +26,19 @@ const UnacceptButton = () => {
         }
     }, [error?.message])
 
+    const onUnaccept =() => {
+        const { wf, pe, ou, aoc } = params
+
+        const unapprovals = [{"ou": ou, "aoc": aoc}]
+        unacceptData({ wf:[wf], pe:[pe], approvals: unapprovals })
+        // refresh()
+    }
+
     return (
         <Button
             small
             disabled={loading}
-            onClick={async () => {
-                const { wf, pe, ou } = params
-                await unacceptData({ wf, pe, ou })
-                refresh()
-            }}
+            onClick={onUnaccept}
         >
             {i18n.t('Unaccept')}
         </Button>

src/bottom-bar/unaccept-button/use-unaccept-data.js

@@ -1,9 +1,10 @@
 import { useDataMutation } from '@dhis2/app-runtime'
 
 export const UNACCEPT_DATA_MUTATION = {
-    resource: 'dataAcceptances',
-    type: 'delete',
-    params: ({ wf, pe, ou }) => ({ wf, pe, ou }),
+    resource: 'dataAcceptances/unacceptances',
+    type: 'create',
+    data: ({ wf, pe, approvals }) => ({ wf, pe, approvals }),
 }
 
-export const useUnacceptData = () => useDataMutation(UNACCEPT_DATA_MUTATION)
+export const useUnacceptData = ({ onComplete, onError }) =>
+    useDataMutation(UNACCEPT_DATA_MUTATION, { onComplete, onError })