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

feat: custom calculations for thematic layer (DHIS2-15474) #2745

Merged
merged 49 commits into from
Sep 12, 2023
Merged

Conversation

turban
Copy link
Contributor

@turban turban commented Jun 28, 2023

This PR adds support for custom calculations for thematic layers.

Fixes: https://dhis2.atlassian.net/browse/DHIS2-15474

After this PR there is a new "Calculations" data type:
Screenshot 2023-08-30 at 14 38 32

A new drop down allows you to select a custom calculation:
Screenshot 2023-08-30 at 14 49 16

If there are no calculations an empty dropdown will show:
Screenshot 2023-08-30 at 15 01 06

@cooper-joe, maybe we should add a help text telling that the user can create custom calculations in the Data Visualizer app? This is not intuitive.

Custom calculation layer added to the map:
Screenshot 2023-08-30 at 14 55 10

Using this custom calculation:
Screenshot 2023-08-30 at 14 46 02

turban and others added 24 commits April 24, 2023 14:04
* feat(plugin): send installation status

* fix: use window.parent

* fix: bump cli-app-scripts for precaching improvement
* docs: move docs to app

* chore: clean up old files

* chore: gitignore

* chore: gitignore
The "add event layer" test continues to be flaky.
This change increases the timeout to 50 seconds.
Also, since the default timeout is now 15 seconds, the EXTENDED_TIMOUT
option isn't needed anymore (since that also sets to 15 seconds)
This is to test whether dependabot will automatically use the default branch.
* chore: increase cypress extended timeout

* chore: use maps-app emoji in nightly slack message
@turban turban marked this pull request as draft June 28, 2023 13:29
@dhis2-bot
Copy link
Contributor

dhis2-bot commented Jun 28, 2023

🚀 Deployed on https://pr-2745--dhis2-maps.netlify.app

@dhis2-bot dhis2-bot temporarily deployed to netlify June 28, 2023 13:38 Inactive
@dhis2-bot dhis2-bot temporarily deployed to netlify June 28, 2023 13:44 Inactive
@turban turban marked this pull request as ready for review August 30, 2023 13:04
@dhis2-bot dhis2-bot temporarily deployed to netlify August 30, 2023 13:16 Inactive
@cooper-joe
Copy link
Member

@cooper-joe, maybe we should add a help text telling that the user can create custom calculations in the Data Visualizer app? This is not intuitive.

Good idea. I suggest adding a help text under the Calculation input with content Calculations can be created in the Data Visualizer app.

@dhis2-bot dhis2-bot temporarily deployed to netlify August 31, 2023 11:53 Inactive
@cypress
Copy link

cypress bot commented Aug 31, 2023

1 flaky test on run #2496 ↗︎

0 36 20 0 Flakiness 1

Details:

Merge 2e555fd into f40bbcb...
Project: maps Commit: 2eee8aace1 ℹ️
Status: Passed Duration: 04:36 💡
Started: Sep 12, 2023 8:36 AM Ended: Sep 12, 2023 8:40 AM
Flakiness  cypress/integration/dataDownload.cy.js • 1 flaky test • e2e-chrome-parallel-2.40

View Output Video

Test Artifacts
Data Download > downloads data from a thematic layer Output Screenshots

This comment has been generated by cypress-bot as a result of this project's GitHub integration settings.

@dhis2-bot dhis2-bot temporarily deployed to netlify August 31, 2023 13:51 Inactive
@turban
Copy link
Contributor Author

turban commented Aug 31, 2023

Help text added:

Screenshot 2023-08-31 at 16 06 52

@dhis2-bot dhis2-bot temporarily deployed to netlify August 31, 2023 14:30 Inactive
@dhis2-bot dhis2-bot temporarily deployed to netlify August 31, 2023 14:37 Inactive
@dhis2-bot dhis2-bot temporarily deployed to netlify September 12, 2023 08:23 Inactive
@turban turban merged commit b757770 into dev Sep 12, 2023
10 checks passed
@turban turban deleted the feat/DHIS2-15474 branch September 12, 2023 08:51
@jenniferarnesen jenniferarnesen restored the feat/DHIS2-15474 branch September 15, 2023 09:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants