Skip to content

Commit

Permalink
Next into test (#758)
Browse files Browse the repository at this point in the history
* zms-2871-2874-minus-deletion-by-location-delete-and-orthography-mail-and-notification-buttons

* fix(deps): update dependency phpoffice/phpspreadsheet to v1.29.6 (#738)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency squizlabs/php_codesniffer to v3.11.2 (#751)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency sass to v1.83.0 (#750)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update dependency phpoffice/phpspreadsheet to v1.29.7 (#752)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency phpspec/prophecy-phpunit to v2.3.0 (#647)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(ZMS-3500) Differentiate between editing and booking a new appointment when selecting the date (#757)

---------

Co-authored-by: matthias1996 <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: MoDaae <[email protected]>
  • Loading branch information
4 people authored Jan 9, 2025
1 parent 9873c53 commit 132608a
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions zmsadmin/js/page/workstation/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,13 @@ class View extends BaseView {
if ('counter' == this.page)
this.loadQueueInfo();
this.loadQueueTable();
this.loadAppointmentForm(true, false);
if (this.selectedProcess) {
// Editing an existing appointment -> full reload
this.loadAppointmentForm(true, false);
} else {
// Creating a new appointment -> partial reload
this.loadAppointmentForm(true, true);
}
}

addFocusTrap(elem) {
Expand Down Expand Up @@ -426,10 +432,10 @@ class View extends BaseView {
onPrintProcessMail(event) {
stopEvent(event);
this.selectedProcess = $(event.currentTarget).data('id');

// URL for mail_confirmation.twig
const url = `${this.includeUrl}/process/queue/?print=1&printType=mail&selectedprocess=${this.selectedProcess}`;

// Ajax request to get content from mail_confirmation.twig
$.ajax({
url: url,
Expand Down

0 comments on commit 132608a

Please sign in to comment.