Add partner UEI column (#81)

* fix: add Partner UEI column, fix partner code name [DAT-1859]
pepfar-datim · Jul 11, 2022 · 818f3d8 · 818f3d8
1 parent e1ace05
commit 818f3d8
Show file tree

Hide file tree

Showing 8 changed files with 19,618 additions and 10,533 deletions.
diff --git a/current/.gitignore b/current/.gitignore
@@ -21,3 +21,5 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+
+*.zip
diff --git a/current/package-lock.json b/current/package-lock.json
diff --git a/current/package.json b/current/package.json
@@ -1,6 +1,6 @@
 {
   "name": "datim-mechanism-finder",
-  "version": "33.3.2",
+  "version": "3.2.3",
   "private": true,
   "dependencies": {
     "@dhis2/app-runtime": "^2.0.4",

diff --git a/current/public/manifest.webapp b/current/public/manifest.webapp
@@ -8,7 +8,7 @@
   },
   "appType": "APP",
   "name": "Mechanism Finder",
-  "version": "3.2.2",
+  "version": "3.2.3",
   "description": "DATIM application to find a mechanism",
   "developer": {
     "name": "PEPFAR"

diff --git a/current/src/components/CardTable.js b/current/src/components/CardTable.js
@@ -12,7 +12,7 @@ const rowStyling = {
 
 const codeNames = {
 	Mechanism: 'mech ID',
-	Partner: 'partner\nDUNS',
+	Partner: 'partner\ncode',
 	Agency: 'code',
 }
 

diff --git a/current/src/components/DataReactTable.js b/current/src/components/DataReactTable.js
@@ -15,7 +15,7 @@ function getData(array) {
 }
 
 function organizeColumns(columnRow, dataRow) {
-	var idealOrder = ["Date","OU","OU Country Code","FY","Reporting Cycle","HQ ID","IM","Agency","Award Number","Partner Name","Partner DUNS","Start Date","End Date","Active","Partner Country","Indigenous Partner","Organization Type","Legacy ID","Legacy Partner Name","Legacy Partner ID","Legacy Partner Organization Type ID"];
+	var idealOrder = ["Date","OU","OU Country Code","FY","Reporting Cycle","HQ ID","IM","Agency","Award Number","Partner Name", "Partner UEI", "Partner DUNS","Start Date","End Date","Active","Partner Country","Indigenous Partner","Organization Type","Legacy ID","Legacy Partner Name","Legacy Partner ID","Legacy Partner Organization Type ID"];
 
 	//first harmonize length between columns and data (if necessary)
 	for (let i = columnRow.length; i <= Object.keys(dataRow).length; i++) {

diff --git a/current/src/config/serverConfig.dev.json b/current/src/config/serverConfig.dev.json
@@ -1,4 +1,4 @@
 {
-  "baseUrl": "https://dev-tom.datim.org/",
+  "baseUrl": "https://dev.datim.org/",
   "apiVersion": "30"
 }