dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #15798
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 5830: (patient) css for data entry form.
------------------------------------------------------------
revno: 5830
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-01-31 12:11:00 +0700
message:
(patient) css for data entry form.
added:
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/dataEntry.css
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.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/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/javascript/entry.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/patient.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/struts.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml 2012-01-15 15:59:31 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml 2012-01-31 05:11:00 +0000
@@ -30,6 +30,7 @@
,javascript/entry.js
,../dhis-web-commons/javascripts/date.js
</param>
+ <param name="stylesheets">style/dataEntry.css</param>
</action>
<action name="validateSearch"
@@ -76,7 +77,7 @@
<result name="success" type="velocity">/content.vm</result>
<param name="page">/dhis-web-caseentry/dataEntryForm.vm</param>
<param name="javascripts">javascript/customcheckbox/prettyCheckboxes.js</param>
- <param name="stylesheets">style/patient.css,javascript/customcheckbox/prettyCheckboxes.css</param>
+ <param name="stylesheets">style/dataEntry.css,javascript/customcheckbox/prettyCheckboxes.css</param>
</action>
<action name="completeDataEntry"
@@ -157,6 +158,7 @@
<result name="success" type="velocity">/content.vm</result>
<param name="page">/dhis-web-caseentry/programStageDataEntryForm.vm</param>
<param name="javascripts">javascript/form.js,javascript/entry.js,../dhis-web-commons/javascripts/date.js</param>
+ <param name="stylesheets">style/dataEntry.css</param>
</action>
<action name="loadProgramStageRecords"
@@ -353,8 +355,7 @@
class="org.hisp.dhis.caseentry.action.caseentry.DataRecordingSelectAction">
<result name="success" type="velocity">/content.vm</result>
<param name="page">/dhis-web-caseentry/dataRecordingSelect.vm</param>
- <param name="javascripts">javascript/entry.js</param>
- <param name="stylesheets">style/patient.css</param>
+ <param name="stylesheets">style/dataEntry.css</param>
</action>
<action name="organisationUnitHasPatients"
@@ -464,7 +465,7 @@
,javascript/anonymousRegistration.js
,javascript/entry.js
,../dhis-web-commons/javascripts/date.js</param>
- <param name="stylesheets">../dhis-web-caseentry/style/patient.css</param>
+ <param name="stylesheets">style/dataEntry.css,../dhis-web-caseentry/style/patient.css</param>
</action>
<action name="createAnonymousEncounter"
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm 2012-01-15 15:59:31 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm 2012-01-31 05:11:00 +0000
@@ -1,20 +1,20 @@
<h3>$i18n.getString( "anonymous_events" )</h3>
-<div id="actions">
- <input type="button" id="createEventBtn" value="$i18n.getString('create_new_event')" onClick="javascript: createNewEvent();" style="width:12em " disabled="disabled">
- <input type="button" id="completeBtn" value="$i18n.getString('complete')" onClick="doComplete();" style="width:12em" disabled="disabled" >
- <input type="button" id="deleteCurrentEventBtn" value="$i18n.getString('delete_current_event')" onClick="javascript: deleteCurrentEvent();" style="width:12em " disabled="disabled" >
+<div class="actions">
+ <input type="button" class='button' id="createEventBtn" value="$i18n.getString('create_new_event')" onClick="javascript: createNewEvent();" disabled="disabled">
+ <input type="button" class='button' id="completeBtn" value="$i18n.getString('complete')" onClick="doComplete();" disabled="disabled" >
+ <input type="button" class='button' id="deleteCurrentEventBtn" value="$i18n.getString('delete_current_event')" onClick="javascript: deleteCurrentEvent();" disabled="disabled" >
</div>
-<div id="dataRecordingSelectDiv" class="inputCriteria" style="width:420px;height:80px;">
+<div id="dataRecordingSelectDiv" class="inputCriteria" style="width:500px;height:65px;">
<input type='hidden' id="programStageId">
<input type='hidden' id='selectedProgramId'>
<table>
<tr>
- <td>$i18n.getString('program')</td>
+ <td class='textColumn'>$i18n.getString('program')</td>
<td>
- <select id='programId' name='programId' style='width:300px' onchange='loadEventForm();'>
+ <select id='programId' name='programId' class='criteria' onchange='loadEventForm();'>
<option value="">[ $i18n.getString('please_select') ]</option>
#foreach( $programInstance in $programInstances)
<option value="$programInstance.program.id" singleevent='$programInstance.program.singleEvent' programInstanceId='$programInstance.id'>$programInstance.program.name</option>
@@ -23,8 +23,8 @@
</td>
</tr>
<tr>
- <td><label for="executionDate">$i18n.getString( "report_date" ) </label></td>
- <td><input type="text" id="executionDate" name="executionDate" style="width:300px" value="$!format.formatDate( $programStageInstance.executionDate )" >
+ <td class='textColumn'><label for="executionDate">$i18n.getString( "report_date" ) </label></td>
+ <td><input type="text" id="executionDate" name="executionDate" class='criteria' value="$!format.formatDate( $programStageInstance.executionDate )" >
<script type="text/javascript">
datePickerValid( 'executionDate', false );
</script>
=== 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 2012-01-11 06:17:35 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm 2012-01-31 05:11:00 +0000
@@ -34,7 +34,7 @@
<input type='hidden' name='irregular' id='irregular' value='$!programStageInstance.programStage.irregular'>
<input type='hidden' name='completed' id='completed' value='$!programStageInstance.completed'>
-<div id='entryForm' style="display: #if($!programStageInstance.executionDate) block #else none #end;">
+<div id='entryForm' #if($!programStageInstance.executionDate) class='visible' #else class='hidden' #end;>
#if( $customDataEntryFormCode )
<div id="customEntryScreenContainer">
$customDataEntryFormCode
@@ -46,107 +46,104 @@
</script>
</div>
#else
- <div id="defaultEntryScreenContainer" >
-
- <table class="mainPageTable">
- <col id="noCol">
- <col id="deCol">
- <col id="entryCol">
+ <table id="defaultEntryScreenContainer" class='entryScreen formSection'>
+ <col id="noCol">
+ <col id="deCol">
+ <col id="entryCol">
+ #if( $programStageInstance.programInstance.program.anonymous == 'false' )
+ <col id="facilityCol">
+ #end
+ <tr>
+ <th>$i18n.getString( "nr" )</th>
+ <th>$i18n.getString( "data_element" )</th>
+ <th>$i18n.getString( "entry" )</th>
#if( $programStageInstance.programInstance.program.anonymous == 'false' )
- <col id="facilityCol">
+ <th>$i18n.getString( "provided_elsewhere" )</th>
#end
- <tr>
- <th>$i18n.getString( "nr" )</th>
- <th>$i18n.getString( "data_element" )</th>
- <th>$i18n.getString( "entry" )</th>
- #if( $programStageInstance.programInstance.program.anonymous == 'false' )
- <th>$i18n.getString( "provided_elsewhere" )</th>
+ </tr>
+ #set( $dataElementRowCount = 0 )
+ #set( $mark = true )
+ #set( $tabIndex = 1 )
+ #foreach( $programStageDataElement in $programStageDataElements )
+ #set( $dataElementRowCount = $dataElementRowCount + 1 )
+ #if( $mark )
+ #set( $mark = false )
+ #else
+ #set( $mark = true )
+ #end
+ #set( $patientDataValue = false )
+ #set( $patientDataValue = $patientDataValueMap.get( $programStageDataElement.dataElement.id ) )
+ <tr #alternate( $mark )>
+ ##dataElementRowCount
+ <td>$dataElementRowCount</td>
+ ##data element name
+ <td class='textColumn'>
+ <span id="value[$programStageDataElement.dataElement.id].name" title="$!encoder.htmlEncode( $programStageDataElement.dataElement.description )">
+ $encoder.htmlEncode( $programStageDataElement.dataElement.name )
+ #if ( $programStageDataElement.compulsory )
+ <em title="$i18n.getString( "required" )" class="required">*</em>
+ #end
+ </span>
+ ##type
+ <span id="value[$programStageDataElement.dataElement.id].type" class="hidden">$encoder.htmlEncode( $programStageDataElement.dataElement.type )</span></td>
+ </td>
+ ##entry
+ <td>
+ #set( $id = $programStageDataElement.programStage.id + '-' + $programStageDataElement.dataElement.id + '-val' )
+ #if( $programStageDataElement.dataElement.type == "bool" )
+ <select name="entryselect" #if($programStageInstance.completed) disabled="disabled" #end data="{compulsory: $programStageDataElement.compulsory }" id="$id" onchange="saveOpt( $programStageDataElement.dataElement.id )" tabindex="$tabIndex">
+ <option value="">[$i18n.getString( "select_value" )]</option>
+ <option value="true" #if( $patientDataValue.value == "true" ) selected="selected" #end>$i18n.getString( "yes" )</option>
+ <option value="false" #if( $patientDataValue.value == "false" ) selected="selected" #end>$i18n.getString( "no" )</option>
+ </select>
+ #elseif( $programStageDataElement.dataElement.type == "string" && $programStageDataElement.dataElement.isMultiDimensional() )
+ #set( $optionValues = $optionMap.get( $programStageDataElement.dataElement.id ) )
+ <select name="entryselect" data="{compulsory: $programStageDataElement.compulsory }" #if($programStageInstance.completed) disabled="disabled" #end id="$id" onchange="saveOpt( $programStageDataElement.dataElement.id )" tabindex="$tabIndex">
+ <option value="">[$i18n.getString( "no_value" )]</option>
+ #foreach( $optionValue in $optionValues )
+ <option value="$optionValue.id" #if( $patientDataValue.value == $optionValue.id ) selected="selected" #end>$encoder.htmlEncode( $optionValue.name )</option>
+ #end
+ </select>
+ #elseif( $programStageDataElement.dataElement.type == "date" )
+ <input type="text" data="{compulsory: $programStageDataElement.compulsory }" #if($programStageInstance.completed) disabled="disabled" #end id="$id" name="entryfield" value="$!encoder.htmlEncode( $patientDataValue.value )" onchange="saveDate( $programStageDataElement.dataElement.id )" onkeypress="return keyPress(event, this)" tabindex="$tabIndex" >
+ #if(!$programStageInstance.completed)
+ <script type="text/javascript">
+ datePicker($programStageDataElement.programStage.id + '-' + $programStageDataElement.dataElement.id + '-val', false);
+ </script>
+ #end
+ #else
+ #foreach( $optionCombo in $programStageDataElement.dataElement.categoryCombo.optionCombos )
+ #set( $id = $programStageDataElement.programStage.id + '-' + $programStageDataElement.dataElement.id + '-' + $optionCombo.id + '-val' )
+ <input name="entryfield" data="{compulsory: $programStageDataElement.compulsory, deName:'$programStageDataElement.dataElement.name', deType:'$programStageDataElement.dataElement.getDetailedNumberType()' }" #if($programStageInstance.completed) disabled="disabled" #end id="$id" type="text" value="$!encoder.htmlEncode( $patientDataValue.value )" onchange="saveVal( $programStageDataElement.dataElement.id, $optionCombo.id )" onkeypress="return keyPress(event, this)" tabindex="$tabIndex">
+ #end
#end
- </tr>
- #set( $dataElementRowCount = 0 )
- #set( $mark = 0 )
- #set( $tabIndex = 1 )
- #foreach( $programStageDataElement in $programStageDataElements )
- #set( $dataElementRowCount = $dataElementRowCount + 1 )
- #if( $mark == 1 )
- #set( $mark = 0 )
+ </td>
+
+
+ ##providedByAnotherFacility
+ #set( $id = $programStageDataElement.programStage.id + '_' + $programStageDataElement.dataElement.id + '_facility' )
+ #if($programStageInstance.programInstance.program.anonymous == 'false')
+ <td>
+ #if ( $patientDataValue.value )
+ #if( !$patientDataValue.providedByAnotherFacility )
+ $patientDataValue.organisationUnit.name
+ <input name="providedByAnotherFacility" id="$id" type="hidden" onclick="updateProvidingFacility( $programStageDataElement.dataElement.id, this )" #if($programStageInstance.completed) disabled="disabled" #end >
+ #else
+ $i18n.getString("other_facility")
+ <input name="providedByAnotherFacility" id="$id" type="hidden" onclick="updateProvidingFacility( $programStageDataElement.dataElement.id, this )" #if($programStageInstance.completed) disabled="disabled" #end >
+ #end
+ #else
+ <input name="providedByAnotherFacility" id="$id" type="checkbox" onclick="updateProvidingFacility( $programStageDataElement.dataElement.id, this )" #if($programStageInstance.completed) disabled="disabled" #end >
+ #end
+ </td>
+
#else
- #set( $mark = 1 )
- #end
- #set( $patientDataValue = false )
- #set( $patientDataValue = $patientDataValueMap.get( $programStageDataElement.dataElement.id ) )
- <tr #if( $mark == 0 ) style="background-color:#dddddd" #end>
- ##dataElementRowCount
- <td style="text-align:right">$dataElementRowCount</td>
- ##data element name
- <td>
- <span id="value[$programStageDataElement.dataElement.id].name" title="$!encoder.htmlEncode( $programStageDataElement.dataElement.description )">
- $encoder.htmlEncode( $programStageDataElement.dataElement.name )
- #if ( $programStageDataElement.compulsory )
- <em title="$i18n.getString( "required" )" class="required">*</em>
- #end
- </span>
- </td>
- ##type
- <td style="display:none"><span id="value[$programStageDataElement.dataElement.id].type" style="display:none">$encoder.htmlEncode( $programStageDataElement.dataElement.type )</span></td>
- ##entry
- <td>
- #set( $id = $programStageDataElement.programStage.id + '-' + $programStageDataElement.dataElement.id + '-val' )
- #if( $programStageDataElement.dataElement.type == "bool" )
- <select name="entryselect" #if($programStageInstance.completed) disabled="disabled" #end data="{compulsory: $programStageDataElement.compulsory }" id="$id" onchange="saveOpt( $programStageDataElement.dataElement.id )" tabindex="$tabIndex" style="text-align:center;">
- <option value="">[$i18n.getString( "select_value" )]</option>
- <option value="true" #if( $patientDataValue.value == "true" ) selected="selected" #end>$i18n.getString( "yes" )</option>
- <option value="false" #if( $patientDataValue.value == "false" ) selected="selected" #end>$i18n.getString( "no" )</option>
- </select>
- #elseif( $programStageDataElement.dataElement.type == "string" && $programStageDataElement.dataElement.isMultiDimensional() )
- #set( $optionValues = $optionMap.get( $programStageDataElement.dataElement.id ) )
- <select name="entryselect" data="{compulsory: $programStageDataElement.compulsory }" #if($programStageInstance.completed) disabled="disabled" #end id="$id" onchange="saveOpt( $programStageDataElement.dataElement.id )" tabindex="$tabIndex" style="text-align:center;">
- <option value="">[$i18n.getString( "no_value" )]</option>
- #foreach( $optionValue in $optionValues )
- <option value="$optionValue.id" #if( $patientDataValue.value == $optionValue.id ) selected="selected" #end>$encoder.htmlEncode( $optionValue.name )</option>
- #end
- </select>
- #elseif( $programStageDataElement.dataElement.type == "date" )
- <input type="text" data="{compulsory: $programStageDataElement.compulsory }" #if($programStageInstance.completed) disabled="disabled" #end id="$id" name="entryfield" value="$!encoder.htmlEncode( $patientDataValue.value )" onchange="saveDate( $programStageDataElement.dataElement.id )" onkeypress="return keyPress(event, this)" tabindex="$tabIndex" style="text-align:center;">
- #if(!$programStageInstance.completed)
- <script type="text/javascript">
- datePicker($programStageDataElement.programStage.id + '-' + $programStageDataElement.dataElement.id + '-val', false);
- </script>
- #end
- #else
- #foreach( $optionCombo in $programStageDataElement.dataElement.categoryCombo.optionCombos )
- #set( $id = $programStageDataElement.programStage.id + '-' + $programStageDataElement.dataElement.id + '-' + $optionCombo.id + '-val' )
- <input name="entryfield" data="{compulsory: $programStageDataElement.compulsory, deName:'$programStageDataElement.dataElement.name', deType:'$programStageDataElement.dataElement.getDetailedNumberType()' }" #if($programStageInstance.completed) disabled="disabled" #end id="$id" type="text" value="$!encoder.htmlEncode( $patientDataValue.value )" onchange="saveVal( $programStageDataElement.dataElement.id, $optionCombo.id )" onkeypress="return keyPress(event, this)" tabindex="$tabIndex" style="text-align:center;">
- #end
- #end
- </td>
-
-
- ##providedByAnotherFacility
- #set( $id = $programStageDataElement.programStage.id + '_' + $programStageDataElement.dataElement.id + '_facility' )
- #if($programStageInstance.programInstance.program.anonymous == 'false')
- <td>
- #if ( $patientDataValue.value )
- #if( !$patientDataValue.providedByAnotherFacility )
- $patientDataValue.organisationUnit.name
- <input name="providedByAnotherFacility" id="$id" type="hidden" onclick="updateProvidingFacility( $programStageDataElement.dataElement.id, this )" #if($programStageInstance.completed) disabled="disabled" #end >
- #else
- $i18n.getString("other_facility")
- <input name="providedByAnotherFacility" id="$id" type="hidden" onclick="updateProvidingFacility( $programStageDataElement.dataElement.id, this )" #if($programStageInstance.completed) disabled="disabled" #end >
- #end
- #else
- <input name="providedByAnotherFacility" id="$id" type="checkbox" onclick="updateProvidingFacility( $programStageDataElement.dataElement.id, this )" #if($programStageInstance.completed) disabled="disabled" #end >
- #end
- </td>
-
- #else
- <input name="providedByAnotherFacility" id="$id" type="hidden">
- #end
- </tr>
- #set( $tabIndex = $tabIndex + 1 )
- #end
- </table>
- </div>
+ <input name="providedByAnotherFacility" id="$id" type="hidden">
+ #end
+ </tr>
+ #set( $tabIndex = $tabIndex + 1 )
+ #end
+ </table>
#end
</div>
=== 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 2012-01-11 08:34:43 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm 2012-01-31 05:11:00 +0000
@@ -21,81 +21,69 @@
<td>$encoder.htmlEncode( $patient.getAge() )</td>
</tr>
</table>
- <td style="vertical-align:top">
- <div id="currentSelection" style="float:right"></div>
+ <td class="history">
+ <div id="currentSelection" class="hidden"></div>
</td>
</tr>
<tr>
- <td colspan='2'><hr style="clear:both"></td>
+ <td colspan='2'><hr style='clear:both;'></td>
</tr>
</table>
-<table width='100%'>
- <tr>
- <td>
- <table>
- <tr>
- <td><label for="programId">$i18n.getString( "program" )</label></td>
- <td>
- <select id="programId" name="programId" style="min-width:350px" onchange="loadProgramStages();" #if( $programs.size() == 0 ) disabled="disabled" #end>
- <option value="0">[$i18n.getString( "select" )]</option>
- #foreach( $program in $programs )
- <option value="$program.id" singleevent="$program.singleEvent" #if( $programId && $program.id == $programId ) selected="selected" #end>$encoder.htmlEncode( $program.name )</option>
- #end
- </select>
- </td>
- </tr>
- <tr>
- <td id='programStageIdLabel'><label for="programStageId">$i18n.getString( "program_stage" )</label></td>
- <td>
- <select id="programStageId" name="programStageId" style="width:350px" onchange="javascript:loadDataEntry();" >
- </select>
- </td>
- </tr>
-
- <tr>
- <td><label for="executionDate">$i18n.getString( "report_date" ) </label></td>
- <td><input type="text" id="executionDate" name="executionDate" style="width:330px" value="$!format.formatDate( $programStageInstance.executionDate )" >
- <script type="text/javascript">
- datePickerValid( 'executionDate', false );
- disable('executionDate');
- </script>
- </tr>
-
- <tr>
- <td id='dueDateLabel'><label for="dueDate">$i18n.getString( "due_date" ) </label></td>
- <td><input type="text" id="dueDate" name="dueDate" style="width:350px" value="$!format.formatDate( $programStageInstance.dueDate )" readonly> </td>
- </tr>
- </table>
- </td>
+
+<div class="actions">
+ <input type="button" class='button' id="newEncounterBtn" value="$i18n.getString('enter_new_encounter')" onClick="javascript: registerIrregularEncounter();" disabled="disabled" >
+ <input type="button" class='button' id="validationBtn" value="$i18n.getString('run_validation')" onClick="javascript: runValidation();" disabled="disabled" >
+ <input type="button" class='button' id="completeBtn" value="$i18n.getString('complete')" onClick="doComplete()" disabled="disabled" >
+ <input type="button" class='button' value="$i18n.getString( 'back_to_search' )" id='backBtnFromEntry' onclick="javascript:showSearchForm();" >
+</div>
- <td>
- <table>
- <tr>
- <td align='right' colspan='2'>
- <input type="button" id="newEncounterBtn" value="$i18n.getString('enter_new_encounter')" onClick="javascript: registerIrregularEncounter();" style="width:12em " disabled="disabled" >
- </td>
- </tr>
- <tr>
- <td align='right' colspan='2'>
- <input type="button" id="validationBtn" value="$i18n.getString('run_validation')" onClick="javascript: runValidation();" style="width:12em " disabled="disabled" >
- </td>
- </tr>
- <tr>
- <td align='right' colspan='2'>
- <input type="button" id="completeBtn" value="$i18n.getString('complete')" onClick="doComplete()" style="width:12em" disabled="disabled" >
- </td>
- </tr>
- <tr>
- <td align='right' colspan='2'>
- <input type="button" value="$i18n.getString( 'back_to_search' )" id='backBtnFromEntry' onclick="javascript:showSearchForm();" style="width:12em">
- </td>
- </tr>
- <tr><td></td></tr>
- </table>
- </td>
- </tr>
-</table>
+<div class="inputCriteria" style="width:530px;height:110px;">
+
+ <table>
+ <tr>
+ <td>
+ <table>
+ <tr>
+ <td class='textColumn'><label for="programId">$i18n.getString( "program" )</label></td>
+ <td>
+ <select id="programId" name="programId" class="criteria" onchange="loadProgramStages();" #if( $programs.size() == 0 ) disabled="disabled" #end>
+ <option value="0">[$i18n.getString( "select" )]</option>
+ #foreach( $program in $programs )
+ <option value="$program.id" singleevent="$program.singleEvent" #if( $programId && $program.id == $programId ) selected="selected" #end>$encoder.htmlEncode( $program.name )</option>
+ #end
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td id='programStageIdLabel' class='textColumn'><label for="programStageId">$i18n.getString( "program_stage" )</label></td>
+ <td>
+ <select id="programStageId" name="programStageId" class="criteria" onchange="javascript:loadDataEntry();" >
+ </select>
+ </td>
+ </tr>
+
+ <tr>
+ <td class='textColumn'><label for="executionDate">$i18n.getString( "report_date" ) </label></td>
+ <td><input type="text" id="executionDate" name="executionDate" class="criteria" value="$!format.formatDate( $programStageInstance.executionDate )" >
+ <script type="text/javascript">
+ datePickerValid( 'executionDate', false );
+ disable('executionDate');
+ </script>
+ </tr>
+
+ <tr>
+ <td id='dueDateLabel' class='textColumn'><label for="dueDate">$i18n.getString( "due_date" ) </label></td>
+ <td><input type="text" id="dueDate" name="dueDate" class="criteria" value="$!format.formatDate( $programStageInstance.dueDate )" readonly> </td>
+ </tr>
+ </table>
+ </td>
+
+
+ </tr>
+ </table>
+</div>
+
</form>
<script>
=== 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-12-21 09:21:08 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm 2012-01-31 05:11:00 +0000
@@ -1,7 +1,7 @@
<table class="mainPageTable">
<tr>
- <td style="vertical-align:top">
+ <td>
<table class="listTable" id="patientList">
<col>
#if( $sortPatientAttribute )
@@ -14,11 +14,11 @@
<tr>
<th>#</th>
#if( $sortPatientAttribute )
- <th style="text-align:center">$encoder.htmlEncode( $sortPatientAttribute.name )</th>
+ <th>$encoder.htmlEncode( $sortPatientAttribute.name )</th>
#end
- <th style="text-align:center">$i18n.getString( "full_name" )</th>
+ <th>$i18n.getString( "full_name" )</th>
#foreach( $programStage in $program.programStages )
- <th style="text-align:center" class="{sorter: false}">$encoder.htmlEncode( $programStage.name )</th>
+ <th class="{sorter: false}">$encoder.htmlEncode( $programStage.name )</th>
#end
</tr>
</thead>
@@ -37,11 +37,11 @@
<td><a href="javascript:showPatientDetails( '$patient.id' )" title="$i18n.getString( 'show_details' )">$patient.getFullName()</a></td>
#foreach( $programStageInstance in $programStageInstanceMap.get( $programInstance ) )
#if( $programStageInstance.executionDate )
- <td style="text-align:center" bgcolor="$colorMap.get( $programStageInstance.id )">
+ <td class="cent" bgcolor="$colorMap.get( $programStageInstance.id )">
<a href="javascript:viewPrgramStageRecords( $programStageInstance.id );">$format.formatDate( $programStageInstance.executionDate )</a>
</td>
#else
- <td style="text-align:center" bgcolor="$colorMap.get( $programStageInstance.id )">
+ <td class="cent" bgcolor="$colorMap.get( $programStageInstance.id )">
<a href="javascript:viewPrgramStageRecords( $programStageInstance.id );">$format.formatDate( $programStageInstance.dueDate )</a>
</td>
#end
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js 2012-01-13 02:14:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js 2012-01-31 05:11:00 +0000
@@ -17,6 +17,7 @@
var programId = jQuery('#dataRecordingSelectDiv [name=programId]').val();
if ( programId == 0 )
{
+ hideById('currentSelection');
return;
}
jQuery.postJSON( "loadProgramStages.action",
@@ -45,13 +46,14 @@
history += '<td>';
history += '<span>' + json.programStageInstances[i].name + '</span>';
history += '</td>';
- history += '<td style="text-align:center">';
+ history += '<td class="cent">';
history += json.programStageInstances[i].infor;
history += '</td>';
history += '</tr>';
}
history += '</table>';
setInnerHTML( 'currentSelection', history );
+ showById('currentSelection');
var singleEvent = jQuery('#dataRecordingSelectDiv [name=programId] option:selected').attr('singleevent');
if(singleEvent=='true')
@@ -710,11 +712,11 @@
});
jQuery("#dataEntryFormDiv").find(".ui-datepicker-trigger").each(function()
{
- jQuery(this).attr('style', 'display:none');
+ jQuery(this).attr('class', 'hidden');
});
jQuery("#dataEntryFormDiv").find(".holder").each(function()
{
- jQuery(this).attr('style', 'display:none');
+ jQuery(this).attr('class', 'visible');
});
disable('validationBtn');
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm 2011-12-21 09:21:08 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm 2012-01-31 05:11:00 +0000
@@ -7,12 +7,14 @@
<td>$i18n.getString( $searchText )</td>
</tr>
</table>
-
-<table class="mainPageTable">
+
+<br>
+<table class="entryScreen">
<tr>
- <td style="vertical-align:top">
+ <td>
<table class="listTable">
<col>
+ <col>
<col>
<col>
<col>
@@ -22,16 +24,9 @@
<col width="20">
<col width="20">
<col width="20">
- <tr>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
<tr>
- <th>$i18n.getString( "full_name" )</th>
+ <th>#</th>
+ <th>$i18n.getString( "full_name" )</th>
<th>$i18n.getString( "gender" )</th>
<th>$i18n.getString( "date_of_birth" )</th>
<th>$i18n.getString( "age" )</th>
@@ -46,6 +41,11 @@
#foreach( $patient in $patients )
<tr #alternate( $mark )>
+ <td>
+ #set( $nr = ( ( $paging.getCurrentPage() - 1 ) * $paging.pageSize ) + $velocityCount )
+ $nr
+ </td>
+
<td>
$encoder.htmlEncode( $patient.getFullName() )
</td>
@@ -62,13 +62,13 @@
<td>$!mapPatientOrgunit.get($patient.id)</td>
#end
- <td style="text-align:center"#alternate( $mark )>
+ <td>
<a href="javascript:showSelectedDataRecoding('$patient.id');" title="$i18n.getString( 'data_entry' )"><img src="images/data_entry.png" alt="$i18n.getString( 'data_entry' )"></a>
</td>
- <td style="text-align:center"#alternate( $mark )>
+ <td>
<a href="javascript:patientChartList( '$patient.id' )" title="$i18n.getString( 'data_entry' )"><img src="../images/add_to_dashboard.png" alt="$i18n.getString( 'view_patient_chart' )"></a>
</td>
- <td style="text-align:center"#alternate( $mark )>
+ <td>
<a href="javascript:showPatientDetails( $patient.id )" title="$i18n.getString( 'show_details' )"><img src="../images/information.png" alt="$i18n.getString( 'show_details' )"></a>
</td>
</tr>
@@ -90,17 +90,13 @@
</tr>
</table>
</td>
- <td style="width:20em; padding-left:2em; vertical-align:top">
- <div id="detailsInfo">
- </div>
- </td>
</tr>
</table>
+<div id="detailsInfo"></div>
<div id="patientChartListDiv"></div>
-
-<div id="chartView" style="display: none; padding: 0; margin: 0;'">
- <img id="chartImage" src="" style="padding: 10px;"></img>
+<div id="chartView" class="hidden">
+ <img id="chartImage" src="" class="padding-chart"></img>
</div>
<span id="message"></span>
=== added file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/dataEntry.css'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/dataEntry.css 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/dataEntry.css 2012-01-31 05:11:00 +0000
@@ -0,0 +1,91 @@
+/*----------------------------------------------------------------------------*/
+/* For data entry form */
+/*----------------------------------------------------------------------------*/
+
+.entryScreen
+{
+ margin-bottom:20px;
+ width:80%;
+ font-size: 13px;
+ line-height:18px;
+}
+
+input.inputText, select.inputText
+{
+ width:220px;
+ text-align:center;
+}
+
+.textColumn
+{
+ text-align:left;
+ padding-right:35px;
+ padding-left:5px;
+}
+
+.hidden
+{
+ display: none;
+}
+
+.visible
+{
+ display: block;
+}
+
+/*----------------------------------------------------------------------------*/
+/* For Program Stages History/Plan */
+/*----------------------------------------------------------------------------*/
+
+td.row
+{
+ border-bottom-style:dotted;
+}
+
+table.history
+{
+ width:350px;
+ margin-left:10px;
+ margin-top:10px;
+ margin-right:10px;
+ margin-bottom:10px;
+}
+
+div#currentSelection
+{
+ float:right;
+}
+
+/*----------------------------------------------------------------------------*/
+/* Action fiels in entry form */
+/*----------------------------------------------------------------------------*/
+
+input.button
+{
+ width: 150px;
+ padding-left:5px;
+ padding-right:5px;
+}
+
+.padding-chart
+{
+ padding: 10px;
+}
+
+.criteria
+{
+ width:350px;
+ padding-left:5px;
+}
+
+.inputWidth
+{
+ width:350px;
+}
+
+div.actions
+{
+ float: right;
+ width:200px;
+ text-align: right;
+}
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/patient.css'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/patient.css 2012-01-11 08:34:43 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/patient.css 2012-01-31 05:11:00 +0000
@@ -63,16 +63,3 @@
width:200px;
text-align: right;
}
-
-td.row
-{
- border-bottom-style:dotted;
-}
-
-table.history
-{
- margin-top:10px;
- margin-bottom:10px;
- margin-right:10px;
- margin-left:10px;
-}
