admin/astra-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ASTRA-139' into 'master'

Browse Source 
Фикс багов

See merge request andrusyakka/urban-couscous!479
This commit is contained in:
Vasiliy Gavrilin
2023-07-19 11:57:14 +00:00
parent 76c201c71f f5aa1379cc
commit 529d949702
5 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/assets/icons/medcard.svg
View File

@@ -1,4 +1,5 @@
<svg width="24" height="30" viewBox="0 0 24 30" fill="none" xmlns="http://www.w3.org/2000/svg"> <svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M6.22099 2.30769C6.40882 1.00296 7.53814 0 8.90323 0H15.0968C16.4619 0 17.5912 1.00296 17.779 2.30769H21.2903C22.7868 2.30769 24 3.51308 24 5V27.3077C24 28.7946 22.7868 30 21.2903 30H2.70968C1.21316 30 0 28.7946 0 27.3077V5C0 3.51308 1.21316 2.30769 2.70968 2.30769H6.22099ZM6.22099 4.61538H2.70968C2.49589 4.61538 2.32258 4.78758 2.32258 5V27.3077C2.32258 27.5201 2.49589 27.6923 2.70968 27.6923H21.2903C21.5041 27.6923 21.6774 27.5201 21.6774 27.3077V5C21.6774 4.78758 21.5041 4.61538 21.2903 4.61538H17.779C17.5912 5.92011 16.4619 6.92308 15.0968 6.92308H8.90323C7.53814 6.92308 6.40882 5.92011 6.22099 4.61538ZM8.90323 2.30769C8.68944 2.30769 8.51613 2.47989 8.51613 2.69231V4.23077C8.51613 4.44319 8.68944 4.61538 8.90323 4.61538H15.0968C15.3106 4.61538 15.4839 4.44319 15.4839 4.23077V2.69231C15.4839 2.47989 15.3106 2.30769 15.0968 2.30769H8.90323Z" fill="#9294A7"/> <g opacity="0.6">
<path d="M2.70968 4.61538H6.22099C6.40882 5.92011 7.53814 6.92308 8.90323 6.92308H15.0968C16.4619 6.92308 17.5912 5.92011 17.779 4.61538H21.2903C21.5041 4.61538 21.6774 4.78758 21.6774 5V27.3077C21.6774 27.5201 21.5041 27.6923 21.2903 27.6923H2.70968C2.49589 27.6923 2.32258 27.5201 2.32258 27.3077V5C2.32258 4.78758 2.49589 4.61538 2.70968 4.61538Z" fill="#9294A7"/> <path fill-rule="evenodd" clip-rule="evenodd" d="M14.221 7.30769C14.4088 6.00296 15.5381 5 16.9032 5H23.0968C24.4619 5 25.5912 6.00296 25.779 7.30769H29.2903C30.7868 7.30769 32 8.51308 32 10V32.3077C32 33.7946 30.7868 35 29.2903 35H10.7097C9.21317 35 8 33.7946 8 32.3077V10C8 8.51308 9.21316 7.30769 10.7097 7.30769H14.221ZM16.9032 7.30769C16.6894 7.30769 16.5161 7.47989 16.5161 7.69231V9.23077C16.5161 9.44319 16.6894 9.61538 16.9032 9.61538H23.0968C23.3106 9.61538 23.4839 9.44319 23.4839 9.23077V7.69231C23.4839 7.47989 23.3106 7.30769 23.0968 7.30769H16.9032Z" fill="#9294A7"/>
</g>
</svg> </svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 709 B

1
src/assets/sass/variables.sass
View File

@@ -90,4 +90,5 @@
--bg-chip-blue-color: #d8e3ff --bg-chip-blue-color: #d8e3ff
--bg-chip-yellow-color: #fff0ca --bg-chip-yellow-color: #fff0ca
--bg-chip-pink-color: #F7D9FF --bg-chip-pink-color: #F7D9FF
--gray-thirdly: #f4f4f6

10
src/pages/newCalendar/components/CalendarOpenSidebar.vue
View File

