Skip to content

Commit

Permalink
Merge pull request #101 from msf-ocba/development
Browse files Browse the repository at this point in the history 
Invidivual export fix
  • Loading branch information
@tomassala
tomassala authored Mar 25, 2022
2 parents 61e1d1a + d857123 commit 821e61e
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions dist2/languages/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
"SYNC": "Online Sync",
"DIFFERENT_VERSIONS": "Different HMIS versions. Please ask the project to update",
"NO_SETTINGS_FILE": "The file has not the right format. Probably it was exported with a previous version. Please ask the project to update",
"REFRESHING_MESSAGE": "The data imported will be available in the tables and charts in the next 24h. If it is urgent please contact hmis@barcelona.msf.org",
"REFRESHING_MESSAGE": "The data imported will be available in the tables and charts in the next 24h. If it is urgent please contac ZenitHelp.Apps4Ops@barcelona.msf.org",

"____________Tracker Data Export":"__________",

Expand Down Expand Up @@ -224,7 +224,7 @@

"________________Service": " Remote API___________",
"LOGGER_USER_NOT_AUTHORIZED": "Logger user credentials are not correct.",
"NOT_IN_WHITELIST": "Please, email hmis@barcelona.msf.org and ask to include '{{urlbase}}' in the whitelist.",
"NOT_IN_WHITELIST": "Please, email ZenitHelp.Apps4Ops@barcelona.msf.org and ask to include '{{urlbase}}' in the whitelist.",
"NO_LOGGER_USER": "Logger user is not available.",
"INVALID_LOGGER_USER": "Logger user credentials are invalid.",

Expand Down
4 changes: 2 additions & 2 deletions dist2/languages/es.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
"SYNC": "Sincronización online",
"DIFFERENT_VERSIONS": "Versiones diferentes. Por favor solicita al proyecto que actualice",
"NO_SETTINGS_FILE": "El fichero no tiene el formato correcto. Probablemente fue exportado con una versión antigua. Por favor solicita al proyecto que actualice",
"REFRESHING_MESSAGE": "Los datos importados estarán disponibles en las tablas y gráficos en las próximas 24h. Si es urgente por favor contacta con hmis@barcelona.msf.org",
"REFRESHING_MESSAGE": "Los datos importados estarán disponibles en las tablas y gráficos en las próximas 24h. Si es urgente por favor contacta con ZenitHelp.Apps4Ops@barcelona.msf.org",


"____________Tracker Data Export":"__________",
Expand Down Expand Up @@ -223,7 +223,7 @@

"________________Service ": " Remote API___________",
"LOGGER_USER_NOT_AUTHORIZED": "Las credenciales de usuario no son correctas",
"NOT_IN_WHITELIST": "Por favor, envia un correo a hmis@barcelona.msf.org y pide que incluyan '{{urlbase}}' en la lista blanca ",
"NOT_IN_WHITELIST": "Por favor, envia un correo a ZenitHelp.Apps4Ops@barcelona.msf.org y pide que incluyan '{{urlbase}}' en la lista blanca ",
"NO_LOGGER_USER": "El usuario no está disponible",
"INVALID_LOGGER_USER": "Las credenciales de usario son inválidas",

Expand Down
4 changes: 2 additions & 2 deletions dist2/languages/fr.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
"SYNC": "Synchronisation en ligne",
"DIFFERENT_VERSIONS": "Différentes versions du HMIS. Veuillez demander au projet de mettre à jour",
"NO_SETTINGS_FILE": "Le fichier n'a pas le bon format. Probablement il a été exporté avec une version précédente. Veuillez demander au projet de mettre à jour",
"REFRESHING_MESSAGE": "Les données importées seront disponibles dans les tableaux et les graphiques dans les prochaines 24h. Si urgent veuillez contacter hmis@barcelona.msf.org",
"REFRESHING_MESSAGE": "Les données importées seront disponibles dans les tableaux et les graphiques dans les prochaines 24h. Si urgent veuillez contacter ZenitHelp.Apps4Ops@barcelona.msf.org",


"____________Tracker Data Export":"__________",
Expand Down Expand Up @@ -220,7 +220,7 @@

"________________Service ": " Remote API___________",
"LOGGER_USER_NOT_AUTHORIZED": "Les informations d'identification de l'utilisateur ne sont pas correctes",
"NOT_IN_WHITELIST": "S'il vous plaît, email hmis@barcelona.msf.org et demander à inclure '{{urlbase}}' dans la liste blanche",
"NOT_IN_WHITELIST": "S'il vous plaît, email ZenitHelp.Apps4Ops@barcelona.msf.org et demander à inclure '{{urlbase}}' dans la liste blanche",
"NO_LOGGER_USER": "Utilisateur n'est pas disponible",
"INVALID_LOGGER_USER": "Les informations d'identification de l'utilisateur sont incorrectes.",

Expand Down
4 changes: 2 additions & 2 deletions languages/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
"SYNC": "Online Sync",
"DIFFERENT_VERSIONS": "Different HMIS versions. Please ask the project to update",
"NO_SETTINGS_FILE": "The file has not the right format. Probably it was exported with a previous version. Please ask the project to update",
"REFRESHING_MESSAGE": "The data imported will be available in the tables and charts in the next 24h. If it is urgent please contact hmis@barcelona.msf.org",
"REFRESHING_MESSAGE": "The data imported will be available in the tables and charts in the next 24h. If it is urgent please contact ZenitHelp.Apps4Ops@barcelona.msf.org",

