From 07c2c3d37a502019c66abe611421fb995940e073 Mon Sep 17 00:00:00 2001 From: josemp10 Date: Tue, 28 Jun 2016 09:44:18 +0200 Subject: [PATCH 01/10] New Health Sites datasets Now the health sites are linked to the datasets coded as DS_DEM. I have also refactor the code, and now both datasets codes (projects and healthsites) are in dhis2Api.js --- core/dhis2Api.js | 3 +++ services/missionservice.js | 2 +- services/projectservice.js | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/dhis2Api.js b/core/dhis2Api.js index 6e0648c..e97168b 100644 --- a/core/dhis2Api.js +++ b/core/dhis2Api.js @@ -50,6 +50,9 @@ var ougroupsetId = { ProjectType: "rQjuGZcxNxE" ,HealthServiceType: "akYeq1mMz2N" ,SiteType: "ZxNjaKVXY1D"}; +var codeDataSets = {codeDataSetProject:"DS_VST_3" + ,codeDataSetSite:"DS_DEM"}; + var levelMSF = {OperationalCenter: "2" ,Mission: "3" ,Project: "4" diff --git a/services/missionservice.js b/services/missionservice.js index 9c17bb5..0035e0a 100644 --- a/services/missionservice.js +++ b/services/missionservice.js @@ -87,7 +87,7 @@ Dhis2Api.service('missionService', ['$q', 'commonvariable', 'User', 'OrgUnitGrou OrgUnitGroupsOrgUnit.POST({ uidgroup: commonvariable.orgUnitGroupSet[commonvariable.ouGroupsetId.Context].id, uidorgunit: newOu.id }); - FilterResource.GET({resource:'dataSets', filter:'code:eq:'+"DS_VST_3"}).$promise + FilterResource.GET({resource:'dataSets', filter:'code:eq:'+commonvariable.codeDataSets.codeDataSetProject}).$promise .then(function(response){ if (response.dataSets.length>0) { var dataSet = response.dataSets[0]; diff --git a/services/projectservice.js b/services/projectservice.js index 9fc31f4..8b70ff3 100644 --- a/services/projectservice.js +++ b/services/projectservice.js @@ -211,7 +211,7 @@ Dhis2Api.service('projectService', ['$q', 'commonvariable', 'User', 'OrgUnitOrgU }); - FilterResource.GET({ resource: 'dataSets', filter: 'code:eq:' + "DS_INFR_3" }).$promise + FilterResource.GET({ resource: 'dataSets', filter: 'code:eq:' + commonvariable.codeDataSets.codeDataSetSite }).$promise .then(function (response) { if (response.dataSets.length > 0) { From 442fec41c0e044be1ff2c6098d14c4bc577a9cac Mon Sep 17 00:00:00 2001 From: josemp10 Date: Tue, 28 Jun 2016 10:12:26 +0200 Subject: [PATCH 02/10] Solving bugs in the naming convention --- core/dhis2Api.js | 1 + services/missionservice.js | 2 +- services/projectservice.js | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/core/dhis2Api.js b/core/dhis2Api.js index e97168b..bbbfa50 100644 --- a/core/dhis2Api.js +++ b/core/dhis2Api.js @@ -75,6 +75,7 @@ Dhis2Api.factory("commonvariable", function () { var Vari={ url: urlApi, urlbase: urlBase, + codedatasets: codeDataSets, OrganisationUnitList:[], OrganisationUnit:"", RefreshTreeOU:false, diff --git a/services/missionservice.js b/services/missionservice.js index 0035e0a..b55694d 100644 --- a/services/missionservice.js +++ b/services/missionservice.js @@ -87,7 +87,7 @@ Dhis2Api.service('missionService', ['$q', 'commonvariable', 'User', 'OrgUnitGrou OrgUnitGroupsOrgUnit.POST({ uidgroup: commonvariable.orgUnitGroupSet[commonvariable.ouGroupsetId.Context].id, uidorgunit: newOu.id }); - FilterResource.GET({resource:'dataSets', filter:'code:eq:'+commonvariable.codeDataSets.codeDataSetProject}).$promise + FilterResource.GET({resource:'dataSets', filter:'code:eq:'+commonvariable.codedatasets.codeDataSetProject}).$promise .then(function(response){ if (response.dataSets.length>0) { var dataSet = response.dataSets[0]; diff --git a/services/projectservice.js b/services/projectservice.js index 8b70ff3..e729442 100644 --- a/services/projectservice.js +++ b/services/projectservice.js @@ -16,8 +16,8 @@ You should have received a copy of the GNU General Public License along with Project Configuration. If not, see . */ -Dhis2Api.service('projectService', ['$q', 'commonvariable', 'User', 'OrgUnitOrgUnitGroups', 'OrgUnit', 'OrgUnitGroupsOrgUnit', 'FilterResource', 'OrgUnitGroupByOrgUnit', 'OrganisationUnitChildren', - function ($q, commonvariable, User, OrgUnitOrgUnitGroups, OrgUnit, OrgUnitGroupsOrgUnit, FilterResource, OrgUnitGroupByOrgUnit, OrganisationUnitChildren) { +Dhis2Api.service('projectService', ['$q', 'commonvariable', 'User', 'OrgUnitOrgUnitGroups', 'OrgUnit', 'OrgUnitGroupsOrgUnit', 'FilterResource', 'OrgUnitGroupByOrgUnit', 'OrganisationUnitChildren', 'DataSetsOrgUnit', + function ($q, commonvariable, User, OrgUnitOrgUnitGroups, OrgUnit, OrgUnitGroupsOrgUnit, FilterResource, OrgUnitGroupByOrgUnit, OrganisationUnitChildren, DataSetsOrgUnit) { this.initValue=function($scope) { @@ -211,7 +211,7 @@ Dhis2Api.service('projectService', ['$q', 'commonvariable', 'User', 'OrgUnitOrgU }); - FilterResource.GET({ resource: 'dataSets', filter: 'code:eq:' + commonvariable.codeDataSets.codeDataSetSite }).$promise + FilterResource.GET({ resource: 'dataSets', filter: 'code:eq:' + commonvariable.codedatasets.codeDataSetSite }).$promise .then(function (response) { if (response.dataSets.length > 0) { From 6bda6a4b6b91b3c34d42c455fcaef4cf5b233682 Mon Sep 17 00:00:00 2001 From: josemp10 Date: Tue, 28 Jun 2016 17:14:15 +0200 Subject: [PATCH 03/10] Removing creation date of the missions org. units --- modules/Mission/missionController.js | 2 +- modules/Mission/missionView.html | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/modules/Mission/missionController.js b/modules/Mission/missionController.js index e7e393d..9f6f3a0 100644 --- a/modules/Mission/missionController.js +++ b/modules/Mission/missionController.js @@ -169,7 +169,7 @@ appConfigProjectMSF.controller('missionController', ["$scope", '$filter', "commo try { $scope.missionname = commonvariable.OrganisationUnit.name; - $scope.missioncreated = commonvariable.OrganisationUnit.openingDate; + //$scope.missioncreated = commonvariable.OrganisationUnit.openingDate; $scope.prevOu = commonvariable.OrganisationUnit.id; $scope.hideForm(); diff --git a/modules/Mission/missionView.html b/modules/Mission/missionView.html index 035f9ac..fcfb446 100644 --- a/modules/Mission/missionView.html +++ b/modules/Mission/missionView.html @@ -52,16 +52,11 @@
-
+
- -
- - -

From 6baaecb26917a5a80f85c54a6b46f9b2e4dc75c4 Mon Sep 17 00:00:00 2001 From: josemp10 Date: Tue, 28 Jun 2016 17:23:33 +0200 Subject: [PATCH 04/10] Remove comments --- modules/Mission/missionController.js | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/Mission/missionController.js b/modules/Mission/missionController.js index 9f6f3a0..3a441b3 100644 --- a/modules/Mission/missionController.js +++ b/modules/Mission/missionController.js @@ -169,7 +169,6 @@ appConfigProjectMSF.controller('missionController', ["$scope", '$filter', "commo try { $scope.missionname = commonvariable.OrganisationUnit.name; - //$scope.missioncreated = commonvariable.OrganisationUnit.openingDate; $scope.prevOu = commonvariable.OrganisationUnit.id; $scope.hideForm(); From 8e0fce6aac42ebf0f79173e51ffe5e3d10a7a845 Mon Sep 17 00:00:00 2001 From: josemp10 Date: Wed, 29 Jun 2016 14:33:45 +0200 Subject: [PATCH 05/10] Users for health sites are optionals --- modules/Project/projectController.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/Project/projectController.js b/modules/Project/projectController.js index 355d140..e6cb07a 100644 --- a/modules/Project/projectController.js +++ b/modules/Project/projectController.js @@ -51,8 +51,8 @@ appConfigProjectMSF.controller('projectController', ["$scope", '$filter', "commo code: codeOrgUnit, openingDate: $filter('date')($scope.siteDate, 'yyyy-MM-dd'), parent: commonvariable.OrganisationUnitParentConf, - healthsitetype: commonvariable.orgUnitGroupSet[commonvariable.ouGroupsetId.SiteType], - userforValidate: commonvariable.userDirective + healthsitetype: commonvariable.orgUnitGroupSet[commonvariable.ouGroupsetId.SiteType] + //userforValidate: commonvariable.userDirective }; ///validate if object is ok. validatorService.emptyValue(newOu).then(function (result) { @@ -62,7 +62,9 @@ appConfigProjectMSF.controller('projectController', ["$scope", '$filter', "commo if (result == true) { commonvariable.RefreshTreeOU = true; - projectService.saveSiteUser(); + + if (commonvariable.userDirective.trim() != "") + projectService.saveSiteUser(); //set message variable $scope.messages.push({ From 86e0aa51bbadd0d13e18a36f78a9522382812a21 Mon Sep 17 00:00:00 2001 From: josemp10 Date: Wed, 29 Jun 2016 14:34:24 +0200 Subject: [PATCH 06/10] Revert "Users for health sites are optionals" This reverts commit 8e0fce6aac42ebf0f79173e51ffe5e3d10a7a845. --- modules/Project/projectController.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/modules/Project/projectController.js b/modules/Project/projectController.js index e6cb07a..355d140 100644 --- a/modules/Project/projectController.js +++ b/modules/Project/projectController.js @@ -51,8 +51,8 @@ appConfigProjectMSF.controller('projectController', ["$scope", '$filter', "commo code: codeOrgUnit, openingDate: $filter('date')($scope.siteDate, 'yyyy-MM-dd'), parent: commonvariable.OrganisationUnitParentConf, - healthsitetype: commonvariable.orgUnitGroupSet[commonvariable.ouGroupsetId.SiteType] - //userforValidate: commonvariable.userDirective + healthsitetype: commonvariable.orgUnitGroupSet[commonvariable.ouGroupsetId.SiteType], + userforValidate: commonvariable.userDirective }; ///validate if object is ok. validatorService.emptyValue(newOu).then(function (result) { @@ -62,9 +62,7 @@ appConfigProjectMSF.controller('projectController', ["$scope", '$filter', "commo if (result == true) { commonvariable.RefreshTreeOU = true; - - if (commonvariable.userDirective.trim() != "") - projectService.saveSiteUser(); + projectService.saveSiteUser(); //set message variable $scope.messages.push({ From 1e12c52d714e8fed4e26ba8e3fe647081eb64752 Mon Sep 17 00:00:00 2001 From: josemp10 Date: Wed, 29 Jun 2016 14:37:29 +0200 Subject: [PATCH 07/10] Health Sites users are optional --- modules/Project/projectController.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/Project/projectController.js b/modules/Project/projectController.js index 355d140..cd1054e 100644 --- a/modules/Project/projectController.js +++ b/modules/Project/projectController.js @@ -51,8 +51,7 @@ appConfigProjectMSF.controller('projectController', ["$scope", '$filter', "commo code: codeOrgUnit, openingDate: $filter('date')($scope.siteDate, 'yyyy-MM-dd'), parent: commonvariable.OrganisationUnitParentConf, - healthsitetype: commonvariable.orgUnitGroupSet[commonvariable.ouGroupsetId.SiteType], - userforValidate: commonvariable.userDirective + healthsitetype: commonvariable.orgUnitGroupSet[commonvariable.ouGroupsetId.SiteType] }; ///validate if object is ok. validatorService.emptyValue(newOu).then(function (result) { @@ -62,7 +61,9 @@ appConfigProjectMSF.controller('projectController', ["$scope", '$filter', "commo if (result == true) { commonvariable.RefreshTreeOU = true; - projectService.saveSiteUser(); + + if (commonvariable.userDirective.trim() != "") + projectService.saveSiteUser(); //set message variable $scope.messages.push({ From c85cdd32b0a04997b10e8f8085ebe8fd8de1b21a Mon Sep 17 00:00:00 2001 From: josemp10 Date: Thu, 30 Jun 2016 05:41:59 +0200 Subject: [PATCH 08/10] Datasets levels are shown in order now --- .../resourcesjsondatasetController.js | 7 ++++++- services/commonservice.js | 8 ++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/directives/resourcesjsonDataset/resourcesjsondatasetController.js b/directives/resourcesjsonDataset/resourcesjsondatasetController.js index 0bffbc1..177b79d 100644 --- a/directives/resourcesjsonDataset/resourcesjsondatasetController.js +++ b/directives/resourcesjsonDataset/resourcesjsondatasetController.js @@ -25,7 +25,8 @@ Dhis2Api.directive('d2Resourcejsondataset', function(){ } } }); -Dhis2Api.controller("d2ResourcejsondatasetController", ['$scope', '$filter', '$interval', "commonvariable", "loadjsonresource", "OrgUnit", "DataSets", function ($scope,$filter, $interval, commonvariable, loadjsonresource, OrgUnit, DataSets) { +Dhis2Api.controller("d2ResourcejsondatasetController", ['$scope', '$filter', '$interval', "commonvariable", "loadjsonresource", "OrgUnit", "DataSets", "commonService", + function ($scope,$filter, $interval, commonvariable, loadjsonresource, OrgUnit, DataSets, commonService) { var stop; @@ -108,7 +109,11 @@ Dhis2Api.controller("d2ResourcejsondatasetController", ['$scope', '$filter', '$i if ($scope.services.length == skey + 1 && $scope.levels.length == 0){ $scope.messages.push({ type: "danger", text: "code " + commonvariable.healhservicesCodeOUG + " not found in file" }); } + }); + + $scope.levels = commonService.sortByKey($scope.levels, 'name'); + }); } diff --git a/services/commonservice.js b/services/commonservice.js index 57fdf0b..0d2f1fc 100644 --- a/services/commonservice.js +++ b/services/commonservice.js @@ -74,6 +74,14 @@ Dhis2Api.service('commonService', ['$q', 'commonvariable', 'OrgUnitGroupByOrgUni } + + this.sortByKey = function (array, key) { + return array.sort(function(a, b) { + var x = a[key]; var y = b[key]; + return ((x < y) ? -1 : ((x > y) ? 1 : 0)); + }); + } + }]); \ No newline at end of file From 8c8c4cdbdf381d1a25b7db9642695dd533592120 Mon Sep 17 00:00:00 2001 From: josemp10 Date: Thu, 30 Jun 2016 06:22:21 +0200 Subject: [PATCH 09/10] Validation of all fields for Vacc datasets --- .../resourcesjsonvaccinationController.js | 32 ++++++++++++------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/directives/resourcesjsonVaccination/resourcesjsonvaccinationController.js b/directives/resourcesjsonVaccination/resourcesjsonvaccinationController.js index d5a126f..e1a48de 100644 --- a/directives/resourcesjsonVaccination/resourcesjsonvaccinationController.js +++ b/directives/resourcesjsonVaccination/resourcesjsonvaccinationController.js @@ -25,7 +25,8 @@ Dhis2Api.directive('d2Resourcejsonvaccination', function(){ } } }); -Dhis2Api.controller("d2ResourcejsonvaccinationController", ['$scope', '$filter', '$interval', "commonvariable", "loadjsonresource", "DataElements", "DataSets", "OrgUnit", function ($scope, $filter, $interval, commonvariable, loadjsonresource, DataElements, DataSets, OrgUnit) { +Dhis2Api.controller("d2ResourcejsonvaccinationController", ['$scope', '$filter', '$interval', "commonvariable", "loadjsonresource", "DataElements", "DataSets", "OrgUnit", "validatorService", + function ($scope, $filter, $interval, commonvariable, loadjsonresource, DataElements, DataSets, OrgUnit, validatorService) { $scope.style=[]; var $translate = $filter('translate'); @@ -149,16 +150,25 @@ Dhis2Api.controller("d2ResourcejsonvaccinationController", ['$scope', '$filter', dataElements: $scope.DataElementSelectedforPUT, organisationUnits: $scope.childOU }; - DataSets.Post({}, newDataSet) - .$promise.then(function (data) { - if (data.response.status == "SUCCESS") { - $scope.messages.push({ type: "success", text: $translate('VACCINATION_DATASET_SAVED') }); - $scope.hideFormvaccination(); - } - else { - $scope.messages.push({ type: "danger", text: $translate('VACCINATION_DATASET_NOSAVED') }); - } - }); + + validatorService.emptyValue(newDataSet).then(function (result) { + + if (result == false){ + DataSets.Post({}, newDataSet) + .$promise.then(function (data) { + if (data.response.status == "SUCCESS") { + $scope.messages.push({ type: "success", text: $translate('VACCINATION_DATASET_SAVED') }); + $scope.hideFormvaccination(); + } + else { + $scope.messages.push({ type: "danger", text: $translate('VACCINATION_DATASET_NOSAVED') }); + } + }); + } + else + $scope.messages.push({type: "warning", text: $translate("FORM_MSG_EMPTYFIELD")}); + }); + }; $scope.updateDatasetVaccination = function () { From 73a79bb5b6c93021e170696fdd2bf09d0ffc2652 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Helder=20Castrill=C3=B3n?= Date: Sun, 10 Jul 2016 16:25:18 -0500 Subject: [PATCH 10/10] Translation of periods for Vaccination datasets Translation of periods for Vaccination datasets --- directives/periodtype/periodTypeView.html | 23 +++++++++++------------ languages/en.json | 5 +++++ languages/es.json | 7 ++++++- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/directives/periodtype/periodTypeView.html b/directives/periodtype/periodTypeView.html index 5d2adc3..4f41113 100644 --- a/directives/periodtype/periodTypeView.html +++ b/directives/periodtype/periodTypeView.html @@ -17,15 +17,14 @@ along with Project Configuration. If not, see . --> -
- - -
-
\ No newline at end of file +
+ + +
diff --git a/languages/en.json b/languages/en.json index 89a2fbf..6ce149e 100644 --- a/languages/en.json +++ b/languages/en.json @@ -8,6 +8,11 @@ "DISABLED_TITLE": "The Organsation Unit Selected is disabled", "CANCEL": "Clear Form", "FORM_MSG_EMPTYFIELD": "verify that the form does not have empty fields", + "PERIOD_LIST": "Select period", + "PERIODTYPE_DAILY":"Daily", + "PERIODTYPE_WEEKLY":"Weekly", + "PERIODTYPE_MONTHLY":"Monthly", + "PERIODTYPE_YEARLY": "Yearly", "_____________MODAL": "modal for delete _____", "CLOSE_DATE": "Close Date", diff --git a/languages/es.json b/languages/es.json index d87d093..a0b9c7c 100644 --- a/languages/es.json +++ b/languages/es.json @@ -8,7 +8,12 @@ "DISABLED_TITLE": "La Unidad Organizativa seleccionada se encuentra desabilitada", "CANCEL": "Cancelar", "FORM_MSG_EMPTYFIELD": "Verifique que el formulario no contenga campos vacios", - + "PERIOD_LIST": "Seleccione un periodo", + "PERIODTYPE_DAILY":"Diariamente", + "PERIODTYPE_WEEKLY":"Semanalmente", + "PERIODTYPE_MONTHLY":"Mensualmente", + "PERIODTYPE_YEARLY": "Anualmente", + "_____________MODAL": "modal for delete _____", "CLOSE_DATE": "Close Date", "MISSION_DELETE_TITTLE": " Delete mission",