Skip to content

Commit

Permalink
Release/3.23.3 (#328)
Browse files Browse the repository at this point in the history
* Use wrapper over excel4node to convert sheetBuilder to xlsx-populate

* Implement getExcelAlpha excel4node in wrapper

* Use solid fill

* Use new cell.comments in xlsx-populate fork

* [fix] fillDataEntrySheet must be executed after fillValidationSheet

* Fix linting warnings

* Adjust dataValidation formulas format

* Minor refactor on Workbook

* Extra check on d2 relationship

* Add option to fill custom template with metadata

* [sheetBuilder] Override cells unless empty

* Add conditional formatting

* Remove static templates

* temporal

* Add customTemplate.isDefault

* Add boolean setting showAutogeneratedForms

* Support default custom forms on settings page

* add nrc custom module

* Update i18n

* Temporal code using dataSetId-teamplateId

* NRC module template (to clean)

* update xlsx-populate dependency

* Skip date row if not org unit

* Update NRC module metadata sheet

* Add showPopulateInCustomForms setting

* Refactor and clean NRCModule1.01.ts

* Use DataFormTemplate to modelize id/templateId combos

* Update i18n

* Use code equality to match dataSet/categoryOption

* Refactor getDataSetPackage to get only required metadata

* bump version

* Use case-insensitive sorting for indexable columns

* Protect NRC sheets Metadata/Validation

* Apply greyed fields to NRC template

* A user with authority ALL is grated all permissions

* Use Version_ without spaces for defined name

* [nrc] Refactor dataElement/categoryOptionCombos metadata

* Update NRC form setup

* Pass data set id on data values post to narrow period restrictions

* Remove now unused dependency excel4node

* Disable no-constant-condition lint rule

* Re-use initial sheet instead of deleting of write (this created wrong indexes)

* Fix defined name for template code

* Quote string on createColumn data validation

* Update yarn.lock

* Update to latest xlsx-populate beta

* Update i18n

* Add MSF custom module

* Fix merge

* Add custom entry form for MSF Module 1

* add styles for entry form sheet

* allow select language and periods for custom template

* update i18n

* bump version

* fix: group dataElements by category combo in a same section

* added support for greyedfield

* fix unsorted category option combos

* add missing types for category, cat. combo and cat. option combo

* hide check to override org unit if visibility is set to import

* set orgunit/period if custom template does not have datavalues

* add data validation according the dataElement valueType

* update i18n

* show only dataSet name in header section

* [NRC] Intersection of orgUnit: dataSet + categoryOptions + current user (new)

* Add constant.shortName to payload

* Perform uniqueness of tei.orgUnits on getBuilderMetadata

* [fix] use validated sheet name for data entry tabs

* [fix] Make Split-data-entry-tabs visible for data sets

* Hide UI flag Also-filter-TEI-and-relationships for data sets

* Fix error while changing theme permissions and improve UX (#322)

* fix: set shortName also for defaultValue

* feat: exchange select position (#325)

* use default app namespace (#326)

* chore: set default namespace in app context

* chore: update translation files

* feat: remove setDefaultNamespace in download template use case

* remove unused i18n import

---------

Co-authored-by: Eduardo Peredo Rivero <jrperedo@gmail.com>

* bump version

---------

Co-authored-by: Arnau Sanchez <pyarnau@gmail.com>
Co-authored-by: Adrian Quintana <adrianquintana@gmail.com>
Co-authored-by: Eduardo Peredo Rivero <jrperedo@gmail.com>
Co-authored-by: Ramon-Jimenez <151524506+Ramon-Jimenez@users.noreply.github.com>
Co-authored-by: Ana García <ana.garcia.peral@gmail.com>
Co-authored-by: Adrian Quintana <adrianq@users.noreply.github.com>
Co-authored-by: María Ozámiz <ozamiz.m@gmail.com>
Co-authored-by: Chukwudumebi Onwuli <37223065+deeonwuli@users.noreply.github.com>
  • Loading branch information
9 people authored Jul 31, 2024
1 parent 8194f0c commit debaf9b
Show file tree
Hide file tree
Showing 65 changed files with 3,441 additions and 498 deletions.
2 changes: 2 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ module.exports = {
"@typescript-eslint/explicit-function-return-type": ["off"],
"unused-imports/no-unused-imports": "warn",
"@typescript-eslint/no-unused-vars": ["warn", { argsIgnorePattern: "^_", varsIgnorePattern: "^_" }],
"no-unreachable": "off",
"no-constant-condition": "warn",
"react/prop-types": "off",
"react/display-name": "off",
"react/react-in-jsx-scope": "off",
Expand Down
66 changes: 60 additions & 6 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: 2023-06-29T07:07:25.389Z\n"
"PO-Revision-Date: 2023-06-29T07:07:25.389Z\n"
"POT-Creation-Date: 2024-06-25T17:49:07.727Z\n"
"PO-Revision-Date: 2024-06-25T17:49:07.727Z\n"

msgid "Data values - Create/update"
msgstr ""
Expand All @@ -23,7 +23,7 @@ msgstr ""
msgid "Tracked Entity Instance"
msgstr ""

msgid "Template {{id}} not loaded"
msgid "Template {{id}} not loaded. Loaded: {{loaded}}"
msgstr ""

msgid "Data values - Delete"
Expand All @@ -32,6 +32,15 @@ msgstr ""
msgid "Failed to import data values"
msgstr ""

msgid "Service"
msgstr ""

msgid "DataSet"
msgstr ""

msgid "Period"
msgstr ""

msgid ""
"It is not possible to create products. The maximum number of products has "
"been reached. Please contact your administrator."
Expand Down Expand Up @@ -288,6 +297,12 @@ msgid ""
"templates"
msgstr ""

msgid "Show autogenerated forms"
msgstr ""

msgid "Show populate in custom forms"
msgstr ""

msgid "Event date time difference for events (programs)"
msgstr ""

Expand All @@ -306,6 +321,15 @@ msgstr ""
msgid "New custom template"
msgstr ""

msgid "Apply to"
msgstr ""

msgid "Show languages in download template"
msgstr ""

msgid "Show periods in download template"
msgstr ""

msgid "Advanced"
msgstr ""

Expand All @@ -315,6 +339,9 @@ msgstr ""
msgid "Data Source Configuration"
msgstr ""

msgid "Fixed Metadata / Dynamic Metadata (TODO)"
msgstr ""

msgid "Styles"
msgstr ""

Expand All @@ -327,6 +354,18 @@ msgstr ""
msgid "Drag and drop template file"
msgstr ""

msgid "Specific program/dataset"
msgstr ""

msgid "All datasets"
msgstr ""

msgid "All programs"
msgstr ""

msgid "All tracker programs"
msgstr ""

msgid "Template saved"
msgstr ""

Expand Down Expand Up @@ -389,6 +428,9 @@ msgstr ""
msgid "Create template"
msgstr ""

msgid "ALL"
msgstr ""

msgid "Access to Templates"
msgstr ""

Expand All @@ -401,9 +443,15 @@ msgstr ""
msgid "Action"
msgstr ""

msgid "Is default"
msgstr ""

msgid "Mode"
msgstr ""

msgid "Generate automatic metadata"
msgstr ""

msgid "Code"
msgstr ""

Expand Down Expand Up @@ -614,6 +662,12 @@ msgstr ""
msgid "Data Source"
msgstr ""

msgid "Show Language"
msgstr ""

msgid "Show Period"
msgstr ""

msgid "Value for field '{{field}}' is invalid - {{value}}"
msgstr ""

Expand Down Expand Up @@ -665,9 +719,6 @@ msgstr ""
msgid "Data Model"
msgstr ""

msgid "Period"
msgstr ""

msgid "Start period"
msgstr ""

Expand Down Expand Up @@ -802,6 +853,9 @@ msgstr ""
msgid "Access to Themes"
msgstr ""

msgid "Error while updating sharing settings"
msgstr ""

msgid "Error deleting data values"
msgstr ""

Expand Down
69 changes: 64 additions & 5 deletions i18n/es.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Bulk Load\n"
"POT-Creation-Date: 2023-06-29T07:07:25.389Z\n"
"POT-Creation-Date: 2024-06-25T17:49:07.727Z\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand All @@ -24,7 +24,8 @@ msgstr "Relaciones"
msgid "Tracked Entity Instance"
msgstr "Instancia de la entidad rastreada"

msgid "Template {{id}} not loaded"
#, fuzzy
msgid "Template {{id}} not loaded. Loaded: {{loaded}}"
msgstr "La plantilla {{id}} no se pudo cargar"

msgid "Data values - Delete"
Expand All @@ -33,6 +34,16 @@ msgstr "Valores de los datos - Borrar"
msgid "Failed to import data values"
msgstr ""

msgid "Service"
msgstr ""

#, fuzzy
msgid "DataSet"
msgstr "Data Set"

msgid "Period"
msgstr "Periodo"

msgid ""
"It is not possible to create products. The maximum number of products has "
"been reached. Please contact your administrator."
Expand Down Expand Up @@ -312,6 +323,12 @@ msgid ""
"templates"
msgstr ""

msgid "Show autogenerated forms"
msgstr ""

msgid "Show populate in custom forms"
msgstr ""

msgid "Event date time difference for events (programs)"
msgstr ""
"Diferencia aceptada entre las fechas de los eventos para la identificación "
Expand All @@ -332,6 +349,15 @@ msgstr "Editar plantilla personalizada"
msgid "New custom template"
msgstr "Nueva plantilla personalizada"

msgid "Apply to"
msgstr ""

msgid "Show languages in download template"
msgstr "Mostrar idiomas en descargar plantilla"

msgid "Show periods in download template"
msgstr "Mostrar periodos en descargar plantilla"

msgid "Advanced"
msgstr ""

Expand All @@ -341,6 +367,9 @@ msgstr ""
msgid "Data Source Configuration"
msgstr "Fuentes de datos"

msgid "Fixed Metadata / Dynamic Metadata (TODO)"
msgstr ""

msgid "Styles"
msgstr ""

Expand All @@ -353,6 +382,21 @@ msgstr "Descargar"
msgid "Drag and drop template file"
msgstr "Mueva aquí los ficheros a importar"

#, fuzzy
msgid "Specific program/dataset"
msgstr "Programa/Dataset"

msgid "All datasets"
msgstr ""

#, fuzzy
msgid "All programs"
msgstr "Programa"

#, fuzzy
msgid "All tracker programs"
msgstr "Programa de tracker"

msgid "Template saved"
msgstr "Plantilla guardada"

Expand Down Expand Up @@ -416,6 +460,9 @@ msgstr ""
msgid "Create template"
msgstr "Crear plantilla"

msgid "ALL"
msgstr ""

msgid "Access to Templates"
msgstr "Acceso a plantillas"

Expand All @@ -428,9 +475,15 @@ msgstr "El campo {{field}} no se puede dejar vacio"
msgid "Action"
msgstr "Acción"

msgid "Is default"
msgstr ""

msgid "Mode"
msgstr "Modo"

msgid "Generate automatic metadata"
msgstr ""

msgid "Code"
msgstr "Código"

Expand Down Expand Up @@ -641,6 +694,12 @@ msgstr "TEI valores de datos del evento - Columna inicial"
msgid "Data Source"
msgstr "Fuente de datos"

msgid "Show Language"
msgstr "Mostrar Idioma"

msgid "Show Period"
msgstr "Mostrar Periodo"

msgid "Value for field '{{field}}' is invalid - {{value}}"
msgstr ""

Expand Down Expand Up @@ -692,9 +751,6 @@ msgstr "Seleccione plantilla para exportar..."
msgid "Data Model"
msgstr "Modelo de Datos"

msgid "Period"
msgstr "Periodo"

msgid "Start period"
msgstr "Periodo inicial"

Expand Down Expand Up @@ -830,6 +886,9 @@ msgstr "Crear tema"
msgid "Access to Themes"
msgstr "Acceso a plantillas"

msgid "Error while updating sharing settings"
msgstr ""

msgid "Error deleting data values"
msgstr "Se ha producido un error borrando valores de datos"

Expand Down
Loading

0 comments on commit debaf9b

Please sign in to comment.