"____________Tracker Data Export":"__________",

Expand Down Expand Up @@ -224,7 +224,7 @@

"________________Service": " Remote API___________",
"LOGGER_USER_NOT_AUTHORIZED": "Logger user credentials are not correct.",
"NOT_IN_WHITELIST": "Please, email hmis@barcelona.msf.org and ask to include '{{urlbase}}' in the whitelist.",
"NOT_IN_WHITELIST": "Please, email ZenitHelp.Apps4Ops@barcelona.msf.org and ask to include '{{urlbase}}' in the whitelist.",
"NO_LOGGER_USER": "Logger user is not available.",
"INVALID_LOGGER_USER": "Logger user credentials are invalid.",

Expand Down
4 changes: 2 additions & 2 deletions languages/es.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
"SYNC": "Sincronización online",
"DIFFERENT_VERSIONS": "Versiones diferentes. Por favor solicita al proyecto que actualice",
"NO_SETTINGS_FILE": "El fichero no tiene el formato correcto. Probablemente fue exportado con una versión antigua. Por favor solicita al proyecto que actualice",
"REFRESHING_MESSAGE": "Los datos importados estarán disponibles en las tablas y gráficos en las próximas 24h. Si es urgente por favor contacta con hmis@barcelona.msf.org",
"REFRESHING_MESSAGE": "Los datos importados estarán disponibles en las tablas y gráficos en las próximas 24h. Si es urgente por favor contacta con ZenitHelp.Apps4Ops@barcelona.msf.org",


"____________Tracker Data Export":"__________",
Expand Down Expand Up @@ -223,7 +223,7 @@

"________________Service ": " Remote API___________",
"LOGGER_USER_NOT_AUTHORIZED": "Las credenciales de usuario no son correctas",
"NOT_IN_WHITELIST": "Por favor, envia un correo a hmis@barcelona.msf.org y pide que incluyan '{{urlbase}}' en la lista blanca ",
"NOT_IN_WHITELIST": "Por favor, envia un correo a ZenitHelp.Apps4Ops@barcelona.msf.org y pide que incluyan '{{urlbase}}' en la lista blanca ",
"NO_LOGGER_USER": "El usuario no está disponible",
"INVALID_LOGGER_USER": "Las credenciales de usario son inválidas",

Expand Down
4 changes: 2 additions & 2 deletions languages/fr.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
"SYNC": "Synchronisation en ligne",
"DIFFERENT_VERSIONS": "Différentes versions du HMIS. Veuillez demander au projet de mettre à jour",
"NO_SETTINGS_FILE": "Le fichier n'a pas le bon format. Probablement il a été exporté avec une version précédente. Veuillez demander au projet de mettre à jour",
"REFRESHING_MESSAGE": "Les données importées seront disponibles dans les tableaux et les graphiques dans les prochaines 24h. Si urgent veuillez contacter hmis@barcelona.msf.org",
"REFRESHING_MESSAGE": "Les données importées seront disponibles dans les tableaux et les graphiques dans les prochaines 24h. Si urgent veuillez contacter ZenitHelp.Apps4Ops@barcelona.msf.org",


"____________Tracker Data Export":"__________",
Expand Down Expand Up @@ -220,7 +220,7 @@

"________________Service ": " Remote API___________",
"LOGGER_USER_NOT_AUTHORIZED": "Les informations d'identification de l'utilisateur ne sont pas correctes",
"NOT_IN_WHITELIST": "S'il vous plaît, email hmis@barcelona.msf.org et demander à inclure '{{urlbase}}' dans la liste blanche",
"NOT_IN_WHITELIST": "S'il vous plaît, email ZenitHelp.Apps4Ops@barcelona.msf.org et demander à inclure '{{urlbase}}' dans la liste blanche",
"NO_LOGGER_USER": "Utilisateur n'est pas disponible",
"INVALID_LOGGER_USER": "Les informations d'identification de l'utilisateur sont incorrectes.",

Expand Down
2 changes: 1 addition & 1 deletion manifest.webapp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version":"2.0.6",
"version":"2.0.7",
"name":"HMIS Management",
"description":"General management of HMIS: data and metadata import/export, password reset,...Commented Analytics in Import ",
"launch_path":"index.html",
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hmis_management",
"version": "2.0.6",
"version": "2.0.7",
"description": "HMIS Management app",
"main": "app.js",
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion services/events/EventExportService.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ export class EventExportService {
};
let teiPromises = orgunitProgramCombo.map( (combination) => {
//ou: combination.orgUnit,
const params = angular.extend({}, commonParams, { program: combination.program, fields: "*", includeDeleted: "true"});
const params = angular.extend({}, commonParams, { program: combination.program, fields: ":all", includeDeleted: "true"});
return this.TrackedEntityInstances.get(params).$promise;
});

Expand Down

0 comments on commit 821e61e

Please sign in to comment.