Skip to content

Replicate MAL approval report for NHWA #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
eperedo wants to merge 26 commits into
base: development
Choose a base branch
from
Draft

Replicate MAL approval report for NHWA #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
40183fe
feat: add logs to display response on data approval
deeonwuli Jun 11, 2025
21472e3
change console.log for console debug for console dir
MiquelAdell Jun 16, 2025
2fa9a07
change console.log for console debug for console dir
MiquelAdell Jun 16, 2025
2ef90f8
feat: include children in data approval; add default years
deeonwuli Jun 16, 2025
af2c005
fix: filter data values correctly in diffreport
deeonwuli Jun 23, 2025
bdc3196
add approval malaria usecase and generate json report with results
eperedo Jun 28, 2025
b841953
check differences by org. unit to include empty values in APVD
eperedo Jun 30, 2025
bd51533
avoid empty dataValues in save process
eperedo Jul 1, 2025
7a9ed8a
Merge branch 'development' of github.com:EyeSeeTea/d2-reports into fe…
eperedo Jul 1, 2025
7c78406
set original value for dataValues in DELETE process
eperedo Jul 2, 2025
ddc9e5c
nhwa approval report
eperedo Aug 14, 2025
469001c
update sqlviews for module 1 and 2
eperedo Aug 15, 2025
26d9f74
fix build process and update locales
eperedo Aug 15, 2025
4fb51b6
include incomplete process in revoke action
eperedo Aug 15, 2025
dc4fe2b
hide approve action if modification count is zero
eperedo Aug 18, 2025
e259eef
validate dataSet status before approve, add new filters
eperedo Aug 19, 2025
771a305
fix approve and submit actions
eperedo Aug 20, 2025
2510437
remove console logs
eperedo Aug 20, 2025
2c7c1ce
show loading messages for actions
eperedo Aug 21, 2025
b6ecf59
clear table after executing actions and allow refresh data by clickin…
eperedo Aug 21, 2025
736c322
update actions to process multiple dataSets
eperedo Aug 21, 2025
124c9b0
fix table to clear list and refresh rows after every action
eperedo Aug 21, 2025
1805f82
update app manifest
eperedo Aug 21, 2025
e22e6af
update label for period dropdown
eperedo Aug 22, 2025
626d4ff
allow check differences even if dataSet is submitted
eperedo Aug 22, 2025
0eaa1a2
remove approval validation before approving single dataValues
eperedo Aug 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 47 additions & 42 deletions i18n/en.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ 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: 2025-01-21T08:14:43.180Z\n"
"PO-Revision-Date: 2025-01-21T08:14:43.180Z\n"
"POT-Creation-Date: 2025-08-21T17:39:05.618Z\n"
"PO-Revision-Date: 2025-08-21T17:39:05.618Z\n"

msgid "<No value>"
msgid "0"
msgstr ""

msgid "- All -"
msgid "<No value>"
msgstr ""

msgid "LOG OUT"
Expand Down Expand Up @@ -58,16 +58,6 @@ msgstr ""
msgid "Are you sure?"
msgstr ""

msgid ""
"Module 1 totals with missing sum or sum that does not match the "
"auto-calculated"
msgstr ""

msgid ""
"Module 1 (Subnational single entry) totals with missing sum or sum that "
"does not match the auto-calculated"
msgstr ""

msgid "Metadata Admin Report"
msgstr ""

Expand Down Expand Up @@ -617,79 +607,94 @@ msgstr ""
msgid "Error when trying to check difference in data values"
msgstr ""

msgid "Malaria Data Approval Report"
msgid "Data Approval Report"
msgstr ""

msgid "Data set"
msgid "Complete"
msgstr ""

msgid "Attribute"
msgid "Incomplete"
msgstr ""

msgid "Completion status"
msgid "Submit"
msgstr ""

msgid "Submission status"
msgid "Revoke"
msgstr ""

msgid "Modification Count"
msgid "Check Difference"
msgstr ""

msgid "Last modification date"
msgid "Check differences"
msgstr ""

msgid "Last date of submission"
msgid "Submitted"
msgstr ""

