dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #22792
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 11069: Change Reschedule and set status layout in person-dashboard.
------------------------------------------------------------
revno: 11069
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-05-29 13:58:40 +0700
message:
Change Reschedule and set status layout in person-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/visitSchedule.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/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 2013-05-28 09:04:10 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2013-05-29 06:58:40 +0000
@@ -44,7 +44,7 @@
search=Search
patient_identifier=Person identifier
identifier=Identifier
-demographics=Demographics
+demographics=Person profile
age=Age
gender=Gender
male=Male
@@ -649,6 +649,7 @@
hide = Hide
none_program = None program
none_dataset = None dataset
-access_log = Access Log
+access_log = View access Log
risk = Risk
-show_only_risk_cases = Show only Risk cases
\ No newline at end of file
+show_only_risk_cases = Show only Risk cases
+toggle_risk_status = Toggle risk status
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm 2013-05-28 05:49:19 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm 2013-05-29 06:58:40 +0000
@@ -1,84 +1,95 @@
#set($programStageInstances = $programInstance.programStageInstances)
<table>
- <tr>
- <!-- Comment -->
- <td style="height:24px" valign="bottom">
- <div class="commentHeader">$i18n.getString( "comment" )
- #if($programInstance.followup)
- #set($followup=$programInstance.followup)
- #else
- #set($followup='false')
- #end
- <a href='javascript:markForFollowup($programInstance.id, false)' #if( $followup == 'false') class='hidden' #end id='imgMarkFollowup' title='$i18n.getString("unmark_followup")' ><img src='../images/marked_large.png'></a>
- <a href='javascript:markForFollowup($programInstance.id, true)' #if( $followup == 'true') class='hidden' #end id='imgUnmarkFollowup' title='$i18n.getString("mark_followup")' ><img src='../images/unmarked_large.png'></a>
- </div>
- </td>
+ <colgroup>
+ <col/>
+ <col/>
+ <col/>
+ <col style="width: 10%;">
+ <col style="width: 10%;">
+ <col style="width: 10%;">
+ <col style="width: 10%;">
+ <col style="width: 10%;">
+ </colgroup>
+
+ <tr>
<!-- Progam Enrollement -->
- <td style="height:24px" valign="bottom">
+ <td style="height:24px" valign="bottom" colspan='3'>
<div class="commentHeader">$encoder.htmlEncode( $i18n.getString( "program_enrollment" ) )</div>
</td>
+ <!-- Comment -->
+ <td style="height:24px" valign="bottom" colspan='3'>
+ <div class="commentHeader">$i18n.getString( "comment" )</div>
+ </td>
</tr>
- <tr>
+
+ <tr>
+ <td style="background-color:#88be3b; height:26px;"> </td>
+ <td class='text-column'>$i18n.getString('toggle_risk_status')</td>
+ <td>
+ #if($programInstance.followup)
+ #set($followup=$programInstance.followup)
+ #else
+ #set($followup='false')
+ #end
+ <a href='javascript:markForFollowup($programInstance.id, false)' #if( $followup == 'false') class='hidden' #end id='imgMarkFollowup' title='$i18n.getString("unmark_followup")' ><img src='../images/marked_large.png'></a>
+ <a href='javascript:markForFollowup($programInstance.id, true)' #if( $followup == 'true') class='hidden' #end id='imgUnmarkFollowup' title='$i18n.getString("mark_followup")' ><img src='../images/unmarked_large.png'></a>
+ </td>
+ <td rowspan='3' colspan='8'>
+ <textarea id="comment" name='comment' maxlength="360" style="height:100px;width:100%">$!encoder.htmlEncode( $programInstance.patientComment.commentText )</textarea>
+ </td>
+ </tr>
+
+ <tr>
+ <td style="background-color:#88be3b; height:26px;"> </td>
+ <td class='text-column'>$programInstance.program.dateOfEnrollmentDescription:</td>
+ <td><input name="enrollmentDate" id="enrollmentDate" readonly value="$!format.formatDate( $programInstance.enrollmentDate )" style="width:325px;"></td>
+ </tr>
+
+ <tr>
+ <td style="background-color:#88be3b; height:26px;"> </td>
+ <td class='text-column'>$programInstance.program.dateOfIncidentDescription:</td>
+ <td><input name="dateOfIncident" id="dateOfIncident" readonly value="$!format.formatDate( $programInstance.dateOfIncident )" style="width:325px;"></td>
+ </tr>
+
+ <tr>
+ <td></td>
+ <td></td>
+ <td>
+ #if( !$auth.hasAccess( "dhis-web-caseentry", "saveProgramEnrollment" ) )
+ <input type="button" style='width:80px' value="$i18n.getString( 'update' )" onclick='updateEnrollment($programInstance.patient.id, $programInstance.program.id, $programInstance.id, "$programInstance.program.displayName")'/>
+ #end
+ <input type="button" style='width:80px' id='completeProgram' value="$i18n.getString( 'complete' )" onclick='unenrollmentForm($programInstance.id, 1)' />
+ <input type="button" style='width:80px' id='cancelProgram' value="$i18n.getString( 'quit' )" onclick='unenrollmentForm($programInstance.id, 2)' />
+ <input type="button" style='width:80px' id='incompleteProgram' value="$i18n.getString( 're_enrol' )" onclick='reenrollmentForm($programInstance.id)' />
+ #set($allowRemove = 'true')
+ #foreach( $programStageInstance in $programStageInstances )
+ #if( $!programStageInstance.executionDate
+ || $!programStageInstance.outboundSms.size() > 0
+ || $!programStageInstance.patientComments.size() > 0 )
+
+ #set($allowRemove = 'false')
+ #end
+ #end
+
+ #if($allowRemove == 'true')
+ <input type="button" style='width:80px' id='removeProgram' value="$i18n.getString( 'remove' )" onclick='removeProgramInstance($programInstance.id)' />
+ <script>
+ jQuery('#enrollmentDate').width('325');
+ jQuery('#dateOfIncident').width('325');
+ </script>
+ #end
+ </td>
+
<td valign="top">
- <textarea id="comment" name='comment' maxlength="360" style="height:157px;width:240px">$!encoder.htmlEncode( $programInstance.patientComment.commentText )</textarea><br>
<input type="button" value="$i18n.getString( 'save_comment' )" style="width:130px" onclick="saveComment($programInstance.id);">
- </td>
- <td valign="top">
- <table>
- <tr>
- <td style="background-color:#88be3b; height:26px;"> </td>
- <td class='text-column'>$programInstance.program.dateOfEnrollmentDescription:</td>
- <td><input name="enrollmentDate" id="enrollmentDate" readonly value="$!format.formatDate( $programInstance.enrollmentDate )" style="width:325px;"></td>
- </tr>
- <tr>
- <td style="background-color:#88be3b; height:26px;"> </td>
- <td class='text-column'>$programInstance.program.dateOfIncidentDescription:</td>
- <td><input name="dateOfIncident" id="dateOfIncident" readonly value="$!format.formatDate( $programInstance.dateOfIncident )" style="width:325px;"></td>
- </tr>
- <tr>
- <td style="background-color:#88be3b; height:26px;"> </td>
- <td></td>
- <td>
- #if( !$auth.hasAccess( "dhis-web-caseentry", "saveProgramEnrollment" ) )
- <input type="button" style='width:80px' value="$i18n.getString( 'update' )" onclick='updateEnrollment($programInstance.patient.id, $programInstance.program.id, $programInstance.id, "$programInstance.program.displayName")'/>
- #end
- <input type="button" style='width:80px' id='completeProgram' value="$i18n.getString( 'complete' )" onclick='unenrollmentForm($programInstance.id, 1)' />
- <input type="button" style='width:80px' id='cancelProgram' value="$i18n.getString( 'quit' )" onclick='unenrollmentForm($programInstance.id, 2)' />
- <input type="button" style='width:80px' id='incompleteProgram' value="$i18n.getString( 're_enrol' )" onclick='reenrollmentForm($programInstance.id)' />
- #set($allowRemove = 'true')
- #foreach( $programStageInstance in $programStageInstances )
- #if( $!programStageInstance.executionDate
- || $!programStageInstance.outboundSms.size() > 0
- || $!programStageInstance.patientComments.size() > 0 )
-
- #set($allowRemove = 'false')
- #end
- #end
-
- #if($allowRemove == 'true')
- <input type="button" style='width:80px' id='removeProgram' value="$i18n.getString( 'remove' )" onclick='removeProgramInstance($programInstance.id)' />
- <script>
- jQuery('#enrollmentDate').width('325');
- jQuery('#dateOfIncident').width('325');
- </script>
- #end
- </td>
- </tr>
- <tr>
- <td colspan="3" style="height:15px"></td>
- </tr>
- <tr>
- <td colspan="2" style="background-color: #e0e0e0; height:26px;">$i18n.getString( "stored_by" ):</td>
- <td>$!encoder.htmlEncode( $programInstance.patientComment.creator )</td>
- </tr>
- <tr>
- <td colspan="2" style="background-color: #e0e0e0; height:26px;">$i18n.getString( "stored_date" ):</td>
- <td>$!format.formatDate( $programInstance.patientComment.createdDate )</td>
- </tr>
- </table>
- </td>
+ </td>
+ <td style="background-color: #e0e0e0; height:26px;">$i18n.getString( "stored_by" ):</td>
+ <td>$!encoder.htmlEncode( $programInstance.patientComment.creator )</td>
+ <td style="background-color: #e0e0e0; height:26px;">$i18n.getString( "stored_date" ):</td>
+ <td>$!format.formatDate( $programInstance.patientComment.createdDate )</td>
</tr>
+
</table>
#if( $programInstance.outboundSms.size() > 0 )
