dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6781
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-04-27 16:18:31 +0700
message:
  (patient) Minor fix.
modified:
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/css/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-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java	2012-03-22 02:15:46 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java	2012-04-27 09:18:31 +0000
@@ -222,7 +222,11 @@
 
         attrGrid.addRow();
         attrGrid.addValue( i18n.getString( "blood_group" ) );
-        attrGrid.addValue( (patient.getBloodGroup() == "") ? PatientAttributeValue.UNKNOWN : patient.getBloodGroup() );
+        attrGrid.addValue( (patient.getBloodGroup().isEmpty() ) ? PatientAttributeValue.UNKNOWN : patient.getBloodGroup() );
+
+        attrGrid.addRow();
+        attrGrid.addValue( i18n.getString( "phoneNumber" ) );
+        attrGrid.addValue( (patient.getPhoneNumber() == null && patient.getPhoneNumber().isEmpty() ) ? PatientAttributeValue.UNKNOWN : patient.getPhoneNumber() );
 
         // ---------------------------------------------------------------------
         // Add dynamic attribues

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js	2012-04-27 07:09:22 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js	2012-04-27 09:18:31 +0000
@@ -794,6 +794,7 @@
 					sortAscText: TR.i18n.asc,
 					sortDescText: TR.i18n.desc
 				}
+				i++;
 			}
 			
 			TR.cmp.params.identifierType.selected.store.each( function(r) {
@@ -894,7 +895,7 @@
 	
 			// grid
 			this.datatable = Ext.create('Ext.grid.Panel', {
-                height: TR.util.viewport.getSize().y - 58,
+                height: TR.util.viewport.getSize().y - 60,
 				id: 'gridTable',
 				columns: cols,
 				scroll: 'both',
@@ -913,6 +914,7 @@
 						xtype: 'button',
 						icon: 'images/arrowleftdouble.png',
 						id:'firstPageBtn',
+						width: 22,
 						handler: function() {
 							TR.exe.paging(1);
 						}
@@ -921,13 +923,14 @@
 						xtype: 'button',
 						icon: 'images/arrowleft.png',
 						id:'previousPageBtn',
+						width: 22,
 						handler: function() {
 							TR.exe.paging( eval(TR.cmp.settings.currentPage.rawValue) - 1 );
 						}
 					},
 					{
-						xtype: 'button',
-						icon: 'images/grid-split.gif'
+						xtype: 'label',
+						text: '|'
 					},
 					{
 						xtype: 'label',
@@ -962,11 +965,7 @@
 					},
 					{
 						xtype: 'label',
-						text: ' of ' + TR.state.total
-					},
-					{
-						xtype: 'button',
-						icon: 'images/grid-split.gif'
+						text: ' of ' + TR.state.total + ' | '
 					},
 					{
 						xtype: 'button',
@@ -985,8 +984,8 @@
 						}
 					},
 					{
-						xtype: 'button',
-						icon: 'images/grid-split.gif'
+						xtype: 'label',
+						text: '|'
 					},
 					{
 						xtype: 'button',

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/css/style.css'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/css/style.css	2012-04-27 08:28:48 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/css/style.css	2012-04-27 09:18:31 +0000
@@ -686,28 +686,5 @@
 }
 
 .x-panel-header-default{
-	background: #FOFOFO !important;
-	background-image:-webkit-gradient(linear, 100% 100%, 100% 100%, color-stop(100%, #f0f0f0), color-stop(100%, #f0f0f0)) !important;;
-	background-image:-webkit-linear-gradient(top, #f0f0f0,#f0f0f0) !important;;
-	background-image:-moz-linear-gradient(top, #f0f0f0,#f0f0f0) !important;;
-	background-image:-o-linear-gradient(top, #f0f0f0,#f0f0f0) !important;;
-	background-image:-ms-linear-gradient(top, #f0f0f0,#f0f0f0) !important;;
-	background-image:linear-gradient(top, #f0f0f0,#f0f0f0) !important;;
-	border-width:0 !important;
-}
-
-.x-hmenu-sort-desc 
-{
-	display:none;
-}
-
-.x-hmenu-sort-asc
-{
-	display:none;
-}
-
-.x-menu-item-separator
-{
-	display:none;
-}
-
+	background: #ffffff !important;
+}