=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js' --- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js 2014-06-06 13:35:06 +0000 +++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js 2014-06-17 07:48:20 +0000 @@ -36,7 +36,7 @@ DHIS2EventFactory.getByEntity($scope.selectedEntity.trackedEntityInstance, $scope.selectedOrgUnit.id, $scope.selectedProgram.id).then(function(data){ $scope.dhis2Events = data; - + /*if(angular.isUndefined($scope.dhis2Events)){ $scope.dhis2Events = []; @@ -94,6 +94,7 @@ } } + //get orgunit name for the event if(dhis2Event.orgUnit){ OrgUnitService.open().then(function(){ OrgUnitService.get(dhis2Event.orgUnit).then(function(ou){ @@ -116,11 +117,11 @@ }; $scope.showDataEntry = function(event){ + if(event){ $scope.currentEvent = event; $scope.currentEvent.providedElsewhere = []; - $scope.currentEvent.dataValues = []; ProgramStageFactory.get($scope.currentEvent.programStage).then(function(stage){ $scope.currentStage = stage; @@ -134,21 +135,77 @@ angular.forEach($scope.currentEvent.dataValues, function(dataValue){ var val = dataValue.value; - var de = $scope.currentStage.programStageDataElements[dataValue.dataElement]; - if( de && de.type === 'int' && val){ - val = parseInt(val); - dataValue.value = val; - } + if(val){ + var de = $scope.currentStage.programStageDataElements[dataValue.dataElement]; + if( de && de.type === 'int' && val){ + val = parseInt(val); + dataValue.value = val; + } + $scope.currentEvent[dataValue.dataElement] = val; + } }); + + $scope.currentEvent.dataValues = []; }); } }; - $scope.savePatientDatavalue = function(currentEvent, dataElement){ - - $scope.updateSuccess = false; - - //get the dataelement whose value is being saved/updated - $scope.currentDataElement = {id: dataElement}; + $scope.saveDatavalue = function(prStDe){ + + $scope.updateSuccess = false; + + if(!angular.isUndefined($scope.currentEvent[prStDe.dataElement.id])){ + + //currentEvent.providedElsewhere[prStDe.dataElement.id]; + var value = $scope.currentEvent[prStDe.dataElement.id]; + var ev = { event: $scope.currentEvent.event, + orgUnit: $scope.currentEvent.orgUnit, + program: $scope.currentEvent.program, + programStage: $scope.currentEvent.programStage, + status: $scope.currentEvent.status, + trackedEntityInstance: $scope.currentEvent.trackedEntityInstance, + dataValues: [ + { + dataElement: prStDe.dataElement.id, + value: value, + providedElseWhere: $scope.currentEvent.providedElsewhere[prStDe.dataElement.id] ? $scope.currentEvent.providedElsewhere[prStDe.dataElement.id] : false + } + ] + }; + DHIS2EventFactory.updateForSingleValue(ev).then(function(response){ + $scope.updateSuccess = true; + }); + + } + }; + + $scope.saveDatavalueLocation = function(prStDe){ + + $scope.updateSuccess = false; + + if(!angular.isUndefined($scope.currentEvent.providedElsewhere[prStDe.dataElement.id])){ + + console.log('the event is: ',$scope.currentEvent.providedElsewhere[prStDe.dataElement.id]); + //currentEvent.providedElsewhere[prStDe.dataElement.id]; + var value = $scope.currentEvent[prStDe.dataElement.id]; + var ev = { event: $scope.currentEvent.event, + orgUnit: $scope.currentEvent.orgUnit, + program: $scope.currentEvent.program, + programStage: $scope.currentEvent.programStage, + status: $scope.currentEvent.status, + trackedEntityInstance: $scope.currentEvent.trackedEntityInstance, + dataValues: [ + { + dataElement: prStDe.dataElement.id, + value: value, + providedElseWhere: $scope.currentEvent.providedElsewhere[prStDe.dataElement.id] ? $scope.currentEvent.providedElsewhere[prStDe.dataElement.id] : false + } + ] + }; + DHIS2EventFactory.updateForSingleValue(ev).then(function(response){ + $scope.updateSuccess = true; + }); + + } }; }); \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.html' --- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.html 2014-06-06 13:35:06 +0000 +++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.html 2014-06-17 07:48:20 +0000 @@ -13,7 +13,7 @@ - === modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/profile/profile-controller.js' --- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/profile/profile-controller.js 2014-06-06 13:35:06 +0000 +++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/profile/profile-controller.js 2014-06-17 07:48:20 +0000 @@ -96,7 +96,7 @@ if(updateResponse.status !== 'SUCCESS'){//update has failed var dialogOptions = { - headerText: 'registration_error', + headerText: 'update_error', bodyText: updateResponse.description }; DialogService.showDialog({}, dialogOptions); === modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/i18n/en.json' --- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/i18n/en.json 2014-06-15 09:15:17 +0000 +++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/i18n/en.json 2014-06-17 07:48:20 +0000 @@ -84,6 +84,7 @@ "registration_date": "Registration date", "register": "Register", "registration_error": "Error in registration", + "update_error": "Error in update", "category": "Category", "entity_type": "Entity type", "save": "Save", === modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/index.html' --- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/index.html 2014-06-06 13:35:06 +0000 +++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/index.html 2014-06-17 07:48:20 +0000 @@ -12,7 +12,7 @@ - + @@ -27,7 +27,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -70,20 +70,22 @@ - + + + - + - + - +
- - - - - - - +
- +
- + \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/app.js' --- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/app.js 2014-06-06 13:35:06 +0000 +++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/app.js 2014-06-17 07:48:20 +0000 @@ -12,6 +12,7 @@ 'trackerCaptureControllers', 'angularLocalStorage', 'ui.select2', + 'd2Menu', 'pascalprecht.translate']) .value('DHIS2URL', '..') === modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/services.js' --- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/services.js 2014-06-06 13:35:06 +0000 +++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/services.js 2014-06-17 07:48:20 +0000 @@ -15,6 +15,7 @@ currentStore: store }; }) + /* factory for loading logged in user profiles from DHIS2 */ .factory('CurrentUserProfile', function($http) { @@ -381,6 +382,30 @@ return response.data.events; }); return promise; + }, + get: function(eventUid){ + var promise = $http.get('../api/events/' + eventUid + '.json').then(function(response){ + return response.data; + }); + return promise; + }, + create: function(dhis2Event){ + var promise = $http.post('../api/events.json', dhis2Event).then(function(response){ + return response.data; + }); + return promise; + }, + update: function(dhis2Event){ + var promise = $http.put('../api/events/' + dhis2Event.event, dhis2Event).then(function(response){ + return response.data; + }); + return promise; + }, + updateForSingleValue: function(singleValue){ + var promise = $http.put('../api/events/' + singleValue.event + '/' + singleValue.dataValues[0].dataElement, singleValue ).then(function(response){ + return response.data; + }); + return promise; } }; }) === modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/styles/style.css' --- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/styles/style.css 2014-06-15 09:15:17 +0000 +++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/styles/style.css 2014-06-17 07:48:20 +0000 @@ -709,6 +709,17 @@ } } +.expanded{ + border: 1px solid #aaa; + padding: 6px 12px; + font-size: 14px; +} +/*input[type=number], input[type=text], input[type=password], textarea { + border: 1px solid #aaa; + padding: 6px 12px; + font-size: 14px; +} + input[type=number] { border: 1px solid #aaa; padding: 4px 1px; @@ -720,7 +731,8 @@ padding: 6px 12px; font-size: 14px; border-radius: 3px; -} +}*/ + /*----------------------------------------------------------------------------*/ /* Search filters === modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/home.html' --- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/home.html 2014-06-06 13:35:06 +0000 +++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/home.html 2014-06-17 07:48:20 +0000 @@ -29,12 +29,12 @@
- +
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/search.html' --- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/search.html 2014-06-15 09:15:17 +0000 +++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/search.html 2014-06-17 07:48:20 +0000 @@ -43,7 +43,7 @@
-
+
+ {{dhis2Event.orgUnitName}} - {{prStDe.dataElement.name}}-{{prStDe.dataElement.type}} + {{prStDe.dataElement.name}}
@@ -54,7 +54,7 @@ class="form-control" ng-model="currentEvent[prStDe.dataElement.id]" ng-required={{prStDe.compulsory}} - ng-blur="savePatientDatavalue(currentEvent, prStDe.dataElement.id)" + ng-blur="saveDatavalue(prStDe)" name="foo"/>
@@ -64,14 +64,14 @@ ng-required={{prStDe.compulsory}} typeahead="option for option in prStDe.dataElement.optionSet.options | filter:$viewValue | limitTo:20" typeahead-open-on-focus - ng-blur="savePatientDatavalue(currentEvent, prStDe.dataElement.id)" + ng-blur="saveDatavalue(prStDe)" name="foo"/>
+ ng-change="saveDatavalueLocation(prStDe)"/>