Подтянула данные из карточки в расписание

This commit is contained in:
Daria Golova
2022-11-02 12:11:12 +03:00
parent eaaa5e21ef
commit c2aeaf714e
10 changed files with 75 additions and 39 deletions

View File

@@ -1,13 +1,13 @@
<template lang="pug">
.flex.flex-col(
:style="backgroundExtendedWidth"
)
)
.flex.flex-col
.line-wrapper
.line.flex.items-center(
v-for="hour in timeCoil"
:key="hour"
)
)
.middle-line
</template>

View File

@@ -4,7 +4,7 @@
v-for="hour in timeCoil"
:key="hour"
:class="currentHourStyle(hour)"
) {{ hour }}
) {{ hour }}
</template>
<script>

View File

@@ -3,7 +3,11 @@
.header.flex.items-center.justify-between.py-2.px-6.top-0
.flex.items-center
base-avatar.mr-2(:size="32", :color="ownerData.color")
img(:src="ownerData.avatar" alt="Team member" v-if="ownerData.avatar")
img(
:src="ownerData.avatar"
alt="Team member"
v-if="ownerData.avatar"
)
span(v-if="!ownerData.avatar") {{ defaultAvatar }}
span.owner-name.font-medium.text-base.mr-6 {{ ownerName }}
img.icon-wrapper.cursor-pointer(src="@/assets/icons/lock.svg")
@@ -14,7 +18,8 @@
:key="event.id"
:ownerEvent="event"
:style="eventCardPosition(event.start, event.end)"
)
@selected-event="transmitEventData"
)
</template>
<script>
@@ -79,6 +84,9 @@ export default {
top: `${position}px`,
};
},
transmitEventData(eventData) {
this.$emit("selected-event", eventData);
},
},
};
</script>

View File

@@ -1,8 +1,8 @@
<template lang="pug">
div.icon-wrap.flex.items-center.justify-center.cursor-pointer.py-1.px-2(
:class="{disable: !isChecked}"
@click="changeState"
)
:class="{disable: !isChecked}"
@click="changeState"
)
.icon-doc-ok.text-xxl
</template>

View File

@@ -1,5 +1,5 @@
<template lang="pug">
.wrapper.flex.px-2.my-1.items-start.cursor-pointer(:style="cardHeight")
.wrapper.flex.px-2.my-1.items-start.cursor-pointer(:style="cardHeight", @click="transmitEventData")
.header.flex.justify-between.items-center
.header-text
span.inline-block.align-middle.font-bold.text-base.mr-4 {{ eventTime }}
@@ -61,6 +61,9 @@ export default {
composeFullName(object) {
return `${object.last_name} ${object.first_name} ${object.patronymic}`;
},
transmitEventData() {
this.$emit("selected-event", this.ownerEvent);
},
},
};
</script>

View File

@@ -21,15 +21,15 @@
.flex.gap-x-2.items-center
.time-input.flex.gap-x-2.px-4.py-2.items-center
input.item-input.text-base.cursor-text(
v-model="start"
placeholder ="11:00"
)
v-model="start"
placeholder ="11:00"
)
span
.time-input.flex.gap-x-2.px-4.py-2.items-center
input.item-input.text-base.cursor-text(
v-model="end"
placeholder ="12:30"
)
v-model="end"
placeholder ="12:30"
)
.flex.gap-x-4.items-center
.icon-person.text-xl.icon
base-select(
@@ -41,7 +41,7 @@
@changeInput="addMember"
placeholder="Выберите участника"
separator
)
)
.flex.flex-col.gap-y-2
span.text-xs.opacity-40.font-bold.leading-3 Вид события
base-select(
@@ -64,14 +64,21 @@
:icon-left-size="10"
id="addContact"
@click="(e)=>addContact(e)")
.flex.gap-x-4.items-center(v-for="(contact, index) in listContacts" :key="index")
.flex.gap-x-4.items-center(
v-for="(contact, index) in listContacts"
:key="index"
)
.icon-mail.text-xl.icon
.form-item.cursor-pointer.flex.gap-x-2.px-4.py-2.items-center
input.item-input.cursor-text.text-base(v-model="contacts" type="text" placeholder="E-mail")
input.item-input.cursor-text.text-base(
v-model="contacts"
type="text"
placeholder="E-mail"
)
base-button.styled-button.text-base.font-semibold(
:size="40"
:disabled="disabledButton"
@click="sendEventData"
:size="40"
:disabled="disabledButton"
@click="sendEventData"
) Создать событие
</template>

View File

@@ -3,11 +3,11 @@
button#day.py-2.px-3(
:class="dayLayoutState"
@click="changeSelectedLayout"
) День
) День
button#week.py-2.px-3(
:class="weekLayoutState"
@click="changeSelectedLayout"
) Неделя
) Неделя
</template>
<script>

View File

@@ -1,14 +1,14 @@
<template lang="pug">
.schedule.ml-2(
:style="scheduleWidth"
)
)
calendar-header(
:current-date="currentDate"
:is-current-date="isCurrentDate"
@previous-date="previousDate"
@next-date="nextDate"
@selected-layout="selectedLayout"
)
)
.schedule-body
.column-wrapper.flex.ml-20(:style="columnWrapperWidth")
calendar-column(
@@ -19,6 +19,7 @@
:day-start-time="validateStartTime"
:day-end-time="validateEndTime"
:style="columnSize"
@selected-event="writeEventData"
)
.flex.w-full.relative
.time-coil-wrapper.left-0.-mt-12.pt-9
@@ -40,7 +41,13 @@
calendar-background(
:time-coil="timeCoil"
:owners-count="ownersCount"
)
)
calendar-form-add-event(
v-if="isOpenForm"
:close-form="closeFormCreateEvent"
:owners-data="ownersData"
:members-data="membersData"
)
</template>
<script>
@@ -49,6 +56,7 @@ import CalendarHeader from "./CalendarHeader.vue";
import CalendarBackground from "./CalendarBackground.vue";
import CalendarClockColumn from "./CalendarClockColumn.vue";
import CalendarColumn from "./CalendarColumn.vue";
import CalendarFormAddEvent from "./CalendarFormAddEvent.vue";
export default {
name: "CalendarSchedule",
components: {
@@ -56,6 +64,7 @@ export default {
CalendarBackground,
CalendarClockColumn,
CalendarColumn,
CalendarFormAddEvent,
},
props: {
currentDate: {
@@ -83,6 +92,14 @@ export default {
return [];
},
},
membersData: {
type: Array,
default() {
return [];
},
},
closeFormCreateEvent: Function,
isOpenForm: Boolean,
},
data() {
return {
@@ -94,6 +111,7 @@ export default {
pixelsPerHour: 62,
columnHeaderHeight: 48,
defaultColumnWidth: 470,
selectedEvent: {},
};
},
computed: {
@@ -284,6 +302,9 @@ export default {
});
return filteredArray;
},
writeEventData(eventData) {
this.selectedEvent = eventData;
},
},
watch: {
currentTime() {