Merge pull request #148 from dderbentsov/UC-64

WIP Перенесла fetchMembers, добавила скролл на селект

src/components/base/BaseCustomSelect.vue

@@ -86,6 +86,8 @@ export default {
   box-shadow: 1px 1px 8px rgba(37, 40, 80, 0.15)
   border-radius: 4px
   background-color: white
+  overflow-y: auto
+  height: 140px
 .placeholder
   color: #090A15
   opacity: 0.5

src/pages/calendar/TheCalendar.vue

@@ -11,7 +11,6 @@
       :current-date="currentDate",
       :time-information="timeInformation",
       :events-data="eventsData",
-      :members-data="membersData",
       :sidebar-width="sidebarWidth",
       :event-types="eventTypes",
       :change-form-was-closed="changeFormWasClosed",
@@ -27,7 +26,6 @@
       v-if="isOpenForm",
       :close-form="closeFormCreateEvent",
       :owners-data="employeesData",
-      :members-data="membersData",
       :selected-event-data="selectedEvent",
       :event-types="eventTypes",
       @clear-selected-event-data="clearSelectedEvent",
@@ -77,7 +75,6 @@ export default {
       employeesData: [],
       isOpenForm: false,
       changeFormWasClosed: false,
-      membersData: [],
       eventTypes: [
         { id: 1, label: "Встреча", color: "var(--bg-event-green-color)" },
         { id: 2, label: "Планерка", color: "var(--bg-event-red-color)" },
@@ -102,16 +99,10 @@ export default {
     saveEmployeesData(res) {
       this.employeesData = res.results;
     },
-    saveMembersData(res) {
+    fetchEmployeesData() {
-      this.membersData = res.results;
-    },
-    fetchPersonsData() {
       fetchWrapper
         .get("general/employee/")
         .then((res) => this.saveEmployeesData(res));
-      fetchWrapper
-        .get("general/person/")
-        .then((res) => this.saveMembersData(res));
     },
     fetchEventsData() {
       fetchWrapper
@@ -158,7 +149,7 @@ export default {
     },
   },
   mounted() {
-    this.fetchPersonsData();
+    this.fetchEmployeesData();
     this.fetchEventsData();
   },
 };

src/pages/calendar/components/CalendarFormAddEvent.vue

@@ -11,7 +11,7 @@
         span.text-xs.opacity-40.font-bold.leading-3 Вид события
         base-custom-select.select(
           v-model="kind",
-          :items="kindEvents",
+          :items="eventTypes",
           placeholder="Вид события"
         )
       .flex.flex-col(class="gap-y-1.5")
@@ -90,12 +90,6 @@ export default {
         return [];
       },
     },
-    membersData: {
-      type: Array,
-      default() {
-        return [];
-      },
-    },
     selectedEventData: {
       type: Object,
       default() {
@@ -111,24 +105,6 @@ export default {
   },
   data() {
     return {
-      kindEvents: [
-        {
-          id: 1,
-          label: "Встреча",
-        },
-        {
-          id: 2,
-          label: "Планерка",
-        },
-        {
-          id: 3,
-          label: "Интервью",
-        },
-        {
-          id: 4,
-          label: "Важная работа",
-        },
-      ],
       EMPLOYEE_TYPE: "owner",
       MEMBER_TYPE: "primary",
       eventData: {},
@@ -140,6 +116,7 @@ export default {
       kind: "",
       id: null,
       ifClearedForm: true,
+      membersData: [],
     };
   },
   computed: {
@@ -381,6 +358,14 @@ export default {
         `error type: ${error.type}\nerror code: ${error.errors[0].code}\nerror detail: ${error.errors[0].detail}`
       );
     },
+    fetchMembersData() {
+      fetchWrapper
+        .get("general/person/")
+        .then((res) => this.saveMembersData(res));
+    },
+    saveMembersData(res) {
+      this.membersData = res.results;
+    },
   },
   watch: {
     startDate: {
@@ -412,6 +397,9 @@ export default {
       },
     },
   },
+  mounted() {
+    this.fetchMembersData();
+  },
 };
 </script>
 

src/pages/calendar/components/CalendarSchedule.vue

@@ -95,12 +95,6 @@ export default {
         return [];
       },
     },
-    membersData: {
-      type: Array,
-      default() {
-        return [];
-      },
-    },
     eventTypes: {
       type: Array,
       default() {