@@ -35,7 +35,6 @@
.flex.h-8.w-full.items-center.justify-between .flex.h-8.w-full.items-center.justify-between
base-input.input( base-input.input(
v-model="foundPerson", v-model="foundPerson",
debounce="10",
@keyup.enter="searchPerson", @keyup.enter="searchPerson",
@input="searchPerson", @input="searchPerson",
id="input", id="input",
@@ -200,7 +199,7 @@ export default {
border-bottom-right-radius: 0.25rem border-bottom-right-radius: 0.25rem
.expansion :deep(.q-item__section--side) .expansion :deep(.q-item__section--side)
color: var(--font-black-color) color: var(--font-dark-blue-color)
.select .select
padding-bottom: 2px padding-bottom: 2px
@@ -211,7 +210,7 @@ export default {
border-radius: 4px border-radius: 4px
height: 28px height: 28px
&:hover &:hover
background: var(--bg-light-grey) background: var(--gray-thirdly)
cursor: pointer cursor: pointer
.q-expansion-item .q-expansion-item
@@ -246,6 +245,8 @@ export default {
.q-expansion-item :deep(.q-item) .q-expansion-item :deep(.q-item)
padding: 10px 16px !important padding: 10px 16px !important
min-height: 54px min-height: 54px
&:hover
opacity: 0.6
.grey-color .grey-color
color: var(--font-grey-color) color: var(--font-grey-color)
@@ -253,6 +254,9 @@ export default {
.q-expansion-item :deep(.q-item) .q-expansion-item :deep(.q-item)
height: 54px height: 54px
.expansion :deep(.q-focus-helper)
display: none
.person-wrapper .person-wrapper
overflow-y: auto overflow-y: auto
margin-right: -10px margin-right: -10px

26
src/pages/newCalendar/components/CalendarSidebar.vue
View File

@@ -14,6 +14,7 @@
.button.flex.relative.btn-sidebar.button-svg.cursor-pointer( .button.flex.relative.btn-sidebar.button-svg.cursor-pointer(
@click="()=>showActive(svg.name)", @click="()=>showActive(svg.name)",
v-for="svg in patientData.arrSvg" v-for="svg in patientData.arrSvg"
v-click-outside="hideActive"
) )
q-btn( q-btn(
:class="{'active-btn': findActiveBtn(svg.name)}", :class="{'active-btn': findActiveBtn(svg.name)}",
@@ -31,15 +32,13 @@
v-if="svg.name === 'round'", v-if="svg.name === 'round'",
anchor="center start", anchor="center start",
self="top right", self="top right",
:style="{'margin-left': '8px !important'}", :style="{'margin-left': '8px !important'}"
@before-hide="hideActive"
) )
.status-wrapper.flex.flex-col.gap-y-4.p-4 .status-wrapper.flex.flex-col.gap-y-4.p-4
.font-bold.text-xm {{svg.text}} .font-bold.text-xm {{svg.text}}
.flex.flex-col.gap-2px .flex.flex-col.gap-2px
.status.flex.items-center.gap-x-1.font-medium.text-smm.rounded.h-7( .status.flex.items-center.gap-x-1.font-medium.text-smm.rounded.h-7(
v-for="status in patientData.statuses", v-for="status in patientData.statuses"
v-close-popup
) )
img(:src="status.icon") img(:src="status.icon")
span {{status.name}} span {{status.name}}
@@ -47,24 +46,21 @@
v-if="svg.name === 'medcard'", v-if="svg.name === 'medcard'",
anchor="center start", anchor="center start",
self="top right", self="top right",
:style="{'margin-left': '8px !important'}", :style="{'margin-left': '8px !important'}"
@before-hide="hideActive"
) )
.fill-wrapper.flex.flex-col.gap-y-4.p-4 .fill-wrapper.flex.flex-col.gap-y-4.p-4
.font-bold.text-xm {{svg.text}} .font-bold.text-xm {{svg.text}}
.flex.flex-col.gap-2px .flex.flex-col.gap-2px
.status.flex.items-center.gap-x-1.font-medium.text-smm.rounded.h-7( .status.flex.items-center.gap-x-1.font-medium.text-smm.rounded.h-7(
v-for="medical in medicalData", v-for="medical in medicalData"
v-close-popup
) )
img(:src="medical.icon") img(:src="medical.icon")
span {{medical.name}} span {{medical.name}}
q-menu( q-menu.overflow-hidden(
v-if="svg.name === 'group'", v-if="svg.name === 'group'",
anchor="center start", anchor="center start",
self="top right", self="top right",
:style="{'margin-left': '8px !important'}", :style="{'margin-left': '8px !important'}"
@before-hide="hideActive"
) )
.patient-wrapper.flex.flex-col.gap-y-4.px-4.pt-4 .patient-wrapper.flex.flex-col.gap-y-4.px-4.pt-4
.font-bold.text-xm {{svg.text}} .font-bold.text-xm {{svg.text}}
@@ -73,7 +69,6 @@
.flex.h-8.w-full.items-center.justify-between .flex.h-8.w-full.items-center.justify-between
base-input.input( base-input.input(
v-model="foundPerson", v-model="foundPerson",
debounce="10",
@keyup.enter="searchPerson", @keyup.enter="searchPerson",
@input="searchPerson", @input="searchPerson",
id="input", id="input",
@@ -180,9 +175,8 @@ export default {
this.patientsData.forEach((e) => (e.check = false)); this.patientsData.forEach((e) => (e.check = false));
}, },
showActive(name) { showActive(name) {
this.patientData.arrSvg = this.patientData.arrSvg.map((e) => { this.patientData.arrSvg.forEach((e) => {
if (e.name === name) return { ...e, active: true }; if (e.name === name) e.active = true;
return { ...e, active: false };
}); });
}, },
copyValue(text) { copyValue(text) {
@@ -275,7 +269,7 @@ export default {
width: 100% width: 100%
&:hover &:hover
height: 28px height: 28px
background: var(--bg-light-grey) background: var(--gray-thirdly)
cursor: pointer cursor: pointer
.person-wrapper .person-wrapper

3
src/pages/newCalendar/components/CalendarSidebarSvg.vue
View File

@@ -4,8 +4,7 @@
path(opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M7.5 20C7.5 26.9036 13.0964 32.5 20 32.5C26.9036 32.5 32.5 26.9036 32.5 20C32.5 13.0964 26.9036 7.5 20 7.5C13.0964 7.5 7.5 13.0964 7.5 20ZM20 5C11.7157 5 5 11.7157 5 20C5 28.2843 11.7157 35 20 35C28.2843 35 35 28.2843 35 20C35 11.7157 28.2843 5 20 5Z" :fill="active ? '#4772F2' : '#9294A7'") path(opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M7.5 20C7.5 26.9036 13.0964 32.5 20 32.5C26.9036 32.5 32.5 26.9036 32.5 20C32.5 13.0964 26.9036 7.5 20 7.5C13.0964 7.5 7.5 13.0964 7.5 20ZM20 5C11.7157 5 5 11.7157 5 20C5 28.2843 11.7157 35 20 35C28.2843 35 35 28.2843 35 20C35 11.7157 28.2843 5 20 5Z" :fill="active ? '#4772F2' : '#9294A7'")
path.hover(:opacity="active ? '1' : '0.6'" d="M10 20C10 14.4772 14.4772 10 20 10C25.5228 10 30 14.4772 30 20C30 25.5228 25.5228 30 20 30C14.4772 30 10 25.5228 10 20Z" :fill="active ? '#4772F2' : '#9294A7'") path.hover(:opacity="active ? '1' : '0.6'" d="M10 20C10 14.4772 14.4772 10 20 10C25.5228 10 30 14.4772 30 20C30 25.5228 25.5228 30 20 30C14.4772 30 10 25.5228 10 20Z" :fill="active ? '#4772F2' : '#9294A7'")
g(v-if="nameSvg === 'medcard'") g(v-if="nameSvg === 'medcard'")
path.hover(:opacity="active ? '1' : '0.6'" fill-rule="evenodd" clip-rule="evenodd" d="M14.221 7.30769C14.4088 6.00296 15.5381 5 16.9032 5H23.0968C24.4619 5 25.5912 6.00296 25.779 7.30769H29.2903C30.7868 7.30769 32 8.51308 32 10V32.3077C32 33.7946 30.7868 35 29.2903 35H10.7097C9.21316 35 8 33.7946 8 32.3077V10C8 8.51308 9.21316 7.30769 10.7097 7.30769H14.221ZM14.221 9.61538H10.7097C10.4959 9.61538 10.3226 9.78758 10.3226 10V32.3077C10.3226 32.5201 10.4959 32.6923 10.7097 32.6923H29.2903C29.5041 32.6923 29.6774 32.5201 29.6774 32.3077V10C29.6774 9.78758 29.5041 9.61538 29.2903 9.61538H25.779C25.5912 10.9201 24.4619 11.9231 23.0968 11.9231H16.9032C15.5381 11.9231 14.4088 10.9201 14.221 9.61538ZM16.9032 7.30769C16.6894 7.30769 16.5161 7.47989 16.5161 7.69231V9.23077C16.5161 9.44319 16.6894 9.61538 16.9032 9.61538H23.0968C23.3106 9.61538 23.4839 9.44319 23.4839 9.23077V7.69231C23.4839 7.47989 23.3106 7.30769 23.0968 7.30769H16.9032Z" :fill="active ? '#4772F2' : '#9294A7'") path.hover(:opacity="active ? '1' : '0.6'" fill-rule="evenodd" clip-rule="evenodd" d="M14.221 7.30769C14.4088 6.00296 15.5381 5 16.9032 5H23.0968C24.4619 5 25.5912 6.00296 25.779 7.30769H29.2903C30.7868 7.30769 32 8.51308 32 10V32.3077C32 33.7946 30.7868 35 29.2903 35H10.7097C9.21317 35 8 33.7946 8 32.3077V10C8 8.51308 9.21316 7.30769 10.7097 7.30769H14.221ZM16.9032 7.30769C16.6894 7.30769 16.5161 7.47989 16.5161 7.69231V9.23077C16.5161 9.44319 16.6894 9.61538 16.9032 9.61538H23.0968C23.3106 9.61538 23.4839 9.44319 23.4839 9.23077V7.69231C23.4839 7.47989 23.3106 7.30769 23.0968 7.30769H16.9032Z" :fill="active ? '#4772F2' : '#9294A7'")
path.hover(:opacity="active ? '1' : '0.6'" d="M10.7097 9.61538H14.221C14.4088 10.9201 15.5381 11.9231 16.9032 11.9231H23.0968C24.4619 11.9231 25.5912 10.9201 25.779 9.61538H29.2903C29.5041 9.61538 29.6774 9.78758 29.6774 10V32.3077C29.6774 32.5201 29.5041 32.6923 29.2903 32.6923H10.7097C10.4959 32.6923 10.3226 32.5201 10.3226 32.3077V10C10.3226 9.78758 10.4959 9.61538 10.7097 9.61538Z" :fill="active ? '#4772F2' : '#9294A7'")
g(v-if="nameSvg === 'group'") g(v-if="nameSvg === 'group'")
path.hover(:opacity="active ? '1' : '0.6'" fill-rule="evenodd" clip-rule="evenodd" d="M0 23.6157C0 20.3869 2.6735 17.7695 5.97143 17.7695H16.0286C19.3265 17.7695 22 20.3869 22 23.6157V24.8464C22 26.036 21.015 27.0003 19.8 27.0003H2.2C0.984974 27.0003 0 26.036 0 24.8464V23.6157Z" :fill="active ? '#4772F2' : '#9294A7'") path.hover(:opacity="active ? '1' : '0.6'" fill-rule="evenodd" clip-rule="evenodd" d="M0 23.6157C0 20.3869 2.6735 17.7695 5.97143 17.7695H16.0286C19.3265 17.7695 22 20.3869 22 23.6157V24.8464C22 26.036 21.015 27.0003 19.8 27.0003H2.2C0.984974 27.0003 0 26.036 0 24.8464V23.6157Z" :fill="active ? '#4772F2' : '#9294A7'")
path.hover(:opacity="active ? '1' : '0.6'" d="M17.1272 8.68044C17.1272 12.0644 14.3839 14.8077 11 14.8077C7.616 14.8077 4.87275 12.0644 4.87275 8.68044C4.87275 5.29647 7.616 2.55322 11 2.55322C14.3839 2.55322 17.1272 5.29647 17.1272 8.68044Z" :fill="active ? '#4772F2' : '#9294A7'") path.hover(:opacity="active ? '1' : '0.6'" d="M17.1272 8.68044C17.1272 12.0644 14.3839 14.8077 11 14.8077C7.616 14.8077 4.87275 12.0644 4.87275 8.68044C4.87275 5.29647 7.616 2.55322 11 2.55322C14.3839 2.55322 17.1272 5.29647 17.1272 8.68044Z" :fill="active ? '#4772F2' : '#9294A7'")