diff --git a/server.js b/server.js
index 84bfc92..8bb4594 100644
--- a/server.js
+++ b/server.js
@@ -35,6 +35,46 @@ export function clientsServer() {
},
],
}));
+ this.get("/registry/event/", () => ({
+ count: 1,
+ next: null,
+ previous: null,
+ results: [
+ {
+ id: "6faa6bb6-1de6-422c-a401-1b35cd455303",
+ start: "2022-10-20T20:23:49Z",
+ end: "2022-10-20T21:23:53Z",
+ kind: "call",
+ subkind: null,
+ description: "",
+ location: null,
+ members: [
+ {
+ id: "b0509f9a-e824-4bb3-a260-2b32dae9bc81",
+ person: {
+ id: "14ff401c-2b7b-4d9a-9159-720c74d8b23c",
+ last_name: "Гагарин",
+ first_name: "Юрий",
+ patronymic: "Алексеевич",
+ },
+ role: null,
+ },
+ ],
+ employees: [
+ {
+ id: "f941a0c6-c750-4f79-92c0-d7a19354e422",
+ employee: {
+ id: "db831a14-e836-481f-a653-6325de7c311e",
+ last_name: "Жмыхов",
+ first_name: "Егор",
+ patronymic: "Сергеевич",
+ },
+ role: "owner",
+ },
+ ],
+ },
+ ],
+ }));
this.passthrough("http://45.84.227.122:8080/**");
},
});
diff --git a/src/pages/calendar/TheCalendar.vue b/src/pages/calendar/TheCalendar.vue
index 02797ec..f16b92a 100644
--- a/src/pages/calendar/TheCalendar.vue
+++ b/src/pages/calendar/TheCalendar.vue
@@ -3,6 +3,7 @@
calendar-schedule(
:current-date="currentDate"
:time-information="timeInformation"
+ :column-information="columnInformation"
@previous-date="switchPreviousDate"
@next-date="switchNextDate"
@selected-layout="changeCalendarLayout"
@@ -24,6 +25,14 @@ export default {
dayEndTime: "18:00",
},
eventsData: [],
+ columnInformation: {
+ owners: [
+ "Захарова А.О.",
+ "Константинопольская Ю.В.",
+ "Коломойцев И.К.",
+ "Зайцев В.С.",
+ ],
+ },
};
},
methods: {
@@ -40,7 +49,7 @@ export default {
this.eventsData = res.results;
},
fetchEventsData() {
- fetch("http://45.84.227.122:8080/registry/event/")
+ fetch("/registry/event/")
.then((res) => res.json())
.then((res) => this.saveEventsData(res));
},
@@ -53,5 +62,5 @@ export default {
diff --git a/src/pages/calendar/components/CalendarBackground.vue b/src/pages/calendar/components/CalendarBackground.vue
index 9af397b..ae7dcf8 100644
--- a/src/pages/calendar/components/CalendarBackground.vue
+++ b/src/pages/calendar/components/CalendarBackground.vue
@@ -1,78 +1,82 @@
- .calendar-background-wrapper.flex.flex-col
- .header.flex.items-center.justify-between.py-2.px-6
- .body.flex.flex-col
+ .calendar-background-wrapper.flex.flex-col(
+ ref="backgroundWrapper"
+ )
+ calendar-column(
+ v-for="(owner, index) in columnInformation.owners"
+ :key="owner"
+ :column-information="owner"
+ :style="calculateColumnPosition(index)"
+ )
+ .header(:style="backgroundExtendedWidth")
+ .body.flex.flex-col(
+ :style="backgroundExtendedWidth"
+ )
.line-wrapper
.line.flex.items-center(
v-for="hour in hoursArray"
:key="hour"
)
.middle-line
- .time-circle-indicator.-left-6px(
- v-if="isShownIndicator"
- :style="circleIndicatorLocation"
- )
- span.time-line-indicator.block(
- v-if="isShownIndicator"
- :style="lineIndicatorLocation"
- )
@@ -80,6 +84,8 @@ export default {
diff --git a/src/pages/calendar/components/CalendarClockColumn.vue b/src/pages/calendar/components/CalendarClockColumn.vue
index 37d3e1f..8bcb639 100644
--- a/src/pages/calendar/components/CalendarClockColumn.vue
+++ b/src/pages/calendar/components/CalendarClockColumn.vue
@@ -1,6 +1,6 @@
.calendar-clock-column.flex.flex-col.items-end.gap-y-43.pt-9.pb-12.px-3
- span.font-medium.text-base(
+ span.text-base(
v-for="hour in hoursArray"
:key="hour"
:class="currentHourStyle(hour)"
@@ -42,6 +42,7 @@ export default {
}
return {
"current-time": false,
+ "font-medium": true,
};
},
convertTime(str, startIndex, endIndex) {
diff --git a/src/pages/calendar/components/CalendarColumn.vue b/src/pages/calendar/components/CalendarColumn.vue
new file mode 100644
index 0000000..601e965
--- /dev/null
+++ b/src/pages/calendar/components/CalendarColumn.vue
@@ -0,0 +1,41 @@
+
+ .calendar-column-wrapper.flex.flex-col
+ .header.flex.items-center.justify-between.py-2.px-6
+ .flex.items-center
+ img.avatar-wrapper.mr-2(src="@/assets/images/team-member.svg" alt="Team member")
+ span.owner-name.font-medium.text-base.mr-6 {{ columnInformation }}
+ img.icon-wrapper.cursor-pointer(src="@/assets/icons/lock.svg")
+ base-doc-ok-button
+ div
+
+
+
+
+
diff --git a/src/pages/calendar/components/CalendarSchedule.vue b/src/pages/calendar/components/CalendarSchedule.vue
index 4ee8b46..d2ca793 100644
--- a/src/pages/calendar/components/CalendarSchedule.vue
+++ b/src/pages/calendar/components/CalendarSchedule.vue
@@ -8,19 +8,25 @@
@selected-layout="selectedLayout"
)
.schedule-body.flex
- calendar-clock-column(
- :hours-array="hoursArray"
- :current-time="currentTime"
- :is-current-date="isCurrentDate"
- :day-end-time="validateEndTime"
- )
+ div
+ calendar-clock-column(
+ :hours-array="hoursArray"
+ :current-time="currentTime"
+ :is-current-date="isCurrentDate"
+ :day-end-time="validateEndTime"
+ )
calendar-background(
:hours-array="hoursArray"
- :current-time="currentTime"
- :current-date="currentDate"
- :day-start-time="validateStartTime"
- :day-end-time="validateEndTime"
+ :column-information="columnInformation"
)
+ .time-circle-indicator.left-74px(
+ v-if="isShownIndicator"
+ :style="circleIndicatorLocation"
+ )
+ span.time-line-indicator.block.left-20(
+ v-if="isShownIndicator"
+ :style="lineIndicatorLocation"
+ )