Skip to content
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

Jump to bottom

Adding slot times constraints to comments. #29

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Adding slot times constraints to comments. #29

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
1 change: 1 addition & 0 deletions src/java/fr/paris/lutece/plugins/appointment/web/AppointmentSlotJspBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,6 +566,7 @@ public String getViewManageSpecificWeek( HttpServletRequest request )
request.getSession( ).removeAttribute( SESSION_ATTRIBUTE_SLOT );
int nIdForm = Integer.parseInt( request.getParameter( PARAMETER_ID_FORM ) );
Form form = FormService.findFormLightByPrimaryKey( nIdForm );

// Get the nb weeks to display
Display display = DisplayService.findDisplayWithFormId( nIdForm );
int nNbWeeksToDisplay = AppPropertiesService.getPropertyInt( PROPERTY_NB_WEEKS_TO_DISPLAY_IN_BO, display.getNbWeeksToDisplay( ) );
Expand Down
681 changes: 365 additions & 316 deletions src/java/fr/paris/lutece/plugins/appointment/web/CommentJspBean.java
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ...lates/admin/plugins/appointment/appointment/appointment_form_list_open_slots_grouped.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

<fieldset>
<legend class="hidden">#i18n{appointment.createField.title}</legend>
<@getCommentForm "comment" "startingValidityDate" "endingValidityDate" "idStartingTime" "idEndingTime" "doAddComment" id_form />
<@getCommentForm "comment" "startingValidityDate" "endingValidityDate" "idStartingTime" "idEndingTime" "doAddComment" id_form min_time!0 max_time!23 />
</fieldset>
</@boxBody>
</@box>
Expand All @@ -52,7 +52,7 @@

<fieldset>
<legend class="hidden">#i18n{appointment.createField.title}</legend>
<@getCommentForm "comment" "modifyStartingValidityDate" "modifyEndingValidityDate" "idModifyStartingTime" "idModifyEndingTime" "doModifyComment" id_form />
<@getCommentForm "comment" "modifyStartingValidityDate" "modifyEndingValidityDate" "idModifyStartingTime" "idModifyEndingTime" "doModifyComment" id_form min_time!0 max_time!23 />
</fieldset>
</@boxBody>
</@box>
Expand Down
4 changes: 2 additions & 2 deletions ...WEB-INF/templates/admin/plugins/appointment/appointment/manage_appointments_calendar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<@modal id='commentModal'>
<@modalHeader modalTitle='#i18n{appointment.create_comment.pageTitle}' />
<@modalBody>
<@getCommentForm "comment" "startingValidityDate" "endingValidityDate" "idStartingTime" "idEndingTime" "doAddComment" id_form />
<@getCommentForm "comment" "startingValidityDate" "endingValidityDate" "idStartingTime" "idEndingTime" "doAddComment" id_form min_time!0 max_time!23 />
</@modalBody>
<@modalFooter>
<@button type='button' params='data-dismiss="modal"' title='#i18n{portal.util.labelCancel}' buttonIcon='times' color='default' />
Expand All @@ -18,7 +18,7 @@
<@modal id='modify-comment'>
<@modalHeader modalTitle='#i18n{appointment.modify_comment.pageTitle}' />
<@modalBody>
<@getCommentForm "comment" "modifyStartingValidityDate" "modifyEndingValidityDate" "idModifyStartingTime" "idModifyEndingTime" "doModifyComment" id_form />
<@getCommentForm "comment" "modifyStartingValidityDate" "modifyEndingValidityDate" "idModifyStartingTime" "idModifyEndingTime" "doModifyComment" id_form min_time!0 max_time!23 />
</@modalBody>
<@modalFooter>
<@button type='button' params='data-dismiss="modal"' title='#i18n{portal.util.labelCancel}' buttonIcon='times' color='default' />
Expand Down
4 changes: 2 additions & 2 deletions ...mplates/admin/plugins/appointment/appointment/manage_appointments_multislot_calendar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<@modal id='commentModal'>
<@modalHeader modalTitle='#i18n{appointment.create_comment.pageTitle}' />
<@modalBody>
<@getCommentForm "comment" "startingValidityDate" "endingValidityDate" "idStartingTime" "idEndingTime" "doAddComment" id_form />
<@getCommentForm "comment" "startingValidityDate" "endingValidityDate" "idStartingTime" "idEndingTime" "doAddComment" id_form min_time!0 max_time!23 />
</@modalBody>
<@modalFooter>
<@button type='button' params='data-dismiss="modal"' title='#i18n{portal.util.labelCancel}' buttonIcon='times' color='default' />
Expand All @@ -18,7 +18,7 @@
<@modal id='modify-comment'>
<@modalHeader modalTitle='#i18n{appointment.modify_comment.pageTitle}' />
<@modalBody>
<@getCommentForm "comment" "modifyStartingValidityDate" "modifyEndingValidityDate" "idModifyStartingTime" "idModifyEndingTime" "doModifyComment" id_form />
<@getCommentForm "comment" "modifyStartingValidityDate" "modifyEndingValidityDate" "idModifyStartingTime" "idModifyEndingTime" "doModifyComment" id_form min_time!0 max_time!23 />
</@modalBody>
<@modalFooter>
<@button type='button' params='data-dismiss="modal"' title='#i18n{portal.util.labelCancel}' buttonIcon='times' color='default' />
Expand Down
10 changes: 7 additions & 3 deletions webapp/WEB-INF/templates/admin/plugins/appointment/appointment_commons.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
</#if>
</#function>

