dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #32662
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16648: tracker capture - some changes to widget titles. those currently active are a little brighter.
------------------------------------------------------------
revno: 16648
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-09-08 11:08:39 +0200
message:
tracker capture - some changes to widget titles. those currently active are a little brighter.
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/profile/profile.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship-controller.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/index.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css
--
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/dashboard/dashboard-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js 2014-09-01 15:32:05 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js 2014-09-08 09:08:39 +0000
@@ -24,7 +24,6 @@
$rootScope.selectedWidget = {title: 'current_selections', view: "components/selected/selected.html", show: false, expand: true};
$rootScope.profileWidget = {title: 'profile', view: "components/profile/profile.html", show: true, expand: true};
$rootScope.relationshipWidget = {title: 'relationships', view: "components/relationship/relationship.html", show: true, expand: true};
- $rootScope.schedulingMessagingWidget = {title: 'scheduling_messaging', view: "components/scheduling-messaging/scheduling-messaging.html", show: true, expand: true};
$rootScope.notesWidget = {title: 'notes', view: "components/notes/notes.html", show: true, expand: true};
$rootScope.biggerDashboardWidgets.push($rootScope.enrollmentWidget);
@@ -33,7 +32,6 @@
$rootScope.smallerDashboardWidgets.push($rootScope.selectedWidget);
$rootScope.smallerDashboardWidgets.push($rootScope.profileWidget);
$rootScope.smallerDashboardWidgets.push($rootScope.relationshipWidget);
- $rootScope.smallerDashboardWidgets.push($rootScope.schedulingMessagingWidget);
$rootScope.smallerDashboardWidgets.push($rootScope.notesWidget);
//selections
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.html 2014-09-05 12:52:43 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.html 2014-09-08 09:08:39 +0000
@@ -1,9 +1,10 @@
<div class="panel panel-info" ng-controller="DataEntryController">
<div class="panel-heading handle bold">
- {{dataentryWidget.title| translate}}
+ <a href ng-click="showEventCreation()"><span ng-class="{'light-blue': showEventCreationDiv}">{{dataentryWidget.title| translate}}</span></a>
<span class="nav-pills" ng-if="allowEventCreation">
- | <a href ng-click="showEventCreation()"><span class="bold">{{'create_new_event'| translate}}</span></a>
+ | <a href ng-click="showEventCreation()"><span ng-class="{'light-blue': !showEventCreationDiv}">{{'create_new_event'| translate}}</span></a>
</span>
+
<span class="pull-right">
<a class="small-horizonal-spacing" href ng-click="expandCollapse(dataentryWidget)">
<span ng-show="dataentryWidget.expand"><i class="fa fa-chevron-up" title="{{'collapse'| translate}}"></i></span>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html 2014-09-07 08:30:29 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html 2014-09-08 09:08:39 +0000
@@ -4,10 +4,9 @@
{{notesWidget.title| translate}}
</span>
<span ng-if="messagingPossible">
- <!--{{notesWidget.title| translate}}-->
- <a href ng-click="showNotes()" title="{{'show_hide_notes'| translate}}"><span class="bold" ng-class="{'black': showNotesDiv}">{{notesWidget.title| translate}}</span></a>
+ <a href ng-click="showNotes()" title="{{'show_hide_notes'| translate}}"><span ng-class="{'light-blue': showMessagingDiv}">{{notesWidget.title| translate}}</span></a>
<span class="nav-pills">
- | <a href ng-click="showMessaging()" title="{{'show_hide_messaging'| translate}}"><span class="bold" ng-class="{'black': showMessagingDiv}">{{'messaging'| translate}}</span></a>
+ | <a href ng-click="showMessaging()" title="{{'show_hide_messaging'| translate}}"><span ng-class="{'light-blue': showNotesDiv}">{{'messaging'| translate}}</span></a>
</span>
</span>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/profile/profile.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/profile/profile.html 2014-09-05 12:52:43 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/profile/profile.html 2014-09-08 09:08:39 +0000
@@ -1,9 +1,11 @@
<div class="panel panel-info" ng-controller="ProfileController">
<div class="panel-heading handle bold">
- {{profileWidget.title| translate}}
- <span class="nav-pills" ng-show="selectedTei.attributes.length">
- | <a href ng-click="enableEdit()" title="{{'edit_profile'| translate}}"><span class="bold">{{'edit'| translate}}</span></a>
+
+ <a href ng-click="enableEdit()"><span ng-class="{'light-blue': editProfile}">{{profileWidget.title| translate}}</span></a>
+ <span class="nav-pills">
+ | <a href ng-click="enableEdit()" title="{{'edit_profile'| translate}}"><span ng-class="{'light-blue': !editProfile}">{{'edit'| translate}}</span></a>
</span>
+
<span class="pull-right">
<a class="small-horizonal-spacing" href ng-click="expandCollapse(profileWidget)">
<span ng-show="profileWidget.expand"><i class="fa fa-chevron-up" title="{{'collapse'| translate}}"></i></span>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship-controller.js 2014-08-29 12:39:37 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship-controller.js 2014-09-08 09:08:39 +0000
@@ -1,5 +1,6 @@
trackerCapture.controller('RelationshipController',
function($scope,
+ $rootScope,
$modal,
$location,
$route,
@@ -9,6 +10,7 @@
TranslationService.translate();
+ $rootScope.showAddRelationshipDiv = false;
$scope.relationshipTypes = [];
$scope.relationships = [];
RelationshipFactory.getAll().then(function(rels){
@@ -26,27 +28,32 @@
$scope.selectedEnrollment = $scope.selections.enrollment;
});
- $scope.showAddRelationship = function() {
- var modalInstance = $modal.open({
- templateUrl: 'components/relationship/add-relationship.html',
- controller: 'AddRelationshipController',
- windowClass: 'modal-full-window',
- resolve: {
- relationshipTypes: function () {
- return $scope.relationshipTypes;
- },
- selections: function () {
- return $scope.selections;
- },
- selectedTei: function(){
- return $scope.selectedTei;
+ $scope.showAddRelationship = function() {
+ $rootScope.showAddRelationshipDiv = !$rootScope.showAddRelationshipDiv;
+
+ console.log('It is me relationship: ', $rootScope.showAddRelationshipDiv);
+ if($rootScope.showAddRelationshipDiv){
+ var modalInstance = $modal.open({
+ templateUrl: 'components/relationship/add-relationship.html',
+ controller: 'AddRelationshipController',
+ windowClass: 'modal-full-window',
+ resolve: {
+ relationshipTypes: function () {
+ return $scope.relationshipTypes;
+ },
+ selections: function () {
+ return $scope.selections;
+ },
+ selectedTei: function(){
+ return $scope.selectedTei;
+ }
}
- }
- });
+ });
- modalInstance.result.then(function (relationships) {
- $scope.selectedTei.relationships = relationships;
- });
+ modalInstance.result.then(function (relationships) {
+ $scope.selectedTei.relationships = relationships;
+ });
+ }
};
$scope.showDashboard = function(rel){
@@ -66,6 +73,7 @@
//Controller for adding new relationship
.controller('AddRelationshipController',
function($scope,
+ $rootScope,
CurrentSelection,
OperatorFactory,
AttributesFactory,
@@ -305,7 +313,8 @@
};
$scope.close = function () {
- $modalInstance.close($scope.selectedTei.relationships ? $scope.selectedTei.relationships : []);
+ $modalInstance.close($scope.selectedTei.relationships ? $scope.selectedTei.relationships : []);
+ $rootScope.showAddRelationshipDiv = !$rootScope.showAddRelationshipDiv;
};
$scope.assignRelationship = function(relativeTei){
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship.html 2014-09-05 12:52:43 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship.html 2014-09-08 09:08:39 +0000
@@ -1,9 +1,11 @@
<div class="panel panel-info" ng-controller="RelationshipController">
<div class="panel-heading handle bold">
- {{relationshipWidget.title| translate}}
- <span class="nav-pills" ng-show="selectedTei">
- | <a href ng-click="showAddRelationship()" title="{{'add_relationship'| translate}}"><span class="bold">{{'add'| translate}}</span></a>
- </span>
+
+ <a href ng-click="showAddRelationship()"><span ng-class="{'light-blue': showAddRelationshipDiv}">{{relationshipWidget.title| translate}}</span></a>
+ <span class="nav-pills" ng-if="selectedTei">
+ | <a href ng-click="showAddRelationship()" title="{{'add_relationship'| translate}}"><span ng-class="{'light-blue': !showAddRelationshipDiv}">{{'add'| translate}}</span></a>
+ </span>
+
<span class="pull-right">
<a class="small-horizonal-spacing" href ng-click="expandCollapse(relationshipWidget)">
<span ng-show="relationshipWidget.expand"><i class="fa fa-chevron-up" title="{{'collapse'| translate}}"></i></span>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/index.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/index.html 2014-09-01 15:32:05 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/index.html 2014-09-08 09:08:39 +0000
@@ -80,8 +80,7 @@
<script type="text/javascript" src="components/report/upcoming-events-controller.js"></script>
<script type="text/javascript" src="components/selected/selected-controller.js"></script>
<script type="text/javascript" src="components/relationship/relationship-controller.js"></script>
- <script type="text/javascript" src="components/profile/profile-controller.js"></script>
- <script type="text/javascript" src="components/scheduling-messaging/scheduling-messaging-controller.js"></script>
+ <script type="text/javascript" src="components/profile/profile-controller.js"></script>
<script type="text/javascript" src="components/notes/notes-controller.js"></script>
<!-- Menu scripts -->
=== 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-09-05 09:21:39 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css 2014-09-08 09:08:39 +0000
@@ -189,6 +189,10 @@
font-weight: bold;
}
+.light-blue {
+ color: #67abcc;
+}
+
.white {
color: white;
}
