dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #14575
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4995: Re-arrange the buttons in Name based data entry.
------------------------------------------------------------
revno: 4995
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-10-21 15:11:21 +0700
message:
Re-arrange the buttons in Name based data entry.
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/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/javascript/entry.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.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 2011-10-21 06:22:36 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2011-10-21 08:11:21 +0000
@@ -1,3 +1,4 @@
+back_to_search = Back to search
back_to_registration = Back to registration
back_to_relationship = Back to relationship
program_stages_history_plan = Program Stages History/Plan
=== 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-10-14 04:25:39 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm 2011-10-21 08:11:21 +0000
@@ -23,10 +23,6 @@
<input type='hidden' id='incidentDate' value='$!format.formatDate($programStageInstance.programInstance.dateOfIncident)'>
<input type='hidden' name='programStageInstanceId' id='programStageInstanceId' value='$!programStageInstance.id'>
-<hr style="clear:both">
-
-<span id="startMsg" style="font-style:italic; color:blue; display: #if($!programStageInstance.executionDate!='') none #else block #end;">$i18n.getString( "report_date_warning" )</span>
-
<div id='entryForm' style="display: #if($!programStageInstance.executionDate) block #else none #end;">
#if( $customDataEntryFormCode )
<div id="customEntryScreenContainer">
=== 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-10-21 06:22:36 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm 2011-10-21 08:11:21 +0000
@@ -2,11 +2,6 @@
<table class="mainPageTable" id='patientInfoDiv'>
<tr>
<td>
- <input type="button" value="$i18n.getString( 'back_to_registration' )" id='backBtnFromEntry' onclick="javascript:showSearchForm();" style="width:10em">
- </td>
- </tr>
- <tr>
- <td>
<table>
<tr>
<td class="bold">$i18n.getString( "full_name" ):</td>
@@ -25,7 +20,7 @@
<td>$encoder.htmlEncode( $patient.getAge() )</td>
</tr>
</table>
- <td style="vertical-align:top" rowspan='5'>
+ <td style="vertical-align:top" rowspan='4'>
<div id="currentSelection" style="float:right"></div>
</td>
</tr>
@@ -35,39 +30,62 @@
</table>
<table width='100%'>
- <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>
- <td><label for="executionDate">$i18n.getString( "report_date" ) </label></td>
- <td><input type="text" id="executionDate" name="executionDate" value="$!format.formatDate( $programStageInstance.executionDate )" >
- <script type="text/javascript">
- datePickerValid( 'executionDate', false );
- </script>
- </tr>
- <tr id='nonSingleEventProgramDiv'>
- <td><label for="programStageId">$i18n.getString( "program_stage" )</label></td>
- <td>
- <select id="programStageId" name="programStageId" style="min-width:350px" onchange="javascript:loadDataEntry();" >
- </select>
- </td>
- <td><label for="dueDate">$i18n.getString( "due_date" ) </label></td>
- <td><input type="text" id="dueDate" name="dueDate" value="$!format.formatDate( $programStageInstance.dueDate )" readonly> </td>
-
- </tr>
<tr>
- <td></td>
- <td>
- <input type="button" id="completeBtn" value="$i18n.getString('complete')" onClick="doComplete()" style="width:12em" disabled="disabled" >
- <input type="button" id="validationBtn" value="$i18n.getString('validation')" onClick="javascript: runValidation();" style="width:12em " disabled="disabled" >
- </td>
- <td></td>
+ <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:350px" value="$!format.formatDate( $programStageInstance.executionDate )" >
+ <script type="text/javascript">
+ datePickerValid( 'executionDate', false );
+ </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>
+
+ <td>
+ <table>
+ <tr>
+ <td align='right' colspan='2'>
+ <input type="button" id="validationBtn" value="$i18n.getString('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>
=== 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 2011-10-21 06:50:59 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js 2011-10-21 08:11:21 +0000
@@ -7,8 +7,10 @@
{
hideById('dataEntryFormDiv');
clearListById('programStageId');
+ setFieldValue('executionDate','');
+ setFieldValue('dueDate','');
+
var programId = jQuery('#dataRecordingSelectDiv [name=programId]').val();
-
if ( programId == 0 )
{
disable('completeBtn');
@@ -44,22 +46,20 @@
}
history += '</table>';
setInnerHTML( 'currentSelection', history );
- jQuery('#dataRecordingSelectDiv select[name=programId] option')
var singleEvent = jQuery('#dataRecordingSelectDiv [name=programId] option:selected').attr('singleevent');
if(singleEvent=='true')
{
byId('programStageId').selectedIndex = 1;
- disable('programStageId');
- loadDataEntry();
enable('completeBtn');
enable('validationBtn');
+
+ loadDataEntry();
}
else
{
disable('completeBtn');
disable('validationBtn');
- enable('programStageId');
}
});
}
@@ -698,7 +698,6 @@
function toggleContentForReportDate(show)
{
if( show ){
- jQuery("#startMsg").hide();
jQuery("#entryForm").show();
jQuery("#completeBtn").removeAttr('disabled');
jQuery("#validationBtn").removeAttr('disabled');
@@ -706,7 +705,6 @@
jQuery("#entryForm").hide();
jQuery("#completeBtn").attr('disabled', 'disabled');
jQuery("#validationBtn").attr('disabled', 'disabled');
- jQuery("#startMsg").show();
}
}
@@ -783,12 +781,9 @@
if( jQuery("#entryFormContainer") ) {
- if( jQuery("#executionDate").val() )
- {
- jQuery("#startMsg").hide();
- }else
- {
- toggleContentForReportDate(false);
+ if( jQuery("#executionDate").val() != '' )
+ {
+ toggleContentForReportDate(true);
}
jQuery("input[name='entryfield'],select[name='entryselect']").each(function(){
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js 2011-10-06 09:06:31 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js 2011-10-21 08:11:21 +0000
@@ -857,7 +857,11 @@
}
});
- hideById('nonSingleEventProgramDiv');
+ jQuery('#backBtnFromEntry').hide();
+ hideById('dueDateLabel');
+ hideById('dueDate');
+ hideById('programStageIdLabel');
+ hideById('programStageId');
hideById('patientInfoDiv');
showById('dataRecordingSelectDiv');
=== 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-10-06 05:05:42 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm 2011-10-21 08:11:21 +0000
@@ -70,10 +70,6 @@
</table>
</div>
-<span id="startMsg" style="font-style:italic; color:blue">
- #if( $programStageInstance.executionDate ) #else $i18n.getString( "report_date_warning" ) #end
-</span>
-
<div id="entryFormContainer" #if( $programStageInstance.executionDate ) #else style='display:none;' #end>
#if( $customDataEntryFormCode )
