Merge pull request #728 from EyeSeeTea/development

Release 2.5.0
EyeSeeTea · Nov 30, 2020 · c9e933f · c9e933f
2 parents 1c2a1bf + e4f1b1f
commit c9e933f
Show file tree

Hide file tree

Showing 42 changed files with 1,219 additions and 448 deletions.
diff --git a/README.md b/README.md
@@ -47,13 +47,13 @@ $ yarn start
 
 This will open the development server for the main application at port 8081 and will connect to DHIS 2 instance http://localhost:8080.
 
-### Start the development server of a given widget:
+### Customization of the development server:
 
 ```
-$ yarn start-widget -p 8082 modules-list|package-exporter
+$ yarn start -p 8082 core-app|data-metadata-app|module-package-app|modules-list|package-exporter
 ```
 
-This will open the development server for the given widget at port 8082 and will connect to DHIS 2 instance http://localhost:8080.
+This will open the development server for the given front-end at port 8082 and will connect to DHIS 2 instance http://localhost:8080.
 
 ### Customize DHIS2 instance url
 
@@ -91,16 +91,16 @@ Note tests only pass on the testing docker instance eyeseetea/dhis2-data:2.30-da
 
 ## Build
 
-To build the web app:
+To build all the front-ends:
 
 ```
-$ yarn build-webapp
+$ yarn build
 ```
 
-To build the widget:
+To build a given front-end:
 
 ```
-$ yarn build-widget modules-list|package-exporter
+$ yarn build [all|core-app|data-metadata-app|module-package-app|modules-list|package-exporter]
 ```
 
 To build the scheduler:

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-11-16T09:46:43.582Z\n"
-"PO-Revision-Date: 2020-11-16T09:46:43.582Z\n"
+"POT-Creation-Date: 2020-11-30T08:20:56.222Z\n"
+"PO-Revision-Date: 2020-11-30T08:20:56.222Z\n"
 
 msgid "Field {{field}} cannot be blank"
 msgstr ""
@@ -143,6 +143,15 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+msgid "Cancel"
+msgstr ""
+
+msgid "Save"
+msgstr ""
+
+msgid "Save & import"
+msgstr ""
+
 msgid "Identifier"
 msgstr ""
 
@@ -176,9 +185,6 @@ msgstr ""
 msgid "Update"
 msgstr ""
 
-msgid "Cancel"
-msgstr ""
-
 msgid "Match string (name, code, description)"
 msgstr ""
 
@@ -526,9 +532,6 @@ msgstr ""
 msgid "Removed {{difference}} elements"
 msgstr ""
 
-msgid "Save"
-msgstr ""
-
 msgid "Metadata exclusions"
 msgstr ""
 
@@ -577,9 +580,15 @@ msgstr ""
 msgid "Unknown error happened loading package"
 msgstr ""
 
+msgid "Unknown error happened loading module"
+msgstr ""
+
 msgid "Unknown error happened loading store"
 msgstr ""
 
+msgid "There are not elements to map in the package"
+msgstr ""
+
 msgid "Existing mapping will be used"
 msgstr ""
 
@@ -641,6 +650,15 @@ msgstr ""
 msgid "Couldn't create new branch on store"
 msgstr ""
 
+msgid "Generating module"
+msgstr ""
+
+msgid "Module generated successfully"
+msgstr ""
+
+msgid "An error has ocurred generating the module"
+msgstr ""
+
 msgid "Installed"
 msgstr ""
 
@@ -650,16 +668,22 @@ msgstr ""
 msgid "Upgrade Available"
 msgstr ""
 
+msgid "Local Package (Installed)"
+msgstr ""
+
+msgid "Local Package (Not Installed)"
+msgstr ""
+
 msgid "Version"
 msgstr ""
 
 msgid "DHIS2 Version"
 msgstr ""
 
-msgid "Module"
+msgid "Status"
 msgstr ""
 
-msgid "State"
+msgid "Module"
 msgstr ""
 
 msgid "Download as JSON"
@@ -680,6 +704,9 @@ msgstr ""
 msgid "Import package (wizard)"
 msgstr ""
 
+msgid "Generate Module"
+msgstr ""
+
 msgid "Not recommended"
 msgstr ""
 
@@ -892,9 +919,6 @@ msgstr ""
 msgid "Destination instance"
 msgstr ""
 
