dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #43272
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 21970: tracker-capture: name -> displayName - WIP
------------------------------------------------------------
revno: 21970
committer: Abyot Asalefew Gizaw <abyot@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2016-02-15 10:46:27 +0100
message:
tracker-capture: name -> displayName - WIP
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/compare-form.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.html
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/event-details.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/event-layout.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/inner-form.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/new-event.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/referral-modal.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/section-inner-form.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/table-entry-form.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment-controller.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/default-registration-form.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/registration/registration-controller.js
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/relationship.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/event-details.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events-controller.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events.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/components/report/program-statistics.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-summary-controller.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-summary.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/reportForm.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/tei-report.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events-controller.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/selected/selected-controller.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/teiadd/registration.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/teiadd/tei-add-controller.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/teiadd/tei-add.html
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/tracker-capture.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/advanced-search.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/column-modal.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/search-ou-tree.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/tei.html
--
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/dashboard/dashboard-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js 2016-02-10 07:35:16 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js 2016-02-15 09:46:27 +0000
@@ -214,9 +214,9 @@
angular.forEach(programs, function(program){
if( program.trackedEntity.id === $scope.selectedTei.trackedEntity ){
$scope.programs.push(program);
- $scope.programNames[program.id] = {id: program.id, name: program.name};
+ $scope.programNames[program.id] = {id: program.id, displayName: program.displayName};
angular.forEach(program.programStages, function(stage){
- $scope.programStageNames[stage.id] = {id: stage.id, name: stage.name};
+ $scope.programStageNames[stage.id] = {id: stage.id, displayName: stage.displayName};
});
if($scope.selectedProgramId && program.id === $scope.selectedProgramId || selectedEnrollment && selectedEnrollment.program === program.id){
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard.html 2016-02-10 07:35:16 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard.html 2016-02-15 09:46:27 +0000
@@ -27,7 +27,7 @@
<ul class="dropdown-menu pull-right" role="menu">
<li><a href ng-click="showHideWidgets()">{{showHideWidgetsLabel}}</a></li>
<li ng-if="userAuthority.canAdministerDashboard"><a href ng-click="saveDashboarLayoutAsDefault()">{{'save_layout_as_default'| translate}}</a></li>
- <li><a href ng-click="activiateTEI()">{{selectedTei.inactive ? 'activate_tei' : 'deactivate_tei' | translate}} {{trackedEntity.name}}</a></li>
+ <li><a href ng-click="activiateTEI()">{{selectedTei.inactive ? 'activate_tei' : 'deactivate_tei' | translate}} {{trackedEntity.displayName}}</a></li>
</ul>
</div>
</div>
@@ -49,7 +49,7 @@
<select ng-model="selectedProgram"
class="form-control-program"
- ng-options="program as program.name for program in programs | orderBy: 'name'"
+ ng-options="program as program.displayName for program in programs | orderBy: 'name'"
ng-disabled="programs.length < 1"
ng-change="applySelectedProgram(selectedProgram)">
<option value="">{{programs.length > 0 ? 'please_select_a_program' : 'no_program_exists' | translate}}</option>
@@ -87,7 +87,7 @@
<ul class="dropdown-menu pull-right" role="menu">
<li><a href ng-click="showHideWidgets()">{{showHideWidgetsLabel}}</a></li>
<li ng-if="userAuthority.canAdministerDashboard"><a href ng-click="saveDashboarLayoutAsDefault()">{{'save_layout_as_default'| translate}}</a></li>
- <li><a href ng-click="activiateTEI()">{{selectedTei.inactive ? 'activate_tei' : 'deactivate_tei' | translate}} {{trackedEntity.name}}</a></li>
+ <li><a href ng-click="activiateTEI()">{{selectedTei.inactive ? 'activate_tei' : 'deactivate_tei' | translate}} {{trackedEntity.displayName}}</a></li>
</ul>
</div>
</div>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/compare-form.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/compare-form.html 2016-02-04 10:43:43 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/compare-form.html 2016-02-15 09:46:27 +0000
@@ -19,7 +19,7 @@
</div>
<div class="compare-form-other-events-column">
<div ng-class="getCompareModeColSize(compareModeColDefs.otherEvent)" ng-repeat="otherEvent in otherStageEvents" class="other-events-alignment">
- {{currentStage.name}} {{otherStageEventIndexes[$index].position + 1}}
+ {{currentStage.displayName}} {{otherStageEventIndexes[$index].position + 1}}
</div>
</div>
<div class="compare-form-navigation-column-forward compare-form-navigation-column">
@@ -37,7 +37,7 @@
{{'current' | translate}}
</span>
<span ng-if="selectedEnrollment.status !== 'ACTIVE' || currentEvent.editingNotAllowed">
- {{currentStage.name}} {{currentStageEventNumber()}}
+ {{currentStage.displayName}} {{currentStageEventNumber()}}
</span>
</div>
<div ng-if="allowProvidedElsewhereExists[currentStage.id]" ng-class="getCompareModeColSize(compareModeColDefs.providedElsewhere)" ng-bind="providedElsewhereLabel" style="text-align: center">
@@ -159,7 +159,7 @@
<div class="row row-alternate compare-form-row" ng-repeat="prStDe in currentStage.programStageDataElements" ng-if="currentEvent.eventDate && !isHidden(prStDe.dataElement.id, currentEvent)">
<div ng-class="getCompareModeColSize(compareModeColDefs.header)" class="compare-form-extra-padding">
- <span ng-bind="prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.name"></span>
+ <span ng-bind="prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.displayName"></span>
<span ng-if="prStDe.compulsory" class="required">*</span>
<span class="hideInPrint">
<a ng-if="prStDe.dataElement.description" Title="{{prStDe.dataElement.description}}" ng-init="showHelpText[prStDe.dataElement.id] = false;" ng-click="showHelpText[prStDe.dataElement.id] = !showHelpText[prStDe.dataElement.id]">
@@ -250,7 +250,7 @@
</div>
</div>
<div style="float:right" class="hideInPrint compare-form-extra-padding mouse-pointer">
- <d2-audit dataelement-id="{{prStDe.dataElement.id}}" dataelement-name="{{prStDe.dataElement.name}}" current-event="{{currentEvent.event}}"></d2-audit>
+ <d2-audit dataelement-id="{{prStDe.dataElement.id}}" dataelement-name="{{prStDe.dataElement.displayName}}" current-event="{{currentEvent.event}}"></d2-audit>
</div>
</div>
<div ng-if="allowProvidedElsewhereExists[currentStage.id]" ng-class="getCompareModeColSize(compareModeColDefs.providedElsewhere)" style="text-align: center">
@@ -271,10 +271,10 @@
<div ng-if='currentStage.programStageSections && currentStage.programStageSections.length > 0 && currentEvent.eventDate'>
<accordion close-others='false'>
- <accordion-group heading="{{section.name}}" is-open="section.open" ng-repeat='section in currentStage.programStageSections' ng-init="sectionNr = $index + 1" ng-if="!hiddenSections[currentEvent.event][section.id]">
+ <accordion-group heading="{{section.displayName}}" is-open="section.open" ng-repeat='section in currentStage.programStageSections' ng-init="sectionNr = $index + 1" ng-if="!hiddenSections[currentEvent.event][section.id]">
<div class="vertical-spacing" ng-if="!section.programStageDataElements || section.programStageDataElements.length === 0">
- <div class="alert alert-warning">{{'section'| translate}} {{section.name}} {{'has_no_dataelements'| translate}}</div>
+ <div class="alert alert-warning">{{'section'| translate}} {{section.displayName}} {{'has_no_dataelements'| translate}}</div>
</div>
<div ng-if="section.programStageDataElements && section.programStageDataElements.length > 0">
@@ -285,7 +285,7 @@
<div ng-class="getCompareModeColSize(compareModeColDefs.otherEvents)" ng-if="otherStageEvents.length > 0">
<div>
<div ng-class="getCompareModeColSize(compareModeColDefs.otherEvent)" ng-repeat="otherEvent in otherStageEvents" class="other-events-alignment">
- {{currentStage.name}} {{otherStageEventIndexes[$index].position + 1}}
+ {{currentStage.displayName}} {{otherStageEventIndexes[$index].position + 1}}
</div>
</div>
</div>
@@ -294,7 +294,7 @@
{{'current' | translate}}
</span>
<span ng-if="selectedEnrollment.status !== 'ACTIVE' || currentEvent.editingNotAllowed">
- {{currentStage.name}} {{currentStageEventNumber()}}
+ {{currentStage.displayName}} {{currentStageEventNumber()}}
</span>
</div>
<div ng-if="allowProvidedElsewhereExists[currentStage.id]" ng-class="getCompareModeColSize(compareModeColDefs.providedElsewhere)" ng-bind="providedElsewhereLabel" style="text-align: center">
@@ -303,7 +303,7 @@
<div class="row row-alternate compare-form-row" ng-repeat="de in section.programStageDataElements" ng-if="!isHidden(de.dataElement.id, currentEvent)">
<div ng-class="getCompareModeColSize(compareModeColDefs.header)" class="compare-form-extra-padding">
- <span ng-bind="prStDes[de.dataElement.id].dataElement.formName ? prStDes[de.dataElement.id].dataElement.formName : prStDes[de.dataElement.id].dataElement.name"></span>
+ <span ng-bind="prStDes[de.dataElement.id].dataElement.formName ? prStDes[de.dataElement.id].dataElement.formName : prStDes[de.dataElement.id].dataElement.displayName"></span>
<span ng-if="prStDes[de.dataElement.id].compulsory" class="required">*</span>
<span class="hideInPrint">
<a ng-if="prStDes[de.dataElement.id].dataElement.description" Title="{{prStDes[de.dataElement.id].dataElement.description}}" ng-init="showHelpText[de.dataElement.id] = false;" ng-click="showHelpText[de.dataElement.id] = !showHelpText[de.dataElement.id]">
@@ -365,7 +365,7 @@
style="float: left">
</div>
<div style="float:right" class="hideInPrint compare-form-extra-padding mouse-pointer">
- <d2-audit dataelement-id="{{de.dataElement.id}}" dataelement-name="{{prStDes[de.dataElement.id].dataElement.name}}" current-event="{{currentEvent.event}}"></d2-audit>
+ <d2-audit dataelement-id="{{de.dataElement.id}}" dataelement-name="{{prStDes[de.dataElement.id].dataElement.displayName}}" current-event="{{currentEvent.event}}"></d2-audit>
</div>
</div>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js 2016-02-09 10:48:20 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js 2016-02-15 09:46:27 +0000
@@ -239,7 +239,7 @@
if(effect.dataElement) {
var message = effect.content;
$scope.errorMessages[event][effect.dataElement.id] = message;
- $scope.errorMessages[event].push($translate.instant($scope.prStDes[effect.dataElement.id].dataElement.name) + ": " + message);
+ $scope.errorMessages[event].push($translate.instant($scope.prStDes[effect.dataElement.id].dataElement.displayName) + ": " + message);
}
else
{
@@ -254,7 +254,7 @@
if(effect.dataElement) {
var message = effect.content;
$scope.warningMessages[event][effect.dataElement.id] = message;
- $scope.warningMessages[event].push($translate.instant($scope.prStDes[effect.dataElement.id].dataElement.name) + ": " + message);
+ $scope.warningMessages[event].push($translate.instant($scope.prStDes[effect.dataElement.id].dataElement.displayName) + ": " + message);
} else {
$scope.warningMessages[event].push(message);
}
@@ -669,7 +669,7 @@
}
var eventStage = $scope.stagesById[dhis2Event.programStage];
if (angular.isObject(eventStage)) {
- dhis2Event.name = eventStage.name;
+ dhis2Event.name = eventStage.displayName;
dhis2Event.excecutionDateLabel = eventStage.excecutionDateLabel ? eventStage.excecutionDateLabel : $translate.instant('report_date');
dhis2Event.dueDate = DateUtils.formatFromApiToUser(dhis2Event.dueDate);
dhis2Event.sortingDate = dhis2Event.dueDate;
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.html 2016-02-04 10:43:43 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.html 2016-02-15 09:46:27 +0000
@@ -35,7 +35,7 @@
<span ng-repeat="stage in headerStagesWithoutCurrent()" ng-if='useMenuMultiMode'>
<span ng-if="$index !== 0"> | </span>
<a href ng-click="openStageFromMenu(stage, stage.id)">
- {{stage.name}} ({{getStageEventCnt(stage)}})
+ {{stage.displayName}} ({{getStageEventCnt(stage)}})
</a>
</span>
<a href ng-click="toggleLegend()" title="{{'event_color_legend'| translate}}" class="small-horizonal-spacing"><i class="fa fa-info-circle vertical-center"></i></a>
=== 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 2016-02-04 11:14:00 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html 2016-02-15 09:46:27 +0000
@@ -14,7 +14,7 @@
</thead>
<tr class="col-md-12" ng-repeat="prStDe in currentStage.programStageDataElements" ng-if="!isHidden(prStDe.dataElement.id, currentEvent)">
<td>
- <span ng-bind="prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.name"></span>
+ <span ng-bind="prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.displayName"></span>
<span ng-if="prStDe.compulsory" class="required">*</span>
<span class="hideInPrint">
<a ng-if="prStDe.dataElement.description" Title="{{prStDe.dataElement.description}}" ng-init="showHelpText[prStDe.dataElement.id] = false;" ng-click="showHelpText[prStDe.dataElement.id] = !showHelpText[prStDe.dataElement.id]">
@@ -30,7 +30,7 @@
<td dhis2-compiled-include="components/dataentry/inner-form.html">
</td>
<td ng-if="currentEvent.event" class="hideInPrint audit-icon-column" align="center">
- <d2-audit dataelement-id="{{prStDe.dataElement.id}}" dataelement-name="{{prStDe.dataElement.name}}" current-event="{{currentEvent.event}}"></d2-audit>
+ <d2-audit dataelement-id="{{prStDe.dataElement.id}}" dataelement-name="{{prStDe.dataElement.displayName}}" current-event="{{currentEvent.event}}"></d2-audit>
</td>
<td class="form-narrow-column" ng-if="allowProvidedElsewhereExists[currentStage.id]">
<div class="align-center" ng-show="prStDe.allowProvidedElsewhere">
@@ -50,7 +50,7 @@
<!-- The inline style was needed to override overflow:hidden in the css. Can possibly be replaced with a CSS update. -->
<accordion-group is-open="section.open" ng-repeat='section in currentStage.programStageSections' ng-if="!hiddenSections[currentEvent.event][section.id]" style="overflow:visible">
<accordion-heading>
- {{section.name}}
+ {{section.displayName}}
<a ng-if="section.description" Title="{{section.description}}" ng-init="showHelpText.sections[section.id] = false;" ng-click="showHelpText.sections[section.id] = !showHelpText.sections[section.id];section.open =!section.open;">
<span class="glyphicon glyphicon-info-sign" ></span>
<span ng-show="showHelpText.sections[section.id]" ><br>{{section.description}}</span>
@@ -58,7 +58,7 @@
</accordion-heading>
<div class="vertical-spacing" ng-if="!section.programStageDataElements || section.programStageDataElements.length === 0">
- <div class="alert alert-warning">{{'section'| translate}} {{section.name}} {{'has_no_dataelements'| translate}}</div>
+ <div class="alert alert-warning">{{'section'| translate}} {{section.displayName}} {{'has_no_dataelements'| translate}}</div>
</div>
<table class="dhis2-list-table-striped default-form-table dhis2-table-hover" ng-if="section.programStageDataElements && section.programStageDataElements.length > 0">
@@ -77,7 +77,7 @@
<tbody id="list">
<tr ng-repeat="de in section.programStageDataElements" ng-if="!isHidden(de.dataElement.id)">
<td>
- <span ng-bind="prStDes[de.dataElement.id].dataElement.formName ? prStDes[de.dataElement.id].dataElement.formName : prStDes[de.dataElement.id].dataElement.name"></span>
+ <span ng-bind="prStDes[de.dataElement.id].dataElement.formName ? prStDes[de.dataElement.id].dataElement.formName : prStDes[de.dataElement.id].dataElement.displayName"></span>
<span ng-if="prStDes[de.dataElement.id].compulsory" class="required">*</span>
<span class="hideInPrint">
<a ng-if="prStDes[de.dataElement.id].dataElement.description" Title="{{prStDes[de.dataElement.id].dataElement.description}}" ng-init="showHelpText[de.dataElement.id] = false;" ng-click="showHelpText[de.dataElement.id] = !showHelpText[de.dataElement.id]">
@@ -92,7 +92,7 @@
<td dhis2-compiled-include="components/dataentry/section-inner-form.html">
</td>
<td class="hideInPrint audit-icon-column" align="center" ng-if="currentEvent.event">
- <d2-audit dataelement-id="{{de.dataElement.id}}" dataelement-name="{{prStDes[de.dataElement.id].dataElement.name}}" current-event="{{currentEvent.event}}"></d2-audit>
+ <d2-audit dataelement-id="{{de.dataElement.id}}" dataelement-name="{{prStDes[de.dataElement.id].dataElement.displayName}}" current-event="{{currentEvent.event}}"></d2-audit>
</td>
<td class="form-narrow-column" ng-if="allowProvidedElsewhereExists[currentStage.id]">
<div class="align-center" ng-show="prStDes[de.dataElement.id].allowProvidedElsewhere">
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/event-details.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/event-details.html 2016-02-08 11:15:05 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/event-details.html 2016-02-15 09:46:27 +0000
@@ -46,13 +46,13 @@
<div class="row col-sm-12" ng-if="selectedProgram" ng-repeat="category in selectedCategories">
<div class="col-sm-6">
- {{category.name}}
+ {{category.displayName}}
</div>
<div class="col-sm-6">
<select class="form-control"
name="option"
ng-model="category.selectedOption"
- ng-options="option as option.name for option in category.categoryOptions"
+ ng-options="option as option.displayName for option in category.categoryOptions"
ng-change="getCategoryOptions()">
<option value="">{{pleaseSelectLabel}}</option>
</select>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/event-layout.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/event-layout.html 2016-02-04 10:43:43 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/event-layout.html 2016-02-15 09:46:27 +0000
@@ -71,7 +71,7 @@
<div class="panel-body">
<div class="container-fluid">
<div class="row row-alternate" style="font-size: 12px" ng-repeat="stage in creatableStages = (programStages | filter:displayStageTasksInTopLine)" ng-if="selectedEnrollment.status === 'ACTIVE'">
- <div class="col-sm-12">{{stage.name}}</div>
+ <div class="col-sm-12">{{stage.displayName}}</div>
<div class="col-sm-12">
<span>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/inner-form.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/inner-form.html 2016-02-04 10:43:43 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/inner-form.html 2016-02-15 09:46:27 +0000
@@ -9,9 +9,9 @@
name="foo"
on-select="saveDatavalue(prStDe, innerForm.foo)"
style="width: 100%">
- <ui-select-match allow-clear="true" ng-class="getInputNotifcationClass(prStDe.dataElement.id, true)" class="form-control-ui-select" placeholder="{{'select_or_search' | translate}}">{{$select.selected.name || $select.selected}}</ui-select-match>
- <ui-select-choices repeat="option.name as option in optionSets[prStDe.dataElement.optionSet.id].options | filter: $select.search | limitTo:maxOptionSize">
- <span ng-bind-html="option.name | highlight: $select.search"></span>
+ <ui-select-match allow-clear="true" ng-class="getInputNotifcationClass(prStDe.dataElement.id, true)" class="form-control-ui-select" placeholder="{{'select_or_search' | translate}}">{{$select.selected.displayName || $select.selected}}</ui-select-match>
+ <ui-select-choices repeat="option.displayName as option in optionSets[prStDe.dataElement.optionSet.id].options | filter: $select.search | limitTo:maxOptionSize">
+ <span ng-bind-html="option.displayName | highlight: $select.search"></span>
</ui-select-choices>
</ui-select>
</div>
@@ -38,7 +38,7 @@
ng-disabled="selectedEnrollment.status !== 'ACTIVE' || currentEvent.editingNotAllowed || assignedFields[currentEvent.event][prStDe.dataElement.id]"
ng-model="currentEvent[prStDe.dataElement.id]"
ng-change="saveDatavalue(prStDe, innerForm.foo)"
- value={{option.name}}> {{option.name}}
+ value={{option.displayName}}> {{option.displayName}}
</label><br>
</span>
</div>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/new-event.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/new-event.html 2016-02-09 10:51:45 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/new-event.html 2016-02-15 09:46:27 +0000
@@ -1,7 +1,7 @@
<div class="modal-header page">
- <h3 ng-if="isNewEvent">{{'add'| translate}}<span ng-if="model.selectedStage"> - {{model.selectedStage.name}}</span></h3>
- <h3 ng-if="isScheduleEvent && !isReferralEvent">{{'schedule'| translate}}<span ng-if="model.selectedStage"> - {{model.selectedStage.name}}</span></h3>
- <h3 ng-if="isReferralEvent">{{'referral' | translate}}<span ng-if="model.selectedStage"> - {{model.selectedStage.name}}</span></h3>
+ <h3 ng-if="isNewEvent">{{'add'| translate}}<span ng-if="model.selectedStage"> - {{model.selectedStage.displayName}}</span></h3>
+ <h3 ng-if="isScheduleEvent && !isReferralEvent">{{'schedule'| translate}}<span ng-if="model.selectedStage"> - {{model.selectedStage.displayName}}</span></h3>
+ <h3 ng-if="isReferralEvent">{{'referral' | translate}}<span ng-if="model.selectedStage"> - {{model.selectedStage.displayName}}</span></h3>
</div>
<div class="modal-body page">
<form name="eventCreationForm" class="form-horizontal" role="form" novalidate>
@@ -14,7 +14,7 @@
<div class="col-sm-9">
<select class="form-control-program"
ng-model="model.selectedStage"
- ng-options="stage.name for stage in stages">
+ ng-options="stage.displayName for stage in stages">
</select>
</div>
</div>
@@ -62,7 +62,7 @@
<span ng-init="initTest(orgUnit)">
<span class="org-unit-tree-button" ng-click="expandCollapse(orgUnit)" ng-show="orgUnit.show && orgUnit.children.length > 0"><i class="fa fa-minus-square-o"></i></span>
<span class="org-unit-tree-button" ng-click="expandCollapse(orgUnit)" ng-show="(!orgUnit.show && orgUnit.children.length > 0) || (!orgUnit.show && orgUnit.hasChildren)"><i class="fa fa-plus-square-o"></i></span>
- <span class="org-unit-tree-button" ng-click="setSelectedSearchingOrgUnit(orgUnit)" ng-class="{'selected-org-unit' : orgUnit.id === selectedSearchingOrgUnit.id}">{{orgUnit.name}}</span>
+ <span class="org-unit-tree-button" ng-click="setSelectedSearchingOrgUnit(orgUnit)" ng-class="{'selected-org-unit' : orgUnit.id === selectedSearchingOrgUnit.id}">{{orgUnit.displayName}}</span>
<ul class="tree" id="tree" ng-show="orgUnit.show">
<li ng-repeat="orgUnit in orgUnit.children | orderBy:'name'" ng-include="'orgUnitTree.html'"></li>
</ul>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/referral-modal.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/referral-modal.html 2015-12-17 15:00:48 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/referral-modal.html 2016-02-15 09:46:27 +0000
@@ -7,7 +7,7 @@
<script type="text/ng-template" id="orgUnitTree.html">
<span class="org-unit-tree-button" ng-click="expandCollapse(orgUnit)" ng-show="orgUnit.show && orgUnit.children.length > 0"><i class="fa fa-minus-square-o"></i></span>
<span class="org-unit-tree-button" ng-click="expandCollapse(orgUnit)" ng-show="(!orgUnit.show && orgUnit.children.length > 0) || (!orgUnit.show && orgUnit.hasChildren)"><i class="fa fa-plus-square-o"></i></span>
- <span class="org-unit-tree-button" ng-click="setSelectedSearchingOrgUnit(orgUnit)" ng-class="{'selected-org-unit' : orgUnit.id === selectedSearchingOrgUnit.id}">{{orgUnit.name}}</span>
+ <span class="org-unit-tree-button" ng-click="setSelectedSearchingOrgUnit(orgUnit)" ng-class="{'selected-org-unit' : orgUnit.id === selectedSearchingOrgUnit.id}">{{orgUnit.displayName}}</span>
<ul class="tree" id="tree" ng-show="orgUnit.show">
<li ng-repeat="orgUnit in orgUnit.children | orderBy:'name'" ng-include="'orgUnitTree.html'"></li>
</ul>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/section-inner-form.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/section-inner-form.html 2016-02-04 10:43:43 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/section-inner-form.html 2016-02-15 09:46:27 +0000
@@ -9,9 +9,9 @@
name="foo"
on-select="saveDatavalue(prStDes[de.dataElement.id], innerForm.foo)"
ng-style="{'width':'100%'}"/>
- <ui-select-match allow-clear="true" ng-class="getInputNotifcationClass(prStDes[de.dataElement.id].dataElement.id,true, currentEvent)" class="form-control-ui-select" placeholder="{{'select_or_search' | translate}}">{{$select.selected.name || $select.selected}}</ui-select-match>
- <ui-select-choices repeat="option.name as option in optionSets[prStDes[de.dataElement.id].dataElement.optionSet.id].options | filter: $select.search | limitTo:maxOptionSize">
- <span ng-bind-html="option.name | highlight: $select.search"></span>
+ <ui-select-match allow-clear="true" ng-class="getInputNotifcationClass(prStDes[de.dataElement.id].dataElement.id,true, currentEvent)" class="form-control-ui-select" placeholder="{{'select_or_search' | translate}}">{{$select.selected.displayName || $select.selected}}</ui-select-match>
+ <ui-select-choices repeat="option.displayName as option in optionSets[prStDes[de.dataElement.id].dataElement.optionSet.id].options | filter: $select.search | limitTo:maxOptionSize">
+ <span ng-bind-html="option.displayName | highlight: $select.search"></span>
</ui-select-choices>
</ui-select>
@@ -41,7 +41,7 @@
ng-disabled="selectedEnrollment.status !== 'ACTIVE' || currentEvent.editingNotAllowed || assignedFields[currentEvent.event][de.dataElement.id]"
ng-model="currentEvent[prStDes[de.dataElement.id].dataElement.id]"
ng-change="saveDatavalue(prStDes[de.dataElement.id])"
- value={{option.name}}> {{option.name}}
+ value={{option.displayName}}> {{option.displayName}}
</label><br>
</span>
</div>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/table-entry-form.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/table-entry-form.html 2016-02-04 10:59:08 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/table-entry-form.html 2016-02-15 09:46:27 +0000
@@ -64,7 +64,7 @@
{{currentStage.excecutionDateLabel}}
</th>
<th class="" ng-repeat="prStDe in currentStage.programStageDataElements">
- {{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.name}}
+ {{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.displayName}}
<span ng-if="prStDe.compulsory" class="required">*</span>
<a href ng-if="prStDe.dataElement.description" Title="{{prStDe.dataElement.description}}" ng-init="showHelpText[prStDe.dataElement.id] = false;" ng-click="showHelpText[prStDe.dataElement.id] = !showHelpText[prStDe.dataElement.id]">
<span class="glyphicon glyphicon-info-sign" ></span>
@@ -114,15 +114,15 @@
<ui-select ng-model="eventRow[prStDe.dataElement.id]"
theme="select2"
ng-dblclick="$event.stopPropagation();"
- title="{{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.name}}"
+ title="{{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.displayName}}"
ng-required={{prStDe.compulsory}}
ng-disabled="selectedEnrollment.status !== 'ACTIVE' || eventRow.editingNotAllowed || assignedFields[eventRow.event][prStDe.dataElement.id] "
name="{{eventRow.event}}{{prStDe.dataElement.id}}"
on-select="saveDatavalue(prStDe, $eval('eventRowForm' + eventRow.event + '.' + eventRow.event + prStDe.dataElement.id))"
style="width:100%;">
- <ui-select-match allow-clear="true" ng-class='getInputNotifcationClass(prStDe.dataElement.id,false)' class="form-control-ui-select" placeholder="{{'select_or_search' | translate}}">{{$select.selected.name || $select.selected}}</ui-select-match>
- <ui-select-choices repeat="option.name as option in optionSets[prStDe.dataElement.optionSet.id].options | filter: $select.search | limitTo:maxOptionSize">
- <span ng-bind-html="option.name | highlight: $select.search"></span>
+ <ui-select-match allow-clear="true" ng-class='getInputNotifcationClass(prStDe.dataElement.id,false)' class="form-control-ui-select" placeholder="{{'select_or_search' | translate}}">{{$select.selected.displayName || $select.selected}}</ui-select-match>
+ <ui-select-choices repeat="option.displayName as option in optionSets[prStDe.dataElement.optionSet.id].options | filter: $select.search | limitTo:maxOptionSize">
+ <span ng-bind-html="option.displayName | highlight: $select.search"></span>
</ui-select-choices>
</ui-select>
</div>
@@ -134,7 +134,7 @@
class="form-control"
name="{{eventRow.event}}{{prStDe.dataElement.id}}"
ng-required={{prStDe.compulsory}}
- title="{{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.name}}"
+ title="{{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.displayName}}"
ng-dblclick="$event.stopPropagation();"
ng-disabled="selectedEnrollment.status !== 'ACTIVE' || eventRow.editingNotAllowed || assignedFields[eventRow.event][prStDe.dataElement.id] "
ng-model="eventRow[prStDe.dataElement.id]"
@@ -148,12 +148,12 @@
ng-class='getInputNotifcationClass(prStDe.dataElement.id,true)'
name="{{eventRow.event}}{{prStDe.dataElement.id}}"
ng-required={{prStDe.compulsory}}
- title="{{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.name}}"
+ title="{{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.displayName}}"
ng-dblclick="$event.stopPropagation();"
ng-disabled="selectedEnrollment.status !== 'ACTIVE' || eventRow.editingNotAllowed || assignedFields[eventRow.event][prStDe.dataElement.id] "
ng-model="eventRow[prStDe.dataElement.id]"
ng-change="saveDatavalue(prStDe, $eval('eventRowForm' + eventRow.event + '.' + eventRow.event + prStDe.dataElement.id))"
- value={{option.name}}> {{option.name}}
+ value={{option.displayName}}> {{option.displayName}}
</label><br>
</span>
</div>
@@ -168,7 +168,7 @@
d2-number-validator
ng-required={{prStDe.compulsory}}
ng-dblclick="$event.stopPropagation();"
- title="{{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.name}}"
+ title="{{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.displayName}}"
ng-disabled="selectedEnrollment.status !== 'ACTIVE' || eventRow.editingNotAllowed || assignedFields[eventRow.event][prStDe.dataElement.id] "
ng-blur="saveDatavalue(prStDe, $eval('eventRowForm' + eventRow.event + '.' + eventRow.event + prStDe.dataElement.id))"
name="{{eventRow.event}}{{prStDe.dataElement.id}}"/>
@@ -181,7 +181,7 @@
ng-model="eventRow[prStDe.dataElement.id]"
d2-number-validator
ng-required={{prStDe.compulsory}}
- title="{{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.name}}"
+ title="{{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.displayName}}"
ng-dblclick="$event.stopPropagation();"
ng-disabled="selectedEnrollment.status !== 'ACTIVE' || currentEvent.editingNotAllowed"
ng-blur="saveDatavalue(prStDe, $eval('eventRowForm' + eventRow.event + '.' + eventRow.event + prStDe.dataElement.id))"
@@ -195,7 +195,7 @@
ng-model="eventRow[prStDe.dataElement.id]"
d2-number-validator
ng-required={{prStDe.compulsory}}
- title="{{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.name}}"
+ title="{{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.displayName}}"
ng-dblclick="$event.stopPropagation();"
ng-disabled="selectedEnrollment.status !== 'ACTIVE' || currentEvent.editingNotAllowed"
ng-blur="saveDatavalue(prStDe, $eval('eventRowForm' + eventRow.event + '.' + eventRow.event + prStDe.dataElement.id))"
@@ -209,7 +209,7 @@
ng-model="eventRow[prStDe.dataElement.id]"
d2-number-validator
ng-required={{prStDe.compulsory}}
- title="{{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.name}}"
+ title="{{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.displayName}}"
ng-dblclick="$event.stopPropagation();"
ng-disabled="selectedEnrollment.status !== 'ACTIVE' || currentEvent.editingNotAllowed"
ng-blur="saveDatavalue(prStDe, $eval('eventRowForm' + eventRow.event + '.' + eventRow.event + prStDe.dataElement.id))"
@@ -223,7 +223,7 @@
ng-model="eventRow[prStDe.dataElement.id]"
d2-number-validator
ng-required={{prStDe.compulsory}}
- title="{{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.name}}"
+ title="{{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.displayName}}"
ng-dblclick="$event.stopPropagation();"
ng-disabled="selectedEnrollment.status !== 'ACTIVE' || currentEvent.editingNotAllowed"
ng-blur="saveDatavalue(prStDe, $eval('eventRowForm' + eventRow.event + '.' + eventRow.event + prStDe.dataElement.id))"
@@ -235,7 +235,7 @@
class="form-control"
ng-model="eventRow[prStDe.dataElement.id]"
ng-required={{prStDe.compulsory}}
- title="{{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.name}}"
+ title="{{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.displayName}}"
ng-dblclick="$event.stopPropagation();"
ng-disabled="selectedEnrollment.status !== 'ACTIVE' || eventRow.editingNotAllowed || assignedFields[eventRow.event][prStDe.dataElement.id] "
ng-blur="saveDatavalue(prStDe, $eval('eventRowForm' + eventRow.event + '.' + eventRow.event + prStDe.dataElement.id))"
@@ -248,7 +248,7 @@
class="form-control"
ng-model="eventRow[prStDe.dataElement.id]"
ng-required={{prStDe.compulsory}}
- title="{{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.name}}"
+ title="{{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.displayName}}"
ng-dblclick="$event.stopPropagation();"
ng-disabled="selectedEnrollment.status !== 'ACTIVE' || eventRow.editingNotAllowed || assignedFields[eventRow.event][prStDe.dataElement.id] "
ng-blur="saveDatavalue(prStDe, $eval('eventRowForm' + eventRow.event + '.' + eventRow.event + prStDe.dataElement.id))"
@@ -257,7 +257,7 @@
<div ng-switch-when="BOOLEAN">
<d2-radio-button
ng-dblclick="$event.stopPropagation();"
- title="{{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.name}}"
+ title="{{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.displayName}}"
dh-required="prStDe.compulsory"
dh-disabled="selectedEnrollment.status !== 'ACTIVE' || eventRow.editingNotAllowed || assignedFields[eventRow.event][de.dataElement.id] === true"
dh-value="eventRow[prStDe.dataElement.id]"
@@ -275,7 +275,7 @@
ng-class='getInputNotifcationClass(prStDe.dataElement.id,false)'
ng-model="eventRow[prStDe.dataElement.id]"
ng-required={{prStDe.compulsory}}
- title="{{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.name}}"
+ title="{{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.displayName}}"
ng-dblclick="$event.stopPropagation();"
ng-disabled="selectedEnrollment.status !== 'ACTIVE' || eventRow.editingNotAllowed || assignedFields[eventRow.event][prStDe.dataElement.id] "
blur-or-change="saveDatavalue(prStDe, $eval('eventRowForm' + eventRow.event + '.' + eventRow.event + prStDe.dataElement.id))"
@@ -287,7 +287,7 @@
ng-class='getInputNotifcationClass(prStDe.dataElement.id,false)'
ng-model="eventRow[prStDe.dataElement.id]"
ng-required={{prStDe.compulsory}}
- title="{{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.name}}"
+ title="{{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.displayName}}"
ng-dblclick="$event.stopPropagation();"
ng-disabled="selectedEnrollment.status !== 'ACTIVE' || eventRow.editingNotAllowed || assignedFields[eventRow.event][prStDe.dataElement.id] "
ng-change="saveDatavalue(prStDe, $eval('eventRowForm' + eventRow.event + '.' + eventRow.event + prStDe.dataElement.id))"
@@ -299,7 +299,7 @@
ng-class='getInputNotifcationClass(prStDe.dataElement.id,false)'
ng-model="eventRow[prStDe.dataElement.id]"
ng-required={{prStDe.compulsory}}
- title="{{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.name}}"
+ title="{{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.displayName}}"
ng-dblclick="$event.stopPropagation();"
ng-disabled="selectedEnrollment.status !== 'ACTIVE' || eventRow.editingNotAllowed || assignedFields[eventRow.event][prStDe.dataElement.id] "
ng-blur="saveDatavalue(prStDe, $eval('eventRowForm' + eventRow.event + '.' + eventRow.event + prStDe.dataElement.id))"
@@ -320,7 +320,7 @@
<div ng-switch-when="BOOLEAN">
<d2-radio-button
dh-required="prStDe.compulsory"
- title="{{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.name}}"
+ title="{{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.displayName}}"
dh-disabled="selectedEnrollment.status !== 'ACTIVE' || eventRow.editingNotAllowed || assignedFields[eventRow.event][de.dataElement.id] === true"
dh-value="eventRow[prStDe.dataElement.id]"
dh-name="{{eventRow.event}}{{prStDe.dataElement.id}}"
@@ -332,19 +332,19 @@
class="form-control"
ng-model="eventRow[prStDe.dataElement.id]"
ng-required={{prStDe.compulsory}}
- title="{{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.name}}"
+ title="{{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.displayName}}"
ng-disabled="true"
name="foo"/>
</div>
<div ng-switch-when="MULTI_SELECT_GROUP">
<ul>
- <li ng-repeat='event in eventRow[prStDe.dataElement.id].selections' title="{{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.name}}">
+ <li ng-repeat='event in eventRow[prStDe.dataElement.id].selections' title="{{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.displayName}}">
{{event.formName ? event.formName : event.name}}
</li>
</ul>
</div>
<div ng-switch-default>
- <span title="{{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.name}}">
+ <span title="{{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.displayName}}">
{{eventRow[prStDe.dataElement.id]}}
</span>
</div>
@@ -355,13 +355,13 @@
class="icon-padding"
ng-click="$event.stopPropagation();"
ng-dblclick="$event.stopPropagation();">
- <span ng-click="showCompleteErrorMessageInModal(errorMessages[eventRow.event][prStDe.dataElement.id], prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.name)"
+ <span ng-click="showCompleteErrorMessageInModal(errorMessages[eventRow.event][prStDe.dataElement.id], prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.displayName)"
ng-show="errorMessages[eventRow.event][prStDe.dataElement.id]">
<i class="fa fa-exclamation-triangle error-text"
tooltip="{{errorMessages[eventRow.event][prStDe.dataElement.id]}}"
tooltip-placement="bottom"></i>
</span>
- <span ng-click="showCompleteErrorMessageInModal(warningMessages[eventRow.event][prStDe.dataElement.id], prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.name, true)"
+ <span ng-click="showCompleteErrorMessageInModal(warningMessages[eventRow.event][prStDe.dataElement.id], prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.displayName, true)"
ng-show="warningMessages[eventRow.event][prStDe.dataElement.id]">
<i class="fa fa-exclamation-triangle warning-text"
tooltip="{{warningMessages[eventRow.event][prStDe.dataElement.id]}}"
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment-controller.js 2016-02-11 15:31:13 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment-controller.js 2016-02-15 09:46:27 +0000
@@ -42,6 +42,8 @@
$scope.enrollments = selections.enrollments;
$scope.programExists = args.programExists;
$scope.programNames = selections.prNames;
+
+ console.log('the names: ', $scope.programNames);
$scope.programStageNames = selections.prStNames;
$scope.attributesById = CurrentSelection.getAttributesById();
$scope.activeEnrollments = [];
@@ -108,7 +110,7 @@
$scope.showEnrollmentHistoryDiv = false;
//load new enrollment details
- $scope.selectedEnrollment = {orgUnitName: $scope.selectedOrgUnit.name};
+ $scope.selectedEnrollment = {orgUnitName: $scope.selectedOrgUnit.displayName};
$scope.loadEnrollmentDetails($scope.selectedEnrollment);
$timeout(function() {
=== 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 2016-02-10 07:35:16 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html 2016-02-15 09:46:27 +0000
@@ -141,7 +141,7 @@
<table class="table table-striped dhis2-table-hover table-bordered">
<tr ng-repeat="activeEnrollment in activeEnrollments">
<td ng-if="selectedProgram && selectedProgram.id !== activeEnrollment.program || !selectedProgram" title="{{'set_as_current'| translate}}" ng-click="changeProgram(activeEnrollment.program)">
- {{programNames[activeEnrollment.program].name}}
+ {{programNames[activeEnrollment.program].displayName}}
</td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/default-registration-form.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/default-registration-form.html 2016-02-09 10:48:20 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/default-registration-form.html 2016-02-15 09:46:27 +0000
@@ -2,7 +2,7 @@
<table class="dhis2-list-table-striped dhis2-table-hover">
<tr ng-repeat="attribute in attributes | filter: {attribute: 'true'} " ng-if="!hiddenFields[attribute.id] && ((editingDisabled && attribute.show) || !editingDisabled)">
<td>
- <span ng-bind="attribute.name"></span><span ng-if="attribute.mandatory || attribute.unique" class="required">*</span>
+ <span ng-bind="attribute.displayName"></span><span ng-if="attribute.mandatory || attribute.unique" class="required">*</span>
<a ng-if="attribute.description" Title="{{attribute.description}}" ng-click="showHelpText(attribute.id)">
<span class="glyphicon glyphicon-info-sign" ></span>
<span ng-show="helpTexts[attribute.id]" ><br>{{attribute.description}}</span>
@@ -22,9 +22,9 @@
ng-disabled="editingDisabled"
on-select="teiValueUpdated(selectedTei, attribute.id)"
ng-style="{'width': '100%'}">
- <ui-select-match allow-clear="true" class="form-control-ui-select" placeholder="{{'select_or_search' | translate}}">{{$select.selected.name || $select.selected}}</ui-select-match>
- <ui-select-choices repeat="option.name as option in optionSets[attributesById[attribute.id].optionSet.id].options | filter: $select.search | limitTo:maxOptionSize">
- <span ng-bind-html="option.name | highlight: $select.search"></span>
+ <ui-select-match allow-clear="true" class="form-control-ui-select" placeholder="{{'select_or_search' | translate}}">{{$select.selected.displayName || $select.selected}}</ui-select-match>
+ <ui-select-choices repeat="option.displayName as option in optionSets[attributesById[attribute.id].optionSet.id].options | filter: $select.search | limitTo:maxOptionSize">
+ <span ng-bind-html="option.displayName | highlight: $select.search"></span>
</ui-select-choices>
</ui-select>
</span>
@@ -173,10 +173,10 @@
style="width:75%;"
ng-required="attribute.mandatory || attribute.unique"/>
<span class="hideInPrint">
- <a href ng-class="{true: 'disable-clicks', false: ''} [editingDisabled]" ng-click="getTrackerAssociate(attribute, selectedTei[attribute.id])" title="{{'add'| translate}} {{attribute.name}}">
+ <a href ng-class="{true: 'disable-clicks', false: ''} [editingDisabled]" ng-click="getTrackerAssociate(attribute, selectedTei[attribute.id])" title="{{'add'| translate}} {{attribute.displayName}}">
<i class="fa fa-external-link fa-2x vertical-center"></i>
</a>
- <a href ng-if="selectedTei[attribute.id]" ng-class="{true: 'disable-clicks', false: ''} [editingDisabled]" ng-click="selectedTei[attribute.id] = null" title="{{'add'| translate}} {{attribute.name}}">
+ <a href ng-if="selectedTei[attribute.id]" ng-class="{true: 'disable-clicks', false: ''} [editingDisabled]" ng-click="selectedTei[attribute.id] = null" title="{{'add'| translate}} {{attribute.displayName}}">
<i class="fa fa-trash-o fa-2x vertical-center"></i>
</a>
</span>
@@ -209,7 +209,7 @@
</ng-form>
</td>
<td class="hideInPrint audit-icon-column" align="center" ng-if="selectedTeiId">
- <d2-audit dataelement-id="{{attribute.id}}" dataelement-name="{{attribute.name}}" data-type="attribute" selected-tei-id={{selectedTei.trackedEntityInstance}}></d2-audit>
+ <d2-audit dataelement-id="{{attribute.id}}" dataelement-name="{{attribute.displayName}}" data-type="attribute" selected-tei-id={{selectedTei.trackedEntityInstance}}></d2-audit>
</td>
</tr>
</table>
=== 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-12-24 11:47:36 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/enrollment-dates-form.html 2016-02-15 09:46:27 +0000
@@ -12,7 +12,7 @@
{{'program' | translate}}
</td>
<td>
- <input type="text" class="form-control" value={{selectedProgram.name}} ng-disabled="true"/>
+ <input type="text" class="form-control" value={{selectedProgram.displayName}} ng-disabled="true"/>
</td>
</tr>
<tr>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js 2016-02-10 11:02:18 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js 2016-02-15 09:46:27 +0000
@@ -62,7 +62,7 @@
}
$scope.selectedOrgUnit = SessionStorageService.get('SELECTED_OU');
- $scope.selectedEnrollment = {enrollmentDate: $scope.today, incidentDate: $scope.today, orgUnitName: $scope.selectedOrgUnit.name};
+ $scope.selectedEnrollment = {enrollmentDate: $scope.today, incidentDate: $scope.today, orgUnitName: $scope.selectedOrgUnit.displayName};
$scope.trackedEntities = {available: []};
TEService.getAll().then(function(entities){
@@ -136,7 +136,7 @@
var goToDashboard = function(destination, teiId){
//reset form
$scope.selectedTei = {};
- $scope.selectedEnrollment = {enrollmentDate: $scope.today, incidentDate: $scope.today, orgUnitName: $scope.selectedOrgUnit.name};
+ $scope.selectedEnrollment = {enrollmentDate: $scope.today, incidentDate: $scope.today, orgUnitName: $scope.selectedOrgUnit.displayName};
$scope.outerForm.submitted = false;
$scope.outerForm.$setPristine();
@@ -286,7 +286,7 @@
}
else {
//TODO: Alerts is going to be replaced with a proper display mecanism.
- alert($scope.attributesById[effect.trackedEntityAttribute.id].name + "Was blanked out and hidden by your last action");
+ alert($scope.attributesById[effect.trackedEntityAttribute.id].displayName + "Was blanked out and hidden by your last action");
}
//Blank out the value:
=== 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 2016-02-04 10:43:43 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration.html 2016-02-15 09:46:27 +0000
@@ -13,7 +13,7 @@
<td>
<select class="form-control"
ng-model="trackedEntities.selected"
- ng-options="trackedEntity.name for trackedEntity in trackedEntities.available | orderBy: 'name'">
+ ng-options="trackedEntity.displayName for trackedEntity in trackedEntities.available | orderBy: 'name'">
</select>
</td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship.html 2015-12-16 09:43:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship.html 2016-02-15 09:46:27 +0000
@@ -34,7 +34,7 @@
{{'relationship' | translate}}
</th>
<th ng-repeat="att in attributes" ng-if="att.displayInListNoProgram">
- {{att.name}}
+ {{att.displayName}}
</th>
<th></th>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/event-details.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/event-details.html 2015-02-18 13:00:15 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/event-details.html 2016-02-15 09:46:27 +0000
@@ -9,7 +9,7 @@
<table class="table table-bordered table-compact">
<tr class="col-md-12" ng-repeat="gridColumn in gridColumns">
<td class="col-md-6">
- {{gridColumn.name}}
+ {{gridColumn.displayName}}
</td>
<td class="col-md-6">
{{selectedTei[gridColumn.id]}}
@@ -38,7 +38,7 @@
</thead>
<tr class="col-md-12" ng-repeat="prStDe in currentStage.programStageDataElements">
<td class="col-md-5">
- {{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.name}}
+ {{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.displayName}}
</td>
<td class="col-md-5">
{{currentEvent[prStDe.dataElement.id].value}}
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events-controller.js 2016-01-07 10:29:04 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events-controller.js 2016-02-15 09:46:27 +0000
@@ -116,7 +116,7 @@
overdueEvent.dueDate = DateUtils.formatFromApiToUser(row.dueDate);
overdueEvent.event = row.event;
- overdueEvent.eventName = $scope.programStages[row.programStage].name;
+ overdueEvent.eventName = $scope.programStages[row.programStage].displayName;
overdueEvent.orgUnitName = row.orgUnitName;
overdueEvent.followup = row.followup;
overdueEvent.program = row.program;
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events.html 2015-11-23 17:03:19 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events.html 2016-02-15 09:46:27 +0000
@@ -47,7 +47,7 @@
<tr>
<td>{{'org_unit' | translate}}</td>
<td>
- <input type="text" class="form-control" selected-org-unit ng-model="selectedOrgUnit.name" value="{{selectedOrgUnit.name || 'please_select'| translate}}" ng-disabled="true">
+ <input type="text" class="form-control" selected-org-unit ng-model="selectedOrgUnit.displayName" value="{{selectedOrgUnit.displayName || 'please_select'| translate}}" ng-disabled="true">
</td>
</tr>
<tr>
@@ -57,7 +57,7 @@
<td>
<select ng-model="selectedProgram"
class="form-control"
- ng-options="program as program.name for program in programs | orderBy: 'name'"
+ ng-options="program as program.displayName for program in programs | orderBy: 'name'"
ng-disabled="programs.length < 1">
<option value="">{{programs.length > 0 ? 'please_select_a_program' : 'no_program_exists'| translate}}</option>
</select>
@@ -138,7 +138,7 @@
<!-- sort icon begins -->
<span ng-click="sortGrid(gridColumn)">
<span ng-class="{true: 'red'} [sortColumn.id === gridColumn.id]"><i class="fa fa-sort hideInPrint"></i></span>
- {{gridColumn.name}}
+ {{gridColumn.displayName}}
</span>
<!-- sort icon ends -->
=== 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-09-15 13:51:19 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-details.html 2016-02-15 09:46:27 +0000
@@ -1,6 +1,6 @@
<div id='printSection'>
<div class="modal-header">
- <h1>{{selectedProgram.name}} {{'report'| translate}}</h1>
+ <h1>{{selectedProgram.displayName}} {{'report'| translate}}</h1>
<span class="pull-right bold">
{{'date'| translate}}: {{today}}
</span>
@@ -8,7 +8,7 @@
<div class="modal-body">
<div class='row'>
<div class="col-sm-6">
- <h2>{{selectedProgram.trackedEntity.name}} {{'_details'| translate}}</h2>
+ <h2>{{selectedProgram.trackedEntity.displayName}} {{'_details'| translate}}</h2>
<table class="table table-bordered table-compact">
<tr ng-repeat="attribute in selectedTei.attributes" ng-show="attribute.show">
<td class="bold">
@@ -90,7 +90,7 @@
</tr>
<tr class="col-sm-12" ng-repeat="prStDe in stagesById[dhis2Event.programStage].programStageDataElements">
<td>
- {{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.name}}
+ {{prStDe.dataElement.formName ? prStDe.dataElement.formName : prStDe.dataElement.displayName}}
</td>
<td>
{{dhis2Event[prStDe.dataElement.id]}}
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-statistics.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-statistics.html 2015-11-23 14:50:42 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-statistics.html 2016-02-15 09:46:27 +0000
@@ -18,7 +18,7 @@
</div>
<!--- selected org unit begins -->
- <input type="text" selected-org-unit ng-model="selectedOrgUnit.name" ng-hide=true>
+ <input type="text" selected-org-unit ng-model="selectedOrgUnit.displayName" ng-hide=true>
<!--- selected org unit ends -->
</div>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-summary-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-summary-controller.js 2016-01-07 10:29:04 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-summary-controller.js 2016-02-15 09:46:27 +0000
@@ -102,7 +102,7 @@
angular.forEach(data.eventRows, function(ev){
if(ev.trackedEntityInstance){
ev.name = $scope.stagesById[ev.programStage].name;
- ev.programName = $scope.selectedProgram.name;
+ ev.programName = $scope.selectedProgram.displayName;
ev.statusColor = EventUtils.getEventStatusColor(ev);
ev.eventDate = DateUtils.formatFromApiToUser(ev.eventDate);
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-summary.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-summary.html 2015-11-23 14:50:42 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-summary.html 2016-02-15 09:46:27 +0000
@@ -18,7 +18,7 @@
</div>
<!--- selected org unit begins -->
- <input type="text" selected-org-unit ng-model="selectedOrgUnit.name" ng-hide=true>
+ <input type="text" selected-org-unit ng-model="selectedOrgUnit.displayName" ng-hide=true>
<!--- selected org unit ends -->
</div>
@@ -48,14 +48,14 @@
<tabset>
<tab ng-repeat="stage in programStages | orderBy: 'sortOrder'">
<tab-heading>
- <span class="bold">{{stage.name}}</span>
+ <span class="bold">{{stage.displayName}}</span>
</tab-heading>
<div ng-if="stage.hasData">
<table class="table table-bordered vertical-spacing">
<thead>
<tr>
<th class="active">
- {{selectedProgram.trackedEntity.name}}
+ {{selectedProgram.trackedEntity.displayName}}
</th>
<th class="active">
{{'event_date' | translate}}
@@ -64,7 +64,7 @@
{{'event_orgunit_name'| translate}}
</th>
<th class="active" ng-if="prStDe.displayInReports" ng-repeat="prStDe in stage.programStageDataElements">
- {{prStDe.dataElement.name}}
+ {{prStDe.dataElement.displayName}}
</th>
</tr>
</thead>
@@ -73,7 +73,7 @@
<td rowspan="{{(dhis2Events | filter: {programStage: stage.id, trackedEntityInstance: tei}).length}}"
ng-if="$index === 0">
<span ng-repeat="gridColumn in gridColumns" ng-if="gridColumn.displayInListNoProgram">
- <span class="bold">{{gridColumn.name}}:</span> {{ev[gridColumn.id]}}<br>
+ <span class="bold">{{gridColumn.displayName}}:</span> {{ev[gridColumn.id]}}<br>
</span>
</td>
<td>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/reportForm.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/reportForm.html 2015-11-23 14:50:42 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/reportForm.html 2016-02-15 09:46:27 +0000
@@ -22,7 +22,7 @@
<td class='col-sm-4 col-md-3'>
<select ng-model="selectedProgram"
class="form-control"
- ng-options="program as program.name for program in programs | orderBy: 'name'"
+ ng-options="program as program.displayName for program in programs | orderBy: 'name'"
ng-disabled="programs.length < 1">
<option value="">{{programs.length > 0 ? 'please_select' : 'no_program_exists'| translate}}</option>
</select>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/tei-report.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/tei-report.html 2015-12-16 09:43:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/tei-report.html 2016-02-15 09:46:27 +0000
@@ -21,7 +21,7 @@
<table class="table table-striped dhis2-table-hover">
<tr ng-click="showProgramReportDetails(pr)" ng-repeat="pr in programs" ng-if="report[pr.id].enrollments" title="{{'details'| translate}}">
<td>
- {{pr.name}}
+ {{pr.displayName}}
</td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events-controller.js 2016-02-10 09:32:32 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events-controller.js 2016-02-15 09:46:27 +0000
@@ -114,7 +114,7 @@
upcomingEvent.dueDate = DateUtils.formatFromApiToUser(row.dueDate);
upcomingEvent.event = row.event;
- upcomingEvent.eventName = $scope.programStages[row.programStage].name;
+ upcomingEvent.eventName = $scope.programStages[row.programStage].displayName;
upcomingEvent.orgUnitName = row.orgUnitName;
upcomingEvent.followup = row.followup;
upcomingEvent.program = row.program;
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events.html 2016-02-10 09:32:32 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events.html 2016-02-15 09:46:27 +0000
@@ -47,7 +47,7 @@
<tr>
<td>{{'org_unit' | translate}}</td>
<td>
- <input type="text" class="form-control" selected-org-unit ng-model="selectedOrgUnit.name" value="{{selectedOrgUnit.name || 'please_select'| translate}}" ng-disabled="true">
+ <input type="text" class="form-control" selected-org-unit ng-model="selectedOrgUnit.displayName" value="{{selectedOrgUnit.displayName || 'please_select'| translate}}" ng-disabled="true">
</td>
</tr>
<tr>
@@ -57,7 +57,7 @@
<td>
<select ng-model="selectedProgram"
class="form-control"
- ng-options="program as program.name for program in programs | orderBy: 'name'"
+ ng-options="program as program.displayName for program in programs | orderBy: 'name'"
ng-disabled="programs.length < 1" ng-selected="programs.length === 1">
<option ng-if="programs.length !== 1" value="">{{programs.length > 1 ? 'please_select_a_program' : 'no_program_exists'| translate}}</option>
</select>
@@ -184,7 +184,7 @@
<!-- sort icon begins -->
<span ng-click="sortGrid(gridColumn)">
<span ng-class="{true: 'red'} [sortColumn.id === gridColumn.id]"><i class="fa fa-sort hideInPrint"></i></span>
- {{gridColumn.name}}
+ {{gridColumn.displayName}}
</span>
<!-- sort icon ends -->
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/selected/selected-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/selected/selected-controller.js 2015-12-16 09:43:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/selected/selected-controller.js 2016-02-15 09:46:27 +0000
@@ -15,8 +15,8 @@
$scope.selectedOrgUnit = SessionStorageService.get('SELECTED_OU');
$scope.selections = [];
- $scope.selections.push({title: 'registering_unit', value: $scope.selectedOrgUnit ? $scope.selectedOrgUnit.name : 'not_selected'});
- $scope.selections.push({title: 'program', value: $scope.selectedProgram ? $scope.selectedProgram.name : 'not_selected'});
+ $scope.selections.push({title: 'registering_unit', value: $scope.selectedOrgUnit ? $scope.selectedOrgUnit.displayName : 'not_selected'});
+ $scope.selections.push({title: 'program', value: $scope.selectedProgram ? $scope.selectedProgram.displayName : 'not_selected'});
});
});
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/teiadd/registration.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/teiadd/registration.html 2016-01-10 11:14:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/teiadd/registration.html 2016-02-15 09:46:27 +0000
@@ -14,7 +14,7 @@
<select class="form-control"
ng-model="trackedEntities.selected"
ng-disabled="selectedAttribute && selectedAttribute.trackedEntity"
- ng-options="trackedEntity.name for trackedEntity in trackedEntities.available | orderBy: 'name'">
+ ng-options="trackedEntity.displayName for trackedEntity in trackedEntities.available | orderBy: 'name'">
</select>
</td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/teiadd/tei-add-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/teiadd/tei-add-controller.js 2015-11-23 17:03:19 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/teiadd/tei-add-controller.js 2016-02-15 09:46:27 +0000
@@ -77,7 +77,7 @@
}
$scope.selectedOrgUnit = SessionStorageService.get('SELECTED_OU');
- $scope.selectedEnrollment = {enrollmentDate: $scope.today, incidentDate: $scope.today, orgUnitName: $scope.selectedOrgUnit.name};
+ $scope.selectedEnrollment = {enrollmentDate: $scope.today, incidentDate: $scope.today, orgUnitName: $scope.selectedOrgUnit.displayName};
//Selections
$scope.selectedOrgUnit = SessionStorageService.get('SELECTED_OU');
@@ -109,7 +109,7 @@
CurrentSelection.setRelationshipOwner($scope.mainTei);
}
else{
- $scope.teiAddLabel = $scope.selectedAttribute && $scope.selectedAttribute.name ? $scope.selectedAttribute.name : $translate.instant('tracker_associate');
+ $scope.teiAddLabel = $scope.selectedAttribute && $scope.selectedAttribute.displayName ? $scope.selectedAttribute.displayName : $translate.instant('tracker_associate');
$scope.addingTeiAssociate = true;
ProgramFactory.getProgramsByOu($scope.selectedOrgUnit, $scope.selectedProgram).then(function(response){
$scope.programs = response.programs;
@@ -404,7 +404,7 @@
var tei = angular.copy($scope.mainTei);
var relationship = {};
relationship.relationship = $scope.relationship.selected.id;
- relationship.displayName = $scope.relationship.selected.name;
+ relationship.displayName = $scope.relationship.selected.displayName;
relationship.relative = {};
relationship.trackedEntityInstanceA = $scope.selectedRelationship.aIsToB === $scope.relationship.selected.aIsToB ? $scope.mainTei.trackedEntityInstance : $scope.teiForRelationship.id;
@@ -699,7 +699,7 @@
$scope.tei[att.attribute] = att.value;
});
- $scope.tei.orgUnitName = $scope.selectedOrgUnit.name;
+ $scope.tei.orgUnitName = $scope.selectedOrgUnit.displayName;
$scope.tei.created = DateUtils.formatFromApiToUser(new Date());
CurrentSelection.setRelationshipInfo({tei: $scope.tei});
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/teiadd/tei-add.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/teiadd/tei-add.html 2015-10-16 05:31:30 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/teiadd/tei-add.html 2016-02-15 09:46:27 +0000
@@ -6,7 +6,7 @@
<div class='col-md-12'>
<select ng-model="relationship.selected"
class="form-control"
- ng-options="rel as rel.name for rel in relationshipTypes | orderBy: 'name'"
+ ng-options="rel as rel.displayName for rel in relationshipTypes | orderBy: 'name'"
ng-disabled="relatedProgramRelationship">
<option value="">{{'please_select_a_relationship'| translate}}</option>
</select>
@@ -61,7 +61,7 @@
<table class="table table-striped table-compact table-borderless">
<tr ng-repeat="gridColumn in gridColumns">
<td>
- {{gridColumn.name}}
+ {{gridColumn.displayName}}
</td>
<td >
{{teiForRelationship[gridColumn.id]}}
@@ -77,7 +77,7 @@
<select ng-model="selectedProgramForRelative"
class="form-control"
ng-disabled="programs.length < 1 || (selectedProgramForRelative && selectedProgram.relatedProgram && relatedProgramRelationship) || selectedAttribute && selectedAttribute.trackedEntity"
- ng-options="program as program.name for program in programs | orderBy: 'name'"
+ ng-options="program as program.displayName for program in programs | orderBy: 'name'"
ng-change="setAttributesForSearch(selectedProgramForRelative)">
<option value="">{{'please_select_a_program'| translate}}</option>
</select>
=== 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 2016-02-12 10:43:51 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js 2016-02-15 09:46:27 +0000
@@ -189,7 +189,7 @@
getCode: function(options, key){
if(options){
for(var i=0; i<options.length; i++){
- if( key === options[i].name){
+ if( key === options[i].displayName){
return options[i].code;
}
}
@@ -200,7 +200,7 @@
if(options){
for(var i=0; i<options.length; i++){
if( key === options[i].code){
- return options[i].name;
+ return options[i].displayName;
}
}
}
@@ -366,7 +366,7 @@
}
});
- programs = orderByFilter(programs, '-name').reverse();
+ programs = orderByFilter(programs, '-displayName').reverse();
if(programs.length === 0){
selectedProgram = null;
@@ -488,7 +488,7 @@
return {
get: function(uid){
if( orgUnit !== uid ){
- orgUnitPromise = $http.get( '../api/organisationUnits.json?filter=id:eq:' + uid + '&fields=id,name,level,children[id,name,level,children[id,name,level]]&paging=false' ).then(function(response){
+ orgUnitPromise = $http.get( '../api/organisationUnits.json?filter=id:eq:' + uid + '&fields=id,displayName,level,children[id,displayName,level,children[id,displayName,level]]&paging=false' ).then(function(response){
orgUnit = response.data.id;
return response.data;
});
@@ -497,7 +497,7 @@
},
getSearchTreeRoot: function(){
if(!rootOrgUnitPromise){
- var url = '../api/me.json?fields=organisationUnits[id,name,level,children[id,name,level,children[id,name,level]]]&paging=false';
+ var url = '../api/me.json?fields=organisationUnits[id,displayName,level,children[id,displayName,level,children[id,displayName,level]]]&paging=false';
rootOrgUnitPromise = $http.get( url ).then(function(response){
return response.data;
});
@@ -540,7 +540,7 @@
for(var k in attributesById){
if( formTei[k] ){
var att = attributesById[k];
- tei.attributes.push({attribute: att.id, value: formTei[k], displayName: att.name, valueType: att.valueType});
+ tei.attributes.push({attribute: att.id, value: formTei[k], displayName: att.displayName, valueType: att.valueType});
formEmpty = false;
}
delete tei[k];
@@ -682,7 +682,7 @@
var tei = response.data;
angular.forEach(tei.attributes, function(att){
if(attributesById[att.attribute]){
- att.displayName = attributesById[att.attribute].name;
+ att.displayName = attributesById[att.attribute].displayName;
}
att.value = AttributesFactory.formatAttributeValue(att, attributesById, optionSets, 'USER');
});
@@ -908,12 +908,12 @@
teiAttributes[j].order = i;
teiAttributes[j].mandatory = requiredAttributes[i].mandatory ? requiredAttributes[i].mandatory : false;
teiAttributes[j].allowFutureDate = requiredAttributes[i].allowFutureDate ? requiredAttributes[i].allowFutureDate : false;
- teiAttributes[j].displayName = requiredAttributes[i].name;
+ teiAttributes[j].displayName = requiredAttributes[i].displayName;
}
}
if(!processed && fromEnrollment){//attribute was empty, so a chance to put some value
- teiAttributes.push({show: true, order: i, allowFutureDate: requiredAttributes[i].allowFutureDate ? requiredAttributes[i].allowFutureDate : false, mandatory: requiredAttributes[i].mandatory ? requiredAttributes[i].mandatory : false, attribute: requiredAttributes[i].id, displayName: requiredAttributes[i].name, type: requiredAttributes[i].valueType, value: ''});
+ teiAttributes.push({show: true, order: i, allowFutureDate: requiredAttributes[i].allowFutureDate ? requiredAttributes[i].allowFutureDate : false, mandatory: requiredAttributes[i].mandatory ? requiredAttributes[i].mandatory : false, attribute: requiredAttributes[i].id, displayName: requiredAttributes[i].displayName, type: requiredAttributes[i].valueType, value: ''});
}
}
@@ -1204,13 +1204,13 @@
if(pi.displayInForm){
var newAction = {
id:pi.id,
- content:pi.displayDescription ? pi.displayDescription : pi.name,
+ content:pi.displayDescription ? pi.displayDescription : pi.displayName,
data:pi.expression,
programRuleActionType:'DISPLAYKEYVALUEPAIR',
location:'indicators'
};
var newRule = {
- name:pi.name,
+ name:pi.displayName,
id: pi.id,
shortname:pi.shortname,
code:pi.code,
@@ -1281,12 +1281,12 @@
angular.forEach(variableObjectsCurrentExpression, function(variableCurrentRule) {
if(valueCountText) {
//This is not the first value in the value count part of the expression.
- valueCountText += ' + d2:count(\'' + variableCurrentRule.name + '\')';
+ valueCountText += ' + d2:count(\'' + variableCurrentRule.displayName + '\')';
}
else
{
//This is the first part value in the value count expression:
- valueCountText = '(d2:count(\'' + variableCurrentRule.name + '\')';
+ valueCountText = '(d2:count(\'' + variableCurrentRule.displayName + '\')';
}
});
//To finish the value count expression we need to close the paranthesis:
@@ -1301,12 +1301,12 @@
angular.forEach(variableObjectsCurrentExpression, function(variableCurrentRule) {
if(zeroPosValueCountText) {
//This is not the first value in the value count part of the expression.
- zeroPosValueCountText += '+ d2:countifzeropos(\'' + variableCurrentRule.name + '\')';
+ zeroPosValueCountText += '+ d2:countifzeropos(\'' + variableCurrentRule.displayName + '\')';
}
else
{
//This is the first part value in the value count expression:
- zeroPosValueCountText = '(d2:countifzeropos(\'' + variableCurrentRule.name + '\')';
+ zeroPosValueCountText = '(d2:countifzeropos(\'' + variableCurrentRule.displayName + '\')';
}
});
//To finish the value count expression we need to close the paranthesis:
@@ -1547,7 +1547,7 @@
//grid.headers[7..] = Attribute, Attribute,....
var attributes = [];
for(var i=6; i<grid.headers.length; i++){
- attributes.push({id: grid.headers[i].name, name: grid.headers[i].column, type: grid.headers[i].type});
+ attributes.push({id: grid.headers[i].name, displayName: grid.headers[i].column, type: grid.headers[i].type});
}
var entityList = {own: [], other: []};
@@ -1656,7 +1656,7 @@
var d = {};
angular.forEach(columns, function(col){
if(col.show){
- d[col.name] = row[col.id];
+ d[col.displayName] = row[col.id];
}
});
data.push(d);
@@ -1667,7 +1667,7 @@
var header = [];
angular.forEach(columns, function(col){
if(col.show){
- header.push($translate.instant(col.name));
+ header.push($translate.instant(col.displayName));
}
});
return header;
@@ -1742,8 +1742,8 @@
programStage: programStage.id,
program: program.id,
orgUnit: orgUnit.id,
- orgUnitName: orgUnit.name,
- name: programStage.name,
+ orgUnitName: orgUnit.displayName,
+ name: programStage.displayName,
excecutionDateLabel: programStage.excecutionDateLabel ? programStage.excecutionDateLabel : $translate.instant('report_date'),
enrollmentStatus: 'ACTIVE',
enrollment: enrollment.enrollment,
@@ -1752,7 +1752,7 @@
if(programStage.periodType){
var periods = getEventDuePeriod(eventsPerStage, programStage, enrollment);
dummyEvent.dueDate = periods[0].endDate;
- dummyEvent.periodName = periods[0].name;
+ dummyEvent.periodName = periods[0].displayName;
dummyEvent.eventDate = dummyEvent.dueDate;
dummyEvent.periods = periods;
}
=== 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 2016-02-08 08:53:25 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/tracker-capture.js 2016-02-15 09:46:27 +0000
@@ -168,7 +168,7 @@
var def = $.Deferred();
var promise = def.promise();
- promise = promise.then( dhis2.tracker.getTrackerObject(null, 'USER_ROLES', '../api/me.json', 'fields=id,name,userCredentials[userRoles[id,authorities]]', 'sessionStorage', dhis2.tc.store) );
+ promise = promise.then( dhis2.tracker.getTrackerObject(null, 'USER_ROLES', '../api/me.json', 'fields=id,displayName,userCredentials[userRoles[id,authorities]]', 'sessionStorage', dhis2.tc.store) );
promise = promise.done(function(){});
def.resolve();
}
@@ -188,7 +188,7 @@
if(res.length > 0){
return;
}
- return dhis2.tracker.getTrackerObjects('constants', 'constants', '../api/constants.json', 'paging=false&fields=id,name,displayName,value', 'idb', dhis2.tc.store);
+ return dhis2.tracker.getTrackerObjects('constants', 'constants', '../api/constants.json', 'paging=false&fields=id,displayName,value', 'idb', dhis2.tc.store);
});
}
@@ -198,7 +198,7 @@
if(res.length > 0){
return;
}
- return dhis2.tracker.getTrackerObjects('ouLevels', 'organisationUnitLevels', '../api/organisationUnitLevels.json', 'filter=level:gt:1&fields=id,name,level&paging=false', 'idb', dhis2.tc.store);
+ return dhis2.tracker.getTrackerObjects('ouLevels', 'organisationUnitLevels', '../api/organisationUnitLevels.json', 'filter=level:gt:1&fields=id,displayName,level&paging=false', 'idb', dhis2.tc.store);
});
}
@@ -208,7 +208,7 @@
if(res.length > 0){
return;
}
- return dhis2.tracker.getTrackerObjects('relationshipTypes', 'relationshipTypes', '../api/relationshipTypes.json', 'paging=false&fields=id,name,aIsToB,bIsToA,displayName', 'idb', dhis2.tc.store);
+ return dhis2.tracker.getTrackerObjects('relationshipTypes', 'relationshipTypes', '../api/relationshipTypes.json', 'paging=false&fields=id,displayName,aIsToB,bIsToA,displayName', 'idb', dhis2.tc.store);
});
}
@@ -218,7 +218,7 @@
if(res.length > 0){
return;
}
- return dhis2.tracker.getTrackerObjects('trackedEntities', 'trackedEntities', '../api/trackedEntities.json', 'paging=false&fields=id,name', 'idb', dhis2.tc.store);
+ return dhis2.tracker.getTrackerObjects('trackedEntities', 'trackedEntities', '../api/trackedEntities.json', 'paging=false&fields=id,displayName', 'idb', dhis2.tc.store);
});
}
@@ -287,20 +287,20 @@
return $.ajax( {
url: '../api/programs.json',
type: 'GET',
- data: 'fields=id,name,type,version,displayFrontPageList,dataEntryMethod,enrollmentDateLabel,incidentDateLabel,displayIncidentDate,ignoreOverdueEvents,selectEnrollmentDatesInFuture,selectIncidentDatesInFuture,onlyEnrollOnce,externalAccess,displayOnAllOrgunit,registration,categoryCombo[id,name,isDefault,categories[id,name,categoryOptions[id,name]]],dataEntryForm[id,name,style,htmlCode,format],relationshipText,relationshipFromA,relatedProgram[id,name],relationshipType[id,name],trackedEntity[id,name,description],userRoles[id,name],organisationUnits[id,name],userRoles[id,name],programStages[id,name,sortOrder,version,dataEntryForm[id,name,style,htmlCode,format],captureCoordinates,blockEntryForm,autoGenerateEvent,allowGenerateNextVisit,generatedByEnrollmentDate,remindCompleted,hideDueDate,excecutionDateLabel,minDaysFromStart,repeatable,openAfterEnrollment,standardInterval,periodType,reportDateToUse,programStageSections[id,name,programStageDataElements[dataElement[id]]],programStageDataElements[displayInReports,allowProvidedElsewhere,allowFutureDate,compulsory,dataElement[id,code,name,description,formName,valueType,optionSetValue,optionSet[id],dataElementGroups[id,name]]]],programTrackedEntityAttributes[displayInList,mandatory,allowFutureDate,trackedEntityAttribute[id,unique]]&paging=false&filter=id:in:' + ids
+ data: 'fields=id,displayName,type,version,displayFrontPageList,dataEntryMethod,enrollmentDateLabel,incidentDateLabel,displayIncidentDate,ignoreOverdueEvents,selectEnrollmentDatesInFuture,selectIncidentDatesInFuture,onlyEnrollOnce,externalAccess,displayOnAllOrgunit,registration,categoryCombo[id,displayName,isDefault,categories[id,displayName,categoryOptions[id,displayName]]],dataEntryForm[id,displayName,style,htmlCode,format],relationshipText,relationshipFromA,relatedProgram[id,displayName],relationshipType[id,displayName],trackedEntity[id,displayName,description],userRoles[id,displayName],organisationUnits[id,displayName],userRoles[id,displayName],programStages[id,displayName,sortOrder,version,dataEntryForm[id,displayName,style,htmlCode,format],captureCoordinates,blockEntryForm,autoGenerateEvent,allowGenerateNextVisit,generatedByEnrollmentDate,remindCompleted,hideDueDate,excecutionDateLabel,minDaysFromStart,repeatable,openAfterEnrollment,standardInterval,periodType,reportDateToUse,programStageSections[id,displayName,programStageDataElements[dataElement[id]]],programStageDataElements[displayInReports,allowProvidedElsewhere,allowFutureDate,compulsory,dataElement[id,code,displayName,description,formName,valueType,optionSetValue,optionSet[id],dataElementGroups[id,displayName]]]],programTrackedEntityAttributes[displayInList,mandatory,allowFutureDate,trackedEntityAttribute[id,unique]]&paging=false&filter=id:in:' + ids
}).done( function( response ){
if(response.programs){
_.each(_.values( response.programs), function(program){
var ou = {};
_.each(_.values( program.organisationUnits), function(o){
- ou[o.id] = o.name;
+ ou[o.id] = o.displayName;
});
program.organisationUnits = ou;
var ur = {};
_.each(_.values( program.userRoles), function(u){
- ur[u.id] = u.name;
+ ur[u.id] = u.displayName;
});
program.userRoles = ur;
@@ -437,7 +437,7 @@
var _attributesInPromise = attributesInPromise.toString();
_attributesInPromise = '[' + _attributesInPromise + ']';
- var filter = 'fields=id,name,code,version,description,valueType,optionSetValue,confidential,inherit,sortOrderInVisitSchedule,sortOrderInListNoProgram,displayOnVisitSchedule,displayInListNoProgram,unique,programScope,orgunitScope,confidential,optionSet[id,version],trackedEntity[id,name]';
+ var filter = 'fields=id,displayName,code,version,description,valueType,optionSetValue,confidential,inherit,sortOrderInVisitSchedule,sortOrderInListNoProgram,displayOnVisitSchedule,displayInListNoProgram,unique,programScope,orgunitScope,confidential,optionSet[id,version],trackedEntity[id,displayName]';
filter = filter + '&filter=id:in:' + _attributesInPromise + '&paging=false';
var url = '../api/trackedEntityAttributes';
@@ -496,7 +496,7 @@
var _optionSetsInPromise = optionSetsInPromise.toString();
_optionSetsInPromise = '[' + _optionSetsInPromise + ']';
- var filter = 'fields=id,name,version,options[id,name,code]';
+ var filter = 'fields=id,displayName,version,options[id,displayName,code]';
filter = filter + '&filter=id:in:' + _optionSetsInPromise + '&paging=false';
var url = '../api/optionSets';
@@ -522,7 +522,7 @@
function getProgramValidations( programValidations )
{
- return dhis2.tracker.checkAndGetTrackerObjects( programValidations, 'programValidations', '../api/programValidations', 'fields=id,name,displayName,operator,rightSide[expression,description],leftSide[expression,description],program[id]', dhis2.tc.store);
+ return dhis2.tracker.checkAndGetTrackerObjects( programValidations, 'programValidations', '../api/programValidations', 'fields=id,displayName,displayName,operator,rightSide[expression,description],leftSide[expression,description],program[id]', dhis2.tc.store);
}
function getMetaProgramIndicators( programs )
@@ -532,7 +532,7 @@
function getProgramIndicators( programIndicators )
{
- return dhis2.tracker.checkAndGetTrackerObjects( programIndicators, 'programIndicators', '../api/programIndicators', 'fields=id,name,code,shortName,displayInForm,expression,displayDescription,rootDate,description,valueType,DisplayName,filter,program[id]', dhis2.tc.store);
+ return dhis2.tracker.checkAndGetTrackerObjects( programIndicators, 'programIndicators', '../api/programIndicators', 'fields=id,displayName,code,shortName,displayInForm,expression,displayDescription,rootDate,description,valueType,DisplayName,filter,program[id]', dhis2.tc.store);
}
function getMetaProgramRules( programs )
@@ -542,7 +542,7 @@
function getProgramRules( programRules )
{
- return dhis2.tracker.checkAndGetTrackerObjects( programRules, 'programRules', '../api/programRules', 'fields=id,name,condition,description,program[id],programStage[id],priority,programRuleActions[id,content,location,data,programRuleActionType,programStageSection[id],dataElement[id],trackedEntityAttribute[id],programIndicator[id],programStage[id]]', dhis2.tc.store);
+ return dhis2.tracker.checkAndGetTrackerObjects( programRules, 'programRules', '../api/programRules', 'fields=id,displayName,condition,description,program[id],programStage[id],priority,programRuleActions[id,content,location,data,programRuleActionType,programStageSection[id],dataElement[id],trackedEntityAttribute[id],programIndicator[id],programStage[id]]', dhis2.tc.store);
}
function getMetaProgramRuleVariables( programs )
@@ -552,5 +552,5 @@
function getProgramRuleVariables( programRuleVariables )
{
- return dhis2.tracker.checkAndGetTrackerObjects( programRuleVariables, 'programRuleVariables', '../api/programRuleVariables', 'fields=id,name,displayName,programRuleVariableSourceType,program[id],programStage[id],dataElement[id],trackedEntityAttribute[id]', dhis2.tc.store);
+ return dhis2.tracker.checkAndGetTrackerObjects( programRuleVariables, 'programRuleVariables', '../api/programRuleVariables', 'fields=id,displayName,programRuleVariableSourceType,program[id],programStage[id],dataElement[id],trackedEntityAttribute[id]', dhis2.tc.store);
}
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css 2016-02-09 15:59:55 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css 2016-02-15 09:46:27 +0000
@@ -1412,8 +1412,6 @@
padding-right: 4px;
}
-
-
.badge.event-table-options-badge {
padding-top: 0.5;
padding-bottom: 0.5;
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/advanced-search.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/advanced-search.html 2016-01-05 19:15:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/advanced-search.html 2016-02-15 09:46:27 +0000
@@ -37,12 +37,12 @@
</tr>
<tr ng-repeat="attribute in attributes | nonConfidential">
<td>
- {{attribute.name}}
+ {{attribute.displayName}}
</td>
<td>
<div ng-if="attribute.optionSetValue">
<select multiple ui-select2 ng-model="attribute.value" data-placeholder="{{'please_select'| translate}}" style="width:100%;">
- <option ng-repeat="option in optionSets[attribute.optionSet.id].options | filter:$viewValue | limitTo:maxOptionSize" value="{{option.code}}">{{option.name}}</option>
+ <option ng-repeat="option in optionSets[attribute.optionSet.id].options | filter:$viewValue | limitTo:maxOptionSize" value="{{option.code}}">{{option.displayName}}</option>
</select>
</div>
<div ng-if="!attribute.optionSetValue" ng-switch="attribute.valueType">
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/column-modal.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/column-modal.html 2015-08-09 22:28:42 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/column-modal.html 2016-02-15 09:46:27 +0000
@@ -5,7 +5,7 @@
<table class="listTable dhis2-table-striped-border">
<tr ng-repeat="gridColumn in gridColumns">
<td ng-click="gridColumn.show = !gridColumn.show">
- {{gridColumn.name}}
+ {{gridColumn.displayName}}
</td>
<td>
<input type="checkbox" ng-model="gridColumn.show" ng-change="showHideColumns(gridColumn)">
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html 2016-02-11 13:47:50 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html 2016-02-15 09:46:27 +0000
@@ -40,7 +40,7 @@
<div class="page" id="mainPage">
<!--- selected org unit begins -->
- <input type="text" selected-org-unit ng-model="selectedOrgUnit.name" ng-hide=true>
+ <input type="text" selected-org-unit ng-model="selectedOrgUnit.displayName" ng-hide=true>
<!--- selected org unit ends -->
<div ng-if="treeLoaded && !selectedOrgUnit">
@@ -67,9 +67,9 @@
theme="select2"
on-select="getProgramAttributes(model.selectedProgram)"
style="width:100%;">
- <ui-select-match allow-clear="true" class="form-control-ui-select" placeholder="{{'select_or_search' | translate}}">{{$select.selected.name || $select.selected}}</ui-select-match>
+ <ui-select-match allow-clear="true" class="form-control-ui-select" placeholder="{{'select_or_search' | translate}}">{{$select.selected.displayName || $select.selected}}</ui-select-match>
<ui-select-choices repeat="program in programs | filter: $select.search | limitTo:maxOptionSize">
- <span ng-bind-html="program.name | highlight: $select.search"></span>
+ <span ng-bind-html="program.displayName | highlight: $select.search"></span>
</ui-select-choices>
</ui-select>
</div>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/search-ou-tree.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/search-ou-tree.html 2015-09-15 13:51:19 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/search-ou-tree.html 2016-02-15 09:46:27 +0000
@@ -8,13 +8,13 @@
<script type="text/ng-template" id="orgUnitTree.html">
<span class="org-unit-tree-button" ng-click="expandCollapse(orgUnit)" ng-show="orgUnit.show && orgUnit.children.length > 0"><i class="fa fa-minus-square-o"></i></span>
<span class="org-unit-tree-button" ng-click="expandCollapse(orgUnit)" ng-show="(!orgUnit.show && orgUnit.children.length > 0) || (!orgUnit.show && orgUnit.hasChildren)"><i class="fa fa-plus-square-o"></i></span>
- <span class="org-unit-tree-button" ng-click="setSelectedSearchingOrgUnit(orgUnit)" ng-class="{'selected-org-unit' : orgUnit.id === selectedSearchingOrgUnit.id}">{{orgUnit.name}}</span>
+ <span class="org-unit-tree-button" ng-click="setSelectedSearchingOrgUnit(orgUnit)" ng-class="{'selected-org-unit' : orgUnit.id === selectedSearchingOrgUnit.id}">{{orgUnit.displayName}}</span>
<ul class="tree" id="tree" ng-show="orgUnit.show">
- <li ng-repeat="orgUnit in orgUnit.children | orderBy:'name'" ng-include="'orgUnitTree.html'"></li>
+ <li ng-repeat="orgUnit in orgUnit.children | orderBy:'displayName'" ng-include="'orgUnitTree.html'"></li>
</ul>
</script>
<ul class="tree" id="tree">
- <li ng-repeat="orgUnit in orgUnits | orderBy:'name'" ng-include="'orgUnitTree.html'"></li>
+ <li ng-repeat="orgUnit in orgUnits | orderBy:'displayName'" ng-include="'orgUnitTree.html'"></li>
</ul>
</div>
</accordion-group>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/tei.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/tei.html 2016-01-07 10:54:44 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/tei.html 2016-02-15 09:46:27 +0000
@@ -1,11 +1,11 @@
<div class="row vertical-spacing">
<div id="selectDropDownParent" class="input-group col-md-3" ng-if="enrollmentStatus==='TODAY' && selectedProgram">
- <button type="button" class="select-dropdown-button form-control">{{selectedEventsTodayFilter.name}}</button>
+ <button type="button" class="select-dropdown-button form-control">{{selectedEventsTodayFilter.displayName}}</button>
<div class="input-group-btn todayfilter-drop-down">
<button class="btn btn-default select-dropdown-caret" type="button" data-toggle="dropdown" title="Test"><i class="fa fa-caret-down"></i></button>
<ul id="selectDropDown" class="dropdown-menu dropdown-menu-right">
<li ng-repeat="filter in eventsTodayFilters | orderBy: 'name'">
- <a href ng-click="fetchTeisEventsToday(filter)">{{filter.name}}</a>
+ <a href ng-click="fetchTeisEventsToday(filter)">{{filter.displayName}}</a>
</li>
</ul>
</div>
@@ -14,7 +14,7 @@
<i ng-if="!teiFetched && showTrackedEntityDiv && enrollmentStatus==='TODAY'" class="fa fa-spinner fa-spin fa-2x"></i>
<div ng-if="teiFetched">
<div class="alert alert-warning vertical-spacing" ng-if="trackedEntityList.length === 0 || !trackedEntityList.length">
- {{'no'| translate}} {{selectedProgram.trackedEntity.name|| 'records' | translate}} {{'found'| translate}}
+ {{'no'| translate}} {{selectedProgram.trackedEntity.displayName|| 'records' | translate}} {{'found'| translate}}
</div>
<div class="vertical-spacing" ng-if="trackedEntityList.length > 0">
@@ -25,7 +25,7 @@
<!-- sort icon begins -->
<span ng-hide="gridColumn.showFilter" class="bold pointer" title="{{'sort'| translate}}">
<span ng-class="{true: 'red'} [sortColumn.id === gridColumn.id]"><i class="fa fa-sort"></i></span>
- {{gridColumn.name}}
+ {{gridColumn.displayName}}
</span>
<!-- sort icon ends -->
</th>
