diff --git a/src/assets/sass/variables.sass b/src/assets/sass/variables.sass
index 3ac4b5d..eb70ee6 100644
--- a/src/assets/sass/variables.sass
+++ b/src/assets/sass/variables.sass
@@ -91,6 +91,7 @@
--bg-chip-yellow-color: #fff0ca
--bg-chip-pink-color: #F7D9FF
--gray-thirdly: #f4f4f6
- --surface-blue-big: #ECF0FE
- --gray-scondary:#DDDDE8
+ --surface-blue-big: #ecf0fe
+ --gray-scondary: #dddde8
+ --system-color-red: #f34549
diff --git a/src/pages/medcards/components/BasicDataForms/TodaysPatientsForm.vue b/src/pages/medcards/components/BasicDataForms/TodaysPatientsForm.vue
index 1dccefe..f15038c 100644
--- a/src/pages/medcards/components/BasicDataForms/TodaysPatientsForm.vue
+++ b/src/pages/medcards/components/BasicDataForms/TodaysPatientsForm.vue
@@ -1,15 +1,105 @@
- medcard-form-wrapper(title="Пациенты на сегодня", :quantity="13", title-link="Календарь")
- .flex gwiefujm
+ medcard-form-wrapper.relative(
+ title="Пациенты на сегодня",
+ :quantity="patientsData.length",
+ title-link="Календарь"
+ )
+ .form-wrapper.flex.flex-col.overflow-y-auto(@scroll="scrollTo")
+ .patient.flex.items-center.gap-x-6.p-4(v-for="(patient, index) in patientsData")
+ .flex.text-base.font-medium.gap-x-3
+ img.h-11.w-11.object-cover.rounded-full(:src="patient.avatar")
+ .flex.flex-col.justify-center
+ .name.flex.relative {{trimName(patient.last_name, patient.first_name, patient.patronymic)}}
+ .gradient.flex.absolute
+ .grey-color.text-smm {{patient.birthday}}
+ .flex.flex-col.justify-center
+ .text-m.font-bold {{patient.time.from + " - " + patient.time.to}}
+ .grey-color.font-medium.text-smm(
+ :class="{'red-color': !index}"
+ ) {{index ? "Время посещения" : "Скоро прием" }}
+ .flex
+ .gradient-name.flex.absolute(v-if="isGradient")
-
+
diff --git a/src/pages/newCalendar/utils/calendarConfig.js b/src/pages/newCalendar/utils/calendarConfig.js
index 258ed09..8ca6ad6 100644
--- a/src/pages/newCalendar/utils/calendarConfig.js
+++ b/src/pages/newCalendar/utils/calendarConfig.js
@@ -119,6 +119,8 @@ export const patientList = [
birthday: "28.03.1980",
avatar: personImage,
check: false,
+ reception: "25.07.2023",
+ time: { from: "12:00", to: "14:00" },
},
{
id: 1,
@@ -128,6 +130,8 @@ export const patientList = [
birthday: "01.03.1975",
avatar: personImage,
check: false,
+ reception: "25.07.2023",
+ time: { from: "11:00", to: "12:00" },
},
{
id: 2,
@@ -137,6 +141,8 @@ export const patientList = [
birthday: "13.07.1999",
avatar: personImage,
check: false,
+ reception: "25.07.2023",
+ time: { from: "09:00", to: "11:00" },
},
{
id: 3,
@@ -146,6 +152,8 @@ export const patientList = [
birthday: "11.11.1991",
avatar: personImage,
check: false,
+ reception: "27.07.2023",
+ time: { from: "12:00", to: "14:00" },
},
{
id: 4,
@@ -155,6 +163,8 @@ export const patientList = [
birthday: "12.03.1989",
avatar: personImage,
check: false,
+ reception: "27.07.2023",
+ time: { from: "11:00", to: "14:00" },
},
{
id: 5,
@@ -164,6 +174,8 @@ export const patientList = [
birthday: "23.07.1949",
avatar: personImage,
check: false,
+ reception: "28.07.2023",
+ time: { from: "18:00", to: "19:00" },
},
{
id: 6,
@@ -173,6 +185,8 @@ export const patientList = [
birthday: "12.11.1995",
avatar: personImage,
check: false,
+ reception: "25.07.2023",
+ time: { from: "16:00", to: "17:00" },
},
{
id: 7,
@@ -182,6 +196,8 @@ export const patientList = [
birthday: "15.05.1989",
avatar: personImage,
check: false,
+ reception: "25.07.2023",
+ time: { from: "20:00", to: "21:00" },
},
{
id: 8,
@@ -191,6 +207,8 @@ export const patientList = [
birthday: "13.07.2000",
avatar: personImage,
check: false,
+ reception: "31.06.2023",
+ time: { from: "12:00", to: "14:00" },
},
{
id: 9,
@@ -200,6 +218,8 @@ export const patientList = [
birthday: "12.12.1986",
avatar: personImage,
check: false,
+ reception: "30.07.2023",
+ time: { from: "12:00", to: "14:00" },
},
{
id: 10,
@@ -209,6 +229,8 @@ export const patientList = [
birthday: "13.03.1979",
avatar: personImage,
check: false,
+ reception: "27.07.2023",
+ time: { from: "09:00", to: "10:00" },
},
],
choice: false,