diff --git a/server.js b/server.js
index 84d67da..e9284ac 100644
--- a/server.js
+++ b/server.js
@@ -494,7 +494,7 @@ export function clientsServer() {
id: "db831a14-e836-481f-a653-6325de7c311e",
last_name: "Жмыхов",
first_name: "Егор",
- patronymic: "Сергеевич",
+ patronymic: "Александрович",
},
role: null,
},
@@ -537,7 +537,7 @@ export function clientsServer() {
id: "db831a14-e836-481f-a653-6325de7c311e",
last_name: "Жмыхов",
first_name: "Егор",
- patronymic: "Сергеевич",
+ patronymic: "Александрович",
},
role: "owner",
},
diff --git a/src/components/base/BaseSelect.vue b/src/components/base/BaseSelect.vue
index f03dc5b..674afaa 100644
--- a/src/components/base/BaseSelect.vue
+++ b/src/components/base/BaseSelect.vue
@@ -15,21 +15,21 @@
:id="id"
)
.option.px-4.py-1(
- v-for="responsible in listData"
+ v-for="data in listData"
@click="(e) => chooseOption(e)"
- :key="responsible"
- :id="responsible"
- ) {{responsible}}
+ :key="data.id || data"
+ :id="data.id || data"
+ ) {{data.name || data}}
.flex.select.cursor-pointer.w-full.text-xl.items-center.networks(v-if="forNetworks" :class="optionData, 'px-2.5'")
.absolute.options.top-11.left-0(
v-show="isSelectOpen"
:id="id")
.flex.option.justify-center.py-1.text-xl(
- v-for="responsible in listData"
+ v-for="data in listData"
@click="(e) => chooseOption(e)"
- :key="responsible.network"
- :id="responsible.network"
- :class="responsible.icon"
+ :key="data.network"
+ :id="data.network"
+ :class="data.icon"
)
.select-form-separator.cursor-pointer.mr-6px(v-if="separator")
.text-xsm.ml-2.pt-1.icon-down-arrow.icon.text-center(v-if="!forNetworks" :class="{ open: isSelectOpen}")
diff --git a/src/pages/calendar/TheCalendar.vue b/src/pages/calendar/TheCalendar.vue
index f54cb7e..a6d1ad0 100644
--- a/src/pages/calendar/TheCalendar.vue
+++ b/src/pages/calendar/TheCalendar.vue
@@ -1,9 +1,10 @@
.calendar-container.flex
calendar-sidebar(@width="changeWidth"
- :team-data="teamData"
+ :team-data="employeesData"
:open-form-create="openFormCreateEvent")
calendar-schedule(
+ :owners-data="employeesData"
:current-date="currentDate"
:time-information="timeInformation"
:events-data="eventsData"
@@ -11,8 +12,12 @@
@previous-date="switchPreviousDate"
@next-date="switchNextDate"
@selected-layout="changeCalendarLayout"
- )
- calendar-form-add-event(v-if="isOpenForm" :close-form="closeFormCreateEvent")
+ )
+ calendar-form-add-event(
+ v-if="isOpenForm"
+ :close-form="closeFormCreateEvent"
+ :owners-data="employeesData"
+ )
diff --git a/src/pages/calendar/components/CalendarSchedule.vue b/src/pages/calendar/components/CalendarSchedule.vue
index b07280d..4388c02 100644
--- a/src/pages/calendar/components/CalendarSchedule.vue
+++ b/src/pages/calendar/components/CalendarSchedule.vue
@@ -77,6 +77,12 @@ export default {
},
},
sidebarWidth: String,
+ ownersData: {
+ type: Array,
+ default() {
+ return [];
+ },
+ },
},
data() {
return {
@@ -138,34 +144,15 @@ export default {
},
filteredOwners() {
let filteredArray = [];
- let ownerAbsence = {
- id: null,
- last_name: null,
- first_name: null,
- patronymic: null,
- };
- this.eventsData.forEach(({ employees }) => {
- let findedElement = employees.find((elem) => elem.role === "owner");
- let emptyDataPresence = this.findObjectInArray(
- filteredArray,
- ownerAbsence
- );
- if (!findedElement && !emptyDataPresence) {
- filteredArray.push(ownerAbsence);
- }
- if (findedElement) {
- let ownerPresence = this.findObjectInArray(
- filteredArray,
- findedElement.employee
- );
- if (!ownerPresence) {
- filteredArray.push(findedElement.employee);
- }
- }
+ this.ownersData.forEach((elem) => {
+ filteredArray.push({
+ id: elem.id,
+ last_name: elem.last_name,
+ first_name: elem.first_name,
+ patronymic: elem.patronymic,
+ });
});
- return filteredArray.sort(
- (previous, subsequent) => Boolean(subsequent.id) - Boolean(previous.id)
- );
+ return filteredArray;
},
ownersCount() {
return this.filteredOwners.length;