dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #36141
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 18504: tracker-capture: removed old code; tracker|event-capture: display total number of TEIs/Events ont...
------------------------------------------------------------
revno: 18504
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-03-06 11:08:41 +0100
message:
tracker-capture: removed old code; tracker|event-capture: display total number of TEIs/Events ontop of grid
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/i18n_app.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/styles/style.css
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/eventList.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties
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/styles/print.css
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/screen.css
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.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-event-capture/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/i18n_app.properties 2015-01-27 14:40:27 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/i18n_app.properties 2015-03-06 10:08:41 +0000
@@ -61,6 +61,7 @@
value=Value
form_id=Form id
register_event=Register event
+total=Total
total_number_of_pages=No. of pages
rows_per_page=No. of rows per page
jump_to_page=Jump to page
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/styles/style.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/styles/style.css 2015-03-05 15:57:02 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/styles/style.css 2015-03-06 10:08:41 +0000
@@ -934,6 +934,10 @@
cursor:pointer;
}
+.small-horizonal-spacing{
+ margin-left: 5px;
+}
+
@media print {
#header, #leftBar, .not-printable {
display: none;
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/eventList.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/eventList.html 2015-01-14 10:02:36 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/eventList.html 2015-03-06 10:08:41 +0000
@@ -13,7 +13,7 @@
</div>
<div ng-switch-default>
<h4>
- {{'registered_events'| translate}}
+ {{'registered_events'| translate}}<span class="small-horizonal-spacing" ng-if="pager.total">({{'total' | translate}}: {{pager.total}})</span>
<button class="button button-std pull-right not-printable"
ng-show="dhis2Events.length"
ng-disabled="eventRegistration || editingEventInFull || editingEventInGrid"
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties 2015-03-05 15:48:50 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties 2015-03-06 10:08:41 +0000
@@ -42,6 +42,7 @@
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=Total
total_number_of_pages=No. of pages
rows_per_page=No. of rows per page
jump_to_page=Jump to page
=== 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 2015-02-19 15:49:49 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js 2015-03-06 10:08:41 +0000
@@ -49,9 +49,6 @@
//Registration
$scope.showRegistrationDiv = false;
- //Reporting
- $scope.showReportDiv = false;
-
//watch for selection of org unit from tree
$scope.$watch('selectedOrgUnit', function() {
@@ -146,12 +143,11 @@
$location.path('/').search({});
}
- $scope.trackedEntityList = null;
-
+ $scope.trackedEntityList = null;
$scope.processAttributes();
- if($scope.showRegistrationDiv || $scope.showReportDiv){
+ if($scope.showRegistrationDiv){
$scope.doSearch = false;
}
@@ -175,7 +171,6 @@
$scope.emptySearchText = false;
$scope.emptySearchAttribute = false;
$scope.showRegistrationDiv = false;
- $scope.showReportDiv = false;
$scope.showTrackedEntityDiv = false;
$scope.trackedEntityList = null;
$scope.teiCount = null;
@@ -306,20 +301,7 @@
$scope.doSearch = true;
$scope.getProgramAttributes($scope.selectedProgram);
}
- };
-
- $scope.showReport = function(){
- $scope.showReportDiv = !$scope.showReportDiv;
- $scope.showTrackedEntityDiv = false;
- $scope.showSearchDiv = false;
- $scope.searchState = false;
-
- if(!$scope.showReportDiv){
- $scope.searchState = true;
- $scope.doSearch = true;
- $scope.getProgramAttributes($scope.selectedProgram);
- }
- };
+ };
$scope.showHideColumns = function(){
$scope.hiddenGridColumns = 0;
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/print.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/print.css 2014-10-13 16:02:01 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/print.css 2015-03-06 10:08:41 +0000
@@ -1,13 +1,3 @@
-/*
-To change this license header, choose License Headers in Project Properties.
-To change this template file, choose Tools | Templates
-and open the template in the editor.
-*/
-/*
- Created on : Oct 13, 2014, 5:16:38 PM
- Author : abyot
-*/
-
#header, #leftBar, .not-printable {
display: none;
}
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/screen.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/screen.css 2014-10-13 16:02:01 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/screen.css 2015-03-06 10:08:41 +0000
@@ -1,13 +1,3 @@
-/*
-To change this license header, choose License Headers in Project Properties.
-To change this template file, choose Tools | Templates
-and open the template in the editor.
-*/
-/*
- Created on : Aug 18, 2014, 11:31:40 AM
- Author : abyot
-*/
-
html, body {
height:100%;
margin: 0;
=== 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 2015-02-11 14:01:07 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html 2015-03-06 10:08:41 +0000
@@ -61,13 +61,10 @@
<div class="row top-bar">
<div class="col-sm-12">
<span ng-if='searchState'>
- {{selectedProgram.trackedEntity.name}} {{'search'| translate}}
+ {{selectedProgram.trackedEntity.name}} {{'search'| translate}}<span class="small-horizonal-spacing" ng-if="pager.total">({{'total' | translate}}: {{pager.total}})</span>
</span>
<span ng-if='showRegistrationDiv'>
{{selectedProgram.trackedEntity.name}} {{'register'| translate}}
- </span>
- <span ng-if='showReportDiv'>
- {{selectedProgram.name}} {{'report'| translate}}
</span>
<div class="pull-right not-printable">
<div class="btn-group" dropdown is-open="status.isopen">
@@ -118,10 +115,10 @@
<!-- simple/advanced search begins -->
<div id="searchDropDownParent" class="input-group col-md-4 not-printable">
- <input type="text" placeholder="{{'type_your_search_criteria_here'| translate}}" ng-model="searchText" class="form-control expanded" d2-enter="search(searchMode.freeText)" ng-class="{true: 'invalid-input'} [!searchText && emptySearchText]" ng-focus="showHideSearch()" ng-disabled="showRegistrationDiv || showReportDiv">
+ <input type="text" placeholder="{{'type_your_search_criteria_here'| translate}}" ng-model="searchText" class="form-control expanded" d2-enter="search(searchMode.freeText)" ng-class="{true: 'invalid-input'} [!searchText && emptySearchText]" ng-focus="showHideSearch()" ng-disabled="showRegistrationDiv">
<div class="input-group-btn">
- <button class="btn btn-default search-dropdown-button trim" type="button" title="{{'advanced_search'| translate}}" data-toggle="dropdown" ng-click="showHideSearch()" ng-disabled="showRegistrationDiv || showReportDiv"><i class="fa fa-caret-down"></i></button>
- <button class="btn btn-primary trim" type="button" title="{{'search'| translate}}" ng-disabled="showRegistrationDiv || showReportDiv" ng-click="search(searchMode.freeText)"><i class="fa fa-search"></i></button>
+ <button class="btn btn-default search-dropdown-button trim" type="button" title="{{'advanced_search'| translate}}" data-toggle="dropdown" ng-click="showHideSearch()" ng-disabled="showRegistrationDiv"><i class="fa fa-caret-down"></i></button>
+ <button class="btn btn-primary trim" type="button" title="{{'search'| translate}}" ng-disabled="showRegistrationDiv" ng-click="search(searchMode.freeText)"><i class="fa fa-search"></i></button>
<div id="searchDropDown" class="dropdown-menu dropdown-menu-right">
<form name="searchForm">
<div ng-include="'views/advanced-search.html'"></div>
@@ -135,13 +132,12 @@
<div class="col-md-4 trim not-printable">
<button type="button"
class="btn btn-success"
- ng-disabled="showRegistrationDiv || showReportDiv"
+ ng-disabled="showRegistrationDiv"
ng-click="search(searchMode.listAll)">
{{'list_all'| translate}}
</button>
<button type="button"
class="btn btn-primary"
- ng-disabled="showReportDiv"
ng-click="showRegistration()">
{{'register'| translate}}
</button>
@@ -171,15 +167,7 @@
<div ng-include="'components/registration/registration.html'"></div>
</div>
</div>
- <!-- registration form ends -->
-
- <!--report div begins -->
- <div class="row" ng-if="showReportDiv">
- <div class="col-md-8">
- <div ng-include="'components/report/report.html'"></div>
- </div>
- </div>
- <!-- report div ends -->
+ <!-- registration form ends -->
<!-- entity grid begins -->
<img src="../images/ajax-loader-bar.gif" alt="{{'in_progress' | translate}}" ng-if="!teiFetched && searchText && !emptySearchTex"/>
