From 0f5b0747b9c35ce522708bbab412eb5b1228b7ec Mon Sep 17 00:00:00 2001
From: Daria Golova <danalis969@gmail.com>
Date: Thu, 20 Oct 2022 16:48:48 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B8?=
 =?UTF-8?q?=D0=BB=D0=B0=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=BB=D0=BE=D0=BD=D0=BE=D0=BA?=
 =?UTF-8?q?=20=D0=B8=20=D0=BF=D0=BE=D0=B4=D0=BB=D0=BE=D0=B6=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/calendar/TheCalendar.vue            |  2 +-
 .../components/CalendarBackground.vue         | 44 ++++++++++++++++---
 .../calendar/components/CalendarColumn.vue    |  8 +---
 .../calendar/components/CalendarSchedule.vue  | 14 +++---
 4 files changed, 49 insertions(+), 19 deletions(-)

diff --git a/src/pages/calendar/TheCalendar.vue b/src/pages/calendar/TheCalendar.vue
index a43bee5..234e5d2 100644
--- a/src/pages/calendar/TheCalendar.vue
+++ b/src/pages/calendar/TheCalendar.vue
@@ -63,5 +63,5 @@ export default {
 
 <style lang="sass" scoped>
 .calendar-container
-  width: 100%
+  width: calc(100% - 80px)
 </style>
diff --git a/src/pages/calendar/components/CalendarBackground.vue b/src/pages/calendar/components/CalendarBackground.vue
index b668ef0..39f11c6 100644
--- a/src/pages/calendar/components/CalendarBackground.vue
+++ b/src/pages/calendar/components/CalendarBackground.vue
@@ -1,13 +1,15 @@
 <template lang="pug">
-  .calendar-background-wrapper.flex.flex-col
+  .calendar-background-wrapper.flex.flex-col(
+    ref="backgroundWrapper"
+    )
     calendar-column(
       v-for="(owner, index) in columnInformation.owners"
       :key="owner"
       :column-information="owner"
       :style="calculateColumnPosition(index)"
       )
-    .header
-    .body.flex.flex-col
+    .header(:style="backgroundExtendedWidth")
+    .body.flex.flex-col(:style="backgroundExtendedWidth")
       .line-wrapper
         .line.flex.items-center(
           v-for="hour in hoursArray"
@@ -42,7 +44,9 @@ export default {
     return {
       isShownIndicator: true,
       pixelsPerHour: 62,
-      columnWidth: 470,
+      backgroundWidth: 0,
+      columnWidth: 0,
+      defaultColumnWidth: 470,
     };
   },
   computed: {
@@ -62,6 +66,19 @@ export default {
     pixelsPerMinute() {
       return this.pixelsPerHour / 60;
     },
+    ownersArrayLength() {
+      return this.columnInformation.owners.length;
+    },
+    backgroundExtendedWidth() {
+      if (this.ownersArrayLength > 3) {
+        return {
+          width: `${this.defaultColumnWidth * this.ownersArrayLength}px`,
+        };
+      }
+      return {
+        width: "auto",
+      };
+    },
   },
   methods: {
     calculateIndicatorLocation() {
@@ -78,10 +95,21 @@ export default {
       return result;
     },
     calculateColumnPosition(elemIndex) {
+      if (this.ownersArrayLength < 4) {
+        this.columnWidth = this.backgroundWidth / this.ownersArrayLength;
+        return {
+          width: `${this.columnWidth}px`,
+          left: `${elemIndex * this.columnWidth}px`,
+        };
+      }
       return {
-        left: `${elemIndex * this.columnWidth}px`,
+        width: `${this.defaultColumnWidth}px`,
+        left: `${elemIndex * this.defaultColumnWidth}px`,
       };
     },
+    calculateBackgroundWidth() {
+      this.backgroundWidth = this.$refs.backgroundWrapper.clientWidth;
+    },
   },
   watch: {
     currentDate: function () {
@@ -89,6 +117,9 @@ export default {
         this.currentDate.format("DD.MM.YYYY") === moment().format("DD.MM.YYYY");
     },
   },
+  mounted() {
+    this.calculateBackgroundWidth();
+  },
 };
 </script>
 
@@ -96,6 +127,7 @@ export default {
 .calendar-background-wrapper
   width: 100%
   position: relative
+  overflow-x: scroll
 
 .header
   height: 48px
@@ -120,6 +152,7 @@ export default {
   width: 100%
   border-top: 1px solid var(--time-indicator-color)
   position: absolute
+  z-index: 10
 
 .time-circle-indicator
   width: 12px
@@ -127,4 +160,5 @@ export default {
   background-color: var(--time-indicator-color)
   border-radius: 50%
   position: absolute
+  z-index: 10
 </style>
diff --git a/src/pages/calendar/components/CalendarColumn.vue b/src/pages/calendar/components/CalendarColumn.vue
index 529c9ec..bd4f178 100644
--- a/src/pages/calendar/components/CalendarColumn.vue
+++ b/src/pages/calendar/components/CalendarColumn.vue
@@ -1,5 +1,5 @@
 <template lang="pug">
-  .calendar-column-wrapper.flex.flex-col(@click="output")
+  .calendar-column-wrapper.flex.flex-col
     .header.flex.items-center.justify-between.py-2.px-6
       .flex.items-center
         img.avatar-wrapper.mr-2(src="@/assets/images/team-member.svg" alt="Team member")
@@ -18,18 +18,12 @@ export default {
     columnInformation: String,
     elementKey: String,
   },
-  methods: {
-    output(event) {
-      console.log(event.target.id);
-    },
-  },
 };
 </script>
 
 <style lang="sass" scoped>
 .calendar-column-wrapper
   position: absolute
-  width: 470px
   border-right: 1px solid var(--border-light-grey-color)
   height: calc(100% - 54px)
 
diff --git a/src/pages/calendar/components/CalendarSchedule.vue b/src/pages/calendar/components/CalendarSchedule.vue
index d7051f8..68e8022 100644
--- a/src/pages/calendar/components/CalendarSchedule.vue
+++ b/src/pages/calendar/components/CalendarSchedule.vue
@@ -8,12 +8,13 @@
       @selected-layout="selectedLayout"
       )
     .schedule-body.flex
-      calendar-clock-column(
-        :hours-array="hoursArray"
-        :current-time="currentTime"
-        :is-current-date="isCurrentDate"
-        :day-end-time="validateEndTime"
-        )
+      div
+        calendar-clock-column(
+          :hours-array="hoursArray"
+          :current-time="currentTime"
+          :is-current-date="isCurrentDate"
+          :day-end-time="validateEndTime"
+          )
       calendar-background(
         :hours-array="hoursArray"
         :current-time="currentTime"
@@ -177,4 +178,5 @@ export default {
 <style lang="sass" scoped>
 .schedule
   background-color: var(--default-white)
+  width: calc(100% - 8px)
 </style>