forge-joniko/ldc-supportweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'ticket1142' into 'develop'

Browse source 
Ticket1142

See merge request service-web-lab/support-web!10
This commit is contained in:
Vincent BRIDIER 2022-12-06 12:05:52 +00:00
commit 803c457d27
4 changed files with 2750 additions and 3560 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

891
composer.lock generated
View file

File diff suppressed because it is too large Load diff

5399
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

2
resources/ts/components/InvoiceTasksComponent.vue
View file

@ -314,7 +314,7 @@ export default defineComponent({
</script>
<style lang="scss">
@import "vue-select/src/scss/vue-select.scss";
@import "vue-select/dist/vue-select.css";
.tasks {
.inputNumber {
width: 6rem !important;

18
resources/ts/components/ScheduleComponent.vue
View file

@ -597,16 +597,14 @@ export default defineComponent({
if (!route) {
throw new Error("undefined route schedule.index");
}
// console.log(forward);
let date = this.momentJs(this.currentDate)
.startOf("week")
.subtract(7, "day");
if (forward) {
date = this.momentJs(this.currentDate).add(7, "day");
}
const thisWeekMonday = this.momentJs(this.currentDate).startOf("week");
const url = new URL(route);
(window as Window).location =
url.origin + url.pathname + "?p=" + date.format("DD/MM/YYYY");
`${url.origin}${url.pathname}?p=` +
(forward
? thisWeekMonday.add(8, "day")
: thisWeekMonday.subtract(6, "day")
).format("DD/MM/YYYY");
},
prepareDays(): Day[] {
let mydays = [];
@ -1053,7 +1051,7 @@ export default defineComponent({
</script>
<style lang="scss">
@import "vue-select/src/scss/vue-select.scss";
@import "vue-select/dist/vue-select.css";
.actions_col {
width: 45px;
@ -1186,7 +1184,7 @@ table.schedules_table {
}
@import "toastify-js/src/toastify.css";
@import "vue-select/src/scss/vue-select.scss";
@import "vue-select/dist/vue-select.css";
.planning {
overflow: auto;