=== 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 @@ -
- -
-

- {{'menu' | translate}} -

-
- +
+
@@ -25,15 +19,16 @@
+

{{'program_summary_report' | translate}}

-
+
- - - - +
+ {{'program' | translate}} +
{{'org_unit'| translate}} + {{'org_unit'| translate}}


@@ -55,8 +50,8 @@
-
- +
+
@@ -75,12 +70,12 @@
-
+
{{'no_program_exists_report'| translate}}
-
+
{{'please_select_program_report'| translate}}
=== 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 @@ + +
+

{{'tracker_reports' | translate}}

+
+
+

{{'program_summary' | translate}}

+ {{'program_summary_description' | translate}} +
+
+

{{'upcoming_events' | translate}}

+ {{'upcoming_events_description' | translate}} +
+
+

{{'overdue_events' | translate}}

+ {{'overdue_events_description' | translate}} +
+
+
\ 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 @@