=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/i18n/en.json'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/i18n/en.json 2014-05-15 17:16:31 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/i18n/en.json 2014-05-16 11:32:21 +0000
@@ -56,6 +56,8 @@
"data_element": "Data element",
"value": "Value",
"provided_elsewhere": "Provided elsewhere",
+ "show_hide_columns": "Show/Hide columns",
+ "select_columns_to_show": "Select columns to show",
"show_hide_widgets": "Show/Hide widgets",
"select_widgets_to_show": "Select widgets to show",
"close": "Close",
@@ -76,6 +78,7 @@
"save_and_continue": "Save and continue",
"go_back": "Go back",
"more": "More",
+ "advanced_search": "Advanced search",
"profile": "Profile",
"applications": "Apps",
"more_applications": "More apps",
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/index.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/index.html 2014-05-14 13:04:39 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/index.html 2014-05-16 11:32:21 +0000
@@ -73,7 +73,7 @@
-
+
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js 2014-05-15 17:16:31 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js 2014-05-16 11:32:21 +0000
@@ -8,6 +8,7 @@
function($rootScope,
$scope,
$location,
+ $modal,
Paginator,
TranslationService,
SelectedEntity,
@@ -111,8 +112,7 @@
$scope.emptySearchText = false;
$scope.emptySearchAttribute = false;
$scope.showSearchDiv = false;
- $scope.showRegistrationDiv = false;
- $scope.gridColumns = $scope.attributes;
+ $scope.showRegistrationDiv = false;
$scope.trackedEntityList = null;
var queryUrl = null,
@@ -123,15 +123,32 @@
programUrl = 'program=' + $scope.selectedProgram.id;
}
- //generate grid column for the selected program
+ $scope.gridColumns = $scope.attributes;
+ //also add extra columns - orgunit for example
+ $scope.gridColumns.push({id: 'orgUnitName', name: 'Organisation unit', type: 'string'});
+
+ //generate grid column for the selected program/attributes
angular.forEach($scope.gridColumns, function(gridColumn){
+
+ if(gridColumn.id === 'orgUnitName' && $scope.ouMode === 'SELECTED'){
+ gridColumn.show = false;
+ }
+ else{
+ gridColumn.show = true;
+ }
+
gridColumn.showFilter = false;
- gridColumn.hide = false;
+
if(gridColumn.type === 'date'){
$scope.filterText[gridColumn.id]= {start: '', end: ''};
}
});
+
+
+
+ console.log('the columns are: ', $scope.gridColumns);
+
if( mode === $scope.searchMode.freeText ){
if(!$scope.searchText){
$scope.emptySearchText = true;
@@ -151,7 +168,7 @@
return;
}
}
- else if( mode === $scope.searchMode.listAll ){
+ else if( mode === $scope.searchMode.listAll ){
$scope.showTrackedEntityDiv = true;
}
@@ -162,6 +179,8 @@
programUrl,
attributeUrl.url).then(function(data){
$scope.trackedEntityList = data;
+
+ console.log('the list is: ', $scope.trackedEntityList);
});
};
@@ -216,7 +235,36 @@
$scope.gridColumns[i].showFilter = false;
}
}
- };
+ };
+
+ $scope.showHideColumns = function(){
+
+ $scope.hiddenGridColumns = 0;
+
+ angular.forEach($scope.gColumns, function(gridColumn){
+ if(!gridColumn.show){
+ $scope.hiddenGridColumns++;
+ }
+ });
+
+ var modalInstance = $modal.open({
+ templateUrl: 'views/column-modal.html',
+ controller: 'ColumnDisplayController',
+ resolve: {
+ gridColumns: function () {
+ return $scope.gridColumns;
+ },
+ hiddenGridColumns: function(){
+ return $scope.hiddenGridColumns;
+ }
+ }
+ });
+
+ modalInstance.result.then(function (gridColumns) {
+ $scope.gridColumns = gridColumns;
+ }, function () {
+ });
+ };
$scope.showDashboard = function(currentEntity){
SelectedEntity.setSelectedEntity(currentEntity);
@@ -229,6 +277,31 @@
};
})
+//Controller for column show/hide
+.controller('ColumnDisplayController',
+ function($scope,
+ $modalInstance,
+ hiddenGridColumns,
+ gridColumns){
+
+ $scope.gridColumns = gridColumns;
+ $scope.hiddenGridColumns = hiddenGridColumns;
+
+ $scope.close = function () {
+ $modalInstance.close($scope.gridColumns);
+ };
+
+ $scope.showHideColumns = function(gridColumn){
+
+ if(gridColumn.show){
+ $scope.hiddenGridColumns--;
+ }
+ else{
+ $scope.hiddenGridColumns++;
+ }
+ };
+})
+
.controller('RegistrationController',
function($scope,
AttributesFactory,
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/services.js'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/services.js 2014-05-15 17:16:31 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/services.js 2014-05-16 11:32:21 +0000
@@ -152,7 +152,7 @@
})
/* Service for getting tracked entity instances */
-.factory('TrackedEntityInstanceService', function($http, $filter) {
+.factory('TrackedEntityInstanceService', function($http, $filter, EntityService) {
var promise;
return {
@@ -180,7 +180,7 @@
var url = '../api/trackedEntityInstances.json?ou=' + orgUnitUid + '&program=' + programUid;
promise = $http.get( url ).then(function(response){
- return entityFormatter(response.data);
+ return EntityService.formatter(response.data);
});
return promise;
},
@@ -189,7 +189,7 @@
var url = '../api/trackedEntityInstances.json?ou=' + orgUnitUid;
promise = $http.get( url ).then(function(response){
- return entityFormatter(response.data);
+ return EntityService.formatter(response.data);
});
return promise;
},
@@ -208,7 +208,7 @@
}
promise = $http.get( url ).then(function(response){
- return entityFormatter(response.data);
+ return EntityService.formatter(response.data);
});
return promise;
}
@@ -392,15 +392,7 @@
query.url = 'filter=' + attribute.id + ':LIKE:' + attribute.value;
}
}
- }
- /*else{
- if(query.url){
- query.url = query.url + '&filter=' + attribute.id;
- }
- else{
- query.url = 'filter=' + attribute.id;
- }
- }*/
+ }
});
return query;
};
@@ -623,10 +615,59 @@
}
};
+})
+
+.service('EntityService', function(OrgUnitService){
+
+ return {
+ formatter: function(grid){
+ if(!grid || !grid.rows){
+ return;
+ }
+
+ //grid.headers[0-4] = Instance, Created, Last updated, Org unit, Tracked entity
+ //grid.headers[5..] = Attribute, Attribute,....
+ var attributes = [];
+ for(var i=5; i