+
+
+
+
+
+
+
+
+
+ Page {currentPage} of {totalPages}
+
+
+
+
+
+
+
+
+
diff --git a/src/renderer/src/pages/DownloadHistory/index.jsx b/src/renderer/src/pages/DownloadHistory/index.jsx
index 9cf35f7..dd545db 100644
--- a/src/renderer/src/pages/DownloadHistory/index.jsx
+++ b/src/renderer/src/pages/DownloadHistory/index.jsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react'
+import React, { useState, useEffect, useMemo } from 'react'
import { useDispatch, useSelector } from 'react-redux'
import JSZip from 'jszip'
import { useLiveQuery } from 'dexie-react-hooks'
@@ -12,9 +12,15 @@ import {
clearEditedRow
} from '../../reducers/historyReducer'
import { addSelectedElements } from '../../reducers/dataElementsReducer'
+import { updateOrgUnitLevels, toggleOrgUnitSelection } from '../../reducers/orgUnitReducer'
+import { MicroArrowDownTray, MicroArrowTopRight, MicroTrash } from '../../components/Icons'
+import Pagination from '../../components/Pagination'
// eslint-disable-next-line react/prop-types
const HistoryPage = ({ dictionaryDb, queryDb }) => {
+ const [currentPage, setCurrentPage] = useState(1)
+ const [jumpToPage, setJumpToPage] = useState('')
+ const [itemsPerPage, setItemsPerPage] = useState(10)
const downloadQueries = useLiveQuery(() => queryDb.query.toArray(), []) || []
const [temporaryNote, setTemporaryNote] = useState('')
const dispatch = useDispatch()
@@ -23,6 +29,35 @@ const HistoryPage = ({ dictionaryDb, queryDb }) => {
const worker = new Worker(new URL('../../service/worker.js', import.meta.url))
const allElements = useLiveQuery(() => dictionaryDb.elements.toArray(), []) || []
+ const totalPages = useMemo(() => {
+ return Math.ceil(downloadQueries.length / itemsPerPage)
+ }, [downloadQueries.length, itemsPerPage])
+
+ const currentPageData = useMemo(() => {
+ const startIndex = (currentPage - 1) * itemsPerPage
+ const endIndex = startIndex + itemsPerPage
+ return downloadQueries.slice(startIndex, endIndex)
+ }, [currentPage, itemsPerPage, downloadQueries])
+
+ useEffect(() => {}, [currentPageData])
+
+ const handlePageChange = (page) => {
+ setCurrentPage(page)
+ }
+
+ const handleItemsPerPageChange = (event) => {
+ setItemsPerPage(Number(event.target.value))
+ setCurrentPage(1)
+ }
+
+ const handleJumpToPageSubmit = (event) => {
+ event.preventDefault()
+ const page = Number(jumpToPage)
+ if (page > 0 && page <= totalPages) {
+ setCurrentPage(page)
+ }
+ }
+
useEffect(() => {
if (editedRow.rowId !== null) {
setTemporaryNote(editedRow.note || '')
@@ -143,12 +178,29 @@ const HistoryPage = ({ dictionaryDb, queryDb }) => {
}
const handlePassParams = (id) => {
- console.log(downloadQueries)
const params = downloadQueries.filter((el) => el.id === id)
const dimensions = params.flatMap((param) =>
param.dimension.includes(';') ? param.dimension.split(';') : param.dimension
)
- console.log(dimensions)
+ // organUnitLevel
+ params.forEach((param) => {
+ ;(param.organizationLevel.includes(';')
+ ? param.organizationLevel.split(';')
+ : [param.organizationLevel]
+ ).forEach((org) => {
+ if (org.includes('LEVEL')) {
+ const numericLevel = parseInt(org.replace(/LEVEL-/gi, ''), 10)
+ if (!isNaN(numericLevel)) {
+ dispatch(updateOrgUnitLevels(numericLevel))
+ }
+ } else if (org.length == 11) {
+ dispatch(toggleOrgUnitSelection(org))
+ }
+ })
+ })
+ // date
+
+ // dimension
const elementsInfo = allElements.filter((el) => dimensions.includes(el.id))
dispatch(
addSelectedElements(elementsInfo.map((el) => ({ id: el.id, displayName: el.displayName })))
@@ -169,15 +221,33 @@ const HistoryPage = ({ dictionaryDb, queryDb }) => {
return (
{/* Toolbar Component */}
-
+
+
+
+
+
+
+
@@ -198,14 +268,14 @@ const HistoryPage = ({ dictionaryDb, queryDb }) => {
{queryHeaders.map((name, index) => (
-
+ |
{name}
|
))}
- {downloadQueries.map((el) => (
+ {currentPageData.map((el) => (
|
{
|
{queryHeaders.map((header) => (
-
+ |
{editedRow.rowId === el.id && header === 'notes' ? (
{
|
-
-
-
-
+
)
diff --git a/src/renderer/src/pages/MainPage/CategoryCombo.jsx b/src/renderer/src/pages/MainPage/CategoryCombo.jsx
index 7add6d6..8b1ff86 100644
--- a/src/renderer/src/pages/MainPage/CategoryCombo.jsx
+++ b/src/renderer/src/pages/MainPage/CategoryCombo.jsx
@@ -59,8 +59,8 @@ const CategoryDropdownMenu = () => {
▼
{openDropdowns[dropdownId] && (
-
-
+
+
{category?.map((combo) => (
- {
className="cursor-pointer"
onChange={(e) => handleSelectCategory(combo.id, e)}
/>
- {combo.displayName}
+ {combo.displayName}
))}
diff --git a/src/renderer/src/pages/MainPage/OrgUnitLevelMenu.jsx b/src/renderer/src/pages/MainPage/OrgUnitLevelMenu.jsx
index ba99f49..1b9e169 100644
--- a/src/renderer/src/pages/MainPage/OrgUnitLevelMenu.jsx
+++ b/src/renderer/src/pages/MainPage/OrgUnitLevelMenu.jsx
@@ -54,9 +54,9 @@ const OrgUnitLevelMenu = () => {
▼
+
- {allOrgUnitLevels.map((level) => (
+ {allOrgUnitLevels?.map((level) => (
- {
className="cursor-pointer"
onChange={(e) => handleOrgUnitLevelChange(level.level, e)}
/>
- {level.displayName}
+ {level.displayName}
))}
diff --git a/src/renderer/src/pages/MainPage/index.jsx b/src/renderer/src/pages/MainPage/index.jsx
index 085db18..089ce0d 100644
--- a/src/renderer/src/pages/MainPage/index.jsx
+++ b/src/renderer/src/pages/MainPage/index.jsx
@@ -9,6 +9,7 @@ import { generateDownloadingUrl, createDataChunks } from '../../utils/downloadUt
import DownloadButton from './DownloadButton'
import { useSelector, useDispatch } from 'react-redux'
import { triggerLoading, triggerNotification } from '../../reducers/statusReducer'
+import Tooltip from '../../components/Tooltip'
// eslint-disable-next-line react/prop-types
const MainPage = ({ queryDb }) => {
@@ -23,7 +24,7 @@ const MainPage = ({ queryDb }) => {
let ou = ''
if (selectedOrgUnits.length > 0) {
let levels = selectedOrgUnitLevels.map((level) => `LEVEL-${level}`).join(';')
- ou = `${levels};${selectedOrgUnits.join(';')}&ouMode=SELECTED`
+ ou = `${levels};${selectedOrgUnits.join(';')}`
} else {
ou = selectedOrgUnitLevels.map((level) => `LEVEL-${level}`).join(';')
}
@@ -76,7 +77,8 @@ const MainPage = ({ queryDb }) => {
period: pe,
dimension: dx,
disaggregation: co,
- url: downloadingUrl
+ url: downloadingUrl,
+ notes: ''
})
const csvBlob = new Blob([headerBlob, ...dataChunks], { type: 'text/csv;charset=utf-8' })
const downloadLink = document.createElement('a')
@@ -97,47 +99,73 @@ const MainPage = ({ queryDb }) => {
}
}
- const isDownloadDisabled =
- new Date(startDate) >= new Date(endDate) ||
+ const isDownloadDisabled = !startDate || !endDate
+ new Date(startDate) >= new Date(endDate) ||
addedElements.length == 0 ||
selectedOrgUnitLevels.length == 0
return (
-
-
-
Organization Units
+
+ {/* Organization Units Column */}
+
+
+ Organization Units
+
+
-
-
Data Elements and Indicators
+
+ {/* Data Elements and Indicators Column */}
+
+
+ Data Elements and Indicators
+
-
-
Organization Levels
-
+
+ {/* Third Column: Organization Levels, Date Range, Disaggregation */}
+
+
Organization Levels
+
-
Date Range
-
+
Date Range
+
-
Category Combination
-
+
Disaggregation
+
-
+
+ {/* Download Button */}
+
+
Download
{
const dispatch = useDispatch()
const openDropdowns = useSelector((state) => state.mouse.openDropdowns)
-
const timerRef = useRef(null)
const handleMouseEnter = (dropdownId) => {
@@ -35,7 +34,7 @@ const NavBar = ({ accessToken, username, handleDisconnect }) => {
return (
-