dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #39667
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 20088: tracker and event capture apps are now updated for tracker data model property name changes
------------------------------------------------------------
revno: 20088
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-09-11 14:20:43 +0200
message:
tracker and event capture apps are now updated for tracker data model property name changes
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/event-capture.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/enrollment-dates-form.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/components/report/program-details.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/tracker-capture.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-event-capture/scripts/event-capture.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/event-capture.js 2015-09-08 10:17:44 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/event-capture.js 2015-09-11 12:20:43 +0000
@@ -306,7 +306,7 @@
return $.ajax( {
url: '../api/programs/' + id + '.json',
type: 'GET',
- data: 'fields=id,name,programType,version,dataEntryMethod,dateOfEnrollmentDescription,dateOfIncidentDescription,displayIncidentDate,ignoreOverdueEvents,categoryCombo[id,isDefault,categories[id]],organisationUnits[id,name],programStages[id,name,version],userRoles[id,name]'
+ data: 'fields=id,name,programType,version,dataEntryMethod,enrollmentDateLabel,incidentDateLabel,displayIncidentDate,ignoreOverdueEvents,categoryCombo[id,isDefault,categories[id]],organisationUnits[id,name],programStages[id,name,version],userRoles[id,name]'
}).done( function( program ){
var ou = {};
_.each(_.values( program.organisationUnits), function(o){
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html 2015-08-26 10:26:31 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html 2015-09-11 12:20:43 +0000
@@ -36,7 +36,7 @@
</tr>
<tr class="col-md-12">
<td class="col-md-6">
- {{selectedProgram.dateOfEnrollmentDescription}}
+ {{selectedProgram.enrollmentDateLabel}}
</td>
<td class="col-md-6">
<input type="text" placeholder="{{dhis2CalendarFormat.keyDateFormat}}" class="form-control" d2-date ng-model="selectedEnrollment.dateOfEnrollment" ng-disabled="true"/>
@@ -44,7 +44,7 @@
</tr>
<tr class="col-md-12" ng-if="selectedProgram.displayIncidentDate">
<td class="col-md-6">
- {{selectedProgram.dateOfIncidentDescription}}
+ {{selectedProgram.incidentDateLabel}}
</td>
<td class="col-md-6">
<input type="text" placeholder="{{dhis2CalendarFormat.keyDateFormat}}" class="form-control" d2-date ng-model="selectedEnrollment.dateOfIncident" ng-disabled="true"/>
@@ -99,10 +99,10 @@
<table class="table table-bordered table-striped dhis2-table-hover">
<tr>
<th>
- {{selectedProgram.dateOfEnrollmentDescription}}
+ {{selectedProgram.enrollmentDateLabel}}
</th>
<th ng-if="selectedProgram.displayIncidentDate">
- {{selectedProgram.dateOfIncidentDescription}}
+ {{selectedProgram.incidentDateLabel}}
</th>
</tr>
<tr ng-click="loadEnrollmentDetails(en)" ng-repeat="en in historicalEnrollments" title="{{'details'| translate}}">
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/enrollment-dates-form.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/enrollment-dates-form.html 2015-08-07 10:37:31 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/enrollment-dates-form.html 2015-09-11 12:20:43 +0000
@@ -9,7 +9,7 @@
</tr>
<tr>
<td>
- {{selectedProgram.dateOfEnrollmentDescription}}
+ {{selectedProgram.enrollmentDateLabel}}
</td>
<td>
<input type="text"
@@ -26,7 +26,7 @@
</tr>
<tr ng-if="selectedProgram.displayIncidentDate">
<td>
- {{selectedProgram.dateOfIncidentDescription}}
+ {{selectedProgram.incidentDateLabel}}
</td>
<td>
<input type="text"
=== 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 2015-06-02 12:25:03 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/registration.html 2015-09-11 12:20:43 +0000
@@ -109,7 +109,7 @@
<table class="dhis2-list-table-striped dhis2-table-hover">
<tr>
<td>
- {{selectedProgramForRelative.dateOfEnrollmentDescription}}
+ {{selectedProgramForRelative.enrollmentDateLabel}}
</td>
<td>
<input type="text"
@@ -125,7 +125,7 @@
</tr>
<tr ng-if="selectedProgramForRelative.displayIncidentDate">
<td>
- {{selectedProgramForRelative.dateOfIncidentDescription}}
+ {{selectedProgramForRelative.incidentDateLabel}}
</td>
<td>
<input type="text"
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-details.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-details.html 2015-08-31 12:49:17 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-details.html 2015-09-11 12:20:43 +0000
@@ -35,10 +35,10 @@
<div class="row" ng-repeat="enrollment in enrollments">
<h2 class='col-sm-12'>{{'enrollment'| translate}} {{'_details'| translate}}</h2>
<div class="col-sm-4">
- <span class="bold">{{selectedProgram.dateOfEnrollmentDescription}}:</span> {{enrollment.dateOfEnrollment}}
+ <span class="bold">{{selectedProgram.enrollmentDateLabel}}:</span> {{enrollment.dateOfEnrollment}}
</div>
<div class="col-sm-4">
- <span class="bold">{{selectedProgram.dateOfIncidentDescription}}:</span> {{enrollment.dateOfIncident}}
+ <span class="bold">{{selectedProgram.incidentDateLabel}}:</span> {{enrollment.dateOfIncident}}
</div>
<div class="col-sm-4">
<span class="bold">{{'status'| translate}}:</span> {{enrollment.status}}
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/tracker-capture.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/tracker-capture.js 2015-09-08 10:17:44 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/tracker-capture.js 2015-09-11 12:20:43 +0000
@@ -272,7 +272,7 @@
return $.ajax( {
url: '../api/programs/' + id + '.json',
type: 'GET',
- data: 'fields=id,name,type,version,dataEntryMethod,dateOfEnrollmentDescription,dateOfIncidentDescription,displayIncidentDate,ignoreOverdueEvents,selectEnrollmentDatesInFuture,selectIncidentDatesInFuture,onlyEnrollOnce,externalAccess,displayOnAllOrgunit,registration,relationshipText,relationshipFromA,relatedProgram[id,name],relationshipType[id,name],trackedEntity[id,name,description],userRoles[id,name],organisationUnits[id,name],userRoles[id,name],programStages[id,name,version,minDaysFromStart,standardInterval,periodType,generatedByEnrollmentDate,reportDateDescription,repeatable,autoGenerateEvent,openAfterEnrollment,reportDateToUse],dataEntryForm[name,style,htmlCode,format],programTrackedEntityAttributes[displayInList,mandatory,allowFutureDate,trackedEntityAttribute[id,unique]],validationCriterias[id,name,operator,value,property]'
+ data: 'fields=id,name,type,version,dataEntryMethod,enrollmentDateLabel,incidentDateLabel,displayIncidentDate,ignoreOverdueEvents,selectEnrollmentDatesInFuture,selectIncidentDatesInFuture,onlyEnrollOnce,externalAccess,displayOnAllOrgunit,registration,relationshipText,relationshipFromA,relatedProgram[id,name],relationshipType[id,name],trackedEntity[id,name,description],userRoles[id,name],organisationUnits[id,name],userRoles[id,name],programStages[id,name,version,minDaysFromStart,standardInterval,periodType,generatedByEnrollmentDate,reportDateDescription,repeatable,autoGenerateEvent,openAfterEnrollment,reportDateToUse],dataEntryForm[name,style,htmlCode,format],programTrackedEntityAttributes[displayInList,mandatory,allowFutureDate,trackedEntityAttribute[id,unique]],validationCriterias[id,name,operator,value,property]'
}).done( function( program ){
var ou = {};
if(program.organisationUnits){
