------------------------------------------------------------
revno: 13055
committer: Morten Olav Hansen <morte...@gmail.com>
branch nick: dhis2
timestamp: Thu 2013-11-28 19:40:39 +0100
message:
minor fix in FormUtils
modified:
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/FormUtils.java
--
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-api/src/main/java/org/hisp/dhis/api/utils/FormUtils.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/FormUtils.java 2013-11-28 16:39:58 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/FormUtils.java 2013-11-28 18:40:39 +0000
@@ -122,45 +122,49 @@
ProgramStage programStage = program.getProgramStageByStage( 1 );
- if ( programStage == null && (Program.SINGLE_EVENT_WITHOUT_REGISTRATION == program.getType()
- || Program.SINGLE_EVENT_WITH_REGISTRATION == program.getType()) )
- {
- throw new NullPointerException();
- }
-
- if ( programStage != null )
- {
- form.getOptions().put( "captureCoordinates", programStage.getCaptureCoordinates() );
-
- if ( programStage.getProgramStageSections().size() > 0 )
+ if ( programStage == null )
+ {
+ if ( (Program.SINGLE_EVENT_WITHOUT_REGISTRATION == program.getType()
+ || Program.SINGLE_EVENT_WITH_REGISTRATION == program.getType()) )
{
- for ( ProgramStageSection section : programStage.getProgramStageSections() )
- {
- List<Field> fields = inputsFromProgramStageDataElements( section.getProgramStageDataElements() );
-
- if ( !fields.isEmpty() )
- {
- Group s = new Group();
- s.setLabel( section.getDisplayName() );
- s.setFields( fields );
- form.getGroups().add( s );
- }
- }
+ throw new NullPointerException();
}
else
{
- List<Field> fields = inputsFromProgramStageDataElements(
- new ArrayList<ProgramStageDataElement>( programStage.getProgramStageDataElements() ) );
+ return form;
+ }
+ }
+
+ form.getOptions().put( "captureCoordinates", programStage.getCaptureCoordinates() );
+
+ if ( programStage.getProgramStageSections().size() > 0 )
+ {
+ for ( ProgramStageSection section : programStage.getProgramStageSections() )
+ {
+ List<Field> fields = inputsFromProgramStageDataElements( section.getProgramStageDataElements() );
if ( !fields.isEmpty() )
{
Group s = new Group();
- s.setLabel( "default" );
+ s.setLabel( section.getDisplayName() );
s.setFields( fields );
form.getGroups().add( s );
}
}
}
+ else
+ {
+ List<Field> fields = inputsFromProgramStageDataElements(
+ new ArrayList<ProgramStageDataElement>( programStage.getProgramStageDataElements() ) );
+
+ if ( !fields.isEmpty() )
+ {
+ Group s = new Group();
+ s.setLabel( "default" );
+ s.setFields( fields );
+ form.getGroups().add( s );
+ }
+ }
return form;
}
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
