From 1e162f2b3b7b370c1624b1ac712619738eebf67a Mon Sep 17 00:00:00 2001 From: Daria Golova Date: Tue, 27 Jun 2023 17:59:15 +0300 Subject: [PATCH] =?UTF-8?q?WIP=20=D0=9F=D0=BE=D0=B4=D1=82=D1=8F=D0=BD?= =?UTF-8?q?=D1=83=D0=BB=D0=B0=20=D0=BA=D0=BE=D0=BD=D1=82=D0=B0=D0=BA=D1=82?= =?UTF-8?q?=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/CalendarRecordCard.vue | 60 ++++++++++++++---- src/pages/newCalendar/utils/calendarConfig.js | 61 +++++++++++++++++++ 2 files changed, 109 insertions(+), 12 deletions(-) diff --git a/src/pages/newCalendar/components/CalendarRecordCard.vue b/src/pages/newCalendar/components/CalendarRecordCard.vue index c42e938..1662acd 100644 --- a/src/pages/newCalendar/components/CalendarRecordCard.vue +++ b/src/pages/newCalendar/components/CalendarRecordCard.vue @@ -15,22 +15,32 @@ size="16px", @click="changeTimeDisplay(true)" ) - .color-black.pl-4.flex-1.font-semibold {{trimPatientName(record?.member?.last_name, record?.member?.first_name, record?.member?.patronymic)}} + .color-black.pl-4.flex-1.font-semibold.py-6px.relative( + :class="{'pl-6px': expandedTime}" + ) + .flex.items-center( + :class="{'collapsed-name': expandedTime}" + ) {{trimPatientName(record?.member?.last_name, record?.member?.first_name, record?.member?.patronymic)}} + .gradient.absolute.w-5.h-full.right-0(v-if="expandedTime") .info-block.justify-center img.w-5.h-5(:src="recordingStatus?.icon") .last-item.info-block.justify-center(v-if="expandedType") img.w-5.h-5(:src="medicalСardStatus?.icon") - .body.background-grey.flex.pl-4.pr-2.py-10px.color-grey.gap-x-12(:style="bodyHeight", :class="bodyClass") - .flex.gap-x-2.items-center - q-icon(name="app:phone", size="14px") - .text-xxs +7 (910) 424–13–13 - .h-6.w-6.color-black.background-dark-grey.text-xxs.rounded.flex.items-center.justify-center( - v-if="collapsedDisplayCondition" - ) +1 - .flex.gap-x-2.items-center(v-if="!collapsedDisplayCondition") - q-icon(name="app:mail", size="14px") - .text-xxs Haritonich@mail.ru - span.text-xxs.self-end(v-if="servicesCount && bodyClass?.['flex-col']") {{`${4} услуги`}} + .body.background-grey.flex.flex-col.justify-between.pl-4.pr-2.py-10px.color-grey( + :style="bodyHeight", + :class="{'py-6px': collapsedDisplayCondition}" + ) + .flex.gap-x-14(:class="bodyClass") + .flex.gap-x-2.items-center( + v-for="contact in contacts", + :key="contact.value", + ) + q-icon(:name="contact.icon", size="14px") + .text-xxs {{ contact.value }} + .h-6.w-6.color-black.background-dark-grey.text-xxs.rounded.flex.items-center.justify-center( + v-if="collapsedDisplayCondition" + ) +1 + span.text-xxs.self-end(v-if="servicesCount && bodyClass?.['flex-col']") {{`${servicesCount} услуги`}} @@ -138,6 +168,12 @@ export default { width: 130px .collapsed width: 30px +.collapsed-name + width: 30px + overflow: hidden + white-space: nowrap +.gradient + background: linear-gradient(270deg, #EFF1F4 0%, rgba(239, 241, 244, 0.00) 100%) .expanded-time width: 138px .last-item diff --git a/src/pages/newCalendar/utils/calendarConfig.js b/src/pages/newCalendar/utils/calendarConfig.js index 19e0814..e62b04f 100644 --- a/src/pages/newCalendar/utils/calendarConfig.js +++ b/src/pages/newCalendar/utils/calendarConfig.js @@ -7,6 +7,41 @@ import filled from "@/assets/icons/medcard_filled.svg"; import partially_filled from "@/assets/icons/medcard_partially_filled.svg"; import not_filled from "@/assets/icons/medcard_not_filled.svg"; +export const networks = [ + { + id: "VK", + icon: "app:icon-vk", + }, + { + id: "TELEGRAM", + icon: "app:icon-tg", + }, + { + id: "GMAIL", + icon: "app:icon-google", + }, + { + id: "SLACK", + icon: "app:icon-slack", + }, + { + id: "DISCORD", + icon: "app:icon-discord", + }, + { + id: "VIBER", + icon: "wifi_calling_3", + }, + { + id: "PHONE", + icon: "app:phone", + }, + { + id: "EMAIL", + icon: "app:mail", + }, +]; + export const recordingStatuses = [ { label: "Не принят", @@ -263,6 +298,16 @@ export const recordList = [ last_name: "Харитонова", first_name: "Ольга", patronymic: "Васильевна", + contacts: [ + { + value: "+7 (910) 424–13–13", + kind: "PHONE", + }, + { + value: "Haritonich@mail.ru", + kind: "EMAIL", + }, + ], }, status: "not_accepted", medicalCard: { @@ -284,6 +329,16 @@ export const recordList = [ last_name: "Гаранова", first_name: "Наталья", patronymic: "Романовна", + contacts: [ + { + value: "+7 (910) 424–13–13", + kind: "PHONE", + }, + { + value: "Haritonich@mail.ru", + kind: "EMAIL", + }, + ], }, status: "accepted", medicalCard: { @@ -305,6 +360,12 @@ export const recordList = [ last_name: "Харитонова", first_name: "Ольга", patronymic: "Васильевна", + contacts: [ + { + value: "+7 (910) 424–13–13", + kind: "PHONE", + }, + ], }, status: "reception", medicalCard: {