diff --git a/src/assets/sass/variables.sass b/src/assets/sass/variables.sass
index cee65c9..6c42ce7 100644
--- a/src/assets/sass/variables.sass
+++ b/src/assets/sass/variables.sass
@@ -71,4 +71,5 @@
--bg-grey-color: rgba(37, 40, 80, 0.15)
--bg-aqua-blue: #55c5e8
--bg-status-green: #55CD76
+ --bg-light-blue-color: #E7EDFF
diff --git a/src/pages/newCalendar/components/CalendarSidebar.vue b/src/pages/newCalendar/components/CalendarSidebar.vue
index 0d2adcd..375d6e4 100644
--- a/src/pages/newCalendar/components/CalendarSidebar.vue
+++ b/src/pages/newCalendar/components/CalendarSidebar.vue
@@ -11,12 +11,28 @@
.button.flex
q-btn(color="primary", dense, padding="14px", @click="createForm")
q-icon(name="app:icon-plus", size="12px")
- .button.flex.relative
- q-btn(dense, style="color: var(--font-grey-color); borderRadius: 50%", padding="4px")
- img(:src="round")
- q-menu(anchor="center start" self="top right" :style="{'margin-left': '8px !important'}")
+ .button.flex.relative.btn-sidebar(v-for="svg in patientData.arrSvg")
+ q-btn(
+ v-click-outside="hideActive",
+ @click="()=>clickButton(svg.name)",
+ dense,
+ style="color: var(--font-grey-color); borderRadius: 50%",
+ :padding="svg.name === 'group' ? '10.5px 7.5px' : '4px'"
+ )
+ calendar-sidebar-svg(:name-svg="svg.name", :active="svg.active")
+ .separator.flex.absolute(v-show="allLeave")
+ .sidebar.flex-col.flex
+ .mark-top.flex.w-2.h-2
+ .mark-bottom.flex.w-2.h-2
+ .mark-text.flex.font-medium.text-sm {{svg.text}}
+ q-menu(
+ v-if="svg.name === 'round'",
+ anchor="center start",
+ self="top right",
+ :style="{'margin-left': '8px !important'}"
+ )
.status-wrapper.flex.flex-col.gap-y-4.p-4
- .font-bold.text-xm Статус приема
+ .font-bold.text-xm {{svg.text}}
.flex.flex-col.gap-2px
.status.flex.items-center.gap-x-1.font-medium.text-smm.rounded.h-7(
v-for="status in patientData.statuses",
@@ -24,12 +40,14 @@
)
img(:src="status.icon")
span {{status.name}}
- .button.flex
- q-btn(dense, style="color: var(--font-grey-color); borderRadius: 50%", padding="4px")
- img(:src="medcard")
- q-menu(anchor="center start" self="top right" :style="{'margin-left': '8px !important'}")
+ q-menu(
+ v-if="svg.name === 'medcard'",
+ anchor="center start",
+ self="top right",
+ :style="{'margin-left': '8px !important'}"
+ )
.fill-wrapper.flex.flex-col.gap-y-4.p-4
- .font-bold.text-xm Первичная медкарта
+ .font-bold.text-xm {{svg.text}}
.flex.flex-col.gap-2px
.status.flex.items-center.gap-x-1.font-medium.text-smm.rounded.h-7(
v-for="medical in medicalData",
@@ -37,12 +55,14 @@
)
img(:src="medical.icon")
span {{medical.name}}
- .button.flex.rounded-b
- q-btn(dense, style="color: var(--font-grey-color); borderRadius: 50%", padding="10.5px 7.5px")
- img(:src="group")
- q-menu(anchor="center start" self="top right" :style="{'margin-left': '8px !important'}")
+ q-menu(
+ v-if="svg.name === 'group'",
+ anchor="center start",
+ self="top right",
+ :style="{'margin-left': '8px !important'}"
+ )
.patient-wrapper.flex.flex-col.gap-y-4.px-4.pt-4
- .font-bold.text-xm Пациенты
+ .font-bold.text-xm {{svg.text}}
.flex.flex-col.relative(:style="{height: '391px'}")
.flex.h-8.w-full.items-center.justify-between
base-input(
@@ -88,25 +108,20 @@
+
+
diff --git a/src/pages/newCalendar/utils/calendarConfig.js b/src/pages/newCalendar/utils/calendarConfig.js
index 1bf8acd..d88ab25 100644
--- a/src/pages/newCalendar/utils/calendarConfig.js
+++ b/src/pages/newCalendar/utils/calendarConfig.js
@@ -197,4 +197,9 @@ export const patientData = {
{ name: "Отказ", icon: rejected, check: false },
{ name: "На приеме", icon: reception, check: false },
],
+ arrSvg: [
+ { name: "round", text: "Статус приема", active: false },
+ { name: "medcard", text: "Первичная медкарта", active: false },
+ { name: "group", text: "Пациенты", active: false },
+ ],
};