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.

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

ZMS-3258 URL wird aktualisiert wenn der Kunde nicht erschienen oder w… #679

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 14 additions & 2 deletions zmsadmin/js/block/process/next/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,19 @@ class View extends BaseView {
loadCancel() {
this.cleanInstance();
const url = `${this.includeUrl}/workstation/process/cancel/`
return this.loadInto(url).then(() => this.onNextProcess());
return this.loadInto(url).then(() => {
this.onNextProcess();
this.updateURL();
});
}

loadParked() {
this.cleanInstance();
const url = `${this.includeUrl}/workstation/process/parked/`
return this.loadInto(url).then(() => this.onNextProcess());
return this.loadInto(url).then(() => {
this.onNextProcess();
this.updateURL();
});
}

// if process is called and button "nein, nächster Kunde bitte" is clicked, delete process from workstation and call next
Expand All @@ -84,6 +90,12 @@ class View extends BaseView {
return this.loadContent(url, 'GET', null, null, this.showLoader).catch(err => this.loadErrorCallback(err.source, err.url));
}

updateURL() {
const url = new URL(window.location.href);
url.searchParams.delete('calledprocess');
window.history.replaceState({}, '', url);
}

bindEvents() {
this.$main.on('click', '.button-callnextclient .button', (ev) => {
ev.preventDefault();
Expand Down
2 changes: 1 addition & 1 deletion zmsdb/src/Zmsdb/Query/Day.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class Day extends Base
const QUERY_INSERT_TEMPORARY_SCOPELIST = '
INSERT INTO calendarscope SET
scopeID = :scopeID,
year = :year,
year = :year,[]
month = :month,
slotsRequired = :slotsRequired;
';
Expand Down
Loading