Skip to content

LUT 32733 : Adding new consts for Position and Code mark #639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rkaabeche wants to merge 1 commit into
base: develop
Choose a base branch
from
+10 −10
Open

LUT 32733 : Adding new consts for Position and Code mark #639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions src/java/fr/paris/lutece/plugins/forms/service/provider/GenericFormsProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,7 @@ public abstract class GenericFormsProvider {
private static final String PROPERTY_BOOKMARKS_BY_QUESTION_CODE = "forms.bookmarks.byQuestionCode";

// MARKS
private static final String MARK_POSITION = "position_";
private static final String MARK_POSITION_ITERATION = "_";
private static final String MARK_CODE = "code_";
private static final String MARK_URL_ADMIN_RESPONSE = "url_admin_forms_response_detail";
private static final String MARK_URL_FO_RESPONSE = "url_fo_forms_response_detail";
private static final String MARK_CREATION_DATE = "creation_date";
Expand Down Expand Up @@ -197,8 +195,8 @@ public static Map<String, Object> getValuesModel( FormResponse formResponse, Htt
{
// in case of multiple FormQuestionResponse for the same question (when there is an iteration),
// we merge them into one FormQuestionResponse and update the marker
String strMultipleFormQuestionResponseKey = MARK_POSITION + formQuestionResponse.getQuestion( ).getId( );
String strMultipleFormQuestionCodeResponseKey = MARK_CODE + FileUtil.normalizeFileName( formQuestionResponse.getQuestion( ).getCode( ) );
String strMultipleFormQuestionResponseKey = FormsConstants.MARK_POSITION + formQuestionResponse.getQuestion( ).getId( );
String strMultipleFormQuestionCodeResponseKey = FormsConstants.MARK_CODE + FileUtil.normalizeFileName( formQuestionResponse.getQuestion( ).getCode( ) );
if ( model.containsKey( strMultipleFormQuestionResponseKey ) )
{
FormQuestionResponse existingFormQuestionResponse = (FormQuestionResponse) model.get( strMultipleFormQuestionResponseKey );
Expand All @@ -222,13 +220,13 @@ public static Map<String, Object> getValuesModel( FormResponse formResponse, Htt
}
else
{
String strFormQuestionResponseKey = MARK_POSITION + formQuestionResponse.getQuestion( ).getId( );
String strFormQuestionResponseKey = FormsConstants.MARK_POSITION + formQuestionResponse.getQuestion( ).getId( );
String strIteratedFormQuestionResponseKey = strFormQuestionResponseKey + MARK_POSITION_ITERATION
+ formQuestionResponse.getQuestion( ).getIterationNumber( );
model.put( strFormQuestionResponseKey, formQuestionResponse );
model.put( strIteratedFormQuestionResponseKey, formQuestionResponse );

String strFormQuestionCodeResponseKey = MARK_CODE + FileUtil.normalizeFileName( formQuestionResponse.getQuestion( ).getCode( ) );
String strFormQuestionCodeResponseKey = FormsConstants.MARK_CODE + FileUtil.normalizeFileName( formQuestionResponse.getQuestion( ).getCode( ) );
String strIteratedFormQuestionCodeResponseKey = strFormQuestionCodeResponseKey + MARK_POSITION_ITERATION
+ formQuestionResponse.getQuestion( ).getIterationNumber( );
model.put( strFormQuestionCodeResponseKey, formQuestionResponse );
Expand Down Expand Up @@ -290,10 +288,10 @@ public static Map<String, Object> getTitlesModel( Form form)
{
if (bByQuestionCodes)
{
model.put( MARK_CODE + formQuestion.getCode( ), formQuestion.getTitle( ) );
model.put( FormsConstants.MARK_CODE + formQuestion.getCode( ), formQuestion.getTitle( ) );
} else
{
model.put( MARK_POSITION + formQuestion.getId( ), formQuestion.getTitle( ) );
model.put( FormsConstants.MARK_POSITION + formQuestion.getId( ), formQuestion.getTitle( ) );
}
}
}
Expand Down Expand Up @@ -385,15 +383,15 @@ private static Collection<InfoMarker> buildMarkerForQuestion(Question question,

if( group == null || group.getIterationMax() == 1 )
{
InfoMarker marker = useQuestionCodes ? new InfoMarker( MARK_CODE + FileUtil.normalizeFileName( question.getCode( ) ) ) : new InfoMarker( MARK_POSITION + question.getId( ) );
InfoMarker marker = useQuestionCodes ? new InfoMarker( FormsConstants.MARK_CODE + FileUtil.normalizeFileName( question.getCode( ) ) ) : new InfoMarker( FormsConstants.MARK_POSITION + question.getId( ) );
marker.setDescription( question.getTitle( ) );
descriptionMarkersList.add(marker);
}
else
{
for (int i = 0 ; i < group.getIterationMax(); i++ )
{
InfoMarker marker = useQuestionCodes ? new InfoMarker( MARK_CODE + FileUtil.normalizeFileName( question.getCode( ) ) + MARK_POSITION_ITERATION + i ) : new InfoMarker( MARK_POSITION + question.getId( ) + MARK_POSITION_ITERATION + i );
InfoMarker marker = useQuestionCodes ? new InfoMarker( FormsConstants.MARK_CODE + FileUtil.normalizeFileName( question.getCode( ) ) + MARK_POSITION_ITERATION + i ) : new InfoMarker( FormsConstants.MARK_POSITION + question.getId( ) + MARK_POSITION_ITERATION + i );
marker.setDescription( question.getTitle( ) + " " + ( i + 1 ) );
descriptionMarkersList.add(marker);
}
Expand Down
2 changes: 2 additions & 0 deletions src/java/fr/paris/lutece/plugins/forms/util/FormsConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ public final class FormsConstants
public static final String MARK_DEFAULT_VALUE_WORKGROUP_KEY = "workgroup_key_default_value";
public static final String MARK_HAS_BACKUP_RESPONSE = "hasBackupResponse";
public static final String MARK_PROD_URL = "prod_url";
public static final String MARK_POSITION = "position_";
public static final String MARK_CODE = "code_";

// Parameters
public static final String PARAMETER_PAGE = "page";
Expand Down