Добавлены проверки событий

src/pages/calendar/TheCalendar.vue

@@ -31,6 +31,7 @@
         :owners-data="employeesData",
         :selected-event-data="selectedEvent",
         :event-types="eventTypes",
+        :time-information="timeInformation",
         @clear-selected-event-data="clearSelectedEvent",
         @close-change-form="setChangeFormState"
       )

src/pages/calendar/components/CalendarColumn.vue

@@ -84,7 +84,7 @@ export default {
         start[1] * this.pixelsPerMinute;
       if (
         parseInt(start[0], 10) < this.dayStartTime ||
-        parseInt(end, 10) >= this.dayEndTime
+        parseInt(end, 10) > this.dayEndTime
       ) {
         return {
           top: "0px",

src/pages/calendar/components/CalendarFormAddEvent.vue

@@ -105,6 +105,12 @@ export default {
         return [];
       },
     },
+    timeInformation: {
+      type: Object,
+      default() {
+        return {};
+      },
+    },
   },
   data() {
     return {
@@ -268,6 +274,75 @@ export default {
     },
   },
   methods: {
+    checkTimeLimits(eventTime, scheduleTime, timeType) {
+      if (timeType === "start")
+        return (
+          parseInt(eventTime.split(":")[0]) <
+          parseInt(scheduleTime.split(":")[0])
+        );
+      if (timeType === "end") {
+        let firstTime = eventTime.split(":").map((elem) => parseInt(elem));
+        let secondTime = scheduleTime.split(":").map((elem) => parseInt(elem));
+        if (firstTime[0] === secondTime[0]) return firstTime[1] > secondTime[1];
+        else return firstTime[0] > secondTime[0];
+      }
+    },
+    checkTime() {
+      let counter = 0;
+      if (
+        this.checkTimeLimits(
+          this.startTime,
+          this.timeInformation.dayStartTime,
+          "start"
+        )
+      ) {
+        this.addErrorNotification(
+          "Некорректное время начала события",
+          "Время начала события раньше начала рабочего дня"
+        );
+        counter += 1;
+      }
+      if (
+        this.checkTimeLimits(
+          this.endTime,
+          this.timeInformation.dayEndTime,
+          "end"
+        )
+      ) {
+        this.addErrorNotification(
+          "Некорректное время окончания события",
+          "Время окончания события позже окончания рабочего дня"
+        );
+        counter += 1;
+      }
+      if (
+        this.checkTimeLimits(
+          this.endTime,
+          this.timeInformation.dayStartTime,
+          "start"
+        )
+      ) {
+        this.addErrorNotification(
+          "Некорректное время окончания события",
+          "Время окончания события раньше начала рабочего дня"
+        );
+        counter += 1;
+      }
+      if (
+        this.checkTimeLimits(
+          this.startTime,
+          this.timeInformation.dayEndTime,
+          "end"
+        )
+      ) {
+        this.addErrorNotification(
+          "Некорректное время начала события",
+          "Время начала события позже окончания рабочего дня"
+        );
+        counter += 1;
+      }
+      return counter === 0;
+    },
     trimOwnerName(lastName, firsName, patronymic) {
       return `${lastName} ${firsName[0]}.${patronymic[0]}.`;
     },
@@ -275,19 +350,22 @@ export default {
       return `${lastName} ${firsName} ${patronymic}`;
     },
     async sendEventData() {
-      this.eventData = {
+      if (!this.checkTime()) return;
-        start: this.mergeDate(this.eventDate, this.startTime),
+      else
-        end: this.mergeDate(this.eventDate, this.endTime),
+        this.eventData = {
-        kind: this.kind.label,
+          start: this.mergeDate(this.eventDate, this.startTime),
-        employees: [
+          end: this.mergeDate(this.eventDate, this.endTime),
-          this.findPerson(this.ownersData, this.employees, "employee"),
+          kind: this.kind.label,
-        ],
+          employees: [
-        members: [this.findPerson(this.membersData, this.members, "person")],
+            this.findPerson(this.ownersData, this.employees, "employee"),
-      };
+          ],
+          members: [this.findPerson(this.membersData, this.members, "person")],
+        };
       await this.postCreateEvent(this.eventData);
       this.eventData = {};
     },
     async updateEventData() {
+      if (!this.checkTime()) return;
       if (
         Object.keys(
           this.findPerson(this.ownersData, this.employees, "employee")
@@ -384,7 +462,7 @@ export default {
       }
     },
     addErrorNotification(title, message) {
-      addNotification(new Date().getTime(), title, message, "error", 5000);
+      addNotification(title, title, message, "error", 5000);
     },
     addSuccessNotification(message) {
       addNotification(new Date().getTime(), message, "", "success", 5000);