dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 15251
committer: Abyot Asalefew Gizaw abyota@xxxxxxxxx
branch nick: dhis2
timestamp: Tue 2014-05-13 11:54:48 +0200
message:
  UI for relationship
added:
  dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/relationship.html
modified:
  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/scripts/controllers.js
  dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/dataentry.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/i18n/en.json'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/i18n/en.json	2014-05-12 15:55:27 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/i18n/en.json	2014-05-13 09:54:48 +0000
@@ -42,6 +42,7 @@
     "profile": "Profile",
     "enrollment": "Enrollment",
     "notes": "Notes",
+    "relationship": "Relationship",
     "dataentry": "Data Entry",
     "current_selections": "Current selections",
     "org_unit_mode": "Searching org unit",

=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js	2014-05-12 15:55:27 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js	2014-05-13 09:54:48 +0000
@@ -379,12 +379,14 @@
     $rootScope.dataentryWidget = {title: 'dataentry', view: "views/dataentry.html", show: true};
     $rootScope.selectedWidget = {title: 'current_selections', view: "views/selected.html", show: false};
     $rootScope.profileWidget = {title: 'profile', view: "views/profile.html", show: true};
+    $rootScope.relationshipWidget = {title: 'relationship', view: "views/relationship.html", show: true};
     $rootScope.notesWidget = {title: 'notes', view: "views/notes.html", show: true};    
    
     $rootScope.dashboardWidgets.bigger.push($rootScope.enrollmentWidget);
     $rootScope.dashboardWidgets.bigger.push($rootScope.dataentryWidget);
     $rootScope.dashboardWidgets.smaller.push($rootScope.selectedWidget);
     $rootScope.dashboardWidgets.smaller.push($rootScope.profileWidget);
+    $rootScope.dashboardWidgets.smaller.push($rootScope.relationshipWidget);
     $rootScope.dashboardWidgets.smaller.push($rootScope.notesWidget);
     
     //selections
@@ -673,6 +675,18 @@
     };       
 })
 
+//Controller for the relationship section
+.controller('RelationshipController',
+        function($scope,                
+                storage,
+                TranslationService) {
+
+    TranslationService.translate();
+    
+    $scope.attributes = storage.get('ATTRIBUTES');
+    
+})
+
 //Controller for the notes section
 .controller('NotesController',
         function($scope,                

=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/dataentry.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/dataentry.html	2014-05-12 14:08:02 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/dataentry.html	2014-05-13 09:54:48 +0000
@@ -13,15 +13,15 @@
         <table class="table-borderless">
             <tbody>
                 <tr>
-                    <td class="inline-block" ng-repeat="dhis2Event in dhis2Events">
-                        <span class="block orgunit-container">{{dhis2Event.orgUnitName}}</span>
-                        <span class="arrow-container">→</span>
+                    <td class="inline-block" ng-repeat="dhis2Event in dhis2Events track by $index">
+                        <span class="block orgunit-container">{{dhis2Event.orgUnitName}}</span>                                              
                         <span class="stage-container"                                                     
                               ng-class="{'current-stage': currentEvent.programStage == dhis2Event.programStage, '{{dhis2Event.statusColor}}': true}"                                                      
                               ng-click="showDataEntry(dhis2Event)">
                             {{dhis2Event.name}}<br/>
                             {{dhis2Event.eventDate}}                                                    
-                        </span>                                                
+                        </span>
+                        <i class="fa fa-arrow-right" ng-show="$index < dhis2Events.length-1"></i>
                     </td>                        
                 </tr>
             </tbody>                

=== added file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/relationship.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/relationship.html	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/relationship.html	2014-05-13 09:54:48 +0000
@@ -0,0 +1,11 @@
+<div class="panel panel-default" ng-controller="RelationshipController">
+    <div class="panel-heading">
+        {{relationshipWidget.title| translate}}
+        <span class="pull-right">
+            <a href ng-click="removeWidget(relationshipWidget)" title="{{'remove'| translate}}"><span class='black'><i class="fa fa-times-circle"></i></span></a>            
+        </span>        
+    </div>
+    <div class="panel-body dashboard-element-container">
+        This is relationships.
+    </div>
+</div>
\ No newline at end of file