dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7989
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-08-30 14:48:24 +0700
message:
  Add Enroll-program button into Active program in dashboard.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties
  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/programEnrollmentForm.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstanceFlow.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-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-08-28 05:48:46 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-08-30 07:48:24 +0000
@@ -177,7 +177,7 @@
 please_enter_a_valid_full_name=Please enter a valid full name
 program_unenrollment=Program un-enrollment
 death_date=Death date
-is_dead=is dead
+is_dead=Is dead
 search_result=Search result
 date_invalid=The date is invalid
 date_less_incident=The date is less than date of incident

=== 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-08-29 07:20:26 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm	2012-08-30 07:48:24 +0000
@@ -74,8 +74,8 @@
 							</div>
 						</div>
 					</td>
-					<td>
-						<div class="link-area">
+					<td class="link-area">
+						<div class="link-area"  style='height:160px;'>
 							<table width='100%'>
 								<tr><th>$i18n.getString("active_programs")</th></tr>
 							</table>
@@ -127,6 +127,7 @@
 								</table>
 							</div>
 						</div>
+						<br><input type='button' value='$i18n.getString("enroll_program")' onclick='showProgramEnrollmentForm( "$patient.id" )'/>
 					</td>
 					<td>
 						<div class="link-area">

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm	2012-08-28 05:48:46 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm	2012-08-30 07:48:24 +0000
@@ -13,6 +13,7 @@
 	<div id="tab-1">
 		<div id='dataRecordingSelectDiv'>
 			<form id='dataRecordingSelectForm' name='dataRecordingSelectForm' method='post'>
+				#parse( "/dhis-web-caseentry/colorHelp.vm" )
 				<div id='programInstanceDiv'>
 					#parse( "/dhis-web-caseentry/programStageInstanceFlow.vm" )
 					<br>		

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstanceFlow.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstanceFlow.vm	2012-08-28 09:11:19 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstanceFlow.vm	2012-08-30 07:48:24 +0000
@@ -1,4 +1,3 @@
-#parse( "/dhis-web-caseentry/colorHelp.vm" )
 <br/>
 <table id='programStageIdTB_$!programInstance.id' style="width:850px;height:125px;">
 	<tr>

=== 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-08-29 07:20:26 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css	2012-08-30 07:48:24 +0000
@@ -224,6 +224,19 @@
 // Dashboard
 // -------------------------------------------------------------- */
 
+td.link-area
+{
+  border:1px solid #d0d0d0;
+  padding-top:1px;
+  padding-right:1px;
+  padding-left:1px;
+  padding-bottom:0px;
+  height:200px;
+  width:350px;
+  overflow:hidden;
+  position:relative;
+}
+
 div.link-area
 {
   border:1px solid #d0d0d0;