Merge pull request #127 from EyeSeeTea/development

Release 3.4.1
EyeSeeTea · Jun 11, 2020 · c58f54b · c58f54b
2 parents 1a2993b + 37d80b0
commit c58f54b
Show file tree

Hide file tree

Showing 11 changed files with 98 additions and 96 deletions.
diff --git a/i18n/en.pot b/i18n/en.pot
@@ -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: 2020-06-06T17:53:55.382Z\n"
-"PO-Revision-Date: 2020-06-06T17:53:55.382Z\n"
+"POT-Creation-Date: 2020-06-11T08:45:45.996Z\n"
+"PO-Revision-Date: 2020-06-11T08:45:45.996Z\n"
 
 msgid "Template not loaded"
 msgstr ""
@@ -74,24 +74,24 @@ msgstr ""
 msgid "Not accessible"
 msgstr ""
 
-msgid "Models"
+msgid "Data model"
 msgstr ""
 
-msgid "Visibility"
-msgstr ""
-
-msgid "Organisation Units visibility"
+msgid "Organisation Unit Visibility"
 msgstr ""
 
 msgid "Duplicate detection for events (programs)"
 msgstr ""
 
-msgid "Event date absolute difference"
+msgid "Event date time difference"
 msgstr ""
 
 msgid "Data elements filter"
 msgstr ""
 
+msgid "Data elements used for duplicates identification"
+msgstr ""
+
 msgid "Permissions"
 msgstr ""
 
@@ -101,13 +101,13 @@ msgstr ""
 msgid "Data Set"
 msgstr ""
 
-msgid "Template properties"
+msgid "Template"
 msgstr ""
 
-msgid "Data Model"
+msgid "Select template to export..."
 msgstr ""
 
-msgid "Select element to export..."
+msgid "Data Model"
 msgstr ""
 
 msgid "Start period"
@@ -119,13 +119,13 @@ msgstr ""
 msgid "Organisation units"
 msgstr ""
 
-msgid "Select available Organisation Units"
+msgid "Select available organisation units to include in the template"
 msgstr ""
 
 msgid "User does not have any capture organisations units"
 msgstr ""
 
-msgid "Advanced properties"
+msgid "Advanced template properties"
 msgstr ""
 
 msgid "Language"
@@ -333,7 +333,7 @@ msgstr ""
 msgid "Deleted"
 msgstr ""
 
-msgid "Bulk Import"
+msgid "Bulk data import"
 msgstr ""
 
 msgid "Drag and drop file to import"

diff --git a/i18n/es.po b/i18n/es.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2020-06-06T17:53:55.382Z\n"
+"POT-Creation-Date: 2020-06-11T08:45:45.996Z\n"
 "PO-Revision-Date: 2018-10-25T09:02:35.143Z\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -76,24 +76,24 @@ msgstr "Solo accesible a los administradores del sistema"
 msgid "Not accessible"
 msgstr "No accesible"
 
-msgid "Models"
-msgstr "Modelos"
+msgid "Data model"
+msgstr "Modelos de Datos"
 
-msgid "Visibility"
-msgstr "Visibilidad"
-
-msgid "Organisation Units visibility"
+msgid "Organisation Unit Visibility"
 msgstr "Visibilidad de unidades organizativas"
 
 msgid "Duplicate detection for events (programs)"
 msgstr "Detección de duplicados para eventos (programas)"
 
-msgid "Event date absolute difference"
-msgstr "Diferencia absoluta sobre la fecha reportada"
+msgid "Event date time difference"
+msgstr "Diferencia de tiempo sobre la fecha reportada"
 
 msgid "Data elements filter"
 msgstr "Filtro de data elements"
 
+msgid "Data elements used for duplicates identification"
+msgstr "Data elements usados para identificar los duplicados"
+
 msgid "Permissions"
 msgstr "Permisos"
 
@@ -103,15 +103,15 @@ msgstr "Todos"
 msgid "Data Set"
 msgstr "Data Set"
 
-msgid "Template properties"
-msgstr "Propiedades de plantilla"
+msgid "Template"
+msgstr "Plantilla"
+
+msgid "Select template to export..."
+msgstr "Seleccione plantilla para exportar..."
 
 msgid "Data Model"
 msgstr "Modelo de Datos"
 
-msgid "Select element to export..."
-msgstr "Seleccione elemento a exportar..."
-
 msgid "Start period"
 msgstr "Periodo inicial"
 
@@ -121,14 +121,14 @@ msgstr "Periodo final"
 msgid "Organisation units"
 msgstr "Unidades Organizativas"
 
-msgid "Select available Organisation Units"
-msgstr "Seleccione una unidad organizativa en la que importar los datos"
+msgid "Select available organisation units to include in the template"
+msgstr "Seleccione las unidades organizativas para añadir a la plantilla"
 
 msgid "User does not have any capture organisations units"
 msgstr "El usuario no tiene unidades organizativas asociadas"
 
-msgid "Advanced properties"
-msgstr "Propiedades avanzadas"
+msgid "Advanced template properties"
+msgstr "Propiedades avanzadas de la plantilla"
 
 msgid "Language"
 msgstr "Idioma"
@@ -347,8 +347,8 @@ msgstr "Ignorados"
 msgid "Deleted"
 msgstr "Borrados"
 
