dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8150
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-09-20 14:07:31 +0700
message:
  Improve UI for dashboard.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm


--
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-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 06:42:42 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm	2012-09-20 07:07:31 +0000
@@ -71,7 +71,7 @@
 						</div>
 					</td>
 					<td>
-						<div class="link-area" style='height:150px;'>
+						<div class="link-area" style='height:190px;'>
 							<table width='100%'>
 								<tr><th>
 										$i18n.getString("active_programs")
@@ -79,7 +79,7 @@
 									</th>
 								</tr>
 							</table>
-							<div class="contentProviderTable" style='height:100px;'>
+							<div class="contentProviderTable" style='height:140px;'>
 								<table width='100%' id='activeTB'>
 									#foreach( $programInstance in $activeProgramInstances )
 										#set($programStageInstanceId = '')
@@ -111,7 +111,7 @@
 										<tr id='tr1_$programInstance.id' type='$programInstance.program.type'
 											programStageInstanceId='$programStageInstanceId'>
 											<td id='td_$programInstance.id'>
-												<a href='javascript:loadProgramInstance("$programInstance.id", false)'>$programInstance.program.name ($format.formatDate($programInstance.enrollmentDate))</a>
+												<a href='javascript:loadProgramInstance($programInstance.id, false)'>$programInstance.program.name ($format.formatDate($programInstance.enrollmentDate))</a>
 											</td>
 										</tr>
 										#end
@@ -120,28 +120,25 @@
 							</div>
 						</div>
 						
-						<div class="link-area" style='height:100px;'>
+						<div class="link-area" style='height:60px;'>
 							<table width='100%'>
 								<tr><th>$i18n.getString("completed_programs")</th></tr>
+								<tr>
+									<td>
+										<select id="completedList" name="completedList" onchange="javascript:loadProgramInstance(this.value, true);" style="width:100%">
+											#foreach($programInstance in $completedProgramInstances)
+												#set($programStageInstanceId = '')
+												#if($programInstance.program.type==2)
+													#foreach( $programStageInstance in $programInstance.programStageInstances)
+														#set($programStageInstanceId = $programStageInstance.id)
+													#end
+												#end
+												<option value="$programInstance.id" type='$programInstance.program.type'>$programInstance.program.name ($format.formatDate($programInstance.enrollmentDate))</option>
+											#end
+										</select>
+									</td>
+								</tr>
 							</table>
-							<div class="contentProviderTable" style='height:50px;'>
-								<table id='completedTB' width='100%'>
-									#foreach($programInstance in $completedProgramInstances)
-										#set($programStageInstanceId = '')
-										#if($programInstance.program.type==2)
-											#foreach( $programStageInstance in $programInstance.programStageInstances)
-												#set($programStageInstanceId = $programStageInstance.id)
-											#end
-										#end
-										<tr id='tr_$programInstance.id' type='$programInstance.program.type' onclick="javascript:loadProgramInstance('$programInstance.id', true);" style='cursor:pointer;'
-											programStageInstanceId='$programStageInstanceId'>
-											<td>
-												<a><span id='infor_$programInstance.id'>$programInstance.program.name ($format.formatDate($programInstance.enrollmentDate))</span></a>
-											</td>
-										</tr>
-									#end
-								</table>					
-							</div>
 						</div>
 					</td>
 					<td>