From 3493ff67642078c7d8806ae2aa9b61ea11f23353 Mon Sep 17 00:00:00 2001
From: Daria Golova <danalis969@gmail.com>
Date: Mon, 24 Oct 2022 18:52:09 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=D0=B0=20?=
 =?UTF-8?q?=D1=81=D0=B6=D0=B0=D1=82=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=BB=D0=BE?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=BA=20=D0=BF=D1=80=D0=B8=20=D0=BE=D1=82=D0=BA?=
 =?UTF-8?q?=D1=80=D1=8B=D1=82=D0=BE=D0=BC=20=D1=81=D0=B0=D0=B9=D0=B4=D0=B1?=
 =?UTF-8?q?=D0=B0=D1=80=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server.js                                     | 43 +++++++++++++++++++
 .../components/CalendarBackground.vue         |  5 ++-
 .../calendar/components/CalendarSchedule.vue  |  1 +
 3 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/server.js b/server.js
index bde4e1a..46c392d 100644
--- a/server.js
+++ b/server.js
@@ -435,6 +435,49 @@ export function clientsServer() {
               },
             ],
           },
+          {
+            id: "2faa7bb2-2de6-422c-a401-1b35cd455223",
+            start: "2022-10-24T10:00:00Z",
+            end: "2022-10-24T11:10:00Z",
+            kind: "call",
+            subkind: null,
+            description: "",
+            location: null,
+            members: [
+              {
+                id: "a9239f9a-e824-4bb3-a260-2b32dae9bc76",
+                person: {
+                  id: "15ff465c-2b7b-4d9a-9159-720c74d8b56d",
+                  last_name: "Елесеевская",
+                  first_name: "Татьяна",
+                  patronymic: "Ивановна",
+                },
+                role: null,
+              },
+            ],
+            employees: [
+              {
+                id: "f451a0c3-c734-4f73-91c2-d7a5674459e422",
+                employee: {
+                  id: "dv841a15-e867-331f-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,
+              },
+            ],
+          },
         ],
       }));
       this.passthrough("http://45.84.227.122:8080/**");
diff --git a/src/pages/calendar/components/CalendarBackground.vue b/src/pages/calendar/components/CalendarBackground.vue
index cf2d670..8f8521b 100644
--- a/src/pages/calendar/components/CalendarBackground.vue
+++ b/src/pages/calendar/components/CalendarBackground.vue
@@ -31,6 +31,7 @@ export default {
     hoursArray: Array,
     eventsData: Array,
     currentDate: Object,
+    sidebarWidth: String,
   },
   data() {
     return {
@@ -102,8 +103,10 @@ export default {
   },
   methods: {
     calculateColumnPosition(elemIndex) {
+      let deductible = parseInt(this.sidebarWidth.slice(0, -2), 10) - 72;
       if (this.ownersArrayLength < 4) {
-        this.columnWidth = this.backgroundWidth / this.ownersArrayLength;
+        this.columnWidth =
+          (this.backgroundWidth - deductible) / this.ownersArrayLength;
         return {
           width: `${this.columnWidth}px`,
           height: `${this.backgroundHeight}px`,
diff --git a/src/pages/calendar/components/CalendarSchedule.vue b/src/pages/calendar/components/CalendarSchedule.vue
index 5d5dbab..ccf047e 100644
--- a/src/pages/calendar/components/CalendarSchedule.vue
+++ b/src/pages/calendar/components/CalendarSchedule.vue
@@ -19,6 +19,7 @@
         :current-date="currentDate"
         :hours-array="hoursArray"
         :events-data="eventsData"
+        :sidebar-width="sidebarWidth"
         )
       .time-circle-indicator.left-74px(
         v-if="isShownIndicator"