<#macro getCommentForm idComment idStartingDate idEndingDate idStartingTime idEndingTime action idForm locale=locale>
<#macro getCommentForm idComment idStartingDate idEndingDate idStartingTime idEndingTime action idForm minStartTime=0 maxEndTime=23 locale=locale>
<@tform action='jsp/admin/plugins/appointment/Comments.jsp'>
<@input type='hidden' name='action' value='${action}' />
<@input type='hidden' name='id_form' value='${idForm}' />
Expand Down Expand Up @@ -207,10 +207,14 @@

</@tform>
<script>
var openingHours = [];
for (var i="${minStartTime}".split(":")[0]; i <= "${maxEndTime}".split(":")[0]; i++){
openingHours.push(parseInt(i));
}
$('#${idStartingDate}').datepicker({language: '${locale}', autoclose: true});
$('#${idEndingDate}').datepicker({language: '${locale}', autoclose: true});
$('#${idStartingTime}').datetimepicker({format: 'HH:mm', stepping: 5});
$('#${idEndingTime}').datetimepicker({format: 'HH:mm', stepping: 5});
$('#${idStartingTime}').datetimepicker({format: 'HH:mm', stepping: 5, enabledHours: openingHours});
$('#${idEndingTime}').datetimepicker({format: 'HH:mm', stepping: 5, enabledHours: openingHours});
</script>
</#macro>

Expand Down
2 changes: 1 addition & 1 deletion webapp/WEB-INF/templates/admin/plugins/appointment/comment/create_comment.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<fieldset>
<legend class="hidden">#i18n{appointment.createField.title}</legend>
<@getCommentForm "comment" "startingValidityDate" "endingValidityDate" "idStartingTime" "idEndingTime" "doAddComment" id_form />
<@getCommentForm "comment" "startingValidityDate" "endingValidityDate" "idStartingTime" "idEndingTime" "doAddComment" id_form min_time!0 max_time!23 />
</fieldset>
</@boxBody>
</@box>
Expand Down
2 changes: 1 addition & 1 deletion webapp/WEB-INF/templates/admin/plugins/appointment/comment/modify_comment.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<fieldset>
<legend class="hidden">#i18n{appointment.createField.title}</legend>
<@getCommentForm "comment" "modifyStartingValidityDate" "modifyEndingValidityDate" "idStartingTime" "idEndingTime" "doModifyComment" id_form />
<@getCommentForm "comment" "modifyStartingValidityDate" "modifyEndingValidityDate" "idStartingTime" "idEndingTime" "doModifyComment" id_form min_time!0 max_time!23 />
</fieldset>
</@boxBody>
</@box>
Expand Down
4 changes: 2 additions & 2 deletions webapp/WEB-INF/templates/admin/plugins/appointment/slots/manage_specific_week.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<@modal id='commentModal'>
<@modalHeader modalTitle='#i18n{appointment.create_comment.pageTitle}' />
<@modalBody>
<@getCommentForm "comment" "startingValidityDate" "endingValidityDate" "idStartingTime" "idEndingTime" "doAddComment" id_form />
<@getCommentForm "comment" "startingValidityDate" "endingValidityDate" "idStartingTime" "idEndingTime" "doAddComment" id_form min_time!0 max_time!23 />
</@modalBody>
<@modalFooter>
<@button type='button' params='data-dismiss="modal"' title='#i18n{portal.util.labelCancel}' buttonIcon='times' color='default' />
Expand All @@ -21,7 +21,7 @@
<@modal id='modify-comment'>
<@modalHeader modalTitle='#i18n{appointment.modify_comment.pageTitle}' />
<@modalBody>
<@getCommentForm "comment" "modifyStartingValidityDate" "modifyEndingValidityDate" "idModifyStartingTime" "idModifyEndingTime" "doModifyComment" id_form />
<@getCommentForm "comment" "modifyStartingValidityDate" "modifyEndingValidityDate" "idModifyStartingTime" "idModifyEndingTime" "doModifyComment" id_form min_time!0 max_time!23 />
</@modalBody>
<@modalFooter>
<@button type='button' params='data-dismiss="modal"' title='#i18n{portal.util.labelCancel}' buttonIcon='times' color='default' />
Expand Down