msgid "Last date of approval"
msgid "Ready for submission"
msgstr ""

msgid "Complete"
msgid "Not Approved"
msgstr ""

msgid "Error when trying to complete data set"
msgid "Greater than 0"
msgstr ""

msgid "Incomplete"
msgid "Data sets"
msgstr ""

msgid "Error when trying to incomplete data set"
msgid "Periods"
msgstr ""

msgid "Submit"
msgid "Completion status"
msgstr ""

msgid "Error when trying to submit data set"
msgid "Submission status"
msgstr ""

msgid "Revoke"
msgid "Approval status"
msgstr ""

msgid "Modification Count"
msgstr ""

msgid "Error when trying to approve data set"
msgstr ""

msgid "Completing dataset"
msgstr ""

msgid "Updating status to incomplete"
msgstr ""

msgid "Revoking dataset"
msgstr ""

msgid "Error when trying to unsubmit data set"
msgstr ""

msgid "Activate monitoring"
msgid "Submitting dataset"
msgstr ""

msgid "Deactivate monitoring"
msgid "Error when trying to submit data set"
msgstr ""

msgid "Check Difference"
msgid "Data set"
msgstr ""

msgid "Check differences"
msgid "Attribute"
msgstr ""

msgid "Submitted"
msgid "Not approved"
msgstr ""

msgid "Ready for submission"
msgid "Last modification date"
msgstr ""

msgid "Data sets"
msgid "Last date of submission"
msgstr ""

msgid "Periods"
msgid "Last date of approval"
msgstr ""

msgid "Malaria Data Subscription Report"
Expand Down Expand Up @@ -749,16 +754,16 @@ msgstr ""
msgid "NHWA Data Approval Status Report"
msgstr ""

msgid "Approval status"
msgid "Last updated value"
msgstr ""

msgid "Last updated value"
msgid "Error when trying to complete data set"
msgstr ""

msgid "Approving data sets..."
msgid "Error when trying to incomplete data set"
msgstr ""

msgid "Error when trying to approve data set"
msgid "Approving data sets..."
msgstr ""

msgid "Unapprove"
Expand Down
87 changes: 46 additions & 41 deletions i18n/es.po
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2025-01-21T08:14:12.526Z\n"
"POT-Creation-Date: 2025-08-21T17:39:05.618Z\n"
"PO-Revision-Date: 2018-10-25T09:02:35.143Z\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"

msgid "<No value>"
msgid "0"
msgstr ""

msgid "- All -"
msgid "<No value>"
msgstr ""

msgid "LOG OUT"
Expand Down Expand Up @@ -58,16 +58,6 @@ msgstr ""
msgid "Are you sure?"
msgstr ""

msgid ""
"Module 1 totals with missing sum or sum that does not match the auto-"
"calculated"
msgstr ""

msgid ""
"Module 1 (Subnational single entry) totals with missing sum or sum that does "
"not match the auto-calculated"
msgstr ""

msgid "Metadata Admin Report"
msgstr ""

Expand Down Expand Up @@ -618,79 +608,94 @@ msgstr ""
msgid "Error when trying to check difference in data values"
msgstr ""

msgid "Malaria Data Approval Report"
msgid "Data Approval Report"
msgstr ""

msgid "Data set"
msgid "Complete"
msgstr ""

msgid "Attribute"
msgid "Incomplete"
msgstr ""

msgid "Completion status"
msgid "Submit"
msgstr ""

msgid "Submission status"
msgid "Revoke"
msgstr ""

msgid "Modification Count"
msgid "Check Difference"
msgstr ""

msgid "Last modification date"
msgid "Check differences"
msgstr ""

msgid "Last date of submission"
msgid "Submitted"
msgstr ""

msgid "Last date of approval"
msgid "Ready for submission"
msgstr ""

msgid "Complete"
msgid "Not Approved"
msgstr ""

msgid "Error when trying to complete data set"
msgid "Greater than 0"
msgstr ""

msgid "Incomplete"
msgid "Data sets"
msgstr ""

msgid "Error when trying to incomplete data set"
msgid "Periods"
msgstr ""

msgid "Submit"
msgid "Completion status"
msgstr ""

