dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 15756
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2014-06-19 17:24:54 +0800
message:
  Fixed bug - The optionset fields of entry form in Visit Schedule function are loaded with two Show-all-items button next to each field..
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.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/webapp/dhis-web-caseentry/javascript/activityPlan.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js	2014-06-19 08:44:10 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js	2014-06-19 09:24:54 +0000
@@ -338,13 +338,11 @@
 					
 			$('#contentDataRecord' ).load("viewProgramStageRecords.action", {
 					programStageInstanceId: psiid
-				}, function( html ) {
-					setInnerHTML('contentDataRecord',html);
+				}, function( ) {
 					showById('reportDateDiv');
 					showById('entityInstanceInforTB');
 					showById('entryForm');
 					showById('inputCriteriaDiv');
-					entryFormContainerOnReady();
 				}).dialog({
 					title:i18n_program_stage,
 					maximize:true,

=== 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	2014-06-18 13:30:41 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js	2014-06-19 09:24:54 +0000
@@ -929,32 +929,6 @@
                 toggleContentForReportDate( true );
             }
 
-            // Set buttons by completed-status of program-stage-instance
-            var completed = $( "#entryFormContainer input[id='completed']" ).val();
-            var blockEntry = $( "#entryFormContainer input[id='blockEntryForm']" ).val();
-
-            if ( completed == 'true' ) {
-                disable( 'completeBtn' );
-                enable( 'uncompleteBtn' );
-                if ( blockEntry == 'true' ) {
-                    blockEntryForm();
-                }
-            }
-            else {
-                enable( 'completeBtn' );
-                disable( 'uncompleteBtn' );
-            }
-
-            jQuery( "input[name='entryfield'],select[name='entryselect']" ).each( function () {
-                jQuery( this ).focus( function () {
-                    currentFocus = this;
-                } );
-
-                jQuery( this ).addClass( "inputText" );
-            } );
-
-            TOGGLE.init();
-
             jQuery( "#entryForm :input" ).each( function () {
                 if ( jQuery( this ).attr( 'options' ) != null 
 					&& jQuery( this ).attr( 'options' ) == 'true'