Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions src/backend/app/central/central_crud.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

import pandas as pd
from litestar import status_codes as status
from osm_fieldwork.enums import NewPointCapture
from osm_fieldwork.update_xlsform import append_field_mapping_fields
from psycopg import AsyncConnection
from pyodk.errors import PyODKError
Expand Down Expand Up @@ -341,6 +342,7 @@ async def append_fields_to_user_xlsform( # noqa: PLR0913
default_language: str | None = None,
use_odk_collect: bool = False,
*,
new_point_capture: NewPointCapture = NewPointCapture.MAP,
form_id: str | None = None,
) -> tuple[str, BytesIO]:
"""Helper to return the intermediate XLSForm prior to convert."""
Expand All @@ -349,6 +351,7 @@ async def append_fields_to_user_xlsform( # noqa: PLR0913
xlsform,
form_name=form_name,
new_geom_type=new_geom_type,
new_point_capture=new_point_capture,
need_verification_fields=need_verification_fields,
include_photo_upload=include_photo_upload,
mandatory_photo_upload=mandatory_photo_upload,
Expand All @@ -368,6 +371,7 @@ async def validate_and_update_user_xlsform( # noqa: PLR0913
mandatory_photo_upload: bool = False,
use_odk_collect: bool = False,
*,
new_point_capture: NewPointCapture = NewPointCapture.MAP,
form_id: str | None = None,
) -> BytesIO:
"""Wrapper to append mandatory fields and validate user uploaded XLSForm."""
Expand All @@ -378,6 +382,7 @@ async def validate_and_update_user_xlsform( # noqa: PLR0913
xlsform,
form_name=form_name,
new_geom_type=new_geom_type,
new_point_capture=new_point_capture,
need_verification_fields=need_verification_fields,
include_photo_upload=include_photo_upload,
mandatory_photo_upload=mandatory_photo_upload,
Expand Down
2 changes: 2 additions & 0 deletions src/backend/app/htmx/htmx_schemas.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
from typing import Optional

from litestar.datastructures import UploadFile
from osm_fieldwork.enums import NewPointCapture
from pydantic import BaseModel, ConfigDict


Expand All @@ -33,6 +34,7 @@ class XLSFormUploadData(BaseModel):
include_photo_upload: Optional[str] = "true"
mandatory_photo_upload: Optional[str] = "false"
use_odk_collect: Optional[str] = "false"
new_point_capture: NewPointCapture = NewPointCapture.MAP
default_language: Optional[str] = "english"
default_language_explicit: Optional[str] = "false"
template_form_id: Optional[str] = None
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ async def upload_xlsform_htmx(
include_photo_upload=include_photo_upload_bool,
mandatory_photo_upload=mandatory_photo_upload_bool,
use_odk_collect=use_odk_collect_bool,
new_point_capture=data.new_point_capture,
default_language=default_language,
)

Expand Down
12 changes: 12 additions & 0 deletions src/backend/app/locales/am/LC_MESSAGES/field_tm.po
Original file line number Diff line number Diff line change
Expand Up @@ -2749,3 +2749,15 @@ msgstr "ማረጋገጫዎችን ሞክር"
msgid "Save & Continue"
msgstr "አስቀምጥ እና ቀጥል"


#: app/templates/partials/project_details/setup_steps/step2_form.html:94
msgid "New points"
msgstr "አዲስ ነጥቦች"

#: app/templates/partials/project_details/setup_steps/step2_form.html:96
msgid "Mappers tap the location on a map"
msgstr "ካርታ ሠሪዎች በካርታ ላይ ቦታውን ይነካሉ"

#: app/templates/partials/project_details/setup_steps/step2_form.html:97
msgid "Mappers capture their GPS location"
msgstr "ካርታ ሠሪዎች የGPS መገኛቸውን ይመዘግባሉ"
12 changes: 12 additions & 0 deletions src/backend/app/locales/ar/LC_MESSAGES/field_tm.po
Original file line number Diff line number Diff line change
Expand Up @@ -2806,3 +2806,15 @@ msgstr "اختبار بيانات الاعتماد"
msgid "Save & Continue"
msgstr "حفظ ومتابعة"


#: app/templates/partials/project_details/setup_steps/step2_form.html:94
msgid "New points"
msgstr "نقاط جديدة"

#: app/templates/partials/project_details/setup_steps/step2_form.html:96
msgid "Mappers tap the location on a map"
msgstr "ينقر راسمو الخرائط على الموقع على الخريطة"

#: app/templates/partials/project_details/setup_steps/step2_form.html:97
msgid "Mappers capture their GPS location"
msgstr "يسجّل راسمو الخرائط موقعهم باستخدام GPS"
12 changes: 12 additions & 0 deletions src/backend/app/locales/bn/LC_MESSAGES/field_tm.po
Original file line number Diff line number Diff line change
Expand Up @@ -2854,3 +2854,15 @@ msgstr "তথ্য পরীক্ষা করুন"
msgid "Save & Continue"
msgstr "সংরক্ষণ করুন ও এগিয়ে যান"


#: app/templates/partials/project_details/setup_steps/step2_form.html:94
msgid "New points"
msgstr "নতুন বিন্দু"

#: app/templates/partials/project_details/setup_steps/step2_form.html:96
msgid "Mappers tap the location on a map"
msgstr "মানচিত্রকারীরা মানচিত্রে অবস্থানটি ট্যাপ করেন"

#: app/templates/partials/project_details/setup_steps/step2_form.html:97
msgid "Mappers capture their GPS location"
msgstr "মানচিত্রকারীরা GPS দিয়ে তাঁদের অবস্থান রেকর্ড করেন"
12 changes: 12 additions & 0 deletions src/backend/app/locales/cs/LC_MESSAGES/field_tm.po
Original file line number Diff line number Diff line change
Expand Up @@ -2867,3 +2867,15 @@ msgstr "Otestovat přihlašovací údaje"
msgid "Save & Continue"
msgstr "Uložit a pokračovat"


#: app/templates/partials/project_details/setup_steps/step2_form.html:94
msgid "New points"
msgstr "Nové body"

#: app/templates/partials/project_details/setup_steps/step2_form.html:96
msgid "Mappers tap the location on a map"
msgstr "Mapovatelé klepnou na místo na mapě"

#: app/templates/partials/project_details/setup_steps/step2_form.html:97
msgid "Mappers capture their GPS location"
msgstr "Mapovatelé zaznamenají svou polohu pomocí GPS"
12 changes: 12 additions & 0 deletions src/backend/app/locales/es/LC_MESSAGES/field_tm.po
Original file line number Diff line number Diff line change
Expand Up @@ -2930,3 +2930,15 @@ msgstr "Probar credenciales"
msgid "Save & Continue"
msgstr "Guardar y continuar"


#: app/templates/partials/project_details/setup_steps/step2_form.html:94
msgid "New points"
msgstr "Puntos nuevos"

#: app/templates/partials/project_details/setup_steps/step2_form.html:96
msgid "Mappers tap the location on a map"
msgstr "Los mapeadores tocan la ubicación en un mapa"

#: app/templates/partials/project_details/setup_steps/step2_form.html:97
msgid "Mappers capture their GPS location"
msgstr "Los mapeadores registran su ubicación GPS"
12 changes: 12 additions & 0 deletions src/backend/app/locales/field_tm.pot
Original file line number Diff line number Diff line change
Expand Up @@ -2644,3 +2644,15 @@ msgstr ""
msgid "Save & Continue"
msgstr ""


#: app/templates/partials/project_details/setup_steps/step2_form.html:94
msgid "New points"
msgstr ""

#: app/templates/partials/project_details/setup_steps/step2_form.html:96
msgid "Mappers tap the location on a map"
msgstr ""

#: app/templates/partials/project_details/setup_steps/step2_form.html:97
msgid "Mappers capture their GPS location"
msgstr ""
12 changes: 12 additions & 0 deletions src/backend/app/locales/fr/LC_MESSAGES/field_tm.po
Original file line number Diff line number Diff line change
Expand Up @@ -2967,3 +2967,15 @@ msgstr "Tester les identifiants"
msgid "Save & Continue"
msgstr "Enregistrer et continuer"


#: app/templates/partials/project_details/setup_steps/step2_form.html:94
msgid "New points"
msgstr "Nouveaux points"

#: app/templates/partials/project_details/setup_steps/step2_form.html:96
msgid "Mappers tap the location on a map"
msgstr "Les cartographes touchent l’emplacement sur une carte"

#: app/templates/partials/project_details/setup_steps/step2_form.html:97
msgid "Mappers capture their GPS location"
msgstr "Les cartographes enregistrent leur position GPS"
12 changes: 12 additions & 0 deletions src/backend/app/locales/ha/LC_MESSAGES/field_tm.po
Original file line number Diff line number Diff line change
Expand Up @@ -2866,3 +2866,15 @@ msgstr "Gwada bayanan shaida"
msgid "Save & Continue"
msgstr "Ajiye kuma ci gaba"


#: app/templates/partials/project_details/setup_steps/step2_form.html:94
msgid "New points"
msgstr "Sabbin maki"

#: app/templates/partials/project_details/setup_steps/step2_form.html:96
msgid "Mappers tap the location on a map"
msgstr "Masu taswira suna taɓa wurin a taswira"

#: app/templates/partials/project_details/setup_steps/step2_form.html:97
msgid "Mappers capture their GPS location"
msgstr "Masu taswira suna ɗaukar matsayinsu ta GPS"
12 changes: 12 additions & 0 deletions src/backend/app/locales/hi/LC_MESSAGES/field_tm.po
Original file line number Diff line number Diff line change
Expand Up @@ -2859,3 +2859,15 @@ msgstr "क्रेडेंशियल जाँचें"
msgid "Save & Continue"
msgstr "सहेजें और जारी रखें"


#: app/templates/partials/project_details/setup_steps/step2_form.html:94
msgid "New points"
msgstr "नए बिंदु"

#: app/templates/partials/project_details/setup_steps/step2_form.html:96
msgid "Mappers tap the location on a map"
msgstr "मानचित्रकार मानचित्र पर स्थान पर टैप करते हैं"

#: app/templates/partials/project_details/setup_steps/step2_form.html:97
msgid "Mappers capture their GPS location"
msgstr "मानचित्रकार GPS से अपना स्थान रिकॉर्ड करते हैं"
12 changes: 12 additions & 0 deletions src/backend/app/locales/id/LC_MESSAGES/field_tm.po
Original file line number Diff line number Diff line change
Expand Up @@ -2880,3 +2880,15 @@ msgstr "Uji Kredensial"
msgid "Save & Continue"
msgstr "Simpan & Lanjutkan"


#: app/templates/partials/project_details/setup_steps/step2_form.html:94
msgid "New points"
msgstr "Titik baru"

#: app/templates/partials/project_details/setup_steps/step2_form.html:96
msgid "Mappers tap the location on a map"
msgstr "Pemetaan dilakukan dengan mengetuk lokasi pada peta"

#: app/templates/partials/project_details/setup_steps/step2_form.html:97
msgid "Mappers capture their GPS location"
msgstr "Pemetaan dilakukan dengan merekam lokasi GPS pemeta"
12 changes: 12 additions & 0 deletions src/backend/app/locales/ig/LC_MESSAGES/field_tm.po
Original file line number Diff line number Diff line change
Expand Up @@ -2822,3 +2822,15 @@ msgstr "Nwale njirimara"
msgid "Save & Continue"
msgstr "Chekwaa ma gaa n'ihu"


#: app/templates/partials/project_details/setup_steps/step2_form.html:94
msgid "New points"
msgstr "Ebe ọhụrụ"

#: app/templates/partials/project_details/setup_steps/step2_form.html:96
msgid "Mappers tap the location on a map"
msgstr "Ndị na-ese maapụ na-akụ ebe ahụ aka na maapụ"

#: app/templates/partials/project_details/setup_steps/step2_form.html:97
msgid "Mappers capture their GPS location"
msgstr "Ndị na-ese maapụ na-edekọ ọnọdụ GPS ha"
12 changes: 12 additions & 0 deletions src/backend/app/locales/it/LC_MESSAGES/field_tm.po
Original file line number Diff line number Diff line change
Expand Up @@ -2925,3 +2925,15 @@ msgstr "Verifica credenziali"
msgid "Save & Continue"
msgstr "Salva e continua"


#: app/templates/partials/project_details/setup_steps/step2_form.html:94
msgid "New points"
msgstr "Nuovi punti"

#: app/templates/partials/project_details/setup_steps/step2_form.html:96
msgid "Mappers tap the location on a map"
msgstr "I mappatori toccano la posizione su una mappa"

#: app/templates/partials/project_details/setup_steps/step2_form.html:97
msgid "Mappers capture their GPS location"
msgstr "I mappatori registrano la propria posizione GPS"
12 changes: 12 additions & 0 deletions src/backend/app/locales/ja/LC_MESSAGES/field_tm.po
Original file line number Diff line number Diff line change
Expand Up @@ -2698,3 +2698,15 @@ msgstr "認証情報をテスト"
msgid "Save & Continue"
msgstr "保存して続行"


#: app/templates/partials/project_details/setup_steps/step2_form.html:94
msgid "New points"
msgstr "新しいポイント"

#: app/templates/partials/project_details/setup_steps/step2_form.html:96
msgid "Mappers tap the location on a map"
msgstr "マッピング担当者が地図上の位置をタップします"

#: app/templates/partials/project_details/setup_steps/step2_form.html:97
msgid "Mappers capture their GPS location"
msgstr "マッピング担当者がGPSで現在位置を記録します"
12 changes: 12 additions & 0 deletions src/backend/app/locales/ne/LC_MESSAGES/field_tm.po
Original file line number Diff line number Diff line change
Expand Up @@ -2868,3 +2868,15 @@ msgstr "प्रमाण परीक्षण गर्नुहोस्"
msgid "Save & Continue"
msgstr "सुरक्षित गर्नुहोस् र जारी राख्नुहोस्"


#: app/templates/partials/project_details/setup_steps/step2_form.html:94
msgid "New points"
msgstr "नयाँ बिन्दुहरू"

#: app/templates/partials/project_details/setup_steps/step2_form.html:96
msgid "Mappers tap the location on a map"
msgstr "नक्साङ्कनकर्ताहरूले नक्सामा स्थान ट्याप गर्छन्"

#: app/templates/partials/project_details/setup_steps/step2_form.html:97
msgid "Mappers capture their GPS location"
msgstr "नक्साङ्कनकर्ताहरूले GPS बाट आफ्नो स्थान रेकर्ड गर्छन्"
12 changes: 12 additions & 0 deletions src/backend/app/locales/om/LC_MESSAGES/field_tm.po
Original file line number Diff line number Diff line change
Expand Up @@ -2919,3 +2919,15 @@ msgstr "Ragaa qori"
msgid "Save & Continue"
msgstr "Olkaa'i fi itti fufi"


#: app/templates/partials/project_details/setup_steps/step2_form.html:94
msgid "New points"
msgstr "Qabxiilee haaraa"

#: app/templates/partials/project_details/setup_steps/step2_form.html:96
msgid "Mappers tap the location on a map"
msgstr "Kaartaa kaastonni kaartaa irratti bakka tuqu"

#: app/templates/partials/project_details/setup_steps/step2_form.html:97
msgid "Mappers capture their GPS location"
msgstr "Kaartaa kaastonni bakka GPS isaanii galmeessu"
12 changes: 12 additions & 0 deletions src/backend/app/locales/pt/LC_MESSAGES/field_tm.po
Original file line number Diff line number Diff line change
Expand Up @@ -2906,3 +2906,15 @@ msgstr "Testar credenciais"
msgid "Save & Continue"
msgstr "Salvar e continuar"


#: app/templates/partials/project_details/setup_steps/step2_form.html:94
msgid "New points"
msgstr "Novos pontos"

#: app/templates/partials/project_details/setup_steps/step2_form.html:96
msgid "Mappers tap the location on a map"
msgstr "Os mapeadores tocam na localização num mapa"

#: app/templates/partials/project_details/setup_steps/step2_form.html:97
msgid "Mappers capture their GPS location"
msgstr "Os mapeadores registam a sua localização GPS"
12 changes: 12 additions & 0 deletions src/backend/app/locales/pt_br/LC_MESSAGES/field_tm.po
Original file line number Diff line number Diff line change
Expand Up @@ -2901,3 +2901,15 @@ msgstr "Testar credenciais"
msgid "Save & Continue"
msgstr "Salvar e continuar"


#: app/templates/partials/project_details/setup_steps/step2_form.html:94
msgid "New points"
msgstr "Novos pontos"

#: app/templates/partials/project_details/setup_steps/step2_form.html:96
msgid "Mappers tap the location on a map"
msgstr "Os mapeadores tocam na localização em um mapa"

#: app/templates/partials/project_details/setup_steps/step2_form.html:97
msgid "Mappers capture their GPS location"
msgstr "Os mapeadores registram sua localização GPS"
12 changes: 12 additions & 0 deletions src/backend/app/locales/ru/LC_MESSAGES/field_tm.po
Original file line number Diff line number Diff line change
Expand Up @@ -2905,3 +2905,15 @@ msgstr "Проверить учетные данные"
msgid "Save & Continue"
msgstr "Сохранить и продолжить"


#: app/templates/partials/project_details/setup_steps/step2_form.html:94
msgid "New points"
msgstr "Новые точки"

#: app/templates/partials/project_details/setup_steps/step2_form.html:96
msgid "Mappers tap the location on a map"
msgstr "Картографы отмечают местоположение касанием на карте"

#: app/templates/partials/project_details/setup_steps/step2_form.html:97
msgid "Mappers capture their GPS location"
msgstr "Картографы записывают своё местоположение по GPS"
12 changes: 12 additions & 0 deletions src/backend/app/locales/sw/LC_MESSAGES/field_tm.po
Original file line number Diff line number Diff line change
Expand Up @@ -2917,3 +2917,15 @@ msgstr "Jaribu taarifa za uthibitishaji"
msgid "Save & Continue"
msgstr "Hifadhi na uendelee"


#: app/templates/partials/project_details/setup_steps/step2_form.html:94
msgid "New points"
msgstr "Pointi mpya"

#: app/templates/partials/project_details/setup_steps/step2_form.html:96
msgid "Mappers tap the location on a map"
msgstr "Wachora ramani wanagusa eneo kwenye ramani"

#: app/templates/partials/project_details/setup_steps/step2_form.html:97
msgid "Mappers capture their GPS location"
msgstr "Wachora ramani wanarekodi eneo lao kwa GPS"
12 changes: 12 additions & 0 deletions src/backend/app/locales/ta/LC_MESSAGES/field_tm.po
Original file line number Diff line number Diff line change
Expand Up @@ -2936,3 +2936,15 @@ msgstr "சான்றுகளைச் சோதிக்கவும்"
msgid "Save & Continue"
msgstr "சேமித்து தொடரவும்"


#: app/templates/partials/project_details/setup_steps/step2_form.html:94
msgid "New points"
msgstr "புதிய புள்ளிகள்"

#: app/templates/partials/project_details/setup_steps/step2_form.html:96
msgid "Mappers tap the location on a map"
msgstr "வரைபடம் உருவாக்குபவர்கள் வரைபடத்தில் இருப்பிடத்தைத் தட்டுகிறார்கள்"

#: app/templates/partials/project_details/setup_steps/step2_form.html:97
msgid "Mappers capture their GPS location"
msgstr "வரைபடம் உருவாக்குபவர்கள் GPS மூலம் தங்கள் இருப்பிடத்தைப் பதிவு செய்கிறார்கள்"
12 changes: 12 additions & 0 deletions src/backend/app/locales/te/LC_MESSAGES/field_tm.po
Original file line number Diff line number Diff line change
Expand Up @@ -2913,3 +2913,15 @@ msgstr "గుర్తింపు వివరాలను పరీక్ష
msgid "Save & Continue"
msgstr "సేవ్ చేసి కొనసాగండి"


#: app/templates/partials/project_details/setup_steps/step2_form.html:94
msgid "New points"
msgstr "కొత్త బిందువులు"

#: app/templates/partials/project_details/setup_steps/step2_form.html:96
msgid "Mappers tap the location on a map"
msgstr "మ్యాపర్లు మ్యాప్‌లో స్థానాన్ని నొక్కుతారు"

#: app/templates/partials/project_details/setup_steps/step2_form.html:97
msgid "Mappers capture their GPS location"
msgstr "మ్యాపర్లు GPS ద్వారా తమ స్థానాన్ని నమోదు చేస్తారు"
Loading
Loading