msgid "Error when trying to submit data set"
msgid "Submission status"
msgstr ""

msgid "Revoke"
msgid "Approval status"
msgstr ""

msgid "Modification Count"
msgstr ""

msgid "Error when trying to approve data set"
msgstr ""

msgid "Completing dataset"
msgstr ""

msgid "Updating status to incomplete"
msgstr ""

msgid "Revoking dataset"
msgstr ""

msgid "Error when trying to unsubmit data set"
msgstr ""

msgid "Activate monitoring"
msgid "Submitting dataset"
msgstr ""

msgid "Deactivate monitoring"
msgid "Error when trying to submit data set"
msgstr ""

msgid "Check Difference"
msgid "Data set"
msgstr ""

msgid "Check differences"
msgid "Attribute"
msgstr ""

msgid "Submitted"
msgid "Not approved"
msgstr ""

msgid "Ready for submission"
msgid "Last modification date"
msgstr ""

msgid "Data sets"
msgid "Last date of submission"
msgstr ""

msgid "Periods"
msgid "Last date of approval"
msgstr ""

msgid "Malaria Data Subscription Report"
Expand Down Expand Up @@ -750,16 +755,16 @@ msgstr ""
msgid "NHWA Data Approval Status Report"
msgstr ""

msgid "Approval status"
msgid "Last updated value"
msgstr ""

msgid "Last updated value"
msgid "Error when trying to complete data set"
msgstr ""

msgid "Approving data sets..."
msgid "Error when trying to incomplete data set"
msgstr ""

msgid "Error when trying to approve data set"
msgid "Approving data sets..."
msgstr ""

msgid "Unapprove"
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@
"data-quality-manifest": "d2-manifest package.json build/manifest.webapp --manifest.version=$npm_package_reportVersions_data_quality",
"mal-subscription-manifest": "d2-manifest package.json build/manifest.webapp --manifest.version=$npm_package_reportVersions_mal_subscription",
"nhwa-manifest": "d2-manifest package.json build/manifest.webapp --manifest.version=$npm_package_reportVersions_nhwa",
"mal-manifest": "d2-manifest package.json manifest.webapp --manifest.version=$npm_package_reportVersions_mal --manifest.icons.48='mal-icon.png' --manifest.name='DHIS2 MAL Approval Report' --manifest.description='DHIS2 MAL Approval Report'",
"mal-build-manifest": "d2-manifest package.json build/manifest.webapp --manifest.version=$npm_package_reportVersions_mal --manifest.icons.48 mal-icon.png --manifest.name='DHIS2 MAL Approval Report' --manifest.description='DHIS2 MAL Approval Report'",
"mal-manifest": "d2-manifest package.json manifest.webapp --manifest.version=$npm_package_reportVersions_mal --manifest.icons.48='mal-icon.png' --manifest.name='NHWA Approval Report' --manifest.description='NHWA Approval Report'",
"mal-build-manifest": "d2-manifest package.json build/manifest.webapp --manifest.version=$npm_package_reportVersions_mal --manifest.icons.48 mal-icon.png --manifest.name='NHWA Approval Report' --manifest.description='NHWA Approval Report'",
"glass-admin-manifest": "d2-manifest package.json manifest.webapp --manifest.version=$npm_package_reportVersions_glass_admin --manifest.icons.48='glass-icon.png' --manifest.name='DHIS2 GLASS Admin Maintenance Report' --manifest.description='DHIS2 GLASS Admin Maintenance Report'",
"glass-admin-build-manifest": "d2-manifest package.json build/manifest.webapp --manifest.version=$npm_package_reportVersions_glass_admin --manifest.icons.48 glass-icon.png --manifest.name='DHIS2 GLASS Admin Maintenance Report' --manifest.description='DHIS2 GLASS Admin Maintenance Report'",
"glass-manifest": "d2-manifest package.json manifest.webapp --manifest.version=$npm_package_reportVersions_glass --manifest.icons.48='glass-icon.png' --manifest.name='DHIS2 GLASS Submission Report' --manifest.description='DHIS2 GLASS Submission Report'",
Expand Down
Loading