Skip to content
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.

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

Feature/visualizations report #19

Open
wants to merge 29 commits into
base: development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
a95a43b
Add totals check for NHWA report
SferaDev Jan 17, 2022
2d3710c
add --url parameter to deployment guide
ifoche Jan 17, 2022
24c3ae7
Add sharing settings to package
SferaDev Jan 18, 2022
0d25f9f
Merge branch 'feature/add-totals-check-nhwa' of https://github.com/Ey…
SferaDev Jan 18, 2022
5b9346f
WIP
idelcano Jan 21, 2022
0e5992b
Delete package-lock.json
SferaDev Jan 27, 2022
9bc4686
Update package.json
SferaDev Jan 27, 2022
9328507
fix locate import
idelcano Jan 27, 2022
00ec184
update other files after start
idelcano Jan 27, 2022
2e7963a
WIP - some types still wrong
idelcano Jan 28, 2022
da5183f
wip
idelcano Jan 31, 2022
24eeccc
WIP - 500 server error
idelcano Jan 31, 2022
c546d79
WIP
idelcano Feb 2, 2022
f69ab16
WIP
idelcano Feb 3, 2022
5686b19
solve some errors
idelcano Feb 3, 2022
b32feb3
Add paging for indicators list
SferaDev Feb 8, 2022
2178da3
added force reload
idelcano Feb 9, 2022
8023017
format
idelcano Feb 9, 2022
b530e43
fix typo
idelcano Mar 4, 2022
dd3108b
Added hiden dashboards and visualizations report
idelcano Mar 4, 2022
c0767da
added strings
idelcano Mar 4, 2022
60ff6ea
trying to create detail links and fix package build
idelcano Mar 11, 2022
1bed15e
remove build visualizations, to build the visualizations reports only…
idelcano Mar 17, 2022
5e53a80
remove some :any
idelcano Mar 17, 2022
6244fdd
remove data quality script due its not necessary
idelcano Mar 17, 2022
a7933b4
fixed some any and starter columns
idelcano Mar 17, 2022
fbcb16d
fix package
idelcano Mar 17, 2022
1c2cd48
update readme
idelcano Mar 17, 2022
cd08580
remove visualizations and rename variant to hidden-dashboards
idelcano Mar 23, 2022
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
18 changes: 16 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,26 @@ Create an standard report:

```
$ yarn build-report # Creates dist/index.html
$ yarn build-<key>-metadata -u 'user:pass' http://dhis2-server.org # Creates dist/metadata.json (key is a particular report group, e.g. nhwa)
$ yarn post-<key>-metadata -u 'user:pass' http://dhis2-server.org # Posts dist/metadata.json (key is a particular report group, e.g. nhwa)
$ yarn build-<key>-metadata -u 'user:pass' --url http://dhis2-server.org # Creates dist/metadata.json (key is a particular report group, e.g. nhwa)
$ yarn post-<key>-metadata -u 'user:pass' --url http://dhis2-server.org # Posts dist/metadata.json (key is a particular report group, e.g. nhwa)
```

Create an standalone DHIS2 webapp app:

```
$ yarn build-webapp # Creates dist/d2-reports.zip
```

Create visualization report:
Edit .env.local adding:
REACT_APP_REPORT_VARIANT=hidden-dashboards
and run build-reports.
After that import dist/index.html in the dhis2 report.



Create data-quality report:
Edit .env.local adding:
REACT_APP_REPORT_VARIANT=dataQuality
and run build-reports.
After that import dist/index.html in the dhis2 report.
53 changes: 49 additions & 4 deletions i18n/en.pot
Original file line number Diff line number Diff line change
Expand Up @@ -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: 2022-01-10T08:43:46.954Z\n"
"PO-Revision-Date: 2022-01-10T08:43:46.954Z\n"
"POT-Creation-Date: 2022-03-23T21:45:20.768Z\n"
"PO-Revision-Date: 2022-03-23T21:45:20.768Z\n"

msgid "<No value>"
msgstr ""
Expand Down Expand Up @@ -74,15 +74,60 @@ msgstr ""
msgid "created"
msgstr ""

msgid "NHWA Data Approval Status Report"
msgid "Data quality"
msgstr ""

msgid "Data set"
msgid "Indicators"
msgstr ""

msgid "ProgramIndicators"
msgstr ""

msgid "denominator"
msgstr ""

msgid "Valid Denominator"
msgstr ""

msgid "numerator"
msgstr ""

msgid "Valid Numerator"
msgstr ""

msgid "expression"
msgstr ""

msgid "Valid Expression"
msgstr ""

msgid "filter"
msgstr ""

msgid "Valid Filter"
msgstr ""

msgid "Hidden dashboards"
msgstr ""

msgid "code"
msgstr ""

msgid "Sharing"
msgstr ""

msgid "Details"
msgstr ""

msgid "NHWA Data Approval Status Report"
msgstr ""

msgid "Period"
msgstr ""

