dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 21989
committer: Abyot Asalefew Gizaw <abyot@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2016-02-17 14:08:44 +0100
message:
  tracker-capture: make sure relevant information is displayed in event boxes under data entry widget
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/event-layout.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/dataentry/event-layout.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/event-layout.html	2016-02-15 09:46:27 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/event-layout.html	2016-02-17 13:08:44 +0000
@@ -4,20 +4,22 @@
             <div class="event-container" ng-click="getEventPage('BACKWARD')" ng-if="$index === 0 && eventPagingStart > 0">
                 {{'previous'| translate}}
             </div>
-            <div style="float: left">
-                <div class="event-container" title="[{{'org_unit' | translate}}: {{dhis2Event.orgUnitName}}, {{'program_stage' | translate}}: {{dhis2Event.name}}]" ng-class="getEventStyle(dhis2Event)" ng-click="showDataEntry(dhis2Event, false)">                
-                    <div class="event-container-item">
-                        {{dhis2Event.sortingDate}}
-                        <br/>
-                    {{dhis2Event.orgUnitName.length > 15 ? dhis2Event.orgUnitName.substring(0,15).concat('...') : dhis2Event.orgUnitName}}<br/>
-                    {{dhis2Event.name.length > 15 ? dhis2Event.name.substring(0,15).concat('...') : dhis2Event.name}}
-                    </div>
-                    <div class="event-container-footer">{{getEventStyleLabel(dhis2Event)}}</div>
-                </div>
-                <div style="float: right" class="arrow-container" ng-if="$index + 1 < eventPageSize && $index + 1 + eventPagingStart < topLineEvents.length">
-                    <i class="fa fa-arrow-right"></i>
-                </div>
-            </div>            
+
+            <div class="event-container" title="[{{'org_unit' | translate}}: {{dhis2Event.orgUnitName}}, {{'program_stage' | translate}}: {{dhis2Event.name}}]" ng-class="getEventStyle(dhis2Event)" ng-click="showDataEntry(dhis2Event, false)">                
+                <div class="event-container-item">
+                    {{dhis2Event.sortingDate}}
+                </div>
+                <div class="event-container-item">
+                    {{dhis2Event.orgUnitName}}
+                </div>
+                <div class="event-container-item">
+                    {{dhis2Event.name}}
+                </div>
+                <div class="event-container-footer">{{getEventStyleLabel(dhis2Event)}}</div>
+            </div>
+            <div class="arrow-container" ng-if="$index + 1 < eventPageSize && $index + 1 + eventPagingStart < topLineEvents.length">
+                <i class="fa fa-arrow-right"></i>
+            </div>       
             <div class="event-container event-container-navigation" ng-click="getEventPage('FORWARD')" ng-if="$index + 1 === eventPageSize && eventPagingEnd < topLineEvents.length">
                 {{'next'| translate}}
             </div>
@@ -132,5 +134,4 @@
             </div>
         </div>
     </div>    
-</div>
-
+</div>
\ No newline at end of file

=== 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-02-15 09:46:27 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css	2016-02-17 13:08:44 +0000
@@ -248,10 +248,13 @@
     font-weight: bold;
 }
 
-.event-container-item{
-    align-self: center;
-    margin: auto;
-    text-align: center;
+.event-container-item {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    width: inherit;
+    padding-left: 5px;
+    padding-right: 5px;
 }
 
 .event-container-footer{