diff --git a/server.js b/server.js index 344db13..ff1f748 100644 --- a/server.js +++ b/server.js @@ -132,7 +132,7 @@ export function clientsServer() { dataClients, })); this.get("/registry/event/", () => ({ - count: 1, + count: 4, next: null, previous: null, results: [ @@ -157,6 +157,16 @@ export function clientsServer() { }, ], employees: [ + { + id: "f941a0c6-c750-4f79-92c0-d7a19354e422", + employee: { + id: "db541a67-e836-481f-a653-6325de7c567e", + last_name: "Захарова", + first_name: "Ольга", + patronymic: "Александровна", + }, + role: null, + }, { id: "f941a0c6-c750-4f79-92c0-d7a19354e422", employee: { @@ -169,6 +179,135 @@ export function clientsServer() { }, ], }, + { + id: "7faa7bb7-2de6-422c-a401-1b35cd455303", + start: "2022-10-20T10:00:00Z", + end: "2022-10-20T11:10:00Z", + kind: "call", + subkind: null, + description: "", + location: null, + members: [ + { + id: "b0509f9a-e824-4bb3-a260-2b32dae9bc81", + person: { + id: "14ff401c-2b7b-4d9a-9159-720c74d8b23c", + last_name: "Гагарин", + first_name: "Юрий", + patronymic: "Алексеевич", + }, + role: null, + }, + ], + employees: [ + { + id: "f941a0c6-c734-4f79-92c2-d7a5674459e422", + employee: { + id: "db831a15-e876-481f-a658-6325de7c311e", + last_name: "Константинопольская", + first_name: "Юлия", + patronymic: "Викторовна", + }, + role: null, + }, + { + id: "f941a0c6-c750-4f79-92c0-d7a19354e422", + employee: { + id: "db541a67-e836-481f-a653-6325de7c567e", + last_name: "Захарова", + first_name: "Ольга", + patronymic: "Александровна", + }, + role: "owner", + }, + ], + }, + { + id: "2faa7bb2-2de6-422c-a401-1b35cd455223", + start: "2022-10-20T10:00:00Z", + end: "2022-10-20T11:10:00Z", + kind: "call", + subkind: null, + description: "", + location: null, + members: [ + { + id: "b0509f9a-e824-4bb3-a260-2b32dae9bc81", + person: { + id: "14ff401c-2b7b-4d9a-9159-720c74d8b23c", + last_name: "Гагарин", + first_name: "Юрий", + patronymic: "Алексеевич", + }, + role: null, + }, + ], + employees: [ + { + id: "f941a0c6-c734-4f79-92c2-d7a5674459e422", + employee: { + id: "db831a15-e876-481f-a658-6325de7c311e", + last_name: "Константинопольская", + first_name: "Юлия", + patronymic: "Викторовна", + }, + role: "owner", + }, + { + id: "f941a0c6-c750-4f79-92c0-d7a19354e422", + employee: { + id: "db541a67-e836-481f-a653-6325de7c567e", + last_name: "Захарова", + first_name: "Ольга", + patronymic: "Александровна", + }, + role: null, + }, + ], + }, + { + id: "6faa6bb2-1de4-425c-a401-1b35cd455303", + start: "2022-10-20T20:23:49Z", + end: "2022-10-20T21:23:53Z", + kind: "call", + subkind: null, + description: "", + location: null, + members: [ + { + id: "b0509f9a-e824-4bb3-a260-2b32dae9bc81", + person: { + id: "14ff401c-2b7b-4d9a-9159-720c74d8b23c", + last_name: "Гагарин", + first_name: "Юрий", + patronymic: "Алексеевич", + }, + role: null, + }, + ], + employees: [ + { + id: "f941a0c6-c750-4f79-92c0-d7a19354e422", + employee: { + id: "db541a67-e836-481f-a653-6325de7c567e", + last_name: "Захарова", + first_name: "Ольга", + patronymic: "Александровна", + }, + role: null, + }, + { + id: "f941a0c6-c750-4f79-92c0-d7a19354e422", + employee: { + id: "db831a14-e836-481f-a653-6325de7c311e", + last_name: "Жмыхов", + first_name: "Егор", + patronymic: "Сергеевич", + }, + role: null, + }, + ], + }, ], })); this.passthrough("http://45.84.227.122:8080/**"); diff --git a/src/pages/calendar/TheCalendar.vue b/src/pages/calendar/TheCalendar.vue index 63c4728..88e5e96 100644 --- a/src/pages/calendar/TheCalendar.vue +++ b/src/pages/calendar/TheCalendar.vue @@ -4,7 +4,7 @@ calendar-schedule( :current-date="currentDate" :time-information="timeInformation" - :column-information="columnInformation" + :events-data="eventsData" @previous-date="switchPreviousDate" @next-date="switchNextDate" @selected-layout="changeCalendarLayout" @@ -27,14 +27,6 @@ export default { dayEndTime: "18:00", }, eventsData: [], - columnInformation: { - owners: [ - "Захарова А.О.", - "Константинопольская Ю.В.", - "Коломойцев И.К.", - "Зайцев В.С.", - ], - }, }; }, methods: { @@ -64,5 +56,5 @@ export default { diff --git a/src/pages/calendar/components/CalendarBackground.vue b/src/pages/calendar/components/CalendarBackground.vue index ae7dcf8..238cef4 100644 --- a/src/pages/calendar/components/CalendarBackground.vue +++ b/src/pages/calendar/components/CalendarBackground.vue @@ -1,11 +1,12 @@