msgid "Data set"
msgstr ""

msgid "Attribute"
msgstr ""

Expand Down
51 changes: 48 additions & 3 deletions i18n/es.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2022-01-10T08:43:46.954Z\n"
"POT-Creation-Date: 2022-03-23T21:45:20.768Z\n"
"PO-Revision-Date: 2018-10-25T09:02:35.143Z\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -74,15 +74,60 @@ msgstr ""
msgid "created"
msgstr ""

msgid "NHWA Data Approval Status Report"
msgid "Data quality"
msgstr ""

msgid "Data set"
msgid "Indicators"
msgstr ""

msgid "ProgramIndicators"
msgstr ""

msgid "denominator"
msgstr ""

msgid "Valid Denominator"
msgstr ""

msgid "numerator"
msgstr ""

msgid "Valid Numerator"
msgstr ""

msgid "expression"
msgstr ""

msgid "Valid Expression"
msgstr ""

msgid "filter"
msgstr ""

msgid "Valid Filter"
msgstr ""

msgid "Hidden dashboards"
msgstr ""

msgid "code"
msgstr ""

msgid "Sharing"
msgstr ""

msgid "Details"
msgstr ""

msgid "NHWA Data Approval Status Report"
msgstr ""

msgid "Period"
msgstr ""

msgid "Data set"
msgstr ""

msgid "Attribute"
msgstr ""

Expand Down
17 changes: 17 additions & 0 deletions src/compositionRoot.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
import { DataQualityDefaultRepository } from "./data/DataQualityDefaultRepository";
import { Dhis2ConfigRepository } from "./data/Dhis2ConfigRepository";
import { Dhis2OrgUnitsRepository } from "./data/Dhis2OrgUnitsRepository";
import { HiddenDashboardsDefaultRepository } from "./data/HiddenDashboardsDefaultRepository";
import { NHWADataApprovalDefaultRepository } from "./data/NHWADataApprovalDefaultRepository";
import { NHWADataCommentsDefaultRepository } from "./data/NHWADataCommentsDefaultRepository";
import { WIDPAdminDefaultRepository } from "./data/WIDPAdminDefaultRepository";
import { GetWIDPAdminDefaultUseCase } from "./domain/admin/usecases/GetWIDPAdminDefaultUseCase";
import { SaveWIDPAdminDefaultCsvUseCase } from "./domain/admin/usecases/SaveWIDPAdminDefaultCsvUseCase";
import { GetConfig } from "./domain/common/usecases/GetConfig";
import { GetOrgUnitsUseCase } from "./domain/common/usecases/GetOrgUnitsUseCase";
import { GetDataQualityDefaultUseCase } from "./domain/data-quality/usecases/GetDataQualityDefaultUseCase";
import { SaveDataQualityDefaultCsvUseCase } from "./domain/data-quality/usecases/SaveDataQualityDefaultCsvUseCase";
import { GetHiddenDashboardsDefaultUseCase } from "./domain/hidden-visualization/usecases/GetHiddenDashboardsDefaultUseCase";
import { SaveHiddenDashboardsDefaultUseCase } from "./domain/hidden-visualization/usecases/SaveHiddenDashboardsDefaultUseCase";
import { UpdateStatusUseCase } from "./domain/nhwa-approval-status/usecases/CompleteDataSetsUseCase";
import { GetApprovalColumnsUseCase } from "./domain/nhwa-approval-status/usecases/GetApprovalColumnsUseCase";
import { GetDataSetsUseCase } from "./domain/nhwa-approval-status/usecases/GetDataSetsUseCase";
Expand All @@ -21,9 +27,20 @@ export function getCompositionRoot(api: D2Api) {
const dataCommentsRepository = new NHWADataCommentsDefaultRepository(api);
const dataApprovalRepository = new NHWADataApprovalDefaultRepository(api);
const widpAdminDefaultRepository = new WIDPAdminDefaultRepository(api);
const dataQualityRepository = new DataQualityDefaultRepository(api);
const hiddenDashboardsRepository = new HiddenDashboardsDefaultRepository(api);
const orgUnitsRepository = new Dhis2OrgUnitsRepository(api);

return {
dataQuality: getExecute({
getValidations: new GetDataQualityDefaultUseCase(dataQualityRepository, true),
reloadValidations: new GetDataQualityDefaultUseCase(dataQualityRepository, false),
exportToCsv: new SaveDataQualityDefaultCsvUseCase(dataQualityRepository),
}),
hiddenDashboards: getExecute({
getHiddenDashboards: new GetHiddenDashboardsDefaultUseCase(hiddenDashboardsRepository),
exportDashboardsToCsv: new SaveHiddenDashboardsDefaultUseCase(hiddenDashboardsRepository),
}),
admin: getExecute({
get: new GetWIDPAdminDefaultUseCase(widpAdminDefaultRepository),
save: new SaveWIDPAdminDefaultCsvUseCase(widpAdminDefaultRepository),
Expand Down
Loading