From c8fc1b944a764c662c49ce6a11a6c01f4759032e Mon Sep 17 00:00:00 2001
From: Daria Golova <danalis969@gmail.com>
Date: Fri, 18 Nov 2022 16:08:34 +0300
Subject: [PATCH] =?UTF-8?q?WIP=20=D0=9F=D0=BE=D0=B7=D0=B8=D1=86=D0=B8?=
 =?UTF-8?q?=D0=BE=D0=BD=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20?=
 =?UTF-8?q?descriptionCard=20=D0=B2=204=20=D1=81=D1=82=D0=BE=D1=80=D0=BE?=
 =?UTF-8?q?=D0=BD=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/calendar/TheCalendar.vue            |  2 +-
 .../calendar/components/CalendarEventCard.vue | 15 ++--------
 .../CalendarEventDescriptionCard.vue          | 30 ++++++++++++-------
 .../calendar/components/CalendarSidebar.vue   | 18 +++++------
 .../clients/components/ClientsWrapper.vue     |  2 +-
 5 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/src/pages/calendar/TheCalendar.vue b/src/pages/calendar/TheCalendar.vue
index dbdc4ae..2da60fc 100644
--- a/src/pages/calendar/TheCalendar.vue
+++ b/src/pages/calendar/TheCalendar.vue
@@ -70,7 +70,7 @@ export default {
       showModal: false,
       timeInformation: {
         dayStartTime: "00:00",
-        dayEndTime: "24:00",
+        dayEndTime: "20:00",
       },
       eventsData: [],
       employeesData: [],
diff --git a/src/pages/calendar/components/CalendarEventCard.vue b/src/pages/calendar/components/CalendarEventCard.vue
index 1efac92..e9f3b4a 100644
--- a/src/pages/calendar/components/CalendarEventCard.vue
+++ b/src/pages/calendar/components/CalendarEventCard.vue
@@ -29,7 +29,6 @@
       @close-description-card="closeDescriptionCard"
       @delete-event="transmitDeleteEvent"
       :schedule-body-ref="scheduleBodyRef"
-      :event-card-size="cardSize"
     )
   </template>
 
@@ -223,12 +222,6 @@ export default {
       this.hideDescriptionCard();
       this.setDefaultTheme();
     },
-    writeCardSize() {
-      this.cardSize = {
-        width: this.$refs["eventCard"].getBoundingClientRect().width,
-        height: this.calculateCardHeight - 8,
-      };
-    },
   },
   watch: {
     changeFormWasClosed: {
@@ -241,21 +234,16 @@ export default {
       },
     },
   },
-  mounted() {
-    this.writeCardSize();
-  },
 };
 </script>
 
 <style lang="sass" scoped>
 .wrapper
   position: absolute
-  z-index: 3
   width: calc(100% - 8px)
-  height: 23px
 
 .default-theme
-  z-index: 0
+  z-index: 2
   .card
     background-color: var(--bg-color)
     border: 2px solid var(--border-color)
@@ -271,6 +259,7 @@ export default {
     background-color: var(--font-color)
 
 .active-theme
+  z-index: 3
   .card
     background-color: var(--bg-active)
     border: 2px solid var(--border-active-color)
diff --git a/src/pages/calendar/components/CalendarEventDescriptionCard.vue b/src/pages/calendar/components/CalendarEventDescriptionCard.vue
index b097379..9df6dfc 100644
--- a/src/pages/calendar/components/CalendarEventDescriptionCard.vue
+++ b/src/pages/calendar/components/CalendarEventDescriptionCard.vue
@@ -16,7 +16,10 @@
         .icon-cancel.text-xxs.flex.items-center.cursor-pointer(@click="close")
     .body.mr-6
       span.text-base  {{ eventMember }}
-      .flex.text-xxs.mt-4.justify-between(v-if="!disabled")
+      .flex.text-xxs.justify-between(
+        v-if="!disabled",
+        :class="{'mt-4': description.length > 0}"
+        )
         .column
           ul
             li(v-for="elem in description" :key="elem") {{ elem }}
@@ -38,7 +41,6 @@ export default {
       default: false,
     },
     scheduleBodyRef: Node,
-    eventCardSize: Object,
   },
   data() {
     return {
@@ -119,19 +121,27 @@ export default {
     if (!this.$refs.descriptionCard || !this.scheduleBodyRef) return;
     const cardRect = this.$refs.descriptionCard.getBoundingClientRect();
     const bodyRect = this.scheduleBodyRef.getBoundingClientRect();
-    //const bodyHeight = this.scheduleBodyRef.clientHeight + bodyRect.y - 20;
-    const bodyWidth = this.scheduleBodyRef.clientWidth + bodyRect.x - 20;
-    if (cardRect.x + cardRect.width > bodyWidth) {
+    const bodyHeight = this.scheduleBodyRef.clientHeight + bodyRect.y - 20;
+    const bodyWidth = this.scheduleBodyRef.clientWidth;
+    console.log(cardRect.x, cardRect.width, bodyWidth);
+    if (cardRect.x + 2 * cardRect.width < bodyWidth) {
       this.position = {
-        top: `-${this.eventCardSize.height + 8}px`,
+        top: 0,
+        right: `-${cardRect.width + 8}px`,
+      };
+    } else if (cardRect.x - 84 > bodyRect.x) {
+      this.position = {
+        top: 0,
         left: `-${cardRect.width + 8}px`,
       };
-    } else {
+    } else if (cardRect.y + cardRect.height < bodyHeight) {
       this.position = {
-        top: `-${this.eventCardSize.height + 8}px`,
-        right: `-${this.eventCardSize.width + 8}px`,
+        "margin-top": "8px",
+      };
+    } else
+      this.position = {
+        top: `-${cardRect.height + 8}px`,
       };
-    }
   },
 };
 </script>
diff --git a/src/pages/calendar/components/CalendarSidebar.vue b/src/pages/calendar/components/CalendarSidebar.vue
index 72d7220..47cc3af 100644
--- a/src/pages/calendar/components/CalendarSidebar.vue
+++ b/src/pages/calendar/components/CalendarSidebar.vue
@@ -21,15 +21,15 @@
         ) Создать событие
         calendar-sidebar-event(:is-open="isOpen", :event-type="eventTypes")
         calendar-sidebar-teammate(:team-data="teamData", :is-open="isOpen")
-      //- .button-wrapper.flex.justify-center.mb-23px
-      //-   base-button(
-      //-     left-icon="icon-long-arrow",
-      //-     rounded, :size="40",
-      //-     :icon-left-size="18",
-      //-     secondary,
-      //-     :style="{ transform: `rotate(${turnButton})`}",
-      //-     @click="changeSize"
-      //-   )
+        .button-wrapper.flex.justify-center.mb-23px
+          base-button(
+            left-icon="icon-long-arrow",
+            rounded, :size="40",
+            :icon-left-size="18",
+            secondary,
+            :style="{ transform: `rotate(${turnButton})`}",
+            @click="changeSize"
+          )
 </template>
 
 <script>
diff --git a/src/pages/clients/components/ClientsWrapper.vue b/src/pages/clients/components/ClientsWrapper.vue
index 98796bb..12d83d8 100644
--- a/src/pages/clients/components/ClientsWrapper.vue
+++ b/src/pages/clients/components/ClientsWrapper.vue
@@ -1,5 +1,5 @@
 <template lang="pug">
-  .wrapper.flex.w-full.relative.mx-6
+  .wrapper.flex.w-full.relative.mx-2
     clients-table(:open-form="openForm", :current-year="currentYear")
 </template>