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.

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

Jump to bottom

Add healthcare form category & minor fixes #1555

Merged
merged 15 commits into from
Jun 10, 2024
Merged

Add healthcare form category & minor fixes #1555

merged 15 commits into from
Jun 10, 2024

Conversation

spwoodcock
Copy link
Member

@spwoodcock spwoodcock commented Jun 7, 2024 •
edited
Loading

What type of PR is this? (check all applicable)

  • 🍕 Feature
  • 🐛 Bug Fix
  • 📝 Documentation
  • 🧑‍💻 Refactor
  • ✅ Test
  • 🤖 Build or CI
  • ❓ Other (please specify)

Related Issue

Work towards #1540
Fixes #1554

Describe this PR

  • Final piece of work for 2024.3.1 release.
  • Added the healthcare category back into FMTM.
  • Also updated all Entity lists (dataset) to default be named features, for consistency.
  • It's not perfect, as the splitting algorithm will likely not work with such sparse data, plus point data, but it's a start.
  • The likely workflow is users uploading their own task areas for mapping sparse health centers.

Also includes:

  • The work on fmtm-splitter (v1.2.2) for Refinements to splitting algorithm (no lines, only major highways) #1554
  • Adds a 5 second delay after project creation before redirect, to give time for the backend to catchup @manjitapandey
  • Minor improvement to backend: caching of the get_odk_credentials, so it is only called once (previously up to 5 times).
  • Using an enum XLSFormType to enable / disable and manage XLSForms.
  • Removes two broken endpoints after osm-fieldwork upgrade converting json2osm.
  • Only display Matomo tracking component in prod fmtm.hotosm.org.
  • Minor fixes to backend typing.
  • Set Content-Type header correctly for basemap downloads.

Screenshots

image

Review Guide

  • Create a project with the healthcare category, uploading the task areas as the AOI.

Checklist before requesting a review

[optional] What gif best describes this PR or how it makes you feel?

skGFw17t6NQqbpgkLb-ezgif com-webp-to-gif-converter

@spwoodcock spwoodcock added backend Related to backend code dependency:osm-fieldwork Requires updates in osm-fieldwork labels Jun 7, 2024
@spwoodcock spwoodcock requested a review from Sujanadh June 7, 2024 17:08
@spwoodcock spwoodcock self-assigned this Jun 7, 2024
@github-actions github-actions bot added the frontend Related to frontend code label Jun 7, 2024
@spwoodcock spwoodcock changed the title Feat/add healthcare form Add healthcare form category & minor fixes Jun 10, 2024
spwoodcock added 12 commits June 10, 2024 17:32
@spwoodcock
build: upgrade osm-fieldwork 0.10.2 --> 0.11.0 (healthcare form)
91cd7e3
@spwoodcock
fix(backend): comment out broken json2osm until osm-fieldwork update
185f859
@spwoodcock
refactor(backend): remove registration form modify, osm-fieldwork upd…
fc5fc27 
…ate (features.csv)
@spwoodcock
fix(backend): update HEALTH enum to HEALTHCARE
57d5d66
@spwoodcock
build: update osm-fieldwork --> 0.11.1 for health.xls form
80b2266
@spwoodcock
fix(backend): use XLSFormType to map available form types
7e71a5e
@spwoodcock
perf(backend): cache the result of get_odk_credentials for future calls
9547dc4
@spwoodcock
fix(backend): update entity dataset name project.xform_category --> f…
b8b52f3 
…eatures
@spwoodcock
refactor(frontend): remove unecessary loading indicator updates proj …
7d42623 
…creation
@spwoodcock
fix(frontend): allow 5-second delay after project creation (backend c…
f04786e 
…atchup)
@spwoodcock
build: upgrade fmtm-splitter --> 1.2.2 with enhancements to algo
dd05ec5
@spwoodcock
fix(backend): use XLSFormType enum for raw-data-api config selection
ef16c36
@spwoodcock spwoodcock force-pushed the feat/add-healthcare-form branch from aa0fe02 to ef16c36 Compare June 10, 2024 16:32
@spwoodcock spwoodcock requested review from nrjadkry and NSUWAL123 June 10, 2024 18:31
@spwoodcock spwoodcock mentioned this pull request Jun 10, 2024
Open
@spwoodcock
Copy link
Member Author

Decided to merge this as the final patch for 2024.3.1 & we can start testing on staging @manjitapandey
I will deploy the current development branch --> staging after this.

Team, please test thoroughly for release 2024.3.1 🙏

@spwoodcock spwoodcock merged commit 100087a into development Jun 10, 2024
7 checks passed
@spwoodcock spwoodcock deleted the feat/add-healthcare-form branch June 10, 2024 18:58
azharcodeit pushed a commit to azharcodeit/fmtm that referenced this pull request Jun 11, 2024
@spwoodcock @azharcodeit
feat: add healthcare form category & minor fixes (hotosm#1555)
3acc092 
* build: upgrade osm-fieldwork 0.10.2 --> 0.11.0 (healthcare form)

* fix(backend): comment out broken json2osm until osm-fieldwork update

* refactor(backend): remove registration form modify, osm-fieldwork update (features.csv)

* fix(backend): update HEALTH enum to HEALTHCARE

* build: update osm-fieldwork --> 0.11.1 for health.xls form

* fix(backend): use XLSFormType to map available form types

* perf(backend): cache the result of get_odk_credentials for future calls

* fix(backend): update entity dataset name project.xform_category --> features

* refactor(frontend): remove unecessary loading indicator updates proj creation

* fix(frontend): allow 5-second delay after project creation (backend catchup)

* build: upgrade fmtm-splitter --> 1.2.2 with enhancements to algo

* fix(backend): use XLSFormType enum for raw-data-api config selection

* refactor(backend): update some typing to solve pyright errors

* fix: correctly set Content-Type header for basemap downloads

* build: update osm-fieldwork --> v0.11.2 (mandatory questions)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Sujanadh Sujanadh Awaiting requested review from Sujanadh

@nrjadkry nrjadkry Awaiting requested review from nrjadkry

@NSUWAL123 NSUWAL123 Awaiting requested review from NSUWAL123

Assignees

@spwoodcock spwoodcock

Labels
backend Related to backend code dependency:osm-fieldwork Requires updates in osm-fieldwork frontend Related to frontend code
Projects
Field Mapping Tasking Manager (FMTM)
Status: Done
Milestone
(2024.3.1) Release (June)
Development

Successfully merging this pull request may close these issues.

Refinements to splitting algorithm (no lines, only major highways)
1 participant
@spwoodcock