Поправила баг в документах

This commit is contained in:
Daria Golova
2023-09-19 17:05:29 +03:00
parent 48e2571c77
commit 7b2e07f0d2
7 changed files with 34 additions and 11 deletions

View File

@@ -2,7 +2,7 @@
.calendar-column-wrapper.flex.flex-col
.header.flex.flex-col.items-center.justify-center.top-0.pt-3.pb-10px
span.font-bold.text-base.color-black {{ date?.format("D MMMM")}}
span.text-smm.color-grey {{ transformDayName(date?.format("dddd"))}}
span.text-smm.color-grey {{ capitalizeFirstChar(date?.format("dddd"))}}
.body.h-full.px-1.py-1
calendar-record-card(
v-for="record in filteredRecords",
@@ -19,6 +19,7 @@
<script>
import * as moment from "moment/moment";
import { columnMixin } from "@/pages/newCalendar/mixins/columnMixin.js";
import { capitalizeFirstChar } from "@/pages/newCalendar/utils/calendarFunctions.js";
export default {
name: "CalendarColumn",
mixins: [columnMixin],
@@ -26,6 +27,11 @@ export default {
date: Object,
expandedDisplayType: Boolean,
},
data() {
return {
capitalizeFirstChar: capitalizeFirstChar,
};
},
computed: {
filteredRecords() {
return this.events.filter(
@@ -35,11 +41,6 @@ export default {
);
},
},
methods: {
transformDayName(name) {
return name[0]?.toUpperCase() + name?.slice(1);
},
},
};
</script>

View File

@@ -18,12 +18,13 @@
icon="arrow_back_ios_new",
text-color="primary",
padding="2px 11px 2px 8px",
@click="previousDate"
@click="previousDate",
)
base-input.search(
size="M"
:width="332",
v-model="currentDate",
:shadow-text="inputShadowText"
)
.h-5.w-5.flex.items-center.justify-center.ml-3
q-icon.calendar-icon.text.cursor-pointer(
@@ -64,6 +65,7 @@
<script>
import { v_model } from "@/shared/mixins/v-model";
import { headerMixin } from "@/pages/newCalendar/mixins/headerMixin.js";
import { capitalizeFirstChar } from "@/pages/newCalendar/utils/calendarFunctions.js";
export default {
name: "CalendarHeader",
mixins: [v_model, headerMixin],
@@ -86,6 +88,12 @@ export default {
currentDate() {
return this.date?.format("D MMMM YYYY");
},
inputShadowText() {
console.log(this.date, capitalizeFirstChar(this.date?.format("dddd")));
return this.date?.isValid()
? capitalizeFirstChar(this.date?.format("dddd"))
: "";
},
},
methods: {
previousDate() {

View File

@@ -13,3 +13,7 @@ export function verifyTime(dayTime) {
let newTime = timeArray[1] >= 30 ? timeArray[0] + 1 : timeArray[0];
return newTime;
}
export function capitalizeFirstChar(str) {
return str[0]?.toUpperCase() + str?.slice(1);
}

View File

@@ -148,7 +148,12 @@ export default {
return this.$store.state.medical.documents;
},
passportFields() {
let excludedFields = ["attachments", "id", "category"];
let excludedFields = [
"attachments",
"id",
"category",
"issued_by_org_code",
];
return Object.keys(this.docData.passport).filter(
(key) => !excludedFields.includes(key)
);