Поправила баг в документах
This commit is contained in:
@@ -233,4 +233,10 @@ export default {
|
|||||||
|
|
||||||
.input :deep(.q-field__marginal)
|
.input :deep(.q-field__marginal)
|
||||||
height: auto !important
|
height: auto !important
|
||||||
|
|
||||||
|
.input :deep(.q-field__shadow)
|
||||||
|
opacity: 0.5
|
||||||
|
top: 3px
|
||||||
|
color: var(--font-grey-color)
|
||||||
|
margin-left: 8px
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
.calendar-column-wrapper.flex.flex-col
|
.calendar-column-wrapper.flex.flex-col
|
||||||
.header.flex.flex-col.items-center.justify-center.top-0.pt-3.pb-10px
|
.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.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
|
.body.h-full.px-1.py-1
|
||||||
calendar-record-card(
|
calendar-record-card(
|
||||||
v-for="record in filteredRecords",
|
v-for="record in filteredRecords",
|
||||||
@@ -19,6 +19,7 @@
|
|||||||
<script>
|
<script>
|
||||||
import * as moment from "moment/moment";
|
import * as moment from "moment/moment";
|
||||||
import { columnMixin } from "@/pages/newCalendar/mixins/columnMixin.js";
|
import { columnMixin } from "@/pages/newCalendar/mixins/columnMixin.js";
|
||||||
|
import { capitalizeFirstChar } from "@/pages/newCalendar/utils/calendarFunctions.js";
|
||||||
export default {
|
export default {
|
||||||
name: "CalendarColumn",
|
name: "CalendarColumn",
|
||||||
mixins: [columnMixin],
|
mixins: [columnMixin],
|
||||||
@@ -26,6 +27,11 @@ export default {
|
|||||||
date: Object,
|
date: Object,
|
||||||
expandedDisplayType: Boolean,
|
expandedDisplayType: Boolean,
|
||||||
},
|
},
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
capitalizeFirstChar: capitalizeFirstChar,
|
||||||
|
};
|
||||||
|
},
|
||||||
computed: {
|
computed: {
|
||||||
filteredRecords() {
|
filteredRecords() {
|
||||||
return this.events.filter(
|
return this.events.filter(
|
||||||
@@ -35,11 +41,6 @@ export default {
|
|||||||
);
|
);
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
methods: {
|
|
||||||
transformDayName(name) {
|
|
||||||
return name[0]?.toUpperCase() + name?.slice(1);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|||||||
@@ -18,12 +18,13 @@
|
|||||||
icon="arrow_back_ios_new",
|
icon="arrow_back_ios_new",
|
||||||
text-color="primary",
|
text-color="primary",
|
||||||
padding="2px 11px 2px 8px",
|
padding="2px 11px 2px 8px",
|
||||||
@click="previousDate"
|
@click="previousDate",
|
||||||
)
|
)
|
||||||
base-input.search(
|
base-input.search(
|
||||||
size="M"
|
size="M"
|
||||||
:width="332",
|
:width="332",
|
||||||
v-model="currentDate",
|
v-model="currentDate",
|
||||||
|
:shadow-text="inputShadowText"
|
||||||
)
|
)
|
||||||
.h-5.w-5.flex.items-center.justify-center.ml-3
|
.h-5.w-5.flex.items-center.justify-center.ml-3
|
||||||
q-icon.calendar-icon.text.cursor-pointer(
|
q-icon.calendar-icon.text.cursor-pointer(
|
||||||
@@ -64,6 +65,7 @@
|
|||||||
<script>
|
<script>
|
||||||
import { v_model } from "@/shared/mixins/v-model";
|
import { v_model } from "@/shared/mixins/v-model";
|
||||||
import { headerMixin } from "@/pages/newCalendar/mixins/headerMixin.js";
|
import { headerMixin } from "@/pages/newCalendar/mixins/headerMixin.js";
|
||||||
|
import { capitalizeFirstChar } from "@/pages/newCalendar/utils/calendarFunctions.js";
|
||||||
export default {
|
export default {
|
||||||
name: "CalendarHeader",
|
name: "CalendarHeader",
|
||||||
mixins: [v_model, headerMixin],
|
mixins: [v_model, headerMixin],
|
||||||
@@ -86,6 +88,12 @@ export default {
|
|||||||
currentDate() {
|
currentDate() {
|
||||||
return this.date?.format("D MMMM YYYY");
|
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: {
|
methods: {
|
||||||
previousDate() {
|
previousDate() {
|
||||||
|
|||||||
@@ -13,3 +13,7 @@ export function verifyTime(dayTime) {
|
|||||||
let newTime = timeArray[1] >= 30 ? timeArray[0] + 1 : timeArray[0];
|
let newTime = timeArray[1] >= 30 ? timeArray[0] + 1 : timeArray[0];
|
||||||
return newTime;
|
return newTime;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function capitalizeFirstChar(str) {
|
||||||
|
return str[0]?.toUpperCase() + str?.slice(1);
|
||||||
|
}
|
||||||
|
|||||||
@@ -148,7 +148,12 @@ export default {
|
|||||||
return this.$store.state.medical.documents;
|
return this.$store.state.medical.documents;
|
||||||
},
|
},
|
||||||
passportFields() {
|
passportFields() {
|
||||||
let excludedFields = ["attachments", "id", "category"];
|
let excludedFields = [
|
||||||
|
"attachments",
|
||||||
|
"id",
|
||||||
|
"category",
|
||||||
|
"issued_by_org_code",
|
||||||
|
];
|
||||||
return Object.keys(this.docData.passport).filter(
|
return Object.keys(this.docData.passport).filter(
|
||||||
(key) => !excludedFields.includes(key)
|
(key) => !excludedFields.includes(key)
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ export default createStore({
|
|||||||
imgUrl: "https://astra-dev.dopcore.com/api/store/",
|
imgUrl: "https://astra-dev.dopcore.com/api/store/",
|
||||||
routingHistory: window.history,
|
routingHistory: window.history,
|
||||||
userData: {},
|
userData: {},
|
||||||
calendarShape: "doctor",
|
calendarShape: "manager",
|
||||||
},
|
},
|
||||||
modules: {
|
modules: {
|
||||||
medical,
|
medical,
|
||||||
|
|||||||
@@ -194,8 +194,7 @@ const getters = {
|
|||||||
series: document?.series || (isPolicy || isPassport ? "" : "000"),
|
series: document?.series || (isPolicy || isPassport ? "" : "000"),
|
||||||
number: document?.number || "",
|
number: document?.number || "",
|
||||||
issued_by: document?.issued_by || (isPassport ? "" : "000"),
|
issued_by: document?.issued_by || (isPassport ? "" : "000"),
|
||||||
issued_by_org_code:
|
issued_by_org_code: document?.issued_by_org_code || "",
|
||||||
document?.issued_by_org_code || (isPassport ? "000-000" : ""),
|
|
||||||
issued_at: document?.issued_at || "",
|
issued_at: document?.issued_at || "",
|
||||||
attachments: document?.attachments?.length
|
attachments: document?.attachments?.length
|
||||||
? {
|
? {
|
||||||
|
|||||||
Reference in New Issue
Block a user