-msgid "Bulk Import"
-msgstr "Importación"
+msgid "Bulk data import"
+msgstr "Importación de datos"
 
 msgid "Drag and drop file to import"
 msgstr "Mueva aquí los ficheros a importar"
@@ -381,9 +381,3 @@ msgstr "Configuración"
 
 msgid "Settings saved"
 msgstr "Configuración guardada"
-
-#~ msgid "Exclude data elements for duplicate detection in programs"
-#~ msgstr "Excluir data elements en la detección de duplicados para programas"
-
-#~ msgid "Used to assess if a record is a duplicated"
-#~ msgstr "Se usa para determinar si una entrada es un duplicado"
diff --git a/i18n/fr.po b/i18n/fr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2020-06-06T17:53:55.382Z\n"
+"POT-Creation-Date: 2020-06-11T08:45:45.996Z\n"
 "PO-Revision-Date: 2019-10-10T10:41:21.864Z\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -74,24 +74,24 @@ msgstr ""
 msgid "Not accessible"
 msgstr ""
 
-msgid "Models"
+msgid "Data model"
 msgstr ""
 
-msgid "Visibility"
-msgstr ""
-
-msgid "Organisation Units visibility"
+msgid "Organisation Unit Visibility"
 msgstr ""
 
 msgid "Duplicate detection for events (programs)"
 msgstr ""
 
-msgid "Event date absolute difference"
+msgid "Event date time difference"
 msgstr ""
 
 msgid "Data elements filter"
 msgstr ""
 
+msgid "Data elements used for duplicates identification"
+msgstr ""
+
 msgid "Permissions"
 msgstr ""
 
@@ -101,13 +101,13 @@ msgstr ""
 msgid "Data Set"
 msgstr ""
 
-msgid "Template properties"
+msgid "Template"
 msgstr ""
 
-msgid "Data Model"
+msgid "Select template to export..."
 msgstr ""
 
-msgid "Select element to export..."
+msgid "Data Model"
 msgstr ""
 
 msgid "Start period"
@@ -119,13 +119,13 @@ msgstr ""
 msgid "Organisation units"
 msgstr ""
 
-msgid "Select available Organisation Units"
+msgid "Select available organisation units to include in the template"
 msgstr ""
 
 msgid "User does not have any capture organisations units"
 msgstr ""
 
-msgid "Advanced properties"
+msgid "Advanced template properties"
 msgstr ""
 
 msgid "Language"
@@ -333,7 +333,7 @@ msgstr ""
 msgid "Deleted"
 msgstr ""
 
-msgid "Bulk Import"
+msgid "Bulk data import"
 msgstr ""
 
 msgid "Drag and drop file to import"

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "bulk-load",
     "description": "Bulk importing made easy",
-    "version": "3.4.0",
+    "version": "3.4.1",
     "license": "GPL-3.0",
     "author": "EyeSeeTea team",
     "homepage": ".",

diff --git a/src/data/InstanceDhisRepository.ts b/src/data/InstanceDhisRepository.ts
@@ -238,6 +238,7 @@ export class InstanceDhisRepository implements InstanceRepository {
                         attributeCos: categoryOptionId,
                         startDate: startDate?.format("YYYY-MM-DD"),
                         endDate: endDate?.format("YYYY-MM-DD"),
+                        cache: Math.random(),
                     })
                     .getData()
             );

diff --git a/src/test/DownloadTemplatePage.spec.tsx b/src/test/DownloadTemplatePage.spec.tsx
@@ -48,8 +48,10 @@ describe("ImportTemplatePage", () => {
     test("Renders correctly", async () => {
         await renderComponent();
 
-        expect(screen.getByRole("heading", { name: "Template properties" })).toBeInTheDocument();
-        expect(screen.getByRole("heading", { name: "Advanced properties" })).toBeInTheDocument();
+        expect(screen.getByRole("heading", { name: "Template" })).toBeInTheDocument();
+        expect(
+            screen.getByRole("heading", { name: "Advanced template properties" })
+        ).toBeInTheDocument();
         expect(screen.getByRole("button", { name: "Download template" })).toBeInTheDocument();
     });
 });

diff --git a/src/test/ImportTemplatePage.spec.tsx b/src/test/ImportTemplatePage.spec.tsx
@@ -48,7 +48,7 @@ describe("ImportTemplatePage", () => {
     test("Renders correctly", async () => {
         await renderComponent();
 
-        expect(screen.getByRole("heading", { name: "Bulk Import" })).toBeInTheDocument();
+        expect(screen.getByRole("heading", { name: "Bulk data import" })).toBeInTheDocument();
         expect(screen.getByText(/drag and drop/i)).toBeInTheDocument();
         expect(screen.getByRole("button", { name: "Import data" })).toBeInTheDocument();
     });

diff --git a/src/test/SettingsPage.spec.tsx b/src/test/SettingsPage.spec.tsx
@@ -43,8 +43,10 @@ describe("ImportTemplatePage", () => {
     test("Renders correctly", async () => {
         await renderComponent();
 
-        expect(screen.getByRole("heading", { name: "Models" })).toBeInTheDocument();
-        expect(screen.getByRole("heading", { name: "Visibility" })).toBeInTheDocument();
+        expect(screen.getByRole("heading", { name: "Data model" })).toBeInTheDocument();
+        expect(
+            screen.getByRole("heading", { name: "Organisation Unit Visibility" })
+        ).toBeInTheDocument();
     });
 });