diff --git a/src/pages/calendar/components/CalendarColumn.vue b/src/pages/calendar/components/CalendarColumn.vue index a1ad860..6854179 100644 --- a/src/pages/calendar/components/CalendarColumn.vue +++ b/src/pages/calendar/components/CalendarColumn.vue @@ -202,10 +202,8 @@ export default { ], start: `${this.currentDate.format( "YYYY-MM-DD" - )}T${hours}:${minuts}:00Z`, - end: `${this.currentDate.format( - "YYYY-MM-DD" - )}T${hours}:${minuts}:00Z`, + )}T${hours}:${minuts}:00`, + end: `${this.currentDate.format("YYYY-MM-DD")}T${hours}:${minuts}:00`, }); }, }, diff --git a/src/pages/calendar/components/CalendarEventCard.vue b/src/pages/calendar/components/CalendarEventCard.vue index ff6f960..afa664a 100644 --- a/src/pages/calendar/components/CalendarEventCard.vue +++ b/src/pages/calendar/components/CalendarEventCard.vue @@ -207,7 +207,7 @@ export default { }, methods: { trimTime(time) { - return time.slice(11, -4); + return time.slice(11, 16); }, composeFullName(object) { return `${object.last_name} ${object.first_name ?? ""} ${ diff --git a/src/pages/calendar/components/CalendarEventDescriptionCard.vue b/src/pages/calendar/components/CalendarEventDescriptionCard.vue index a3de16b..0080951 100644 --- a/src/pages/calendar/components/CalendarEventDescriptionCard.vue +++ b/src/pages/calendar/components/CalendarEventDescriptionCard.vue @@ -137,7 +137,7 @@ export default { if (!this.disabled) this.$emit("close-description-card"); }, trimTime(time) { - return time.slice(11, -4); + return time.slice(11, 16); }, composeFullName(object) { return `${object.last_name} ${object.first_name ?? ""} ${ diff --git a/src/pages/calendar/components/CalendarFormAddEvent.vue b/src/pages/calendar/components/CalendarFormAddEvent.vue index 79326fd..cfb94de 100644 --- a/src/pages/calendar/components/CalendarFormAddEvent.vue +++ b/src/pages/calendar/components/CalendarFormAddEvent.vue @@ -188,13 +188,14 @@ export default { return true; }, disabledUpdateButton() { - let start = moment.parseZone(this.selectedEventData.start); - let end = moment.parseZone(this.selectedEventData.end); + let start = moment(this.selectedEventData.start); + let end = moment(this.selectedEventData.end); if ( - this.eventDate === start.format("YYYY-MM-DD") && + moment(this.eventDate).format("YYYY-MM-DD") === + start.format("YYYY-MM-DD") && this.startTime === start.format("HH:mm") && this.endTime === end.format("HH:mm") && - this.status.label === this.selectedEventData.status && + this.findStatus(this.status.label) === this.selectedEventData.status && this.employees.employee.id === this.personId(this.selectedEventData.employees, "employee") && this.members.person.id === @@ -202,6 +203,7 @@ export default { ) { return true; } + if (!this.eventDate) return true; return false; }, startDate() { @@ -312,7 +314,8 @@ export default { if (foundedEmployee) foundedSchedule = foundedEmployee.schedules.find( (elem) => - elem.date === this.eventDate && elem.status === this.WORKING_STATUS + elem.date === moment(this.eventDate).format("YYYY-MM-DD") && + elem.status === this.WORKING_STATUS ); if (!foundedSchedule) { this.addErrorNotification( @@ -417,7 +420,10 @@ export default { this.closeForm(); }, mergeDate(eventDate, time) { - return moment(`${eventDate} ${time}`).format("YYYY-MM-DDTHH:mm:ss"); + let parseTime = time.split(":"); + return moment(eventDate.setHours(parseTime[0], parseTime[1]), 0).format( + "YYYY-MM-DDTHH:mm:ss" + ); }, findPerson(requestedList, object, field) { let foundPerson = requestedList.find(({ id }) => id === object[field].id); @@ -490,7 +496,7 @@ export default { }, fetchMembersData() { fetchWrapper - .get("general/person/?limit=100") + .get("general/person/?limit=200") .then((res) => this.saveMembersData(res)); }, fetchOwnersData() { diff --git a/src/pages/clients/components/FormCreateMedicalCard.vue b/src/pages/clients/components/FormCreateMedicalCard.vue index 3e1c1dc..358b149 100644 --- a/src/pages/clients/components/FormCreateMedicalCard.vue +++ b/src/pages/clients/components/FormCreateMedicalCard.vue @@ -96,14 +96,6 @@ export default { }, finish() {}, }, - watch: { - selectedClientId: { - immediate: true, - handler(newValue) { - console.log(newValue); - }, - }, - }, };