=== 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 08:11:56 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm 2012-08-02 13:10:04 +0000
@@ -26,6 +26,7 @@
+
#if( $customDataEntryFormCode )
@@ -149,3 +150,8 @@
+
+
+
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2012-08-02 08:24:38 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2012-08-02 13:10:04 +0000
@@ -158,8 +158,8 @@
function getDateField( container )
{
- var dateField = '';
- dateField += '';
+ var dateField = '';
+ dateField += '';
return dateField;
}
=== 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 09:55:03 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js 2012-08-02 13:10:04 +0000
@@ -149,8 +149,8 @@
function saveVal( dataElementId )
{
- if( byId('programStageId') == null) return;
- var programStageId = byId('programStageId').value;
+ if( jQuery('#entryFormContainer [id=programStageId]') == null) return;
+ var programStageId = jQuery('#entryFormContainer [id=programStageId]').val();;
var fieldId = programStageId + '-' + dataElementId + '-val';
@@ -418,7 +418,7 @@
function markValue( color )
{
- var programStageId = getFieldValue('programStageId');
+ var programStageId = jQuery('#entryFormContainer [id=programStageId]').val();
var element = byId( programStageId + "-" + dataElementId + '-val' );
element.style.backgroundColor = color;
}
=== 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-02 05:27:55 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js 2012-08-02 13:10:04 +0000
@@ -748,6 +748,7 @@
hideById('searchDiv');
hideById('dataEntryFormDiv');
hideById('migrationPatientDiv');
+
jQuery('#dataRecordingSelectDiv').load( 'selectDataRecording.action',
{
patientId: patientId
=== 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-08-02 06:46:14 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/singleEvent.js 2012-08-02 13:10:04 +0000
@@ -1,4 +1,3 @@
-var unSave = true;
var _continue = false;
function orgunitSelected( orgUnits, orgUnitNames )
{
@@ -20,7 +19,9 @@
hideById('contentDiv');
hideById('searchDiv');
hideById('advanced-search');
-
+ setInnerHTML('addNewDiv','');
+ setInnerHTML('dataRecordingSelectDiv','');
+ unSave = true;
jQuery('#loaderDiv').show();
jQuery('#addNewDiv').load('showEventWithRegistrationForm.action',
{
=== 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 2012-08-02 06:46:14 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm 2012-08-02 13:10:04 +0000
@@ -71,7 +71,7 @@
$!mapPatientOrgunit.get($patient.id) |
#end
-
+
|
=== 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 2012-08-02 07:25:56 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm 2012-08-02 13:10:04 +0000
@@ -1,4 +1,5 @@
-
+
+
#if( $patient )
=== 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 2012-08-02 12:04:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportSelect.vm 2012-08-02 13:10:04 +0000
@@ -10,7 +10,7 @@
$i18n.getString( "program_summary_report" ) #openHelp('program_summary_report')
|