dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8164
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-09-20 21:02:14 +0700
message:
  Make boxes smaller in Dashboard; Exception when searching in Tracking module.
modified:
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientStore.java
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/relationshipPatient.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/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/patient/hibernate/HibernatePatientStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientStore.java	2012-09-18 01:55:04 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientStore.java	2012-09-20 14:02:14 +0000
@@ -505,6 +505,7 @@
             sql = sql + subSQL + from + " left join programinstance pgi on " + " (pgi.patientid=p.patientid) "
                 + " left join programstageinstance psi on " + " (psi.programinstanceid=pgi.programinstanceid) ";
             orderBy = " ORDER BY duedate DESC ";
+            from = " ";
         }
 
         if ( hasIdentifier )
@@ -525,7 +526,7 @@
         {
             sql += statementBuilder.limitRecord( min, max );
         }
-        System.out.println( "\n\n === \n " + sql );
+System.out.println( "\n\n === \n " + sql );
         return sql;
     }
 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js	2012-09-20 13:04:02 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js	2012-09-20 14:02:14 +0000
@@ -605,6 +605,7 @@
 
 function onClickBackBtn()
 {
+	showById('patientManagementLbl');
 	showById('selectDiv');
 	showById('searchDiv');
 	showById('listPatientDiv');

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/relationshipPatient.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/relationshipPatient.js	2012-09-20 03:00:16 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/relationshipPatient.js	2012-09-20 14:02:14 +0000
@@ -46,6 +46,7 @@
 			resize();
 			hideLoader();
 			hideById('contentDiv'); 
+			jQuery('#executionDate').focus();
 		} );
 }
 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm	2012-09-20 07:07:31 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm	2012-09-20 14:02:14 +0000
@@ -1,5 +1,5 @@
 <h4>
- <a href="javascript:onClickBackBtn();">$i18n.getString( 'back_to_registration' )</a>
+ <a href="javascript:onClickBackBtn();">$i18n.getString( 'patient_management' )</a>
  &#8226; <a href="javascript:showProgramEnrollmentForm( '$patient.id' )">$i18n.getString( "program_management" )</a>
  &#8226; <a href="javascript:showUpdatePatientForm( '$patient.id', true )">$i18n.getString( "edit_profile" )</a>
  &#8226; <a href="javascript:setFieldValue( 'isShowPatientList', 'false' ); showRelationshipList( '$patient.id' );">$i18n.getString( "manage_relationship" )</a>
@@ -71,7 +71,7 @@
 						</div>
 					</td>
 					<td>
-						<div class="link-area" style='height:190px;'>
+						<div class="link-area" style='height:120px;'>
 							<table width='100%'>
 								<tr><th>
 										$i18n.getString("active_programs")
@@ -79,7 +79,7 @@
 									</th>
 								</tr>
 							</table>
-							<div class="contentProviderTable" style='height:140px;'>
+							<div class="contentProviderTable" style='height:76px;'>
 								<table width='100%' id='activeTB'>
 									#foreach( $programInstance in $activeProgramInstances )
 										#set($programStageInstanceId = '')
@@ -120,7 +120,7 @@
 							</div>
 						</div>
 						
-						<div class="link-area" style='height:60px;'>
+						<div class="link-area" style='height:50px;'>
 							<table width='100%'>
 								<tr><th>$i18n.getString("completed_programs")</th></tr>
 								<tr>
@@ -172,4 +172,8 @@
 </table>
 
 <div id='programEnrollmentDiv' class='hidden'></div>
-<div id='dataEntryFormDiv'></div>
\ No newline at end of file
+<div id='dataEntryFormDiv'></div>
+
+<script>
+	hideById('patientManagementLbl');
+</script>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm	2012-09-20 05:15:30 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm	2012-09-20 14:02:14 +0000
@@ -11,7 +11,7 @@
 		#end
 	});
 </script>
-<h3>$i18n.getString( "patient_management" ) #openHelp( "patient" )</h3>
+<h3 id='patientManagementLbl'>$i18n.getString( "patient_management" ) #openHelp( "patient" )</h3>
 
 <input type='hidden' id='isRegistration' name= 'isRegistration' value='false'>
 <input type='hidden' id='isShowPatientList' name= 'isShowPatientList' >

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css	2012-09-19 13:39:07 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css	2012-09-20 14:02:14 +0000
@@ -194,7 +194,7 @@
   padding-right:1px;
   padding-left:1px;
   padding-bottom:0px;
-  height:200px;
+  height:120px;
   width:350px;
   overflow:hidden;
   position:relative;
@@ -207,7 +207,7 @@
   padding-right:1px;
   padding-left:1px;
   padding-bottom:0px;
-  height:252px;
+  height:172px;
   width:350px;
   overflow:hidden;
   position:relative;
@@ -215,7 +215,7 @@
 
 .contentProviderTable
 {
-  height: 202px;
+  height: 122px;
   width: 350px;
   overflow-y: auto;
   overflow-x:hidden;