Skip to content

WFALERTF-3: fix missing months/year in periods #2

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
pierresciorella wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

WFALERTF-3: fix missing months/year in periods #2

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
2 changes: 2 additions & 0 deletions ...paris/lutece/plugins/workflow/modules/alertforms/resources/alertforms_messages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ task_alert_config.label_task_retrieval_type=Fetch the reference date from
task.alertTaskHistory.information.title=Alert. Change of state for this response
task.alertTaskHistory.information.in=In
task.alertTaskHistory.information.days=day(s)
task.alertTaskHistory.information.months=month(s)
task.alertTaskHistory.information.years=year(s)
task.alertTaskHistory.information.resourceWillChangeState=The response will change of state
task.alertTaskHistory.information.resourceHasChangedState=The response has changed of state
task.alertTaskHistory.information.resourceNotChangedState=The response has not changed of state
Expand Down
2 changes: 2 additions & 0 deletions ...is/lutece/plugins/workflow/modules/alertforms/resources/alertforms_messages_fr.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ task_alert_config.label_task_retrieval_type=R\u00e9cup\u00e9rer la date de r\u00
task.alertTaskHistory.information.title=Alerte. Changement d'\u00e9tat de la fiche
task.alertTaskHistory.information.in=Dans
task.alertTaskHistory.information.days=jour(s)
task.alertTaskHistory.information.months=mois
task.alertTaskHistory.information.years=ann�e(s)
task.alertTaskHistory.information.resourceWillChangeState=La fiche va changer d'\u00e9tat
task.alertTaskHistory.information.resourceHasChangedState=La fiche a chang\u00e9 d'\u00e9tat
task.alertTaskHistory.information.resourceNotChangedState=Pas de changement d'\u00e9tat
Expand Down
2 changes: 2 additions & 0 deletions ...va/fr/paris/lutece/plugins/workflow/modules/alertforms/util/constants/AlertConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ public final class AlertConstants
public static final String MARK_STATE_BEFORE = "state_before";
public static final String MARK_STATE_AFTER = "state_after";
public static final String MARK_DAYS_BETWEEN = "days_between";
public static final String MARK_MONTHS_BETWEEN = "months_between";
public static final String MARK_YEARS_BETWEEN = "years_between";
public static final String MARK_ALERT_ACTIVE = "alert_active";
public static final String MARK_ALERT_EXECUTED = "alert_executed";
public static final String MARK_NB_DAYS_ALERT = "nb_days_alert";
Expand Down
2 changes: 2 additions & 0 deletions src/java/fr/paris/lutece/plugins/workflow/modules/alertforms/web/AlertTaskComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ public String getDisplayTaskInformation( int nIdHistory, HttpServletRequest requ

Period period = Period.between( ldtNow.toLocalDate( ), ldtRefAlert.toLocalDate( ) );
model.put( AlertConstants.MARK_DAYS_BETWEEN, period.getDays( ) );
model.put( AlertConstants.MARK_MONTHS_BETWEEN, period.getMonths( ) );
model.put( AlertConstants.MARK_YEARS_BETWEEN, period.getYears( ) );
model.put( AlertConstants.MARK_ALERT_ACTIVE, alert.isActive( ) );
model.put( AlertConstants.MARK_ALERT_EXECUTED, alert.isExecuted( ) );

Expand Down
6 changes: 5 additions & 1 deletion webapp/WEB-INF/templates/admin/plugins/workflow/modules/alertforms/task_alert_history.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
<label>#i18n{module.workflow.alertforms.task.alertTaskHistory.information.title} :</label>
<br/>
<#if alert_active>
#i18n{module.workflow.alertforms.task.alertTaskHistory.information.in} <b>${days_between!''} #i18n{module.workflow.alertforms.task.alertTaskHistory.information.days}</b><br/>
#i18n{module.workflow.alertforms.task.alertTaskHistory.information.in}
<b>${years_between!''} #i18n{module.workflow.alertforms.task.alertTaskHistory.information.years}</b>
<b>${months_between!''} #i18n{module.workflow.alertforms.task.alertTaskHistory.information.months}</b>
<b>${days_between!''} #i18n{module.workflow.alertforms.task.alertTaskHistory.information.days}</b>
<br/>
#i18n{module.workflow.alertforms.task.alertTaskHistory.information.resourceWillChangeState} : <br/>
${state_before.name!''} <i class="fa fa-arrow-right" aria-hidden="true"></i> ${state_after.name!''}
<#else>
Expand Down