=== 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 @@
-
+