dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #42325
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 21640: Confidential - no comment
------------------------------------------------------------
revno: 21640
committer: Markus Bekken <markus.bekken@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2016-01-07 11:29:04 +0100
message:
Confidential - no comment
modified:
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/report/overdue-events-controller.js
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/upcoming-events-controller.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js 2015-12-10 22:51:07 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js 2016-01-07 10:29:04 +0000
@@ -114,7 +114,7 @@
$scope.getAttributes = function(_mode){
var mode = _mode ? _mode : 'ENROLLMENT';
AttributesFactory.getByProgram($scope.selectedProgram).then(function(atts){
- $scope.attributes = TEIGridService.generateGridColumns(atts, null).columns;
+ $scope.attributes = TEIGridService.generateGridColumns(atts, null,false).columns;
$scope.customFormExists = false;
if($scope.selectedProgram && $scope.selectedProgram.id && $scope.selectedProgram.dataEntryForm && $scope.selectedProgram.dataEntryForm.htmlCode){
$scope.customFormExists = true;
=== 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 2015-12-24 11:47:36 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration.html 2016-01-07 10:29:04 +0000
@@ -35,7 +35,7 @@
<div ng-include="'../dhis-web-commons/angular-forms/custom-form.html'"></div>
</div>
- <!-- custom registration form ends-->
+ <!-- custom registration form ends -->
<!-- default registration form begins -->
<div class="vertical-spacing" ng-if="!customFormExists">
=== 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 2015-12-02 20:59:00 +0000
+++ 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
@@ -153,7 +153,7 @@
});
AttributesFactory.getByProgram($scope.selectedProgram).then(function(atts){
- var grid = TEIGridService.generateGridColumns(atts, $scope.selectedOuMode);
+ var grid = TEIGridService.generateGridColumns(atts, $scope.selectedOuMode,true);
$scope.gridColumns = [];
$scope.gridColumns.push({name: $translate.instant('due_date'), id: 'dueDate', valueType: 'DATE', displayInListNoProgram: false, showFilter: false, show: true, eventCol: true});
$scope.gridColumns.push({name: $translate.instant('event_name'), id: 'eventName', valueType: 'TEXT', displayInListNoProgram: false, showFilter: false, show: true, eventCol: true});
=== 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 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-controller.js 2016-01-07 10:29:04 +0000
@@ -83,7 +83,7 @@
$scope.dataReady = false;
AttributesFactory.getByProgram($scope.selectedProgram).then(function(atts){
- var grid = TEIGridService.generateGridColumns(atts, $scope.selectedOuMode.name);
+ var grid = TEIGridService.generateGridColumns(atts, $scope.selectedOuMode.name,true);
$scope.gridColumns = grid.columns;
});
=== 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 2015-12-02 20:59:00 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events-controller.js 2016-01-07 10:29:04 +0000
@@ -152,7 +152,7 @@
AttributesFactory.getByProgram($scope.selectedProgram).then(function(atts){
- var grid = TEIGridService.generateGridColumns(atts, $scope.selectedOuMode);
+ var grid = TEIGridService.generateGridColumns(atts, $scope.selectedOuMode, true);
$scope.gridColumns = [];
$scope.gridColumns.push({name: $translate.instant('due_date'), id: 'dueDate', valueType: 'DATE', displayInListNoProgram: false, showFilter: false, show: true, eventCol: true});
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js 2016-01-06 09:00:50 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js 2016-01-07 10:29:04 +0000
@@ -233,7 +233,7 @@
//$scope.searchParam = {bools: []};
$scope.search = function(mode){
resetParams();
- var grid = TEIGridService.generateGridColumns($scope.attributes, $scope.selectedOuMode.name);
+ var grid = TEIGridService.generateGridColumns($scope.attributes, $scope.selectedOuMode.name, true);
$scope.gridColumns = grid.columns;
$scope.selectedSearchMode = mode;
=== 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-01-05 19:15:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js 2016-01-07 10:29:04 +0000
@@ -1663,7 +1663,7 @@
return {headers: attributes, rows: entityList, pager: grid.metaData.pager, length: len};
},
- generateGridColumns: function(attributes, ouMode){
+ generateGridColumns: function(attributes, ouMode, nonConfidential){
if( ouMode === null ){
ouMode = 'SELECTED';
@@ -1671,14 +1671,21 @@
var filterTypes = {}, filterText = {};
var columns = [];
- //Filter out attributes that is confidential, so they will not be part of any grid:
- var nonConfidentialAttributes = angular.copy($filter('nonConfidential')(attributes));
+ var returnAttributes = [];
+ if(nonConfidential) {
+ //Filter out attributes that is confidential, so they will not be part of any grid:
+ returnAttributes = angular.copy($filter('nonConfidential')(attributes));
+ }
+ else
+ {
+ returnAttributes = angular.copy(attributes);
+ }
//also add extra columns which are not part of attributes (orgunit for example)
columns.push({id: 'orgUnitName', name: $translate.instant('registering_unit'), valueType: 'TEXT', displayInListNoProgram: false, attribute: false});
columns.push({id: 'created', name: $translate.instant('registration_date'), valueType: 'DATE', displayInListNoProgram: false, attribute: false});
columns.push({id: 'inactive', name: $translate.instant('inactive'), valueType: 'BOOLEAN', displayInListNoProgram: false, attribute: false});
- columns = columns.concat(nonConfidentialAttributes ? nonConfidentialAttributes : []);
+ columns = columns.concat(returnAttributes ? returnAttributes : []);
//generate grid column for the selected program/attributes
angular.forEach(columns, function(column){
