dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2118
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2010-11-20 12:38:25 +0100
message:
  Centralized method
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/java/org/hisp/dhis/de/state/DefaultSelectedStateManager.java
  dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/state/SelectedStateManager.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/select.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-20 10:53:59 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/SelectAction.java	2010-11-20 11:38:25 +0000
@@ -27,10 +27,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import static org.hisp.dhis.de.state.SelectedStateManager.CUSTOM_FORM;
-import static org.hisp.dhis.de.state.SelectedStateManager.DEFAULT_FORM;
-import static org.hisp.dhis.de.state.SelectedStateManager.SECTION_FORM;
-
 import java.util.Collection;
 import java.util.Date;
 import java.util.Map;
@@ -244,18 +240,7 @@
         
         if ( !selectedStateManager.displayModeIsValid( displayMode ) )
         {
-            if ( selectedDataSet.hasDataEntryForm() )
-            {
-                displayMode = CUSTOM_FORM;
-            }
-            else if ( selectedDataSet.hasSections() )
-            {
-                displayMode = SECTION_FORM;
-            }
-            else
-            {
-                displayMode = DEFAULT_FORM;
-            }
+            displayMode = selectedStateManager.getDisplayMode();
         }
         
         selectedStateManager.setSelectedDisplayMode( displayMode );

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/state/DefaultSelectedStateManager.java'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/state/DefaultSelectedStateManager.java	2010-11-20 10:53:59 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/state/DefaultSelectedStateManager.java	2010-11-20 11:38:25 +0000
@@ -304,6 +304,22 @@
         return displayMode != null && map.containsKey( displayMode ) ? map.get( displayMode ) : false;
     }
     
+    public String getDisplayMode()
+    {
+        DataSet dataSet = getSelectedDataSet();
+        
+        if ( dataSet.hasDataEntryForm() )
+        {
+            return CUSTOM_FORM;
+        }
+        else if ( dataSet.hasSections() )
+        {
+            return SECTION_FORM;
+        }
+        
+        return DEFAULT_FORM;
+    }
+    
     // -------------------------------------------------------------------------
     // Support methods
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/state/SelectedStateManager.java'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/state/SelectedStateManager.java	2010-11-20 10:53:59 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/state/SelectedStateManager.java	2010-11-20 11:38:25 +0000
@@ -93,4 +93,6 @@
     String getSelectedDisplayMode();
     
     boolean displayModeIsValid( String displayMode );
+    
+    String getDisplayMode();
 }

=== 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-20 10:12:54 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2010-11-20 11:38:25 +0000
@@ -199,6 +199,8 @@
 			$( '#displayModeSection' ).attr( 'disabled', 'disabled' );
 		}
 		
+		$( '#displayModeDefault' ).removeAttr( 'disabled' );
+		
 		if ( json.displayMode == 'customform' ) {
 			$( '#displayModeCustom' ).attr( 'checked', 'checked' );
 			$( '#displayModeSection' ).removeAttr( 'checked' );

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm	2010-11-18 13:53:54 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm	2010-11-20 11:38:25 +0000
@@ -17,7 +17,7 @@
     <label for="displayModeCustom">$i18n.getString( "use_custom_form" )</label><br/>
 	<input type="radio" id="displayModeSection" name="displayMode" value="sectionform" disabled="disabled" onclick="displayModeSelected()">
 	<label for="displayModeSection">$i18n.getString( "use_section_form" )</label><br/>
-	<input type="radio" id="displayModeDefault" name="displayMode" value="defaultform" onclick="displayModeSelected()">
+	<input type="radio" id="displayModeDefault" name="displayMode" value="defaultform" disabled="disabled" onclick="displayModeSelected()">
     <label for="displayModeDefault">$i18n.getString( "use_default_form" )</label><br/><br/>
 </div>