dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #32651
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16642: tracker capture - removed scheduling and messaging widget as the features are now put in other wi...
------------------------------------------------------------
revno: 16642
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2014-09-07 10:30:29 +0200
message:
tracker capture - removed scheduling and messaging widget as the features are now put in other widgets; bug fix in boolean type attributes and dataelements
removed:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/scheduling-messaging/
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/scheduling-messaging/scheduling-messaging-controller.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/scheduling-messaging/scheduling-messaging.html
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes-controller.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/registration.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html 2014-08-08 14:59:22 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html 2014-09-07 08:30:29 +0000
@@ -46,8 +46,8 @@
ng-change="saveDatavalue(prStDe)"
name="foo">
<option value="">{{'please_select'| translate}}</option>
- <option value="0">{{'no'| translate}}</option>
- <option value="1">{{'yes'| translate}}</option>
+ <option value="false">{{'no'| translate}}</option>
+ <option value="true">{{'yes'| translate}}</option>
</select>
</div>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes-controller.js 2014-09-05 12:52:43 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes-controller.js 2014-09-07 08:30:29 +0000
@@ -1,7 +1,8 @@
trackerCapture.controller('NotesController',
function($scope,
- $filter,
storage,
+ DateUtils,
+ TEIService,
EnrollmentService,
CurrentSelection,
orderByFilter,
@@ -15,12 +16,17 @@
storedBy = loginDetails.userCredentials.username;
}
- var today = moment();
- today = Date.parse(today);
- today = $filter('date')(today, 'yyyy-MM-dd');
+ var today = DateUtils.format(moment());
+
+ $scope.showMessagingDiv = false;
+ $scope.showNotesDiv = true;
$scope.$on('dashboardWidgets', function(event, args) {
$scope.selectedEnrollment = null;
+ var selections = CurrentSelection.get();
+ $scope.selectedTei = angular.copy(selections.tei);
+ $scope.selectedProgram = selections.pr;
+
var selections = CurrentSelection.get();
if(selections.enrollment){
EnrollmentService.get(selections.enrollment.enrollment).then(function(data){
@@ -32,7 +38,23 @@
});
}
});
- }
+ }
+
+ if($scope.selectedProgram && $scope.selectedTei){
+ //check if the selected TEI has any of the contact attributes
+ //that can be used for communication
+ TEIService.processAttributes($scope.selectedTei, $scope.selectedProgram, $scope.selectedEnrollment).then(function(tei){
+ $scope.selectedTei = tei;
+ var continueLoop = true;
+ for(var i=0; i<$scope.selectedTei.attributes.length && continueLoop; i++){
+ if( ($scope.selectedTei.attributes[i].type === 'phoneNumber' && $scope.selectedTei.attributes[i].show) ||
+ ($scope.selectedTei.attributes[i].type === 'email' && $scope.selectedTei.attributes[i].show) ){
+ $scope.messagingPossible = true;
+ continueLoop = false;
+ }
+ }
+ });
+ }
});
$scope.searchNoteField = false;
@@ -74,4 +96,14 @@
$scope.searchNoteField = $scope.searchNoteField === false ? true : false;
$scope.noteSearchText = '';
};
+
+ $scope.showNotes = function(){
+ $scope.showNotesDiv = !$scope.showNotesDiv;
+ $scope.showMessagingDiv = !$scope.showMessagingDiv;
+ };
+
+ $scope.showMessaging = function(){
+ $scope.showNotesDiv = !$scope.showNotesDiv;
+ $scope.showMessagingDiv = !$scope.showMessagingDiv;
+ };
});
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html 2014-09-05 12:52:43 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html 2014-09-07 08:30:29 +0000
@@ -1,9 +1,16 @@
<div class="panel panel-info" ng-controller="NotesController">
<div class="panel-heading handle bold">
- {{notesWidget.title| translate}}
- <span class="nav-pills" ng-show="selectedEnrollment">
- | <a href ng-click="showAddNote()" title="{{'add_note'| translate}}"><span class="bold">{{'add'| translate}}</span></a>
- </span>
+ <span ng-if="!messagingPossible">
+ {{notesWidget.title| translate}}
+ </span>
+ <span ng-if="messagingPossible">
+ <!--{{notesWidget.title| translate}}-->
+ <a href ng-click="showNotes()" title="{{'show_hide_notes'| translate}}"><span class="bold" ng-class="{'black': showNotesDiv}">{{notesWidget.title| translate}}</span></a>
+ <span class="nav-pills">
+ | <a href ng-click="showMessaging()" title="{{'show_hide_messaging'| translate}}"><span class="bold" ng-class="{'black': showMessagingDiv}">{{'messaging'| translate}}</span></a>
+ </span>
+ </span>
+
<span class="pull-right">
<a class="small-horizonal-spacing" href ng-click="expandCollapse(notesWidget)">
<span ng-show="notesWidget.expand"><i class="fa fa-chevron-up" title="{{'collapse'| translate}}"></i></span>
@@ -12,9 +19,10 @@
<a class="small-horizonal-spacing" href ng-click="removeWidget(notesWidget)" title="{{'remove'| translate}}"><i class="fa fa-times-circle"></i></a>
</span>
</div>
- <div ng-show="notesWidget.expand" class="panel-body dashboard-widget-container">
- <div ng-show="!selectedEnrollment" class="alert alert-danger">{{'not_yet_enrolled_note'| translate}}</div>
- <div ng-show='selectedEnrollment' class='remove-default-padding overflow-ellipsis'>
+ <div ng-show="notesWidget.expand" class="panel-body dashboard-widget-container">
+ <div ng-show="showNotesDiv">
+ <div ng-show="!selectedEnrollment" class="alert alert-danger">{{'not_yet_enrolled_note'| translate}}</div>
+ <div ng-show='selectedEnrollment' class='remove-default-padding overflow-ellipsis'>
<textarea class="form-control" rows="3" ng-model="note" placeholder="{{'add_new_note_here'| translate}}"></textarea>
<div class="vertical-spacing">
<button type="button"
@@ -28,23 +36,26 @@
{{'clear'| translate}}
</button>
</div>
- <div ng-show="!selectedEnrollment.notes" class="alert alert-warning">{{'empty_notes'| translate}}</div>
- <table class="table table-striped dhis2-table-hover">
- <tr ng-repeat="note in selectedEnrollment.notes| filter:noteSearchText">
- <td>
- <d2-pop-over content="note" template="note.html" details="{{'details'| translate}}">
- <div>{{note.value}}</div>
- </d2-pop-over>
- <script type="text/ng-template" id="note.html">
- <p>{{content.value}}</p>
- <hr>
- <p><strong>{{'created_by' | translate}}: </strong>{{content.storedBy}}</p>
- <p><strong>{{'date' | translate}}: </strong>{{content.storedDate}}</p>
- </script>
- </td>
- </tr>
- </table>
- </div>
-
+ <div ng-show="!selectedEnrollment.notes" class="alert alert-warning">{{'empty_notes'| translate}}</div>
+ <table class="table table-striped dhis2-table-hover">
+ <tr ng-repeat="note in selectedEnrollment.notes| filter:noteSearchText">
+ <td>
+ <d2-pop-over content="note" template="note.html" details="{{'details'| translate}}">
+ <div>{{note.value}}</div>
+ </d2-pop-over>
+ <script type="text/ng-template" id="note.html">
+ <p>{{content.value}}</p>
+ <hr>
+ <p><strong>{{'created_by' | translate}}: </strong>{{content.storedBy}}</p>
+ <p><strong>{{'date' | translate}}: </strong>{{content.storedDate}}</p>
+ </script>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </div>
+ <div ng-show="showMessagingDiv">
+ This is for messaging
+ </div>
</div>
</div>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration.html 2014-08-25 13:40:37 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration.html 2014-09-07 08:30:29 +0000
@@ -37,8 +37,8 @@
<div ng-switch-when="bool">
<select name="foo" ng-model="attribute.value" class="form-control" ng-required="attribute.mandatory">
<option value="">{{'please_select'| translate}}</option>
- <option value="0">{{'no'| translate}}</option>
- <option value="1">{{'yes'| translate}}</option>
+ <option value="false">{{'no'| translate}}</option>
+ <option value="true">{{'yes'| translate}}</option>
</select>
<span ng-show="outerForm.submitted && innerForm.foo.$invalid" class="error">{{'required'| translate}}</span>
</div>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/registration.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/registration.html 2014-08-08 14:59:22 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/registration.html 2014-09-07 08:30:29 +0000
@@ -44,8 +44,8 @@
<div ng-switch-when="bool">
<select name="foo" ng-model="attribute.value" class="form-control" ng-required="attribute.mandatory">
<option value="">{{'please_select'| translate}}</option>
- <option value="0">{{'no'| translate}}</option>
- <option value="1">{{'yes'| translate}}</option>
+ <option value="false">{{'no'| translate}}</option>
+ <option value="true">{{'yes'| translate}}</option>
</select>
<span ng-show="outerForm.submitted && innerForm.foo.$invalid" class="error">{{'required'| translate}}</span>
</div>
=== removed directory 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/scheduling-messaging'
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/scheduling-messaging/scheduling-messaging-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/scheduling-messaging/scheduling-messaging-controller.js 2014-09-05 12:52:43 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/scheduling-messaging/scheduling-messaging-controller.js 1970-01-01 00:00:00 +0000
@@ -1,165 +0,0 @@
-trackerCapture.controller('SchedulingMessagingController',
- function($scope,
- storage,
- DateUtils,
- EventUtils,
- DHIS2EventFactory,
- TEIService,
- CurrentSelection,
- TranslationService) {
-
- TranslationService.translate();
-
- var loginDetails = storage.get('LOGIN_DETAILS');
- var storedBy = '';
- if(loginDetails){
- storedBy = loginDetails.userCredentials.username;
- }
-
- var today = DateUtils.format(moment());
- $scope.showSchedulingDiv = false;
- $scope.schedulingPossible = false;
- $scope.showMessagingDiv = false;
- $scope.messagingPossible = false;
- $scope.showEventSchedulingDiv = false;
-
- $scope.$on('dashboardWidgets', function(event, args) {
- var selections = CurrentSelection.get();
- $scope.selectedOrgUnit = storage.get('SELECTED_OU');
- $scope.selectedTei = angular.copy(selections.tei);
- $scope.selectedProgram = selections.pr;
- $scope.selectedEnrollment = selections.enrollment;
- $scope.selectedProgramWithStage = [];
- $scope.dhis2Events = [];
-
- if($scope.selectedOrgUnit &&
- $scope.selectedProgram &&
- $scope.selectedTei &&
- $scope.selectedEnrollment){
-
- angular.forEach($scope.selectedProgram.programStages, function(stage){
- $scope.selectedProgramWithStage[stage.id] = stage;
- });
-
- //check if the selected TEI has any of the contact attributes
- //that can be used for communication
- TEIService.processAttributes($scope.selectedTei, $scope.selectedProgram, $scope.selectedEnrollment).then(function(tei){
- $scope.selectedTei = tei;
- var continueLoop = true;
- for(var i=0; i<$scope.selectedTei.attributes.length && continueLoop; i++){
- if( ($scope.selectedTei.attributes[i].type === 'phoneNumber' && $scope.selectedTei.attributes[i].show) ||
- ($scope.selectedTei.attributes[i].type === 'email' && $scope.selectedTei.attributes[i].show) ){
- $scope.messagingPossible = true;
- continueLoop = false;
- }
- }
-
- DHIS2EventFactory.getEventsByStatus($scope.selectedTei.trackedEntityInstance, $scope.selectedOrgUnit.id, $scope.selectedProgram.id, 'ACTIVE').then(function(eventList){
- angular.forEach(eventList, function(dhis2Event){
- if( dhis2Event.enrollment === $scope.selectedEnrollment.enrollment &&
- dhis2Event.status === 'SCHEDULE' &&
- angular.isUndefined(dhis2Event.eventDate)){
- var eventStage = $scope.selectedProgramWithStage[dhis2Event.programStage];
- if(angular.isObject(eventStage)){
-
- $scope.dhis2Events.push(dhis2Event);
- dhis2Event.name = eventStage.name;
- dhis2Event.reportDateDescription = eventStage.reportDateDescription;
- dhis2Event.dueDate = DateUtils.format(dhis2Event.dueDate);
-
- if(dhis2Event.eventDate){
- dhis2Event.eventDate = DateUtils.format(dhis2Event.eventDate);
- dhis2Event.sortingDate = DateUtils.format(dhis2Event.eventDate);
- }
- else{
- dhis2Event.sortingDate = dhis2Event.dueDate;
- }
- dhis2Event.statusColor = EventUtils.getEventStatusColor(dhis2Event);
- dhis2Event = EventUtils.setEventOrgUnitName(dhis2Event);
- }
- }
- });
- $scope.schedulingPossible = $scope.dhis2Events.length > 0 ? true : false;
- if($scope.schedulingPossible && $scope.messagingPossible){
-
- }
- });
- });
- }
- });
-
- $scope.showScheduling = function(){
- $scope.showSchedulingDiv = !$scope.showSchedulingDiv;
- //$scope.showMessagingDiv = !$scope.showMessagingDiv;
- };
-
- $scope.showMessaging = function(){
- //$scope.showSchedulingDiv = !$scope.showSchedulingDiv;
- $scope.showMessagingDiv = !$scope.showMessagingDiv;
- };
-
- $scope.showSchedulingDetails = function(dhis2Event){
-
- if( !$scope.currentEvent ){
- $scope.currentEvent = dhis2Event;
- $scope.showEventSchedulingDiv = !$scope.showEventSchedulingDiv;
- }
- else{
- if( dhis2Event.event === $scope.currentEvent.event ){
- $scope.showEventSchedulingDiv = !$scope.showEventSchedulingDiv;
- $scope.currentEvent = null;
- }
- else{
- $scope.currentEvent = dhis2Event;
- }
- }
- };
-
- $scope.cancelScheduling = function(){
- $scope.showEventSchedulingDiv = !$scope.showEventSchedulingDiv;
- $scope.currentEvent = null;
- };
-
- $scope.saveDueDate = function(){
- $scope.dueDateSaved = false;
-
- if($scope.currentEvent.dueDate == ''){
- $scope.invalidDate = true;
- return false;
- }
- else{
- var rawDate = $filter('date')($scope.currentEvent.dueDate, 'yyyy-MM-dd');
- var convertedDate = moment($scope.currentEvent.dueDate, 'YYYY-MM-DD')._d;
- convertedDate = $filter('date')(convertedDate, 'yyyy-MM-dd');
-
- if(rawDate !== convertedDate){
- $scope.invalidDate = true;
- return false;
- }
-
- var e = {event: $scope.currentEvent.event,
- enrollment: $scope.currentEvent.enrollment,
- dueDate: $scope.currentEvent.dueDate,
- status: $scope.currentEvent.status,
- program: $scope.currentEvent.program,
- programStage: $scope.currentEvent.programStage,
- orgUnit: $scope.currentEvent.orgUnit,
- trackedEntityInstance: $scope.currentEvent.trackedEntityInstance
- };
-
- DHIS2EventFactory.update(e).then(function(data){
- $scope.invalidDate = false;
- $scope.dueDateSaved = true;
- $scope.currentEvent.sortingDate = $scope.currentEvent.dueDate;
- var statusColor = EventUtils.getEventStatusColor($scope.currentEvent);
- var continueLoop = true;
- for(var i=0; i< $scope.dhis2Events.length && continueLoop; i++){
- if($scope.dhis2Events[i].event === $scope.currentEvent.event ){
- $scope.dhis2Events[i].statusColor = statusColor;
- continueLoop = false;
- }
- }
- });
- }
- };
-});
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/scheduling-messaging/scheduling-messaging.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/scheduling-messaging/scheduling-messaging.html 2014-09-05 12:52:43 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/scheduling-messaging/scheduling-messaging.html 1970-01-01 00:00:00 +0000
@@ -1,92 +0,0 @@
-<div class="panel panel-default" ng-controller="SchedulingMessagingController" ng-show="schedulingPossible || messagingPossible">
- <div class="panel-heading handle bold">
- <span class="nav-pills" ng-if="schedulingPossible">
- <a href ng-click="showScheduling()" title="{{'show_hide_scheduling'| translate}}">
- <span class="bold" ng-class="{'text-primary': showSchedulingDiv}">{{'scheduling'| translate}}</span>
- </a>
- </span>
- <span class="nav-pills" ng-if="messagingPossible">
- <span ng-if="schedulingPossible">|</span> <a href ng-click="showMessaging()" title="{{'show_hide_messaging'| translate}}">
- <span class="bold" ng-class="{'text-primary': showMessagingDiv}">{{'messaging'| translate}}</span>
- </a>
- </span>
- <span class="pull-right">
- <a class="small-horizonal-spacing" href ng-click="expandCollapse(schedulingMessagingWidget)">
- <span ng-show="schedulingMessagingWidget.expand"><i class="fa fa-chevron-up" title="{{'collapse'| translate}}"></i></span>
- <span ng-show="!schedulingMessagingWidget.expand"><i class="fa fa-chevron-down" title="{{'expand'| translate}}"></i></span>
- </a>
- <a class="small-horizonal-spacing" href ng-click="removeWidget(schedulingMessagingWidget)" title="{{'remove'| translate}}"><i class="fa fa-times-circle"></i></a>
- </span>
- </div>
-
- <div ng-show="schedulingMessagingWidget.expand" class="panel-body dashboard-element-container">
- <div ng-if="!selectedEnrollment" class="alert alert-warning">{{'not_yet_enrolled_scheduling'| translate}}</div>
- <div ng-if="showSchedulingDiv && schedulingPossible">
- <div ng-switch="dhis2Events.length">
- <div ng-switch-when="0" class="alert alert-warning">
- {{'no_event_to_schedule'| translate}}
- </div>
- <div ng-switch-default>
- <table class="table-borderless table-striped">
- <tr ng-click="showSchedulingDetails(dhis2Event)" ng-repeat="dhis2Event in dhis2Events">
- <td>
- {{dhis2Event.name}}
- </td>
- <td>
- {{dhis2Event.dueDate}}
- <input type="text" placeholder="yyyy-mm-dd" class="form-control" ng-date ng-model="dhis2Event.dueDate"/>
- </td>
- </tr>
- </table>
- <div ng-if="showEventSchedulingDiv">
- <pre>{{currentEvent}}</pre>
- </div>
- </div>
- </div>
- </div>
- <!--<div class="remove-default-padding" ng-if="showSchedulingDiv && schedulingPossible">
- <div ng-switch="dhis2Events.length">
- <div ng-switch-when="0" class="alert alert-warning">
- {{'no_event_to_schedule'| translate}}
- </div>
- <div ng-switch-default>
- <table class="table table-striped dhis2-table-hover">
- <tr>
- <th>{{'event_name'| translate}}</th>
- <th>{{'due_date'| translate}}</th>
- </tr>
- <tr ng-click="showSchedulingDetails(dhis2Event)" ng-repeat="dhis2Event in dhis2Events">
- <td>{{dhis2Event.name}}</td>
- <td>{{dhis2Event.dueDate}}</td>
- </tr>
- </table>
- <div ng-if="showEventSchedulingDiv">
- <pre>{{currentEvent}}</pre>
- </div>
- </div>
- </div>
- </div>-->
- <div class="remove-default-padding" ng-if="showMessagingDiv && messagingPossible">
- <div ng-switch="dhis2Events.length">
- <div ng-switch-when="0" class="alert alert-warning add-default-padding">
- {{'no_event_to_schedule'| translate}}
- </div>
- <div ng-switch-default>
- <table class="table table-striped dhis2-table-hover">
- <tr>
- <th>{{'event_name'| translate}}</th>
- <th>{{'due_date'| translate}}</th>
- </tr>
- <tr ng-click="showSchedulingDetails(dhis2Event)" ng-repeat="dhis2Event in dhis2Events">
- <td>{{dhis2Event.name}}</td>
- <td>{{dhis2Event.dueDate}}</td>
- </tr>
- </table>
- <div ng-if="showEventSchedulingDiv">
- <pre>{{currentEvent}}</pre>
- </div>
- </div>
- </div>
- </div>
- </div>
-</div>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js 2014-09-05 09:21:39 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js 2014-09-07 08:30:29 +0000
@@ -797,8 +797,9 @@
' ng-change="saveDatavalue(programStageDataElements.'+ deId + ')"' +
' ng-required="programStageDataElements.' + deId + '.compulsory">' +
'<option value="">{{\'please_select\'| translate}}</option>' +
- '<option value="0">{{\'no\'| translate}}</option>' +
- '<option value="1">{{\'yes\'| translate}}</option>';
+ '<option value="false">{{\'no\'| translate}}</option>' +
+ '<option value="true">{{\'yes\'| translate}}</option>' +
+ '</select>';
}
if(programStageDataElements[deId].dataElement.type == "date"){
newInputField = '<input type="text" ' +
