From 41755926d02b44818f4eb8bb951a9b3fa4823933 Mon Sep 17 00:00:00 2001 From: megavrilinvv Date: Wed, 2 Nov 2022 10:48:47 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=86=D0=B2=D0=B5=D1=82=D0=B0=20=D0=B0=D0=B2=D1=82?= =?UTF-8?q?=D0=B0=D1=80=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/calendar/components/CalendarColumn.vue | 2 +- src/pages/calendar/components/CalendarSchedule.vue | 1 + src/pages/clients/components/ClientsTableRow.vue | 1 + src/pages/clients/components/cells/TableCellBodyName.vue | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/pages/calendar/components/CalendarColumn.vue b/src/pages/calendar/components/CalendarColumn.vue index 93bcfd0..ea648d1 100644 --- a/src/pages/calendar/components/CalendarColumn.vue +++ b/src/pages/calendar/components/CalendarColumn.vue @@ -2,7 +2,7 @@ .calendar-column-wrapper.flex.flex-col .header.flex.items-center.justify-between.py-2.px-6.top-0 .flex.items-center - base-avatar.mr-2(:size="32" :color="ownerData.color") + base-avatar.mr-2(:size="32", :color="ownerData.color") img(:src="ownerData.avatar" alt="Team member" v-if="ownerData.avatar") span(v-if="!ownerData.avatar") {{ defaultAvatar }} span.owner-name.font-medium.text-base.mr-6 {{ ownerName }} diff --git a/src/pages/calendar/components/CalendarSchedule.vue b/src/pages/calendar/components/CalendarSchedule.vue index 4388c02..a496d22 100644 --- a/src/pages/calendar/components/CalendarSchedule.vue +++ b/src/pages/calendar/components/CalendarSchedule.vue @@ -150,6 +150,7 @@ export default { last_name: elem.last_name, first_name: elem.first_name, patronymic: elem.patronymic, + color: elem.color, }); }); return filteredArray; diff --git a/src/pages/clients/components/ClientsTableRow.vue b/src/pages/clients/components/ClientsTableRow.vue index e776436..7a29e47 100644 --- a/src/pages/clients/components/ClientsTableRow.vue +++ b/src/pages/clients/components/ClientsTableRow.vue @@ -89,6 +89,7 @@ export default { }, contacts: [...this.client.contacts], avatar: `${this.client.last_name[0]}${this.client.first_name[0]}`, + color: this.client.color, }; }, methods: { diff --git a/src/pages/clients/components/cells/TableCellBodyName.vue b/src/pages/clients/components/cells/TableCellBodyName.vue index 5814af6..3e6193e 100644 --- a/src/pages/clients/components/cells/TableCellBodyName.vue +++ b/src/pages/clients/components/cells/TableCellBodyName.vue @@ -1,6 +1,6 @@