dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #14228
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4755: Remove option for switching between custom and default form (Patient module)
------------------------------------------------------------
revno: 4755
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-09-29 12:59:35 +0700
message:
Remove option for switching between custom and default form (Patient module)
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/LoadDataEntryAction.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/ProgramStageCustomDataEntryAction.java
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/dataEntry.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/java/org/hisp/dhis/caseentry/action/caseentry/LoadDataEntryAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/LoadDataEntryAction.java 2011-09-14 06:36:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/LoadDataEntryAction.java 2011-09-29 05:59:35 +0000
@@ -85,8 +85,6 @@
private Integer programStageId;
- private boolean useDefaultForm;
-
private ProgramStageInstance programStageInstance;
private String customDataEntryFormCode;
@@ -147,11 +145,6 @@
return optionMap;
}
- public boolean isUseDefaultForm()
- {
- return useDefaultForm;
- }
-
public OrganisationUnit getOrganisationUnit()
{
return organisationUnit;
@@ -162,11 +155,6 @@
return programStageInstance;
}
- public void setUseDefaultForm( boolean useDefaultForm )
- {
- this.useDefaultForm = useDefaultForm;
- }
-
public void setI18n( I18n i18n )
{
this.i18n = i18n;
@@ -206,7 +194,7 @@
// ---------------------------------------------------------------------
ProgramStage programStage = programStageService.getProgramStage( programStageId );
-
+
program = programStage.getProgram();
programStageDataElements = new ArrayList<ProgramStageDataElement>( programStage.getProgramStageDataElements() );
@@ -216,7 +204,7 @@
Collections.sort( programStageDataElements, new ProgramStageDataElementSortOrderComparator() );
programStageInstance = programStageInstanceService.getProgramStageInstance( programInstance, programStage );
-
+
if ( programStageInstance != null )
{
selectedStateManager.setSelectedProgramStageInstance( programStageInstance );
@@ -250,17 +238,14 @@
// Get data-entry-form
// ---------------------------------------------------------------------
- if ( !useDefaultForm )
+ DataEntryForm dataEntryForm = programStage.getDataEntryForm();
+
+ if ( dataEntryForm != null )
{
- DataEntryForm dataEntryForm = programStage.getDataEntryForm();
-
- if ( dataEntryForm != null )
- {
- customDataEntryFormCode = programDataEntryService.prepareDataEntryFormForEntry( dataEntryForm
- .getHtmlCode(), patientDataValues, "", i18n, programStage, programStageInstance,
- organisationUnit );
- }
+ customDataEntryFormCode = programDataEntryService.prepareDataEntryFormForEntry( dataEntryForm
+ .getHtmlCode(), patientDataValues, "", i18n, programStage, programStageInstance, organisationUnit );
}
+
}
return SUCCESS;
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/ProgramStageCustomDataEntryAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/ProgramStageCustomDataEntryAction.java 2011-09-28 03:31:19 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/ProgramStageCustomDataEntryAction.java 2011-09-29 05:59:35 +0000
@@ -218,18 +218,6 @@
this.customDataEntryFormExists = customDataEntryFormExists;
}
- private String useDefaultForm;
-
- public String getUseDefaultForm()
- {
- return useDefaultForm;
- }
-
- public void setUseDefaultForm( String useDefaultForm )
- {
- this.useDefaultForm = useDefaultForm;
- }
-
public ProgramStageInstance programStageInstance;
public int getProgramStageInstanceId()
=== 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-09-29 05:30:18 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm 2011-09-29 05:59:35 +0000
@@ -26,7 +26,7 @@
<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( !$useDefaultForm && $customDataEntryFormCode )
+ #if( $customDataEntryFormCode )
<div id="customEntryScreenContainer">
<div id="dragDiv">
<table id="listInfo">
@@ -134,12 +134,4 @@
#end
</div>
-</div>
-
-<script>
- #if (!$useDefaultForm && $!customDataEntryFormCode )
- showById('useDefaultTD');
- #else
- hideById('useDefaultTD');
- #end
-</script>
\ No newline at end of file
+</div>
\ No newline at end of file
=== 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-09-29 05:30:18 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm 2011-09-29 05:59:35 +0000
@@ -55,13 +55,4 @@
<td></td>
</tr>
- <tr>
- <td></td>
- <td></td>
- <td></td>
- <td id='useDefaultTD'>
- <input type="radio" id="useDefaultForm" name="useDefaultForm" value="true" onclick="loadDataEntry();" /><label>$i18n.getString( "use_default_form" )</label><br>
- <input type="radio" id="useDefaultForm" name="useDefaultForm" value="false" onclick="loadDataEntry();" checked /><label>$i18n.getString( "use_custom_form" )</label>
- </td>
- </tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/dataEntry.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/dataEntry.js 2011-09-28 04:02:30 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/dataEntry.js 2011-09-29 05:59:35 +0000
@@ -16,20 +16,6 @@
selection.setListenerFunction( organisationUnitSelected );
-function selectDefaultForm()
-{
- if( byId('useDefaultForm').checked )
- {
- hideById('customEntryScreenContainer');
- showById('defaultEntryScreenContainer');
- }
- else
- {
- hideById('defaultEntryScreenContainer');
- showById('customEntryScreenContainer');
- }
-}
-
//--------------------------------------------------------------------------------------------
// Show search-form
//--------------------------------------------------------------------------------------------
@@ -146,17 +132,14 @@
}
showLoader();
- var useDefaultForm = jQuery("input[id='useDefaultForm']:checked").val();
$( '#dataEntryFormDiv' ).load( "dataentryform.action",
{
- programStageId:getFieldValue('programStageId'),
- useDefaultForm:useDefaultForm
+ programStageId:getFieldValue('programStageId')
},function( )
{
enable('validationBtn');
enable('completeBtn');
- enable('useDefaultForm');
hideLoader();
hideById('contentDiv');
@@ -990,11 +973,9 @@
{
setInnerHTML('dataEntryFormDiv', '');
showLoader();
- var useDefaultForm = jQuery("#useDefaultForm").attr('checked') ? true : false;
$('#dataEntryFormDiv' ).load("loadProgramStageRecords.action",
{
- programStageInstanceId: programStageInstanceId,
- useDefaultForm:useDefaultForm
+ programStageInstanceId: programStageInstanceId
}, function() {
hideLoader();
});
=== 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-09-01 04:50:41 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm 2011-09-29 05:59:35 +0000
@@ -38,7 +38,7 @@
</td>
#if( $programStageInstance )
<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 )' )" >
+ <td><input type="text" id="executionDate" name="executionDate" value="$!format.formatDate( $programStageInstance.executionDate )" onchange="saveExecutionDate( $programStageInstance.id, getFieldValue('executionDate') )" >
<script type="text/javascript">
datePickerValid( 'executionDate', false );
</script>
@@ -53,15 +53,6 @@
<td></td>
</tr>
- <tr>
- <td></td>
- <td></td>
- <td></td>
- <td>
- <input type="radio" id="useDefaultForm" name="useDefaultForm" value="true" onclick="loadProgramStageRecords($programStageInstance.id);" /><label>$i18n.getString( "use_default_form" )</label><br>
- <input type="radio" id="useDefaultForm" name="useDefaultForm" value="false" onclick="loadProgramStageRecords($programStageInstance.id);" checked='true' /><label>$i18n.getString( "use_custom_form" )</label>
- </td>
- </tr>
</table>
</form>
@@ -86,14 +77,12 @@
<div id="entryFormContainer" #if( $programStageInstance.executionDate ) #else style='display:none;' #end>
+#if( $customDataEntryFormCode )
<div id="customEntryScreenContainer">
- #if( $customDataEntryFormCode )
- $customDataEntryFormCode
- #else <span style="font-style:italic; color:blue"> $i18n.getString( "no_custom_data_entry_exist" )</span>
- #end
+ $customDataEntryFormCode
</div>
-
- <div id='defaultEntryScreenContainer' style='display:none;'>
+#else
+ <div id='defaultEntryScreenContainer'>
<table class="mainPageTable">
<col id="noCol">
<col id="deCol">
@@ -177,6 +166,7 @@
#end
</table>
</div>
+#end
</div>
<div id="completeDataEntryFormContainer">
@@ -208,3 +198,4 @@
var i18n_error_required_field = '$encoder.jsEscape( $i18n.getString( "error_required_field" ) , "'")';
var i18n_violate_validation = '$encoder.jsEscape( $i18n.getString( "violate_validation" ) , "'")';
var i18n_date_is_greater_then_or_equals_due_date = '$encoder.jsEscape( $i18n.getString( "date_is_greater_then_or_equals_due_date" ) , "'")';</script>
+</script>
\ No newline at end of file
