dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #40882
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 20825: tracker-capture: left-bar show/hide menu for report pages
------------------------------------------------------------
revno: 20825
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-10-21 14:04:23 +0200
message:
tracker-capture: left-bar show/hide menu for report pages
modified:
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-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/upcoming-events-controller.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events.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/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-05-18 17:05:23 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events-controller.js 2015-10-21 12:04:23 +0000
@@ -12,7 +12,7 @@
AttributesFactory,
ProgramFactory,
CurrentSelection,
- OptionSetService) {
+ MetaDataFactory) {
$scope.today = DateUtils.getToday();
$scope.selectedOuMode = 'SELECTED';
@@ -24,11 +24,10 @@
$scope.optionSets = CurrentSelection.getOptionSets();
if(!$scope.optionSets){
$scope.optionSets = [];
- OptionSetService.getAll().then(function(optionSets){
- angular.forEach(optionSets, function(optionSet){
+ MetaDataFactory.getAll('optionSets').then(function(optionSets){
+ angular.forEach(optionSets, function(optionSet){
$scope.optionSets[optionSet.id] = optionSet;
});
-
CurrentSelection.setOptionSets($scope.optionSets);
});
}
=== 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-09-15 16:03:55 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events.html 2015-10-21 12:04:23 +0000
@@ -1,15 +1,22 @@
-<div id="leftBar">
- <div class="left-bar-menu" ng-controller="LeftBarMenuController">
- <ul class="nav nav-pills nav-stacked">
- <li><a href ng-click="showHome()">{{'registration_and_data_entry'| translate}}</a></li>
- <li><a href ng-click="showReportTypes()">{{'reports'| translate}}</a></li>
- </ul>
- </div>
- <div id="orgUnitTree" style="margin-top:20px">
+<span id="showLeftBar">
+ <a href="javascript:dhis2.leftBar.showAnimated()" title="$i18n.getString('show_menu' )"><i class="fa fa-arrow-right leftBarIcon"></i></a>
+</span>
+
+<div id="leftBar">
+
+ <d2-left-bar></d2-left-bar>
+
+ <div id="orgUnitTree">
<ul>
</ul>
</div>
- <img id="ouwt_loader" src="../images/ajax-loader-bar.gif" alt="{{'loading_tree' | translate}}"/>
+
+ <img id="ouwt_loader" src="../images/ajax-loader-bar.gif" alt="{{'in_progress'| translate}}"/>
+
+ <div class="small-horizonal-spacing" ng-if="!treeLoaded">
+ {{'loading_tree'| translate}}
+ </div>
+
</div>
<div id="mainPage" class="page">
=== 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-03-06 16:52:13 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-statistics.html 2015-10-21 12:04:23 +0000
@@ -1,18 +1,22 @@
-<div id="leftBar">
- <div class="left-bar-menu" ng-controller="LeftBarMenuController">
- <ul class="nav nav-pills nav-stacked">
- <li><a href ng-click="showHome()">{{'registration_and_data_entry'| translate}}</a></li>
- <li><a href ng-click="showReportTypes()">{{'reports'| translate}}</a></li>
- </ul>
- </div>
- <div id="orgUnitTree" style="margin-top:20px">
+<span id="showLeftBar">
+ <a href="javascript:dhis2.leftBar.showAnimated()" title="$i18n.getString('show_menu' )"><i class="fa fa-arrow-right leftBarIcon"></i></a>
+</span>
+
+<div id="leftBar">
+
+ <d2-left-bar></d2-left-bar>
+
+ <div id="orgUnitTree">
<ul>
</ul>
</div>
- <img id="ouwt_loader" src="../images/ajax-loader-bar.gif" alt="{{'loading_tree' | translate}}"/>
- <!--- selected org unit begins -->
- <input type="text" selected-org-unit ng-model="selectedOrgUnit.name" ng-hide=true>
- <!--- selected org unit ends -->
+
+ <img id="ouwt_loader" src="../images/ajax-loader-bar.gif" alt="{{'in_progress'| translate}}"/>
+
+ <div class="small-horizonal-spacing" ng-if="!treeLoaded">
+ {{'loading_tree'| translate}}
+ </div>
+
</div>
<div id="mainPage" class="bordered-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 2015-05-18 17:05:23 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-summary-controller.js 2015-10-21 12:04:23 +0000
@@ -2,18 +2,15 @@
trackerCapture.controller('ProgramSummaryController',
function($scope,
- $modal,
DateUtils,
EventUtils,
- TEIService,
TEIGridService,
AttributesFactory,
ProgramFactory,
ProgramStageFactory,
CurrentSelection,
- OptionSetService,
- EventReportService,
- DHIS2EventFactory) {
+ MetaDataFactory,
+ EventReportService) {
$scope.today = DateUtils.getToday();
$scope.ouModes = [{name: 'SELECTED'}, {name: 'CHILDREN'}, {name: 'DESCENDANTS'}, {name: 'ACCESSIBLE'}];
@@ -23,11 +20,10 @@
$scope.optionSets = CurrentSelection.getOptionSets();
if(!$scope.optionSets){
$scope.optionSets = [];
- OptionSetService.getAll().then(function(optionSets){
- angular.forEach(optionSets, function(optionSet){
+ MetaDataFactory.getAll('optionSets').then(function(optionSets){
+ angular.forEach(optionSets, function(optionSet){
$scope.optionSets[optionSet.id] = optionSet;
});
-
CurrentSelection.setOptionSets($scope.optionSets);
});
}
=== 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-04-27 08:24:30 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events-controller.js 2015-10-21 12:04:23 +0000
@@ -3,7 +3,6 @@
$modal,
$location,
$translate,
- orderByFilter,
DateUtils,
Paginator,
EventReportService,
@@ -11,7 +10,7 @@
AttributesFactory,
ProgramFactory,
CurrentSelection,
- OptionSetService) {
+ MetaDataFactory) {
$scope.today = DateUtils.getToday();
$scope.selectedOuMode = 'SELECTED';
@@ -23,11 +22,10 @@
$scope.optionSets = CurrentSelection.getOptionSets();
if(!$scope.optionSets){
$scope.optionSets = [];
- OptionSetService.getAll().then(function(optionSets){
- angular.forEach(optionSets, function(optionSet){
+ MetaDataFactory.getAll('optionSets').then(function(optionSets){
+ angular.forEach(optionSets, function(optionSet){
$scope.optionSets[optionSet.id] = optionSet;
});
-
CurrentSelection.setOptionSets($scope.optionSets);
});
}
=== 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 2015-09-15 16:03:55 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events.html 2015-10-21 12:04:23 +0000
@@ -1,15 +1,22 @@
-<div id="leftBar">
- <div class="left-bar-menu" ng-controller="LeftBarMenuController">
- <ul class="nav nav-pills nav-stacked">
- <li><a href ng-click="showHome()">{{'registration_and_data_entry'| translate}}</a></li>
- <li><a href ng-click="showReportTypes()">{{'reports'| translate}}</a></li>
- </ul>
- </div>
- <div id="orgUnitTree" style="margin-top:20px">
+<span id="showLeftBar">
+ <a href="javascript:dhis2.leftBar.showAnimated()" title="$i18n.getString('show_menu' )"><i class="fa fa-arrow-right leftBarIcon"></i></a>
+</span>
+
+<div id="leftBar">
+
+ <d2-left-bar></d2-left-bar>
+
+ <div id="orgUnitTree">
<ul>
</ul>
</div>
- <img id="ouwt_loader" src="../images/ajax-loader-bar.gif" alt="{{'loading_tree' | translate}}"/>
+
+ <img id="ouwt_loader" src="../images/ajax-loader-bar.gif" alt="{{'in_progress'| translate}}"/>
+
+ <div class="small-horizonal-spacing" ng-if="!treeLoaded">
+ {{'loading_tree'| translate}}
+ </div>
+
</div>
<div id="mainPage" class="page">
