dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #31517
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16070: tracker capture - minor improvments
------------------------------------------------------------
revno: 16070
committer: Abyot Asalefew Gizaw abyota@xxxxxxxxx
branch nick: dhis2
timestamp: Thu 2014-07-10 15:17:04 +0200
message:
tracker capture - minor improvments
modified:
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment-controller.js
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship.html
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/report/report-controller.js
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/report/report.html
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/report/teiReport.html
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/views/tei.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-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment-controller.js'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment-controller.js 2014-07-02 16:25:28 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment-controller.js 2014-07-10 13:17:04 +0000
@@ -33,7 +33,7 @@
if($scope.selectedProgram){
EnrollmentService.getByEntityAndProgram($scope.selectedTei.trackedEntityInstance, $scope.selectedProgram.id).then(function(data){
$scope.enrollments = data.enrollmentList;
- $scope.loadEvents();
+ $scope.loadEnrollmentDetails();
});
}
else{
@@ -41,7 +41,7 @@
}
});
- $scope.loadEvents = function() {
+ $scope.loadEnrollmentDetails = function() {
if($scope.selectedProgram){
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html 2014-07-09 09:33:55 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html 2014-07-10 13:17:04 +0000
@@ -31,8 +31,7 @@
</div>
<div ng-show='selectedEnrollment' class='remove-default-padding'>
-
- <table class="table table-with-fixed-layout">
+ <table class="table table-striped dhis2-table-hover">
<tr ng-repeat="note in selectedEnrollment.notes| filter:noteSearchText">
<td class="over-flow-hidden">
<d2-pop-over content="note" template="note.html" details="{{'details'| translate}}">
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship.html 2014-07-09 09:33:55 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship.html 2014-07-10 13:17:04 +0000
@@ -18,7 +18,7 @@
<div ng-show="selectedTei" class="remove-default-padding">
<table class="table table-striped dhis2-table-hover">
- <tr ng-click="showDashboard(rel)" ng-repeat="rel in selectedTei.relationships">
+ <tr ng-click="showDashboard(rel)" ng-repeat="rel in selectedTei.relationships" title="{{'go_to_dashboard'| translate}}">
<td>
<span ng-if="selectedTei.trackedEntityInstance === rel.trackedEntityInstanceA">{{relationships[rel.relationship].bIsToA}}</span>
<span ng-if="selectedTei.trackedEntityInstance === rel.trackedEntityInstanceB">{{relationships[rel.relationship].aIsToB}}</span>
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/report/report-controller.js'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/report/report-controller.js 2014-07-09 12:49:49 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/report/report-controller.js 2014-07-10 13:17:04 +0000
@@ -56,7 +56,7 @@
angular.forEach(eventList, function(ev){
if(ev.trackedEntityInstance){
ev.name = $scope.programStages[ev.programStage].name;
- ev.programName = $scope.selectedProgram.name
+ ev.programName = $scope.selectedProgram.name;
ev.statusColor = EventUtils.getEventStatusColor(ev);
ev.eventDate = DateUtils.format(ev.eventDate);
@@ -99,7 +99,8 @@
modalInstance.result.then({
});
- };
+ };
+
})
//Controller for event details
@@ -208,10 +209,6 @@
programId = $scope.selectedProgram.id;
}
- /*if($scope.selectedOrgUnit){
- orgUnitId = $scope.selectedOrgUnit.id;
- }*/
-
$scope.report = [];
angular.forEach($scope.programs, function(pr){
$scope.report[pr.id] = {events: []};
@@ -262,5 +259,9 @@
modalInstance.result.then({
});
- };
+ };
+
+ $scope.showProgramReportDetails = function(prId){
+ console.log('I need to display details for: ', prId, '-',$scope.report[prId].events);
+ };
});
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/report/report.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/report/report.html 2014-07-09 12:49:49 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/report/report.html 2014-07-10 13:17:04 +0000
@@ -61,7 +61,7 @@
<thead>
<tr>
<th>{{selectedProgram.trackedEntity.name}}</th>
- <th>{{'registered_data' | translate}}</th>
+ <th>{{selectedProgram.name}} {{'record' | translate}}</th>
</tr>
</thead>
<tr ng-repeat="tei in teiList.rows">
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/report/teiReport.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/report/teiReport.html 2014-07-09 12:49:49 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/report/teiReport.html 2014-07-10 13:17:04 +0000
@@ -12,33 +12,30 @@
<div ng-show="reportWidget.expand" class="panel-body dashboard-widget-container">
<div ng-if="!dataExists" class="alert alert-warning">{{'no_data_report'| translate}}</div>
<div ng-if="dataExists" class="remove-default-padding">
- <table class="table table-compact table-striped">
- <tr ng-repeat="pr in programs" ng-if="report[pr.id].events">
+ <table class="table table-striped dhis2-table-hover">
+ <tr ng-click="showProgramReportDetails(pr.id)" ng-repeat="pr in programs" ng-if="report[pr.id].events" title="{{'program_details'| translate}}">
<td>
- <div class="bold inline-block vertical-center">{{pr.name}}</div>
- </td>
- <td>
+ {{pr.name}}
+ <!--<div class="row col-md-12 bold vertical-spacing">{{pr.name}}</div>
<div class='bold vertical-center' ng-if='report[pr.id].events.length < 1'>{{'no_visit_made'| translate}}</div>
<div class="inline-block vertical-center" ng-repeat="ev in report[pr.id].events | orderBy: 'eventDate'">
- <div class="block align-center">{{ev.orgUnitName}}</div>
<div class="empty-stage-container"
title="{{ev.dataValues ? 'details' : 'no_data_registerd'| translate}}"
ng-class="{'{{ev.statusColor}}': true}"
ng-if='!ev.dataValues'>
- {{ev.name}}<br/>
- {{ev.eventDate}}
+ <div class="row">{{ev.name}}</div>
+ <div class="row">{{ev.eventDate}}</div>
</div>
<div class="stage-container"
title="{{ev.dataValues ? 'details' : 'no_data_registerd'| translate}}"
ng-class="{'{{ev.statusColor}}': true}"
ng-if='ev.dataValues'
ng-click="showEventDetails(ev)">
- {{ev.name}}<br/>
- {{ev.eventDate}}
+ <div class="row">{{ev.name}}</div>
+ <div class="row">{{ev.eventDate}}</div>
</div>
-
- <i class="fa fa-arrow-right" ng-show="$index < report[pr.id].events.length - 1"></i>
- </div>
+ <i class="fa fa-arrow-right vertical-center" ng-show="$index < report[pr.id].events.length - 1"></i>
+ </div> -->
</td>
</tr>
</table>
=== 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-08 16:14:36 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/i18n/en.json 2014-07-10 13:17:04 +0000
@@ -44,7 +44,7 @@
"previous": "Previous",
"next": "Next",
"last": "Last",
- "dashboard": "Go to dashboard",
+ "go_to_dashboard": "Go to dashboard",
"go": "Go",
"edit": "Edit",
"edit_profile": "Edit profile",
@@ -61,6 +61,7 @@
"incomplete": "Incomplete",
"validate": "Validate",
"details": "Details",
+ "program_details": "Program details",
"created_by": "Registerd by",
"date": "Date",
"add_new": "Add new",
@@ -138,6 +139,7 @@
"yes": "Yes",
"no": "No",
"records": "Records",
+ "record": "Record",
"found": "Found",
"move_to_selected": "Move to selected",
"move_all_to_selected": "Move all to selected",
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/tei.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/tei.html 2014-07-08 16:14:36 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/tei.html 2014-07-10 13:17:04 +0000
@@ -23,7 +23,8 @@
</thead>
<tbody id="list">
<tr ng-repeat="trackedEntity in trackedEntityList.rows"
- ng-click="showDashboard(trackedEntity)">
+ ng-click="showDashboard(trackedEntity)"
+ title="{{'go_to_dashboard'| translate}}">
<td ng-show="gridColumn.show"
ng-repeat="gridColumn in gridColumns">
{{trackedEntity[gridColumn.id]}}
