=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html 2014-08-21 16:30:01 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html 2014-08-22 11:29:33 +0000
@@ -1,6 +1,5 @@
-
-
+
Event Capture
@@ -46,7 +45,7 @@
-
+
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js 2014-08-21 16:45:54 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js 2014-08-22 11:29:33 +0000
@@ -125,8 +125,6 @@
$scope.selectedProgramStage = programStage;
- console.log('The stage is: ', $scope.selectedProgramStage);
-
angular.forEach($scope.selectedProgramStage.programStageSections, function(section){
section.open = true;
});
@@ -141,10 +139,8 @@
$scope.newDhis2Event = {dataValues: []};
$scope.currentEvent = {dataValues: []};
- if($scope.selectedProgramStage.preGenerateUID){
- $scope.eventGridColumns.push({name: 'form_id', id: 'uid', type: 'string', compulsory: false, showFilter: false, show: true});
- $scope.filterTypes['uid'] = 'string';
- }
+ $scope.eventGridColumns.push({name: 'form_id', id: 'uid', type: 'string', compulsory: false, showFilter: false, show: true});
+ $scope.filterTypes['uid'] = 'string';
$scope.eventGridColumns.push({name: $scope.selectedProgramStage.reportDateDescription ? $scope.selectedProgramStage.reportDateDescription : 'incident_date', id: 'event_date', type: 'date', compulsory: false, showFilter: false, show: true});
$scope.filterTypes['event_date'] = 'date';
@@ -157,7 +153,7 @@
//create a template for new event
//for date type dataelements, filtering is based on start and end dates
var dataElement = prStDe.dataElement;
- var name = dataElement.formName || dataElement.name;
+ var name = dataElement.formName ? dataElement.formName : dataElement.name;
$scope.newDhis2Event.dataValues.push({id: dataElement.id, value: ''});
if($scope.selectedProgramStage.captureCoordinates){
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html 2014-08-21 16:45:54 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html 2014-08-22 11:29:33 +0000
@@ -11,7 +11,7 @@
-
+
{{'form_id' | translate}}
|
@@ -83,7 +83,7 @@
-
@@ -312,7 +233,7 @@
- {{programStageDataElements[de.dataElement.id].dataElement.name}}
+ {{programStageDataElements[de.dataElement.id].dataElement.formName ? programStageDataElements[de.dataElement.id].dataElement.formName : programStageDataElements[de.dataElement.id].dataElement.name}}
|
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/eventList.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/eventList.html 2014-08-21 16:30:01 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/eventList.html 2014-08-22 11:29:33 +0000
@@ -140,7 +140,7 @@
name="foo"
style="width:99%;"/>
-
+
|