Include dataSets elements.

ccxzhang · Aug 2, 2024 · de09953 · de09953
1 parent 5d9e9bf
commit de09953
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 15 deletions.
diff --git a/src/renderer/src/pages/MainPage/DataElements.jsx b/src/renderer/src/pages/MainPage/DataElements.jsx
@@ -20,20 +20,25 @@ const DataElementsSelector = () => {
   const elements = useLiveQuery(() => dictionaryDb.dataElements.toArray(), [])
   const indicators = useLiveQuery(() => dictionaryDb.indicators.toArray(), [])
   const programIndicators = useLiveQuery(() => dictionaryDb.programIndicators.toArray(), [])
+  const dataSets = useLiveQuery(() => dictionaryDb.dataSets.toArray(), [])
 
   useEffect(() => {
-    if (elements && indicators && programIndicators) {
-      const allData = [...elements, ...indicators, ...programIndicators]
+    if (elements && indicators && programIndicators && dataSets) {
+      const allData = [...elements, ...indicators, ...programIndicators, ...dataSets]
       dispatch(setData(allData))
     }
-  }, [elements, indicators, programIndicators, dispatch])
+  }, [elements, indicators, programIndicators, dataSets, dispatch])
 
   useEffect(() => {
     const filtered = data
       .filter((element) =>
         selectedDataType !== 'All' ? element.category === selectedDataType : true
       )
-      .filter((element) => element.displayName.toLowerCase().includes(searchQuery.toLowerCase()))
+      .filter(
+        (element) =>
+          searchQuery === '' ||
+          element.displayName.toLowerCase().includes(searchQuery.toLowerCase())
+      )
     dispatch(setFilteredElements(filtered))
   }, [data, selectedDataType, searchQuery, dispatch])
 
@@ -60,10 +65,12 @@ const DataElementsSelector = () => {
         <option value="DataElement">Data Element</option>
         <option value="Indicator">Indicator</option>
         <option value="ProgramIndicator">Program Indicator</option>
+        <option value="dataSets">DataSet</option>
       </select>
       <input
         type="text"
         placeholder="Search"
+        value={searchQuery}
         onChange={(e) => dispatch(setSearchQuery(e.target.value))}
         className="mb-2 w-full px-4 py-2 border border-gray-700 rounded"
       />
@@ -73,7 +80,7 @@ const DataElementsSelector = () => {
         className="w-full px-4 py-2 overflow-y border-gray-700 rounded"
         style={{ minHeight: '200px', maxHeight: '200px' }}
       >
-        {filteredElements.map((element) => (
+        {filteredElements?.map((element) => (
           <option key={element.id} value={element.id} className="whitespace-normal">
             - {element.displayName}
           </option>
@@ -91,7 +98,7 @@ const DataElementsSelector = () => {
 
 const SelectedDataElementsDisplay = () => {
   const dispatch = useDispatch()
-  const addedDataElements = useSelector((state) => state.dataElements.addedElements)
+  const addedDataElements = useSelector((state) => state.dataElements?.addedElements)
 
   const handleRemoveElement = (id) => {
     dispatch(removeElement(id))
@@ -101,7 +108,7 @@ const SelectedDataElementsDisplay = () => {
     <div className="mb-4">
       <h3 className="text-xl font-bold mb-2">Selected Items</h3>
       <ul>
-        {addedDataElements.map((element) => (
+        {addedDataElements?.map((element) => (
           <li key={element.id} className="text-sm">
             {element.displayName}
             <button onClick={() => handleRemoveElement(element.id)} className="ml-2 text-red-500">

diff --git a/src/renderer/src/reducers/authReducer.js b/src/renderer/src/reducers/authReducer.js
@@ -4,7 +4,8 @@ import {
   getDataElements,
   getIndicators,
   getProgramIndicators,
-  getCategoryOptionCombos
+  getCategoryOptionCombos,
+  getDataSets
 } from '../service/useApi'
 import { dictionaryDb, servicesDb } from '../service/db'
 import { setLoading, setError, setNotification } from '../reducers/statusReducer'
@@ -78,12 +79,31 @@ export const connect = (dhis2Url, username, password) => async (dispatch) => {
       localStorage.setItem('password', password)
       localStorage.setItem('dhis2Url', dhis2Url)
 
-      const [elements, indicators, programIndicators, catOptionCombos] = await Promise.all([
-        getDataElements(dhis2Url, username, password),
-        getIndicators(dhis2Url, username, password),
-        getProgramIndicators(dhis2Url, username, password),
-        getCategoryOptionCombos(dhis2Url, username, password)
-      ])
+      const [elements, indicators, programIndicators, catOptionCombos, dataSetsRaw] =
+        await Promise.all([
+          getDataElements(dhis2Url, username, password),
+          getIndicators(dhis2Url, username, password),
+          getProgramIndicators(dhis2Url, username, password),
+          getCategoryOptionCombos(dhis2Url, username, password),
+          getDataSets(dhis2Url, username, password)
+        ])
+
+      const dataSetMetrics = [
+        'REPORTING_RATE',
+        'REPORTING_RATE_ON_TIME',
+        'ACTUAL_REPORTS',
+        'ACTUAL_REPORTS_ON_TIME',
+        'EXPECTED_REPORTS'
+      ]
+
+      const dataSets = dataSetsRaw.dataSets.flatMap((ds) =>
+        dataSetMetrics.map((metric) => ({
+          ...ds,
+          id: `${ds.id}.${metric}`,
+          displayName: `${ds.displayName} (${metric})`,
+          category: 'dataSets'
+        }))
+      )
 
       await Promise.all([
         dictionaryDb.dataElements.bulkAdd(
@@ -98,7 +118,8 @@ export const connect = (dhis2Url, username, password) => async (dispatch) => {
             category: 'ProgramIndicator'
           }))
         ),
-        dictionaryDb.catOptionCombos.bulkAdd(catOptionCombos.categoryOptionCombos)
+        dictionaryDb.catOptionCombos.bulkAdd(catOptionCombos.categoryOptionCombos),
+        dictionaryDb.dataSets.bulkAdd(dataSets)
       ])
 
       dispatch(setNotification({ message: 'Connected successfully', type: 'success' }))

diff --git a/src/renderer/src/service/db.js b/src/renderer/src/service/db.js
@@ -11,6 +11,7 @@ dictionaryDb.version(1).stores({
   indicators: '++id, category, displayName, displayDescription, numerator, denominator',
   programIndicators: '++id, category, displayName, displayDescription',
   catOptionCombos: '++id, displayName',
+  dataSets: '++id, displayName',
   query: '++id, ou, pe, dx, co, url'
 })
 

diff --git a/src/renderer/src/service/useApi.js b/src/renderer/src/service/useApi.js
@@ -117,3 +117,8 @@ export const getOrganizationUnitGroupSets = (dhis2Url, username, password) => {
   const orgUnitGroupSetsUrl = `${dhis2Url}/api/organisationUnitGroupSets?fields=id,displayName&paging=false`
   return fetchData(orgUnitGroupSetsUrl, username, password)
 }
+
+export const getDataSets = (dhis2Url, username, password) => {
+  const dataSetsUrl = `${dhis2Url}/api/dataSets?fields=id,displayName&paging=false`
+  return fetchData(dataSetsUrl, username, password)
+}