From 95550de12b6647967ee6fd7a5bd9f2fc8fe39296 Mon Sep 17 00:00:00 2001 From: josemp10 Date: Sat, 12 Nov 2016 04:17:19 +0100 Subject: [PATCH 1/6] Codes are now properly formed for Project children --- services/projectservice.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/services/projectservice.js b/services/projectservice.js index d13c726..6ba357b 100644 --- a/services/projectservice.js +++ b/services/projectservice.js @@ -142,7 +142,7 @@ Dhis2Api.service('projectService', ['$q', 'commonvariable', 'User', 'OrgUnitOrgU if (orgUnit.level == commonvariable.level.HealthSite || orgUnit.level == commonvariable.level.HealthService) { var textToUpdate = "OU_" + commonvariable.ouDirectiveCode.slice(2, 7); - var newCode = textToUpdate + orgUnit.code.slice(7); + var newCode = textToUpdate + orgUnit.code.slice(8); OrgUnit.PATCH({id:orgUnit.id},{code:newCode}).$promise.then(function(data){ defered.resolve(data); @@ -241,11 +241,10 @@ Dhis2Api.service('projectService', ['$q', 'commonvariable', 'User', 'OrgUnitOrgU var defered = $q.defer(); var promise = defered.promise; var projectEdited = false; - + OrgUnit.PATCH({id:idOu},editOu).$promise.then(function(data){ if (data.response.status=="SUCCESS") { - //projectEdited=true; //asign OU selected commonvariable.EditOrganisationUnit = commonvariable.OrganisationUnit; From c285cc77e02de47a2d1cfd668c5cccb1c1122831 Mon Sep 17 00:00:00 2001 From: josemp10 Date: Sat, 12 Nov 2016 06:40:46 +0100 Subject: [PATCH 2/6] Now DataSets service brings all the payload --- core/dhis2Api.js | 6 ++++-- .../resourcesjsonDataset/resourcesjsondatasetController.js | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/core/dhis2Api.js b/core/dhis2Api.js index 5933117..d6edcb4 100644 --- a/core/dhis2Api.js +++ b/core/dhis2Api.js @@ -269,11 +269,13 @@ Dhis2Api.factory("DataSets", ['$resource', 'commonvariable', function ($resource return $resource(commonvariable.url + "dataSets/:uid", { uid: '@uid', - fields: 'name,id,code,periodType,dataElements,organisationUnits' + fields: ':all' + //fields: 'name,id,code,periodType,dataElements,organisationUnits' }, { Get:{method:"GET"}, Post: { method: "POST" }, - Put: { method: "PUT" } + Put: { method: "PUT" }, + Patch: {method: "PATCH"} }); }]); diff --git a/directives/resourcesjsonDataset/resourcesjsondatasetController.js b/directives/resourcesjsonDataset/resourcesjsondatasetController.js index 180782a..b1409ba 100644 --- a/directives/resourcesjsonDataset/resourcesjsondatasetController.js +++ b/directives/resourcesjsonDataset/resourcesjsondatasetController.js @@ -75,7 +75,9 @@ Dhis2Api.controller("d2ResourcejsondatasetController", ['$scope', '$filter', '$i } $scope.editHealtServiceDataset = function () { angular.forEach($scope.datasetforsave, function (dvalue,dkey) { - DataSets.Put({ uid: dvalue.id }, dvalue) + + if (dvalue.code != "DS_DEM"){ + DataSets.Put({ uid: dvalue.id }, dvalue) .$promise.then(function (data) { if (data.response.status == "SUCCESS") { @@ -87,6 +89,7 @@ Dhis2Api.controller("d2ResourcejsondatasetController", ['$scope', '$filter', '$i $scope.messages.push({ type: "danger", text: $translate('DATASET_NOSAVED') }); } }); + } }); }; From 7b396d27ce02efabbc93de8a74c6060e2303459d Mon Sep 17 00:00:00 2001 From: josemp10 Date: Sat, 12 Nov 2016 07:20:44 +0100 Subject: [PATCH 3/6] Assign user roles to datasets --- core/dhis2Api.js | 26 +++++++++++++++++++ .../resourcesjsonvaccinationController.js | 17 ++++++++++-- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/core/dhis2Api.js b/core/dhis2Api.js index d6edcb4..e74601d 100644 --- a/core/dhis2Api.js +++ b/core/dhis2Api.js @@ -332,6 +332,32 @@ Dhis2Api.factory("DataSetsOrgUnit",['$resource','commonvariable', function ($res DELETE: {method: "DELETE"}}); }]); +Dhis2Api.factory("UserRoles", ['$resource', 'commonvariable', function ($resource, commonvariable) { + + return $resource(commonvariable.url + "userRoles/:uid", + { + uid: '@uid' + }, + { Get:{method:"GET"}, + Post: { method: "POST" }, + Put: { method: "PUT" }, + Patch: {method: "PATCH"} + }); +}]); + + +Dhis2Api.factory("DataSetUserRole",['$resource','commonvariable', function ($resource,commonvariable) { + + return $resource(commonvariable.url+"userRoles/:uiduserrole/dataSets/:uiddataset", + { + uiduserrole:'@uiduserrole', + uiddataset: '@uiddataset' + }, + { POST: { method: "POST"}, + GET: {method: "GET"}, + DELETE: {method: "DELETE"}}); +}]); + Dhis2Api.factory("OrganisationUnitChildren",['$resource','commonvariable', function ($resource,commonvariable) { return $resource(commonvariable.url+"organisationUnits/:uid", { diff --git a/directives/resourcesjsonVaccination/resourcesjsonvaccinationController.js b/directives/resourcesjsonVaccination/resourcesjsonvaccinationController.js index 3f3ead8..093a3b5 100644 --- a/directives/resourcesjsonVaccination/resourcesjsonvaccinationController.js +++ b/directives/resourcesjsonVaccination/resourcesjsonvaccinationController.js @@ -26,8 +26,8 @@ Dhis2Api.directive('d2Resourcejsonvaccination', function(){ } }); -Dhis2Api.controller("d2ResourcejsonvaccinationController", ['$scope', '$filter', '$interval', "commonvariable", "loadjsonresource", "DataElements", "DataSets", "OrgUnit", "validatorService", "Section", "$q", - function ($scope, $filter, $interval, commonvariable, loadjsonresource, DataElements, DataSets, OrgUnit, validatorService, Section, $q) { +Dhis2Api.controller("d2ResourcejsonvaccinationController", ['$scope', '$filter', '$interval', "commonvariable", "loadjsonresource", "DataElements", "DataSets", "OrgUnit", "validatorService", "Section", "$q", "UserRoles", "DataSetUserRole", + function ($scope, $filter, $interval, commonvariable, loadjsonresource, DataElements, DataSets, OrgUnit, validatorService, Section, $q, UserRoles, DataSetUserRole) { $scope.style=[]; var $translate = $filter('translate'); @@ -242,6 +242,18 @@ Dhis2Api.controller("d2ResourcejsonvaccinationController", ['$scope', '$filter', $scope.CreateDatasetVaccination = true; }); } + + $scope.assignUserRoles = function (uidDataSet) { + + UserRoles.Get({}).$promise.then (function(data){ + + angular.forEach(data.userRoles, function(userRole, key) { + DataSetUserRole.POST({uiduserrole:userRole.id,uiddataset:uidDataSet}); + }); + + }); + + } // $scope.saveDatasetVaccination = function () { @@ -272,6 +284,7 @@ Dhis2Api.controller("d2ResourcejsonvaccinationController", ['$scope', '$filter', .$promise.then(function (data) { if (data.response.status == "SUCCESS") { $scope.dataSetUid = data.response.lastImported; + $scope.assignUserRoles(data.response.lastImported); $scope.createSectionsToDataSet().then(function(data){ $scope.dhisSectionsToRemove=$scope.dhisSections; $scope.dhisSections=[]; From 735f1f827b943e2912a327793a965c1bb794a1dd Mon Sep 17 00:00:00 2001 From: josemp10 Date: Sun, 13 Nov 2016 05:05:17 +0100 Subject: [PATCH 4/6] Only assiging Vacc dataset to Vacc health services --- .../resourcesjsonvaccinationController.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/directives/resourcesjsonVaccination/resourcesjsonvaccinationController.js b/directives/resourcesjsonVaccination/resourcesjsonvaccinationController.js index 093a3b5..549813b 100644 --- a/directives/resourcesjsonVaccination/resourcesjsonvaccinationController.js +++ b/directives/resourcesjsonVaccination/resourcesjsonvaccinationController.js @@ -86,13 +86,14 @@ Dhis2Api.controller("d2ResourcejsonvaccinationController", ['$scope', '$filter', $scope.GetChildrenOU = function () { $scope.childOU = []; - OrgUnit.get({ id: commonvariable.OrganisationUnit.id, includeDescendants: true, fields: 'name,id,level,closedDate', filter: 'level:eq:' + commonvariable.level.HealthService }) + OrgUnit.get({ id: commonvariable.OrganisationUnit.id, includeDescendants: true, fields: 'name,id,level,closedDate,organisationUnitGroups', filter: 'level:eq:' + commonvariable.level.HealthService }) .$promise.then(function (childOU) { angular.forEach(childOU.organisationUnits, function (ou, key) { - if(ou.id!=commonvariable.OrganisationUnit.id && ou.closedDate==undefined){ - $scope.childOU.push({ id: ou.id }); - } - + if(ou.id!=commonvariable.OrganisationUnit.id && ou.closedDate==undefined) + angular.forEach(ou.organisationUnitGroups, function (oug, key){ + if (oug.code=="OUG_HSV_VAC") + $scope.childOU.push({ id: ou.id }); + }); }); }); From 31594f3da4b9ec267878a216bcffc5cd5345dd7c Mon Sep 17 00:00:00 2001 From: josemp10 Date: Sun, 13 Nov 2016 05:44:34 +0100 Subject: [PATCH 5/6] Remove paging --- .../resourcesjsonvaccinationController.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/directives/resourcesjsonVaccination/resourcesjsonvaccinationController.js b/directives/resourcesjsonVaccination/resourcesjsonvaccinationController.js index 549813b..e1d1f40 100644 --- a/directives/resourcesjsonVaccination/resourcesjsonvaccinationController.js +++ b/directives/resourcesjsonVaccination/resourcesjsonvaccinationController.js @@ -378,7 +378,7 @@ Dhis2Api.controller("d2ResourcejsonvaccinationController", ['$scope', '$filter', $scope.GetDataelement=function(codes){ $scope.ListnameDataelement=[]; - DataElements.Get({filter:'code:in:['+codes+"]"}) + DataElements.Get({paging:'no',filter:'code:in:'+codes}) .$promise.then(function(response){ angular.forEach(response.dataElements, function(dvalue,dkey){ $scope.ListnameDataelement[dvalue.code] = { id: dvalue.id, name: dvalue.name }; From acd67932f76f7491ace1de9656f34ed50f526d3e Mon Sep 17 00:00:00 2001 From: josemp10 Date: Fri, 17 Feb 2017 16:47:34 +0100 Subject: [PATCH 6/6] Small edition in vaccinationController --- .../resourcesjsonvaccinationController.js | 1 + 1 file changed, 1 insertion(+) diff --git a/directives/resourcesjsonVaccination/resourcesjsonvaccinationController.js b/directives/resourcesjsonVaccination/resourcesjsonvaccinationController.js index e1d1f40..f47774b 100644 --- a/directives/resourcesjsonVaccination/resourcesjsonvaccinationController.js +++ b/directives/resourcesjsonVaccination/resourcesjsonvaccinationController.js @@ -220,6 +220,7 @@ Dhis2Api.controller("d2ResourcejsonvaccinationController", ['$scope', '$filter', $scope.dataSetDescription = "" commonvariable.PeriodSelected = []; commonvariable.DataElementSelected = []; + $scope.checkingDEGroup(); }; ///get if there exist a Dataset for this Mission.