-msgid "Status"
-msgstr ""
-
 msgid "Messages"
 msgstr ""
 
@@ -1153,9 +1177,6 @@ msgstr ""
 msgid "You do not have assigned any organisation unit"
 msgstr ""
 
-msgid "MetaData Synchronization"
-msgstr ""
-
 msgid "Metadata Synchronization History"
 msgstr ""
 
@@ -1183,6 +1204,9 @@ msgstr ""
 msgid "Sync Rule"
 msgstr ""
 
+msgid "(package import)"
+msgstr ""
+
 msgid "(manual synchronization)"
 msgstr ""
 
@@ -1709,6 +1733,9 @@ msgstr ""
 msgid "Program Rule"
 msgstr ""
 
+msgid "Url"
+msgstr ""
+
 msgid "This URL and username combination already exists"
 msgstr ""
 

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-11-16T06:06:52.782Z\n"
+"POT-Creation-Date: 2020-11-30T08:20:56.222Z\n"
 "PO-Revision-Date: 2020-07-10T06:53:30.625Z\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -143,6 +143,15 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+msgid "Cancel"
+msgstr ""
+
+msgid "Save"
+msgstr ""
+
+msgid "Save & import"
+msgstr ""
+
 msgid "Identifier"
 msgstr ""
 
@@ -176,9 +185,6 @@ msgstr ""
 msgid "Update"
 msgstr ""
 
-msgid "Cancel"
-msgstr ""
-
 msgid "Match string (name, code, description)"
 msgstr ""
 
@@ -527,9 +533,6 @@ msgstr ""
 msgid "Removed {{difference}} elements"
 msgstr ""
 
-msgid "Save"
-msgstr ""
-
 msgid "Metadata exclusions"
 msgstr ""
 
@@ -581,9 +584,15 @@ msgstr "Paquetes"
 msgid "Unknown error happened loading package"
 msgstr ""
 
+msgid "Unknown error happened loading module"
+msgstr ""
+
 msgid "Unknown error happened loading store"
 msgstr ""
 
+msgid "There are not elements to map in the package"
+msgstr ""
+
 msgid "Existing mapping will be used"
 msgstr ""
 
@@ -645,6 +654,15 @@ msgstr ""
 msgid "Couldn't create new branch on store"
 msgstr ""
 
+msgid "Generating module"
+msgstr ""
+
+msgid "Module generated successfully"
+msgstr ""
+
+msgid "An error has ocurred generating the module"
+msgstr ""
+
 msgid "Installed"
 msgstr ""
 
@@ -654,16 +672,22 @@ msgstr ""
 msgid "Upgrade Available"
 msgstr ""
 
+msgid "Local Package (Installed)"
+msgstr ""
+
+msgid "Local Package (Not Installed)"
+msgstr ""
+
 msgid "Version"
 msgstr ""
 
 msgid "DHIS2 Version"
 msgstr ""
 
-msgid "Module"
+msgid "Status"
 msgstr ""
 
-msgid "State"
+msgid "Module"
 msgstr ""
 
 msgid "Download as JSON"
@@ -684,6 +708,9 @@ msgstr ""
 msgid "Import package (wizard)"
 msgstr ""
 
+msgid "Generate Module"
+msgstr ""
+
 msgid "Not recommended"
 msgstr ""
 
@@ -897,9 +924,6 @@ msgstr ""
 msgid "Destination instance"
 msgstr ""
 
-msgid "Status"
-msgstr ""
-
 msgid "Messages"
 msgstr ""
 
@@ -1159,9 +1183,6 @@ msgstr ""
 msgid "You do not have assigned any organisation unit"
 msgstr ""
 
-msgid "MetaData Synchronization"
-msgstr ""
-
 msgid "Metadata Synchronization History"
 msgstr ""
 
@@ -1189,6 +1210,10 @@ msgstr ""
 msgid "Sync Rule"
 msgstr ""
 
+#, fuzzy
+msgid "(package import)"
+msgstr "Paquetes"
+
 msgid "(manual synchronization)"
 msgstr ""
 
@@ -1715,6 +1740,9 @@ msgstr ""
 msgid "Program Rule"
 msgstr ""
 
+msgid "Url"
+msgstr ""
+
 msgid "This URL and username combination already exists"
 msgstr ""