------------------------------------------------------------
revno: 16535
committer: Abyot Asalefew Gizaw <aby...@gmail.com>
branch nick: dhis2
timestamp: Wed 2014-08-27 12:38:27 +0200
message:
tracker capture - reports menu reorganization
added:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/reports.html
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/report.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/en.json
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/app.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/styles/style.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-tracker-capture/components/report/report.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/report.html 2014-08-26 16:39:26 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/report.html 2014-08-27 10:38:27 +0000
@@ -1,19 +1,13 @@
<script src="../dhis-web-commons/ouwt/ouwt.js"></script>
<script src="scripts/tracker-capture.js"></script>
-<div id="leftBar">
-
- <div class='col-sm-12'>
- <h2>
- {{'menu' | translate}}
- </h2>
- </div>
- <ul class="nav nav-pills nav-stacked" ng-controller="LeftBarMenuController">
- <li><a href class='menuTitle' ng-click="showHome()">{{'registration_and_data_entry' | translate}}</a></li>
- <li><a href class='menuTitle' ng-click="showSummaryReport()">{{'program_summary_report' | translate}}</a></li>
- <li><a href class='menuTitle' ng-click="showVisitSchedule()">{{'visit_schedule' | translate}}</a></li>
- <li><a href class='menuTitle' ng-click="showLostToFollowup()">{{'lost_to_followup' | translate}}</a></li>
- </ul>
+<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">
<ul>
</ul>
@@ -25,15 +19,16 @@
</div>
<div id="mainPage" class="bordered-div">
+ <h2>{{'program_summary_report' | translate}}</h2>
<form name="outerForm" novalidate>
<div class="row">
- <div class="col-sm-12 col-md-8">
+ <div class="col-sm-8 col-md-6">
<table class="table table-borderless table-striped">
<tr>
- <td class='col-sm-6 col-md-4 vertical-center'>
+ <td class='col-sm-4 col-md-3 vertical-center'>
{{'program' | translate}}
</td>
- <td class='col-sm-6 col-md-4'>
+ <td class='col-sm-4 col-md-3'>
<select ng-model="selectedProgram"
class="form-control"
ng-options="program as program.name for program in programs | orderBy: 'name'"
@@ -43,8 +38,8 @@
</td>
</tr>
<tr>
- <td class='col-sm-6 col-md-4 vertical-center'>{{'org_unit'| translate}}</td>
- <td class='col-sm-6 col-md-4'>
+ <td class='col-sm-4 col-md-3 vertical-center'>{{'org_unit'| translate}}</td>
+ <td class='col-sm-4 col-md-3'>
<label><input type="radio" ng-model="selectedOuMode.name" name="selected" value="SELECTED"> {{'SELECTED'| translate}}</label><br/>
<label><input type="radio" ng-model="selectedOuMode.name" name="children" value="CHILDREN"> {{'CHILDREN'| translate}}</label><br/>
<label><input type="radio" ng-model="selectedOuMode.name" name="descendants" value="DESCENDANTS"> {{'DESCENDANTS'| translate}}</label><br/>
@@ -55,8 +50,8 @@
</div>
</div>
<div class="row">
- <div class="col-md-6">
- <table class="table-borderless table-with-fixed-layout">
+ <div class="col-sm-8 col-md-6">
+ <table class="table-borderless">
<tr>
<td>
<input type="text" name="reportStartDate" placeholder="{{'start_date'| translate}} (yyyy-mm-dd)" class="form-control" ng-date ng-model="report.startDate" max="today" ng-required="true"/>
@@ -75,12 +70,12 @@
</div>
</form>
<div class="row" ng-if="programs.length < 1">
- <div class="col-md-12 vertical-spacing">
+ <div class="col-sm-8 col-md-6 vertical-spacing">
<div class="alert alert-warning">{{'no_program_exists_report'| translate}}</div>
</div>
</div>
<div class="row" ng-if="programs.length > 0 && !selectedProgram">
- <div class="col-md-12 vertical-spacing">
+ <div class="col-sm-8 col-md-6 vertical-spacing">
<div class="alert alert-warning">{{'please_select_program_report'| translate}}</div>
</div>
</div>
=== added file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/reports.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/reports.html 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/reports.html 2014-08-27 10:38:27 +0000
@@ -0,0 +1,25 @@
+<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>
+<div id="mainPage">
+ <h2>{{'tracker_reports' | translate}}</h2>
+ <div class="row">
+ <div class="col-md-6 report-type-container" ng-click="showSummaryReport()">
+ <h2><i class="fa fa-list-alt"></i> <span class="horizonal-spacing">{{'program_summary' | translate}}</span></h2>
+ {{'program_summary_description' | translate}}
+ </div>
+ <div class="col-md-6 report-type-container">
+ <h2><i class="fa fa-clock-o"></i> <span class="horizonal-spacing">{{'upcoming_events' | translate}}</span></h2>
+ {{'upcoming_events_description' | translate}}
+ </div>
+ <div class="col-md-6 report-type-container">
+ <h2><i class="fa fa-exclamation-circle"></i> <span class="horizonal-spacing">{{'overdue_events' | translate}}</span></h2>
+ {{'overdue_events_description' | translate}}
+ </div>
+ </div>
+</div>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/en.json'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/en.json 2014-08-26 16:39:26 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/en.json 2014-08-27 10:38:27 +0000
@@ -113,10 +113,18 @@
"custom_form": "Custom form",
"default_form": "Default form",
"menu": "Menu",
- "report": "Report",
- "_report": "report",
+ "tracker_reports": "Tracker Reports",
+ "reports": "Reports",
"registration_and_data_entry": "Registration and Data Entry",
"program_summary_report": "Program Summary Report",
+ "program_summary": "Program Summary",
+ "program_summary_description": "Generate a summary report for a particular program, organisation unit and time frame. The report provides an overview of data recorded for a list of tracked entity instances.",
+ "upcoming_events": "Upcoming Events",
+ "upcoming_events_description": "Generate a report that lists tracked entity instances and their upcoming events that require attention. The events displayed are those that are scheduled in due time.",
+ "overdue_events": "Overdue Events",
+ "overdue_events_description": "Generate a report of overdue events for a selected program and organisation unit. The report displays list of tracked entity instances and thier events which are either missing or overdue.",
+ "report": "Report",
+ "_report": "report",
"visit_schedule": "Visit Schedule",
"lost_to_followup": "Lost to Follow-up",
"registered_data": "Registered data",
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/app.js 2014-08-26 16:39:26 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/app.js 2014-08-27 10:38:27 +0000
@@ -31,6 +31,9 @@
}).when('/report',{
templateUrl:'components/report/report.html',
controller: 'ReportController'
+ }).when('/reports',{
+ templateUrl:'components/report/reports.html',
+ controller: 'ReportTypesController'
}).otherwise({
redirectTo : '/'
});
=== 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 2014-08-26 16:39:26 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js 2014-08-27 10:38:27 +0000
@@ -391,12 +391,33 @@
TranslationService.translate();
$scope.showHome = function(){
- $location.path('/').search();
+ $location.path('/').search();
+ };
+
+ $scope.showReportTypes = function(){
+ $location.path('/reports').search();
};
+})
+
+//Controller for the header section
+.controller('ReportTypesController',
+ function($scope,
+ $location,
+ TranslationService) {
+
+ TranslationService.translate();
$scope.showSummaryReport = function(){
- $location.path('/report').search();
+ $location.path('/report').search();
+ };
+
+ $scope.showOverDueEvents = function(){
+ $location.path('/report').search();
};
+
+ $scope.showUpcomingEvents = function(){
+ $location.path('/report').search();
+ };
})
//Controller for the header section
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css 2014-08-26 16:39:26 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css 2014-08-27 10:38:27 +0000
@@ -23,10 +23,6 @@
height: 50%;
}
-.menuTitle {
- font-size: 1em;
-}
-
.top-bar {
font-size: 16pt;
font-weight: normal;
@@ -765,12 +761,21 @@
left: auto;
}
-
+.left-bar-menu{
+ margin-top: 15px;
+}
+
+.report-type-container{
+ padding: 10px;
+}
+
+.report-type-container:hover, .report-type-container:focus{
+ background-color: #ebebeb;
+ cursor: pointer;
+}
@media print {
#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/views/home.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html 2014-08-26 16:39:26 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html 2014-08-27 10:38:27 +0000
@@ -3,17 +3,13 @@
<div id="leftBar">
- <div class='col-sm-12'>
- <h2>
- {{'menu' | translate}}
- </h2>
- </div>
- <ul class="nav nav-pills nav-stacked" ng-controller="LeftBarMenuController">
- <li><a href class='menuTitle' ng-click="showHome()">{{'registration_and_data_entry' | translate}}</a></li>
- <li><a href class='menuTitle' ng-click="showSummaryReport()">{{'program_summary_report' | translate}}</a></li>
- <li><a href class='menuTitle' ng-click="showVisitSchedule()">{{'visit_schedule' | translate}}</a></li>
- <li><a href class='menuTitle' ng-click="showLostToFollowup()">{{'lost_to_followup' | translate}}</a></li>
- </ul>
+ <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">
<ul>
</ul>
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
