dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #11188
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3161: general template cleanup
------------------------------------------------------------
revno: 3161
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-03-24 18:27:39 +0100
message:
general template cleanup
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResult.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryMenu.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/multiDataEntrySelect.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/records.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/report.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportSelect.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportsMenu.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatient.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/search.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/select.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectProgram.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitPlan.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitPlanSelect.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/caseAggregationResult.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResult.vm 2011-03-24 03:34:53 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResult.vm 2011-03-24 17:27:39 +0000
@@ -1,40 +1,41 @@
+
<div>
<input type="button" value="$i18n.getString( "back" )" onclick="window.location.href='caseAggregationForm.action'" style="width:10em">
</div>
+
<p></p>
<div>
#if( $mapDataValues.keySet().size() > 0 )
- <table class='mainPageTable listTable'>
- <col width="40">
- <col>
- <col>
- <col>
- <thead>
- <tr>
- <th>#</th>
- <th>$i18n.getString('name')</th>
- <th>$i18n.getString('value')</th>
- <th>$i18n.getString('status')</th>
+<table class='mainPageTable listTable'>
+ <col width="40">
+ <col>
+ <col>
+ <col>
+ <thead>
+ <tr>
+ <th>#</th>
+ <th>$i18n.getString('name')</th>
+ <th>$i18n.getString('value')</th>
+ <th>$i18n.getString('status')</th>
+ </tr>
+ </thead>
+
+ #set ( $keys = $mapDataValues.keySet() )
+ #set ($index = 1)
+ <tbody>
+ #foreach( $key in $keys)
+ <tr id="tr${key.dataElement.id}" style="cursor: pointer" onclick="viewResultDetails($key.source.id,$key.period.id,$mapCaseAggCondition.get($key).id)">
+ <td>$index</td>
+ <td>$key.dataElement.getName()</td>
+ <td>$key.getValue()</td>
+ <td>$mapDataValues.get($key)</td>
</tr>
- </thead>
-
- #set ( $keys = $mapDataValues.keySet() )
- #set ($index = 1)
- <tbody>
- #foreach( $key in $keys)
- <tr id="tr${key.dataElement.id}" style="cursor: pointer" onclick="viewResultDetails($key.source.id,$key.period.id,$mapCaseAggCondition.get($key).id)">
- <td>$index</td>
- <td>$key.dataElement.getName()</td>
- <td>$key.getValue()</td>
- <td>$mapDataValues.get($key)</td>
- </tr>
- #set ($index = $index + 1)
- #end
- </tbody>
- </table>
-
+ #set ($index = $index + 1)
+ #end
+ </tbody>
+</table>
#else
$i18n.getString('no_value_added_or_update')
#end
-</div>
\ No newline at end of file
+</div>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm 2011-03-18 12:26:31 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm 2011-03-24 17:27:39 +0000
@@ -19,14 +19,25 @@
<div id="dragDiv">
<table id="listInfo">
- <tr><td style="text-align:left"><strong>$i18n.getString("org_unit_name") :</strong></td> <td id="orgUnitName" style="text-align:right"></td></tr>
- <tr><td style="text-align:left"><strong>$i18n.getString("program_stage_name") :</strong></td> <td id="programStageName" style="text-align:right"></td></tr>
- <tr><td style="text-align:left"><strong>$i18n.getString("datae_element_name") :</strong></td> <td id="dataelementName" style="text-align:right"></td></tr>
+ <tr>
+ <td style="text-align:left">
+ <strong>$i18n.getString("org_unit_name") :</strong></td> <td id="orgUnitName" style="text-align:right">
+ </td>
+ </tr>
+ <tr>
+ <td style="text-align:left">
+ <strong>$i18n.getString("program_stage_name") :</strong></td> <td id="programStageName" style="text-align:right">
+ </td>
+ </tr>
+ <tr>
+ <td style="text-align:left">
+ <strong>$i18n.getString("datae_element_name") :</strong></td> <td id="dataelementName" style="text-align:right">
+ </td>
+ </tr>
</table>
</div>
-<span id="startMsg" style="font-style:italic; color:blue"> $i18n.getString( "report_date_warning" )
-</span>
+<span id="startMsg" style="font-style:italic; color:blue"> $i18n.getString( "report_date_warning" )</span>
<div id="entryFormContainer" >
@@ -38,10 +49,11 @@
#end
</span>
</div>
-<script>
+<script type="text/javascript">
initCustomCheckboxes();
DRAG_DIV.init();
</script>
+
#else
<table class="mainPageTable">
@@ -127,6 +139,7 @@
#end
</div>
+
<div id="completeDataEntryFormContainer">
<form id="completeDataEntryForm" name="completeDataEntry" method="post" action="completeDataEntry.action">
<input type="hidden" name="id" value="$id"/>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryMenu.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryMenu.vm 2010-12-08 07:17:37 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryMenu.vm 2011-03-24 17:27:39 +0000
@@ -1,9 +1,11 @@
<a href="index.action"><h2>$i18n.getString( "data_entry_and_reports" ) </h2></a>
+
<ul>
<li><a href="dataEntrySelect.action">$i18n.getString( "data_entry" ) </a></li>
<li><a href="multipledataEntrySelect.action">$i18n.getString( "multiple_data_entry" ) </a></li>
</ul>
<br>
-#parse( "/dhis-web-commons/ouwt/orgunittree.vm" )
\ No newline at end of file
+
+#parse( "/dhis-web-commons/ouwt/orgunittree.vm" )
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm 2011-01-21 02:26:00 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm 2011-03-24 17:27:39 +0000
@@ -67,27 +67,30 @@
#if( $programStageInstance )
<td> </td>
<td><label for="dueDate">$i18n.getString( "due_date" ) </label></td>
- <td><input type="text" id="dueDate" name="dueDate" value="$!format.formatDate( $programStageInstance.dueDate )" disabled="disabled" </td>
+ <td>
+ <input type="text" id="dueDate" name="dueDate" value="$!format.formatDate( $programStageInstance.dueDate )" disabled="disabled"/>
+ </td>
<td> </td>
<td><label for="executionDate">$i18n.getString( "report_date" ) </label></td>
- <td><input type="text" id="executionDate" name="executionDate" value="$!format.formatDate( $programStageInstance.executionDate )" onchange="saveExecutionDate( $programStageInstance.id, '$encoder.jsEncode( $programStageInstance.programStage.name )' )" >
- <script type="text/javascript">
- datePickerValid('executionDate', false);
- </script>
+ <td>
+ <input type="text" id="executionDate" name="executionDate" value="$!format.formatDate( $programStageInstance.executionDate )" onchange="saveExecutionDate( $programStageInstance.id, '$encoder.jsEncode( $programStageInstance.programStage.name )' )" />
+ </td>
+ <script type="text/javascript">
+ datePickerValid('executionDate', false);
+ </script>
#end
</tr>
- <tr>
- <td><input type="button" id="completeBtn" value="$i18n.getString('complete')" onClick="doComplete()"></td>
- </tr>
-
+ <tr>
+ <td><input type="button" id="completeBtn" value="$i18n.getString('complete')" onClick="doComplete()"></td>
+ </tr>
</table>
+
<div id="actions" style="float:right">
-
<input type="checkbox" id="useDefaultForm" name="useDefaultForm"
#if( $useDefaultForm )
checked="checked"
#end
- onchange="selectDefaultForm();">
+ onchange="selectDefaultForm();"/>
<label>$i18n.getString( "use_default_form" )</label><br>
</div>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm 2011-03-18 12:26:31 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm 2011-03-24 17:27:39 +0000
@@ -69,7 +69,6 @@
#parse( "/dhis-web-commons/paging/paging.vm" )
</div>
-
<div id="detailsArea" style="display:none;overflow:auto;height:250px;width:250px">
<div style="float:right">
<a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( "hide_details" )"></a>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/multiDataEntrySelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/multiDataEntrySelect.vm 2011-03-18 12:26:31 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/multiDataEntrySelect.vm 2011-03-24 17:27:39 +0000
@@ -30,15 +30,16 @@
<h3>$i18n.getString( "" )</h3>
<form id="dataEntryForm" name="dataEntryForm" method="post" action="multipledataEntrySelect.action">
-
- <table>
- <tr>
- <td><label>$i18n.getString( "reporting_unit" )</label></td>
- <td><input type="text" readonly="readonly" #if( $organisationUnit ) value="$encoder.htmlEncode( $organisationUnit.name )" #else value="[$i18n.getString( "select" )]" #end style="min-width:350px"></td>
- <td> </td>
- <td> </td>
+ <table>
+ <tr>
+ <td><label>$i18n.getString( "reporting_unit" )</label></td>
+ <td>
+ <input type="text" readonly="readonly" #if( $organisationUnit ) value="$encoder.htmlEncode( $organisationUnit.name )" #else value="[$i18n.getString( "select" )]" #end style="min-width:350px">
+ </td>
+ <td> </td>
+ <td> </td>
</tr>
-
+
<tr>
<td><label for="programId">$i18n.getString( "program" )</label></td>
<td>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm 2011-03-18 12:26:31 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm 2011-03-24 17:27:39 +0000
@@ -62,20 +62,17 @@
<td> </td>
<td>
<div id="actions" style="float:left">
-
<input type="checkbox" id="useDefaultForm" name="useDefaultForm"
#if( $useDefaultForm )
- checked="checked"
- #end
+ checked="checked"
+ #end
onchange="selectDefaultForm();">
<label>$i18n.getString( "use_default_form" )</label><br>
</div>
</td>
</tr>
-
</table>
-
</form>
<hr style="clear:both">
@@ -101,10 +98,12 @@
#end
</span>
</div>
-<script>
+
+<script type="text/javascript">
initCustomCheckboxes();
DRAG_DIV.init();
</script>
+
#else
<table class="mainPageTable">
@@ -112,12 +111,14 @@
<col id="deCol">
<col id="entryCol">
<col id="facilityCol">
+
<tr>
<th>$i18n.getString( "nr" )</th>
<th>$i18n.getString( "data_element" )</th>
<th>$i18n.getString( "entry" )</th>
<th>$i18n.getString( "facility_provided_data" )</th>
</tr>
+
#set( $dataElementRowCount = 0 )
#set( $mark = 0 )
#set( $tabIndex = 1 )
@@ -190,6 +191,7 @@
#end
</div>
+
<div id="completeDataEntryFormContainer">
<form id="completeDataEntryForm" name="completeDataEntry" method="post" action="completeProgramStageDataEntry.action">
<input type="hidden" name="id" value="$patient.id"/>
@@ -197,5 +199,6 @@
<input type="hidden" name="programStageId" value="$programStage.id"/>
<input type="hidden" name="programStageInstanceId" value="$programStageInstance.id"/>
</form>
+
</div>
</div>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/records.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/records.vm 2009-11-11 00:05:58 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/records.vm 2011-03-24 17:27:39 +0000
@@ -1,95 +1,86 @@
+
<p align="right">
- <input type="button" value="$i18n.getString( "close" )" onclick="window.close()" style="width:10em">
+ <input type="button" value="$i18n.getString( "close" )" onclick="window.close()" style="width:10em"/>
</p>
<table>
- <tr>
- <td><strong>$i18n.getString( "full_name" ):</strong></td>
- <td>
- $encoder.htmlEncode( $patient.getFullName() )
- </td>
- </tr>
- <tr>
- <td><strong>$i18n.getString( "gender" ):</strong></td>
- <td>
- $encoder.htmlEncode( $patient.gender )
- </td>
- </tr>
- <tr>
- <td><strong>$i18n.getString( "date_of_birth" ):</strong></td>
- <td>
- $format.formatDate( $patient.birthDate )
- </td>
- </tr>
- <tr>
- <td><strong>$i18n.getString( "age" ):</strong></td>
- <td>
- $encoder.htmlEncode( $patient.getAge() )
- </td>
- </tr>
-
+ <tr>
+ <td><strong>$i18n.getString( "full_name" ):</strong></td>
+ <td>$encoder.htmlEncode( $patient.getFullName() )</td>
+ </tr>
+ <tr>
+ <td><strong>$i18n.getString( "gender" ):</strong></td>
+ <td>$encoder.htmlEncode( $patient.gender )</td>
+ </tr>
+ <tr>
+ <td><strong>$i18n.getString( "date_of_birth" ):</strong></td>
+ <td>$format.formatDate( $patient.birthDate )</td>
+ </tr>
+ <tr>
+ <td><strong>$i18n.getString( "age" ):</strong></td>
+ <td>$encoder.htmlEncode( $patient.getAge() )</td>
+ </tr>
</table>
<h4>$i18n.getString( "records_for" ) $encoder.htmlEncode( $programStageInstance.programStage.name ) </h4>
<table class="mainPageTable">
- <col id="noCol">
- <col id="deCol">
- <col id="entryCol">
- <col id="facilityCol">
- <tr>
- <th>$i18n.getString( "nr" )</th>
- <th>$i18n.getString( "data_element" )</th>
- <th>$i18n.getString( "entry" )</th>
- <th>$i18n.getString( "provided_by_another_facility" )</th>
- </tr>
-
- #set( $dataElementRowCount = 0 )
- #set( $mark = 0 )
- #set( $tabIndex = 1 )
-
- #foreach( $patientDataValue in $patientDataValues )
-
- #set( $dataElementRowCount = $dataElementRowCount + 1 )
- #if( $mark == 1 )
- #set( $mark = 0 )
- #else
- #set( $mark = 1 )
- #end
-
- <tr #if( $mark == 0 ) style="background-color:#dddddd" #end>
- ##dataElementRowCount
- <td style="text-align:center">$dataElementRowCount</td>
-
- ##data element name
- <td>
- $encoder.htmlEncode( $patientDataValue.dataElement.name )
- </td>
-
- ##value
- <td style="text-align:center">
- #if( $patientDataValue.dataElement.type == "bool" )
- #if( $patientDataValue.value == "true" )
- $i18n.getString( "yes" )
- #elseif( $patientDataValue.value == "false" )
- $i18n.getString( "no" )
- #end
- #elseif( $patientDataValue.dataElement.type == "string" && $patientDataValue.dataElement.isMultiDimensional() )
- #if( $patientDataValue.value )
- #set( $optionValue = $optionValueMap.get( $patientDataValue.dataElement.id ) )
- $encoder.htmlEncode( $optionValue )
- #end
- #else
- $!encoder.htmlEncode( $patientDataValue.value )
- #end
- </td>
-
- ##providedByAnotherFacility
- <td style="text-align:center">
- #if( $patientDataValue.providedByAnotherFacility )
- $i18n.getString( "yes" )
- #end
- </td>
- </tr>
- #end
+ <col id="noCol">
+ <col id="deCol">
+ <col id="entryCol">
+ <col id="facilityCol">
+ <tr>
+ <th>$i18n.getString( "nr" )</th>
+ <th>$i18n.getString( "data_element" )</th>
+ <th>$i18n.getString( "entry" )</th>
+ <th>$i18n.getString( "provided_by_another_facility" )</th>
+ </tr>
+
+ #set( $dataElementRowCount = 0 )
+ #set( $mark = 0 )
+ #set( $tabIndex = 1 )
+
+ #foreach( $patientDataValue in $patientDataValues )
+ #set( $dataElementRowCount = $dataElementRowCount + 1 )
+ #if( $mark == 1 )
+ #set( $mark = 0 )
+ #else
+ #set( $mark = 1 )
+ #end
+
+ <tr #if( $mark == 0 ) style="background-color:#dddddd" #end>
+ ##dataElementRowCount
+ <td style="text-align:center">$dataElementRowCount</td>
+
+ ##data element name
+ <td>
+ $encoder.htmlEncode( $patientDataValue.dataElement.name )
+ </td>
+
+ ##value
+ <td style="text-align:center">
+ #if( $patientDataValue.dataElement.type == "bool" )
+ #if( $patientDataValue.value == "true" )
+ $i18n.getString( "yes" )
+ #elseif( $patientDataValue.value == "false" )
+ $i18n.getString( "no" )
+ #end
+ #elseif( $patientDataValue.dataElement.type == "string" && $patientDataValue.dataElement.isMultiDimensional() )
+ #if( $patientDataValue.value )
+ #set( $optionValue = $optionValueMap.get( $patientDataValue.dataElement.id ) )
+ $encoder.htmlEncode( $optionValue )
+ #end
+ #else
+ $!encoder.htmlEncode( $patientDataValue.value )
+ #end
+ </td>
+
+ ##providedByAnotherFacility
+ <td style="text-align:center">
+ #if( $patientDataValue.providedByAnotherFacility )
+ $i18n.getString( "yes" )
+ #end
+ </td>
+ </tr>
+ #end
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/report.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/report.vm 2010-10-30 10:56:31 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/report.vm 2011-03-24 17:27:39 +0000
@@ -2,49 +2,51 @@
#parse( "/dhis-web-caseentry/reportSelect.vm" )
<table class="mainPageTable">
- <tr>
- <td style="vertical-align:top">
- <table class="listTable">
+<tr>
+ <td style="vertical-align:top">
+ <table class="listTable">
+ <col>
+ #foreach( $programStage in $program.programStages )
<col>
+ #end
+ <tr>
+ <th style="text-align:center">$i18n.getString( "full_name" )</th>
#foreach( $programStage in $program.programStages )
- <col>
- #end
- <tr>
- <th style="text-align:center">$i18n.getString( "full_name" )</th>
- #foreach( $programStage in $program.programStages )
- <th style="text-align:center">$encoder.htmlEncode( $programStage.name )</th>
- #end
- </tr>
-
- <tbody id="list">
- #set( $mark = false )
- #foreach( $programInstance in $programInstances )
- <tr #alternate( $mark )>
- <td><a href="javascript:showPatientDetails( $programInstance.patient.id )" title='$i18n.getString( "show_details" )'>$programInstance.patient.getFullName()</a></td>
- #foreach( $programStageInstance in $programInstance.programStageInstances )
- #if( $programStageInstance.executionDate )
- <td style="text-align:center" bgcolor="$colorMap.get( $programStageInstance.id )">
- <a href="javascript:viewRecords( $programStageInstance.id )">
- $format.formatDate( $programStageInstance.executionDate )
- </td>
- #else
- <td style="text-align:center" bgcolor="$colorMap.get( $programStageInstance.id )">$format.formatDate( $programStageInstance.dueDate ) </td>
- #end
+ <th style="text-align:center">$encoder.htmlEncode( $programStage.name )</th>
+ #end
+ </tr>
+
+ <tbody id="list">
+ #set( $mark = false )
+ #foreach( $programInstance in $programInstances )
+ <tr #alternate( $mark )>
+ <td><a href="javascript:showPatientDetails( $programInstance.patient.id )" title='$i18n.getString( "show_details" )'>$programInstance.patient.getFullName()</a></td>
+ #foreach( $programStageInstance in $programInstance.programStageInstances )
+ #if( $programStageInstance.executionDate )
+ <td style="text-align:center" bgcolor="$colorMap.get( $programStageInstance.id )">
+ <a href="javascript:viewRecords( $programStageInstance.id )">
+ $format.formatDate( $programStageInstance.executionDate )
+ </td>
+ #else
+ <td style="text-align:center" bgcolor="$colorMap.get( $programStageInstance.id )">$format.formatDate( $programStageInstance.dueDate ) </td>
#end
- </tr>
- #if( $mark )
- #set( $mark = false )
- #else
- #set( $mark = true )
- #end
- #end
- </tbody>
-
- </table>
- </td>
- </tr>
+ #end
+ </tr>
+ #if( $mark )
+ #set( $mark = false )
+ #else
+ #set( $mark = true )
+ #end
+ #end
+ </tbody>
+
+ </table>
+ </td>
+</tr>
</table>
+
<p></p>
+
<div class="paging-container">
#parse( "/dhis-web-commons/paging/paging.vm" )
</div>
@@ -53,7 +55,7 @@
<div style="float:right;" onclick="javascript:hideDetails()">
<a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( "hide_details" )"></a>
</div>
- <p><label>$i18n.getString( "identifier" ):</label><br><span id="identifierField"></span></p>
+ <p><label>$i18n.getString( "identifier" ):</label><br><span id="identifierField"></span></p>
<p><label>$i18n.getString( "attributes" ):</label><br><span id="attributeField"></span></p>
<p><label>$i18n.getString( "enrolled_in_program" ):</label><br><span id="programField"></span></p>
</div>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportSelect.vm 2011-03-18 12:26:31 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportSelect.vm 2011-03-24 17:27:39 +0000
@@ -5,50 +5,48 @@
<h3>$i18n.getString( "report_management" )</h3>
<form id="reportForm" name="reportForm" method="post" action="reportSelect.action">
-
- <table>
- <tr>
- <td><label>$i18n.getString( "reporting_unit" )</label></td>
- <td><input type="text" readonly="readonly" #if( $organisationUnit ) value="$encoder.htmlEncode( $organisationUnit.name )" #else value="[$i18n.getString( "select" )]" #end style="min-width:350px"></td>
- </tr>
-
- <tr>
- <td><label for="programId">$i18n.getString( "program" )</label></td>
- <td>
- <select id="programId" name="programId" style="min-width:350px" onchange="document.getElementById( 'reportForm' ).submit();" #if( $programs.size() == 0 ) disabled="disabled" #end>
- <option value="0">[$i18n.getString( "select" )]</option>
- #foreach( $program in $programs )
- <option value="$program.id" #if( $programId && $program.id == $programId ) selected="selected" #end>$encoder.htmlEncode( $program.name )</option>
- #end
- </select>
- </td>
- </tr>
-
- <tr>
- <td><label>$i18n.getString( "start_date" )</label></td>
- <td>
- <input type="text" id="startDate" name="startDate" #if( $startDate ) value="$encoder.htmlEncode( $startDate )" #end>
- <script type="text/javascript">
- datePicker('startDate');
- </script>
- </td>
- </tr>
+<table>
+ <tr>
+ <td><label>$i18n.getString( "reporting_unit" )</label></td>
+ <td><input type="text" readonly="readonly" #if( $organisationUnit ) value="$encoder.htmlEncode( $organisationUnit.name )" #else value="[$i18n.getString( "select" )]" #end style="min-width:350px"></td>
+ </tr>
+
+ <tr>
+ <td><label for="programId">$i18n.getString( "program" )</label></td>
+ <td>
+ <select id="programId" name="programId" style="min-width:350px" onchange="document.getElementById( 'reportForm' ).submit();" #if( $programs.size() == 0 ) disabled="disabled" #end>
+ <option value="0">[$i18n.getString( "select" )]</option>
+ #foreach( $program in $programs )
+ <option value="$program.id" #if( $programId && $program.id == $programId ) selected="selected" #end>$encoder.htmlEncode( $program.name )</option>
+ #end
+ </select>
+ </td>
+ </tr>
- <tr>
- <td><label>$i18n.getString( "end_date" )</label></td>
- <td>
- <input type="text" id="endDate" name="endDate" #if( $endDate ) value="$encoder.htmlEncode( $endDate )" #end>
- <script type="text/javascript">
- datePicker('endDate');
- </script>
- </td>
- </tr>
- </table>
- <p>
- <input type="button" value="$i18n.getString( "generate" )" style="width:10em" onclick="validateAndGenerateReport()">
- <input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='index.action'" style="width:10em">
- </p>
-
+ <tr>
+ <td><label>$i18n.getString( "start_date" )</label></td>
+ <td>
+ <input type="text" id="startDate" name="startDate" #if( $startDate ) value="$encoder.htmlEncode( $startDate )" #end>
+ <script type="text/javascript">
+ datePicker('startDate');
+ </script>
+ </td>
+ </tr>
+
+ <tr>
+ <td><label>$i18n.getString( "end_date" )</label></td>
+ <td>
+ <input type="text" id="endDate" name="endDate" #if( $endDate ) value="$encoder.htmlEncode( $endDate )" #end>
+ <script type="text/javascript">
+ datePicker('endDate');
+ </script>
+ </td>
+ </tr>
+</table>
+<p>
+ <input type="button" value="$i18n.getString( "generate" )" style="width:10em" onclick="validateAndGenerateReport()">
+ <input type="button" value="$i18n.getString( "cancel" )" onclick="window.location.href='index.action'" style="width:10em">
+</p>
</form>
<hr style="clear:both">
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportsMenu.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportsMenu.vm 2009-11-20 12:19:58 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportsMenu.vm 2011-03-24 17:27:39 +0000
@@ -6,4 +6,4 @@
</ul>
<br>
-#parse( "/dhis-web-commons/ouwt/orgunittree.vm" )
\ No newline at end of file
+#parse( "/dhis-web-commons/ouwt/orgunittree.vm" )
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatient.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatient.vm 2011-01-20 06:06:45 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatient.vm 2011-03-24 17:27:39 +0000
@@ -26,4 +26,3 @@
</program>
#end
</patient>
-
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/search.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/search.vm 2009-10-27 17:39:55 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/search.vm 2011-03-24 17:27:39 +0000
@@ -4,17 +4,19 @@
<table>
<tr>
<td><label>$i18n.getString( "registering_unit" )</label></td>
- <td><input type="text" readonly="readonly" #if( $organisationUnit ) value="$encoder.htmlEncode( $organisationUnit.name )" #else value="[$i18n.getString( "please_select_village" )]" #end style="min-width:350px"></td>
+ <td>
+ <input type="text" readonly="readonly" #if( $organisationUnit ) value="$encoder.htmlEncode( $organisationUnit.name )" #else value="[$i18n.getString( "please_select_village" )]" #end style="min-width:350px">
+ </td>
<td> </td>
- <td><input type="button" value="$i18n.getString( "list_all_patients" )" onclick="window.location.href='listAllPatients.action'"></td>
+ <td>
+ <input type="button" value="$i18n.getString( "list_all_patients" )" onclick="window.location.href='listAllPatients.action'">
+ </td>
</tr>
</table>
<hr style="clear:both">
-
<form id="searchForm" name="searchForm" action="searchPatient.action" method="post" onsubmit="return validateSearch()">
-
<table>
<tr>
<td>
@@ -26,13 +28,15 @@
</select>
<em title="$i18n.getString( "required" )" class="required">*</em></label>
</td>
- <td><input type="text" id="searchText" name="searchText" maxlength="30" style="width:20em"></td>
- <td><input type="submit" value="$i18n.getString( "search" )"</td>
+ <td>
+ <input type="text" id="searchText" name="searchText" maxlength="30" style="width:20em"/>
+ </td>
+ <td>
+ <input type="submit" value="$i18n.getString( "search" )"/>
+ </td>
</tr>
<tr></tr>
</table>
-
</form>
<span id="message"></span>
-
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/select.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/select.vm 2010-10-28 09:17:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/select.vm 2011-03-24 17:27:39 +0000
@@ -1,16 +1,16 @@
<h3>$i18n.getString( "name_based_data_entry" )</h3>
<form id="selectForm" name="selectForm" method="post" action="select.action">
-
<table>
<tr>
<td><label>$i18n.getString( "registering_unit" )</label></td>
- <td><input type="text" readonly="readonly" #if( $organisationUnit ) value="$encoder.htmlEncode( $organisationUnit.name )" #else value="[$i18n.getString( "select" )]" #end style="min-width:350px"></td>
+ <td>
+ <input type="text" readonly="readonly" #if( $organisationUnit ) value="$encoder.htmlEncode( $organisationUnit.name )" #else value="[$i18n.getString( "select" )]" #end style="min-width:350px">
+ </td>
</tr>
</table>
-
</form>
-<hr style="clear:both">
\ No newline at end of file
+<hr style="clear:both">
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectProgram.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectProgram.vm 2009-10-06 13:49:47 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectProgram.vm 2011-03-24 17:27:39 +0000
@@ -1,16 +1,13 @@
<h3>$i18n.getString( "name_based_data_entry" )</h3>
-
<br>
<form id="selectProgramForm" name="selectProgramForm" method="post" action="selectProgram.action">
-
<div>
<input type="hidden" id="id" name="id" value="$patient.id">
</div>
<table>
-
<tr>
<td>
$encoder.htmlEncode( $patient.firstName )
@@ -44,9 +41,7 @@
</select>
</td>
</tr>
-
</table>
-
</form>
<hr style="clear:both">
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitPlan.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitPlan.vm 2009-11-20 12:22:52 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitPlan.vm 2011-03-24 17:27:39 +0000
@@ -1,75 +1,74 @@
<h3>$i18n.getString( "visit_plan" )</h3>
<table>
-
<tr>
<td><label>$i18n.getString( "registering_unit" )</label></td>
- <td><input type="text" readonly="readonly" #if( $organisationUnit ) value="$encoder.htmlEncode( $organisationUnit.name )" #else value="[$i18n.getString( "select" )]" #end style="min-width:350px"></td>
+ <td>
+ <input type="text" readonly="readonly" #if( $organisationUnit ) value="$encoder.htmlEncode( $organisationUnit.name )" #else value="[$i18n.getString( "select" )]" #end style="min-width:350px">
+ </td>
</tr>
<tr>
<td>$i18n.getString( "sort_by" )</td>
<td>
- <select id="sortingAttributeId" name="sortingAttributeId" style="min-width:350px" onchange="sortByAttribute( this.options[this.selectedIndex].value )" #if( $attributes.size() == 0 ) disabled="disabled" #end>
+ <select id="sortingAttributeId" name="sortingAttributeId" style="min-width:350px" onchange="sortByAttribute( this.options[this.selectedIndex].value )" #if( $attributes.size() == 0 ) disabled="disabled" #end>
#foreach( $attribute in $attributes )
<option value="$attribute.id" #if( $sortingAttribute && $attribute.id == $sortingAttribute.id ) selected="selected" #end>$encoder.htmlEncode( $attribute.name )</option>
#end
</select>
</td>
</tr>
-
</table>
<hr style="clear:both">
#foreach( $patient in $sortedPatients )
-
- <div id="visitPlanContainer" style="border:1px solid #808080; width:465px;">
- <table class="mainPageTable">
- <tr>
- <td>
- <strong>$i18n.getString( "full_name" ):</strong>$encoder.htmlEncode( $patient.getFullName() )<br>
- <strong>$i18n.getString( "gender" ):</strong>$encoder.htmlEncode( $patient.gender )<br>
- <strong>$i18n.getString( "date_of_birth" ):</strong>$format.formatDate( $patient.birthDate )<br>
- <strong>$i18n.getString( "age" ):</strong>$encoder.htmlEncode( $patient.getAge() )
- </td>
- <td style="vertical-align:top">
- <div style="float:right">
- #set( $attributeValues = false )
- #set( $attributeValues = $attributeValueMap.get( $patient.id ) )
- #foreach( $attributeValue in $attributeValues )
- <strong>$encoder.htmlEncode( $attributeValue.patientAttribute.name ):</strong>$encoder.htmlEncode( $attributeValue.value )<br>
- #end
- </div>
- </td>
- </tr>
- </table>
- #set( $stageInstances = false )
- #set( $stageInstances = $visitsByPatients.get( $patient ) )
- <table class="listTable">
- <col>
- <col>
- <col>
- <tr>
- <th>$i18n.getString( "program" )</th>
- <th>$i18n.getString( "stage" )</th>
- <th>$i18n.getString( "due_date" )</th>
- </tr>
- <tbody id="list">
- #set( $mark = false )
- #foreach( $stageInstance in $stageInstances )
- <tr #alternate( $mark )>
- <td>$!stageInstance.programInstance.program.name</td>
- <td>$!stageInstance.programStage.name</td>
- <td>$!format.formatDate( $!stageInstance.dueDate )</td>
- </tr>
- #if( $mark )
- #set( $mark = false )
- #else
- #set( $mark = true )
- #end
- #end
- </tbody>
- </table>
- </div>
- <p></p>
-#end
\ No newline at end of file
+<div id="visitPlanContainer" style="border:1px solid #808080; width:465px;">
+ <table class="mainPageTable">
+ <tr>
+ <td>
+ <strong>$i18n.getString( "full_name" ):</strong>$encoder.htmlEncode( $patient.getFullName() )<br>
+ <strong>$i18n.getString( "gender" ):</strong>$encoder.htmlEncode( $patient.gender )<br>
+ <strong>$i18n.getString( "date_of_birth" ):</strong>$format.formatDate( $patient.birthDate )<br>
+ <strong>$i18n.getString( "age" ):</strong>$encoder.htmlEncode( $patient.getAge() )
+ </td>
+ <td style="vertical-align:top">
+ <div style="float:right">
+ #set( $attributeValues = false )
+ #set( $attributeValues = $attributeValueMap.get( $patient.id ) )
+ #foreach( $attributeValue in $attributeValues )
+ <strong>$encoder.htmlEncode( $attributeValue.patientAttribute.name ):</strong>$encoder.htmlEncode( $attributeValue.value )<br>
+ #end
+ </div>
+ </td>
+ </tr>
+ </table>
+ #set( $stageInstances = false )
+ #set( $stageInstances = $visitsByPatients.get( $patient ) )
+ <table class="listTable">
+ <col>
+ <col>
+ <col>
+ <tr>
+ <th>$i18n.getString( "program" )</th>
+ <th>$i18n.getString( "stage" )</th>
+ <th>$i18n.getString( "due_date" )</th>
+ </tr>
+ <tbody id="list">
+ #set( $mark = false )
+ #foreach( $stageInstance in $stageInstances )
+ <tr #alternate( $mark )>
+ <td>$!stageInstance.programInstance.program.name</td>
+ <td>$!stageInstance.programStage.name</td>
+ <td>$!format.formatDate( $!stageInstance.dueDate )</td>
+ </tr>
+ #if( $mark )
+ #set( $mark = false )
+ #else
+ #set( $mark = true )
+ #end
+ #end
+ </tbody>
+ </table>
+</div>
+<p></p>
+#end
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitPlanSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitPlanSelect.vm 2009-10-16 17:11:16 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitPlanSelect.vm 2011-03-24 17:27:39 +0000
@@ -1,12 +1,12 @@
<h3>$i18n.getString( "visit_plan" )</h3>
<table>
-
<tr>
<td><label>$i18n.getString( "registering_unit" )</label></td>
- <td><input type="text" readonly="readonly" #if( $organisationUnit ) value="$encoder.htmlEncode( $organisationUnit.name )" #else value="[$i18n.getString( "select" )]" #end style="min-width:350px"></td>
+ <td>
+ <input type="text" readonly="readonly" #if( $organisationUnit ) value="$encoder.htmlEncode( $organisationUnit.name )" #else value="[$i18n.getString( "select" )]" #end style="min-width:350px">
+ </td>
</tr>
-
</table>
<hr style="clear:both">
