B ({{selectedRelationshipType.bIsToA}})
-
+
+
+
+
+ | + {{gridColumn.name}} + | ++ {{teiForRelationship[gridColumn.id]}} + | +
-
-
-
+
=== added file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/relationship/registration.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/relationship/registration.html 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/relationship/registration.html 2014-07-04 10:10:13 +0000
@@ -0,0 +1,102 @@
+
+
-
-
-
-
+
+
-
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{'search_input_required'| translate}}
+
+
+
+
+
+
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship-controller.js'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship-controller.js 2014-07-03 11:30:22 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship-controller.js 2014-07-04 10:10:13 +0000
@@ -7,19 +7,20 @@
TranslationService.translate();
- $scope.relationshipTypes = [];
+ $scope.relationshipTypes = [];
RelationshipFactory.getAll().then(function(rels){
$scope.relationshipTypes = rels;
});
+
//listen for the selected entity
$scope.$on('dashboard', function(event, args) {
- var selections = CurrentSelection.get();
- $scope.selectedTei = angular.copy(selections.tei);
- $scope.trackedEntity = selections.te;
- $scope.selectedProgram = selections.pr;
- $scope.selectedEnrollment = selections.enrollment;
+ $scope.selections = CurrentSelection.get();
+ $scope.selectedTei = angular.copy($scope.selections.tei);
+ $scope.trackedEntity = $scope.selections.te;
+ $scope.selectedProgram = $scope.selections.pr;
+ $scope.selectedEnrollment = $scope.selections.enrollment;
});
@@ -32,6 +33,9 @@
relationshipTypes: function () {
return $scope.relationshipTypes;
},
+ selections: function () {
+ return $scope.selections;
+ },
selectedTei: function(){
return $scope.selectedTei;
}
@@ -41,24 +45,237 @@
modalInstance.result.then(function (relationships) {
$scope.selectedTei.relationships = relationships;
});
- };
+ };
+
})
//Controller for adding new relationship
.controller('AddRelationshipController',
function($scope,
+ OperatorFactory,
+ AttributesFactory,
+ EntityQueryFactory,
+ TEIService,
+ TEIGridService,
+ Paginator,
+ storage,
$modalInstance,
relationshipTypes,
+ selections,
selectedTei){
$scope.relationshipTypes = relationshipTypes;
$scope.selectedTei = selectedTei;
$scope.relationshipSources = ['search_from_existing','register_new'];
+ //Selection
+ $scope.selectedOrgUnit = storage.get('SELECTED_OU');
+ $scope.selectedProgram = selections.pr;
+ $scope.selectedTei = selections.tei;
+
+
+ $scope.ouModes = [{name: 'SELECTED'},
+ {name: 'CHILDREN'},
+ {name: 'DESCENDANTS'},
+ {name: 'ACCESSIBLE'}
+ ];
+ $scope.selectedOuMode = $scope.ouModes[0];
+
+ //Paging
+ $scope.pager = {pageSize: 50, page: 1, toolBarDisplay: 5};
+
+ //EntityList
+ $scope.showTrackedEntityDiv = false;
+
+ //Searching
+ $scope.showSearchDiv = false;
+ $scope.searchText = {value: null};
+ $scope.emptySearchText = false;
+ $scope.searchFilterExists = false;
+ $scope.defaultOperators = OperatorFactory.defaultOperators;
+ $scope.boolOperators = OperatorFactory.boolOperators;
+
+ $scope.trackedEntityList = null;
+ $scope.enrollment = {programStartDate: '', programEndDate: '', operator: $scope.defaultOperators[0]};
+
+ $scope.searchMode = {
+ listAll: 'LIST_ALL',
+ freeText: 'FREE_TEXT',
+ attributeBased: 'ATTRIBUTE_BASED'
+ };
+
+ if($scope.selectedProgram){
+ AttributesFactory.getByProgram($scope.selectedProgram).then(function(atts){
+ $scope.attributes = atts;
+ $scope.attributes = $scope.generateAttributeFilters($scope.attributes);
+ $scope.gridColumns = $scope.generateGridColumns($scope.attributes);
+ });
+ }
+ else{
+ AttributesFactory.getWithoutProgram().then(function(atts){
+ $scope.attributes = atts;
+ $scope.attributes = $scope.generateAttributeFilters($scope.attributes);
+ $scope.gridColumns = $scope.generateGridColumns($scope.attributes);
+ });
+ }
+
+ $scope.search = function(mode){
+
+ $scope.teiForRelationship = null;
+ $scope.teiFetched = false;
+ $scope.emptySearchText = false;
+ $scope.emptySearchAttribute = false;
+ $scope.showSearchDiv = false;
+ $scope.showRegistrationDiv = false;
+ $scope.showTrackedEntityDiv = false;
+ $scope.trackedEntityList = null;
+ $scope.teiCount = null;
+
+ $scope.queryUrl = null;
+ $scope.programUrl = null;
+ $scope.attributeUrl = {url: null, hasValue: false};
+
+ $scope.selectedSearchMode = mode;
+ $scope.attributes = $scope.generateAttributeFilters($scope.attributes);
+ $scope.gridColumns = $scope.generateGridColumns($scope.attributes);
+
+ if($scope.selectedProgram){
+ $scope.programUrl = 'program=' + $scope.selectedProgram.id;
+ }
+
+ //check search mode
+ if( $scope.selectedSearchMode === $scope.searchMode.freeText ){
+
+ if(!$scope.searchText.value){
+ $scope.emptySearchText = true;
+ $scope.teiFetched = false;
+ $scope.teiCount = null;
+ return;
+ }
+
+ $scope.queryUrl = 'query=' + $scope.searchText.value;
+ }
+
+ if( $scope.selectedSearchMode === $scope.searchMode.attributeBased ){
+ $scope.searchText.value = null;
+ $scope.attributeUrl = EntityQueryFactory.getAttributesQuery($scope.attributes, $scope.enrollment);
+
+ if(!$scope.attributeUrl.hasValue && !$scope.selectedProgram){
+ $scope.emptySearchAttribute = true;
+ $scope.teiFetched = false;
+ $scope.teiCount = null;
+ return;
+ }
+ }
+
+ $scope.doSearch();
+ };
+
+ $scope.doSearch = function(){
+
+ //get events for the specified parameters
+ TEIService.search($scope.selectedOrgUnit.id,
+ $scope.selectedOuMode.name,
+ $scope.queryUrl,
+ $scope.programUrl,
+ $scope.attributeUrl.url,
+ $scope.pager).then(function(data){
+ //$scope.trackedEntityList = data;
+ if(data.rows){
+ $scope.teiCount = data.rows.length;
+ }
+
+ if( data.metaData.pager ){
+ $scope.pager = data.metaData.pager;
+ $scope.pager.toolBarDisplay = 5;
+
+ Paginator.setPage($scope.pager.page);
+ Paginator.setPageCount($scope.pager.pageCount);
+ Paginator.setPageSize($scope.pager.pageSize);
+ Paginator.setItemCount($scope.pager.total);
+ }
+
+ //process tei grid
+ $scope.trackedEntityList = TEIGridService.format(data);
+ $scope.showTrackedEntityDiv = true;
+ $scope.teiFetched = true;
+ });
+ };
+
+ $scope.jumpToPage = function(){
+ $scope.search($scope.selectedSearchMode);
+ };
+
+ $scope.resetPageSize = function(){
+ $scope.pager.page = 1;
+ $scope.search($scope.selectedSearchMode);
+ };
+
+ $scope.getPage = function(page){
+ $scope.pager.page = page;
+ $scope.search($scope.selectedSearchMode);
+ };
+
+ $scope.generateAttributeFilters = function(attributes){
+
+ angular.forEach(attributes, function(attribute){
+ if(attribute.valueType === 'number' || attribute.valueType === 'date'){
+ attribute.operator = $scope.defaultOperators[0];
+ }
+ });
+
+ return attributes;
+ };
+
+ //generate grid columns from teilist attributes
+ $scope.generateGridColumns = function(attributes){
+
+ var columns = attributes ? angular.copy(attributes) : [];
+
+ //also add extra columns which are not part of attributes (orgunit for example)
+ columns.push({id: 'orgUnitName', name: 'Organisation unit', type: 'string', displayInListNoProgram: false});
+ columns.push({id: 'created', name: 'Registration date', type: 'string', displayInListNoProgram: false});
+
+ //generate grid column for the selected program/attributes
+ angular.forEach(columns, function(column){
+ if(column.id === 'orgUnitName' && $scope.selectedOuMode.name !== 'SELECTED'){
+ column.show = true;
+ }
+
+ if(column.displayInListNoProgram){
+ column.show = true;
+ }
+
+ if(column.type === 'date'){
+ $scope.filterText[column.id]= {start: '', end: ''};
+ }
+ });
+ return columns;
+ };
+
+ $scope.showHideSearch = function(simpleSearch){
+ if(simpleSearch){
+ $scope.showSearchDiv = false;
+ }
+ else{
+ $scope.showSearchDiv = !$scope.showSearchDiv;
+ }
+ };
+
$scope.close = function () {
$modalInstance.close('');
};
+ $scope.closeRegistration = function(){
+ console.log('registration close');
+ $scope.selectedRelationshipSource = '';
+ };
+
+ $scope.assignRelationship = function(selectedTei){
+ $scope.teiForRelationship = selectedTei;
+ console.log('selected is: ', $scope.teiForRelationship);
+ };
+
$scope.add = function(){
console.log('I will add new relationship');
};
=== added file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/relationship/search.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/relationship/search.html 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/relationship/search.html 2014-07-04 10:10:13 +0000
@@ -0,0 +1,115 @@
+
+
\ No newline at end of file
=== added file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/relationship/tei.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/relationship/tei.html 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/relationship/tei.html 2014-07-04 10:10:13 +0000
@@ -0,0 +1,39 @@
+
+
+
+
+
+ | {{'org_unit'| translate}} | +
+ + + + + |
+
| {{'enrollment_date'| translate}} | +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
| + {{attribute.name}} + | +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+
\ No newline at end of file
=== 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-07-03 11:30:22 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/i18n/en.json 2014-07-04 10:10:13 +0000
@@ -26,11 +26,13 @@
"search": "Search",
"advanced_search": "Advanced search",
"search_for": "Search for",
+ "type_here_for_simple_search": "Type your criteria here for simple search",
"type_your_search_criteria_here": "Type your search criteria here",
"search_input_required": "Please specify a search criteria",
"registered_entities": "Registered entities",
"empty_entity_list": "There are no registered entities",
"empty": "Empty",
+ "form_is_empty_fill_at_least_one": "Form is empty, please fill at least one.",
"total_number_of_pages": "No. of pages",
"rows_per_page": "No. of rows per page",
"jump_to_page": "Jump to page",
@@ -83,10 +85,10 @@
"dataentry": "Data Entry",
"current_selections": "Current selections",
"org_unit": "Organisation unit",
- "selected": "Selected",
- "immediate_children": "Immediate children",
- "all_children": "All children",
- "all_accessible": "All accessible",
+ "SELECTED": "Selected",
+ "CHILDREN": "Immediate children",
+ "DESCENDANTS": "All children",
+ "ACCESSIBLE": "All accessible",
"data_element": "Data element",
"value": "Value",
"provided_elsewhere": "Provided elsewhere",
=== 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-07-03 11:30:22 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js 2014-07-04 10:10:13 +0000
@@ -21,13 +21,12 @@
//Selection
$scope.selectedOrgUnit = '';
$scope.selectedProgram = '';
- $scope.ouModes = [
- {name: 'SELECTED', id: 1},
- {name: 'CHILDREN', id: 2},
- {name: 'DESCENDANTS', id: 3},
- {name: 'ACCESSIBLE', id: 4}
- ];
- $scope.ouMode = $scope.ouModes[0];
+ $scope.ouModes = [{name: 'SELECTED'},
+ {name: 'CHILDREN'},
+ {name: 'DESCENDANTS'},
+ {name: 'ACCESSIBLE'}
+ ];
+ $scope.selectedOuMode = $scope.ouModes[0];
//Paging
$scope.pager = {pageSize: 50, page: 1, toolBarDisplay: 5};
@@ -179,7 +178,7 @@
if( $scope.selectedSearchMode === $scope.searchMode.attributeBased ){
- $scope.attributeUrl = EntityQueryFactory.getQueryForAttributes($scope.attributes, $scope.enrollment);
+ $scope.attributeUrl = EntityQueryFactory.getAttributesQuery($scope.attributes, $scope.enrollment);
if(!$scope.attributeUrl.hasValue && !$scope.selectedProgram){
$scope.emptySearchAttribute = true;
@@ -196,7 +195,7 @@
//get events for the specified parameters
TEIService.search($scope.selectedOrgUnit.id,
- $scope.ouMode.name,
+ $scope.selectedOuMode.name,
$scope.queryUrl,
$scope.programUrl,
$scope.attributeUrl.url,
@@ -258,7 +257,7 @@
//generate grid column for the selected program/attributes
angular.forEach(columns, function(column){
- if(column.id === 'orgUnitName' && $scope.ouMode.name !== 'SELECTED'){
+ if(column.id === 'orgUnitName' && $scope.selectedOuMode.name !== 'SELECTED'){
column.show = true;
}
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/tracker-capture.js'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/tracker-capture.js 2014-07-03 11:30:22 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/tracker-capture.js 2014-07-04 10:10:13 +0000
@@ -138,7 +138,7 @@
$("#searchDropDown").width(searchParentWidth);
$('#searchDropDown').on('click', "[data-stop-propagation]", function(e) {
e.stopPropagation();
- });
+ });
});
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/home.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/home.html 2014-07-03 11:30:22 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/home.html 2014-07-04 10:10:13 +0000
@@ -55,7 +55,7 @@
+
+
+ {{'no'| translate}} {{selectedProgram.trackedEntity.name|| 'records' | translate}} {{'found'| translate}}
+
+
+
+
+ {{'no'| translate}} {{selectedProgram.trackedEntity.name|| 'records' | translate}} {{'found'| translate}}
+
+
+
+
+
+
+
+
+
+
+
+ | + {{gridColumn.name}} + | +
|---|
| + {{trackedEntity[gridColumn.id]}} + | +
-
+
@@ -92,7 +92,7 @@
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/search.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/search.html 2014-07-03 12:40:31 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/search.html 2014-07-04 10:10:13 +0000
@@ -3,11 +3,11 @@
-
+
| {{'org_unit'| translate}} | -
- - - - + |
+ + + + |