dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #18498
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 7821: Return to the list persons screen after add new event in Single with registration.
------------------------------------------------------------
revno: 7821
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-08-02 12:27:55 +0700
message:
Return to the list persons screen after add new event in Single with registration.
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/ShowEventWithRegistrationFormAction.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addSingleEventRegistration.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/javascript/entry.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/form.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/javascript/singleEvent.js
--
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/ShowEventWithRegistrationFormAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/ShowEventWithRegistrationFormAction.java 2012-06-27 05:12:36 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/ShowEventWithRegistrationFormAction.java 2012-08-02 05:27:55 +0000
@@ -121,7 +121,9 @@
private String customDataEntryFormCode;
private List<ProgramStageDataElement> programStageDataElements = new ArrayList<ProgramStageDataElement>();
-
+
+ private ProgramStage programStage;
+
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
@@ -142,7 +144,7 @@
Program program = programService.getProgram( programId );
- ProgramStage programStage = program.getProgramStages().iterator().next();
+ programStage = program.getProgramStages().iterator().next();
DataEntryForm dataEntryForm = programStage.getDataEntryForm();
@@ -178,6 +180,11 @@
this.programId = programId;
}
+ public ProgramStage getProgramStage()
+ {
+ return programStage;
+ }
+
public Collection<PatientAttribute> getNoGroupAttributes()
{
return noGroupAttributes;
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addSingleEventRegistration.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addSingleEventRegistration.vm 2012-08-02 02:48:18 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addSingleEventRegistration.vm 2012-08-02 05:27:55 +0000
@@ -37,10 +37,12 @@
</script>
<form id='singleEventForm'>
-
+
<h3>$i18n.getString( "add_new_patient" )</h3>
<input type="hidden" id="representativeId" name="representativeId"/>
<input type="hidden" id="relationshipTypeId" name="relationshipTypeId"/>
+ <input type="hidden" id="programStageId" name="programStageId" value='$programStage.id'/>
+
<table id='patientForm'>
#parse( "/dhis-web-caseentry/patientForm.vm" )
</table>
@@ -56,7 +58,7 @@
<script>
var i18n_error_connect_to_server = '$encoder.jsEscape( $i18n.getString( "error_connect_to_server" ) , "'" )';
var i18n_add_person_successfully = '$encoder.jsEscape( $i18n.getString( "add_person_successfully" ) , "'" )';
- setInnerHTML('entryName', jQuery('#programIdAddPatient').text() );
+ setInnerHTML('entryName', jQuery('#programIdAddPatient option:selected').text() );
jQuery(document).ready( function(){
@@ -83,12 +85,5 @@
}
}
});
-
- jQuery("#dataForm :input").each(function()
- {
- $( this ).unbind( 'focus' );
- $( this ).unbind( 'blur' );
- $( this ).unbind( 'change' );
- });
});
</script>
\ No newline at end of file
=== 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-08-02 03:50:45 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm 2012-08-02 05:27:55 +0000
@@ -1,6 +1,8 @@
<script>
jQuery("#entryFormContainer").ready(function(){
- setFieldValue('programStageId', "$!programStageInstance.programStage.id");
+ #if($!programStageInstance.programStage.id)
+ setFieldValue('programStageId', "$!programStageInstance.programStage.id");
+ #end
#if( $programStageInstance )
setFieldValue( 'dueDate', "$!format.formatDate( $programStageInstance.dueDate )" );
setFieldValue( 'executionDate', "$!format.formatDate( $programStageInstance.executionDate )" );
=== 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-08-02 03:50:45 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js 2012-08-02 05:27:55 +0000
@@ -843,7 +843,8 @@
minLength: 0,
select: function( event, ui ) {
input.val(ui.item.value);
- saveVal( dataElementId );
+ if(!unSave)
+ saveVal( dataElementId );
input.autocomplete( "close" );
},
change: function( event, ui ) {
@@ -852,7 +853,8 @@
valid = false;
if ( !valid ) {
$( this ).val( "" );
- saveVal( dataElementId );
+ if(!unSave)
+ saveVal( dataElementId );
input.data( "autocomplete" ).term = "";
return false;
}
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/form.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/form.js 2012-07-10 06:49:04 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/form.js 2012-08-02 05:27:55 +0000
@@ -152,6 +152,7 @@
setInnerHTML( 'contentDiv', html );
showById('contentDiv');
setInnerHTML('searchInforTD', i18n_search_patients_by_attributes );
+ setFieldValue('listAll',false);
jQuery( "#loaderDiv" ).hide();
}
});
=== 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 2012-08-01 02:35:18 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js 2012-08-02 05:27:55 +0000
@@ -778,6 +778,7 @@
statusSearching = 1;
setInnerHTML( 'listPatientDiv', html );
showById('listPatientDiv');
+ setFieldValue('listAll',false);
jQuery( "#loaderDiv" ).hide();
}
});
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/singleEvent.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/singleEvent.js 2012-07-11 04:18:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/singleEvent.js 2012-08-02 05:27:55 +0000
@@ -1,3 +1,4 @@
+var unSave = true;
function orgunitSelected( orgUnits, orgUnitNames )
{
organisationUnitSelected( orgUnits, orgUnitNames );
@@ -26,6 +27,13 @@
{
showById('addNewDiv');
showById('entryForm');
+ hideById('newEncounterBtn');
+ jQuery("#dataForm :input").each(function()
+ {
+ $( this ).attr('onchange','');
+ $( this ).attr('onblur','');
+ $( this ).attr('onkeypress','');
+ });
jQuery('#loaderDiv').hide();
});
}
@@ -105,8 +113,15 @@
success: function(json) {
showSuccessMessage( i18n_save_success );
jQuery("#resultSearchDiv").dialog("close");
- setFieldvalue('listAll', true);
- }
+ hideById('addNewDiv');
+ if( getFieldValue('listAll')=='true'){
+ listAllPatient();
+ }
+ else{
+ showById('searchDiv');
+ showById('contentDiv');
+ }
+ }
});
return false;
}
@@ -195,6 +210,6 @@
function backAddNewBtn()
{
showSearchForm();
- if( getFieldvalue('listAll')=='true')
+ if( getFieldValue('listAll')=='true')
listPatientBtn();
}
