------------------------------------------------------------
revno: 22188
committer: Abyot Asalefew Gizaw <ab...@dhis2.org>
branch nick: dhis2
timestamp: Tue 2016-03-08 14:58:39 +0100
message:
tracker-capture: messaging and communication wiget - WIP
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes-controller.js
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/i18n/i18n_app.properties
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/notes/notes-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes-controller.js 2016-02-29 14:26:12 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes-controller.js 2016-03-08 13:58:39 +0000
@@ -42,8 +42,7 @@
//that can be used for communication
var continueLoop = true;
for(var i=0; i<$scope.selectedTei.attributes.length && continueLoop; i++){
- if( ($scope.selectedTei.attributes[i].type === 'phoneNumber' && $scope.selectedTei.attributes[i].show) ||
- ($scope.selectedTei.attributes[i].type === 'email' && $scope.selectedTei.attributes[i].show) ){
+ if( $scope.selectedTei.attributes[i].valueType === 'PHONE_NUMBER' || $scope.selectedTei.attributes[i].valueType === 'EMAIL' ){
$scope.messagingPossible = true;
continueLoop = false;
}
=== 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 2016-02-04 10:43:43 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html 2016-03-08 13:58:39 +0000
@@ -4,9 +4,9 @@
{{notesWidget.title| translate}}
</span>
<span ng-if="messagingPossible">
- <a href ng-click="showNotes()" title="{{'show_hide_notes'| translate}}">{{notesWidget.title| translate}}</a>
+ <a href ng-click="showNotes()" title="{{'show_hide_notes'| translate}}"><span ng-class="{true: 'widget-link-active', false: 'widget-link'} [showNotesDiv]">{{notesWidget.title| translate}}</span></a>
<span class="nav-pills">
- | <a href ng-click="showMessaging()" title="{{'show_hide_messaging'| translate}}"><span ng-class="{true: 'widget-link-active', false: 'widget-link'} [showNotesDiv]">{{'messaging'| translate}}</span></a>
+ | <a href ng-click="showMessaging()" title="{{'show_hide_messaging'| translate}}"><span ng-class="{true: 'widget-link-active', false: 'widget-link'} [showMessagingDiv]">{{'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 2016-01-10 11:14:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/profile/profile.html 2016-03-08 13:58:39 +0000
@@ -2,7 +2,7 @@
<div class="panel-heading handle bold">
{{profileWidget.title| translate}}
<span class="nav-pills" ng-if="!enrollmentEditing && !selectedTei.inactive">
- | <a href ng-click="enableEdit()" title="{{'edit_profile'| translate}}"><span ng-class="{true: 'widget - link - active', false: 'widget - link'} [!editingDisabled]">{{'edit'| translate}}</span></a>
+ | <a href ng-click="enableEdit()" title="{{'edit_profile'| translate}}"><span ng-class="{true: 'widget-link-active', false: 'widget-link'} [!editingDisabled]">{{'edit'| translate}}</span></a>
</span>
<span class="pull-right widget-link">
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties 2016-03-01 15:11:41 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties 2016-03-08 13:58:39 +0000
@@ -228,6 +228,7 @@
enable_rescheduling=Enable rescheduling
disable_rescheduling=Disable rescheduling
show_hide_scheduling=Show/hide scheduling form
+show_hide_notes=Show/hide notes form
show_hide_messaging=Show/hide messaging form
messaging=Messaging
scheduling=Scheduling
=== 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 2016-03-01 16:47:58 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css 2016-03-08 13:58:39 +0000
@@ -637,11 +637,11 @@
}
.widget-link {
- color: #104E8B;
+ font-weight: normal !important;
}
.widget-link-active {
- color: #551A8B;
+ font-weight: bold !important;
}
.empty-dashboard-container{
_______________________________________________
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
