WIP Исправила статусы, очистку форму создания

This commit is contained in:
Daria Golova
2023-03-20 16:36:28 +03:00
parent 1f50c12581
commit 6bfda2e2a7
5 changed files with 32 additions and 52 deletions

View File

@@ -24,17 +24,16 @@
@delete-event="openModal",
:open-form-create-event="openFormCreateEvent"
)
transition(name="form")
calendar-form-add-event(
v-model="isOpenForm"
:close-form="closeFormCreateEvent",
:selected-event-data="selectedEvent",
:event-statuses="eventStatuses",
:time-information="timeInformation",
:current-date="currentDate",
@clear-selected-event-data="clearSelectedEvent",
@close-change-form="setChangeFormState"
)
calendar-form-add-event(
v-model="isOpenForm"
:close-form="closeFormCreateEvent",
:selected-event-data="selectedEvent",
:event-statuses="eventStatuses",
:time-information="timeInformation",
:current-date="currentDate",
@clear-selected-event-data="clearSelectedEvent",
@close-change-form="setChangeFormState"
)
base-modal(
v-model="showModal",
title="Удаление события"
@@ -56,7 +55,7 @@ import CalendarSidebar from "./components/CalendarSidebar.vue";
import CalendarFormAddEvent from "./components/CalendarFormAddEvent.vue";
import BaseModal from "@/components/base/BaseModal.vue";
import CalendarDeleteModal from "./components/CalendarDeleteModal.vue";
import { statusesDictionary } from "@/pages/calendar/utils/statusesDictionary";
import { statusesConfig } from "@/pages/calendar/utils/statusesConfig";
export default {
name: "TheCalendar",
@@ -86,7 +85,7 @@ export default {
isOpenForm: false,
WORKING_STATUS: "WORKS",
changeFormWasClosed: false,
eventStatuses: statusesDictionary,
eventStatuses: statusesConfig,
};
},
methods: {
@@ -191,23 +190,4 @@ export default {
<style lang="sass" scoped>
.calendar-container
width: calc(100vw - 80px)
.form-enter-from
opacity: 0
transform: translateY(300px)
pointer-events: none
.form-enter-active
transition: 0.5s ease
.form-leave-to
opacity: 0
transform: translateY(300px)
pointer-events: none
.form-leave-active
transition: 0.5s ease
.form-move
transition: 0.5s ease
</style>

View File

@@ -26,7 +26,7 @@
</template>
<script>
import { statusesDictionary } from "@/pages/calendar/utils/statusesDictionary";
import { statusesConfig } from "@/pages/calendar/utils/statusesConfig";
export default {
name: "CalendarEventDescriptionCard",
@@ -48,14 +48,12 @@ export default {
return {
isCertainType: true,
position: {},
calendarConfig: statusesDictionary,
};
},
computed: {
status() {
return this.ownerEvent.status
? this.calendarConfig.find((e) => e.value === this.ownerEvent.status)
.label
? statusesConfig.find((e) => e.value === this.ownerEvent.status).label
: "";
},
typeColor() {

View File

@@ -82,7 +82,7 @@ import BaseSelect from "@/components/base/BaseSelect.vue";
import * as moment from "moment/moment";
import BaseModal from "@/components/base/BaseModal.vue";
import { v_model } from "@/shared/mixins/v-model";
import { statusesDictionary } from "@/pages/calendar/utils/statusesDictionary";
import { statusesConfig } from "@/pages/calendar/utils/statusesConfig";
export default {
name: "FormChangeEvent",
@@ -138,7 +138,6 @@ export default {
membersData: [],
ownersData: [],
WORKING_STATUS: "WORKS",
calendarConfig: statusesDictionary,
};
},
computed: {
@@ -178,7 +177,7 @@ export default {
},
statusesList() {
let filteredArray = [];
this.calendarConfig.forEach((elem) => {
statusesConfig.forEach((elem) => {
filteredArray.push({
id: elem.id,
label: elem.label,
@@ -290,22 +289,22 @@ export default {
eventStatus() {
return this.selectedEventData.status
? {
label: this.calendarConfig.find(
label: statusesConfig.find(
(e) => e.value === this.selectedEventData.status
).label,
id: this.calendarConfig.find(
id: statusesConfig.find(
(e) => e.value === this.selectedEventData.status
).id,
}
: {
label: this.calendarConfig.find((e) => e.value === "PLANNED").id,
label: statusesConfig.find((e) => e.value === "PLANNED").label,
id: 0,
};
},
},
methods: {
findStatus(value) {
return this.calendarConfig.find((e) => e.label === value)?.value;
return statusesConfig.find((e) => e.label === value)?.value;
},
checkTimeLimits(eventTime, scheduleTime, timeType) {
if (timeType === "start")

View File

@@ -1,4 +1,4 @@
export const statusesDictionary = [
export const statusesConfig = [
{
id: 0,
label: "Планируется прием",