dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2116
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2010-11-20 11:12:54 +0100
message:
  Improved display mode selection
modified:
  dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/SelectAction.java
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/responseDisplayModes.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-dataentry/src/main/java/org/hisp/dhis/de/action/SelectAction.java'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/SelectAction.java	2010-11-18 13:11:49 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/SelectAction.java	2010-11-20 10:12:54 +0000
@@ -238,19 +238,15 @@
         // Get display mode
         // ---------------------------------------------------------------------
 
-        if ( displayMode == null )
+        if ( displayMode == null || !ALLOWED_FORM_TYPES.contains( displayMode ) )
         {
             displayMode = selectedStateManager.getSelectedDisplayMode();
         }
-        else
-        {
-            selectedStateManager.setSelectedDisplayMode( displayMode );
-        }
+        
+        boolean customDataEntryFormExists = selectedDataSet.getDataEntryForm() != null;
 
         boolean hasSection = selectedDataSet.getSections() != null && selectedDataSet.getSections().size() > 0;
-
-        boolean customDataEntryFormExists = selectedDataSet.getDataEntryForm() != null;
-
+        
         if ( displayMode == null || !ALLOWED_FORM_TYPES.contains( displayMode ) )
         {
             if ( customDataEntryFormExists )
@@ -267,6 +263,8 @@
             }
         }
         
+        selectedStateManager.setSelectedDisplayMode( displayMode );
+        
         return displayMode;
     }
 }

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2010-11-19 16:12:02 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2010-11-20 10:12:54 +0000
@@ -24,7 +24,7 @@
 
 function clearEntryForm()
 {
-	$('#contentDiv').html( '' );
+	$( '#contentDiv' ).html( '' );
 }
 
 // -----------------------------------------------------------------------------
@@ -162,8 +162,11 @@
 	
 	if ( periodIndex && periodIndex != -1 )
 	{
-		var url = 'select.action?selectedPeriodIndex=' + periodIndex +
-			'&displayMode=' + $("input[name='displayMode']:checked").val();
+		var url = 'select.action?selectedPeriodIndex=' + periodIndex;
+		
+		var displayMode = $("input[name='displayMode']:checked").val();
+		
+		url += displayMode ? '&displayMode=' + displayMode : '';
 		
 		var callback = updateDisplayModes ? setDisplayModes : displayEntryFormCompleted;
 		

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/responseDisplayModes.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/responseDisplayModes.vm	2010-11-17 18:26:47 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/responseDisplayModes.vm	2010-11-20 10:12:54 +0000
@@ -1,5 +1,5 @@
 {
-  "sectionForm": ${sectionForm},
-  "customForm": ${customForm},
-  "displayMode": "${displayMode}"
+  "sectionForm": $!{sectionForm},
+  "customForm": $!{customForm},
+  "displayMode": "$!{displayMode}"
 }
\ No newline at end of file