diff --git a/src/components/base/BaseInput.vue b/src/components/base/BaseInput.vue
index 9869d8c..6a6e0c8 100644
--- a/src/components/base/BaseInput.vue
+++ b/src/components/base/BaseInput.vue
@@ -50,7 +50,7 @@ export default {
border: 2px solid var(--border-light-grey-color)
border-radius: 4px
background-color: var(--default-white)
- color: var(--font-dark-blue-color)
+ color: var(--font-black-color)
.date
background: url("../../assets/icons/calendar-input.svg") no-repeat 100% 50%
&::-webkit-calendar-picker-indicator
diff --git a/src/components/base/BaseInputDate.vue b/src/components/base/BaseInputDate.vue
index 2c85678..096d053 100644
--- a/src/components/base/BaseInputDate.vue
+++ b/src/components/base/BaseInputDate.vue
@@ -42,7 +42,7 @@ export default {
.input-wrapper
border-radius: 4px
background-color: var(--default-white)
- color: var(--font-dark-blue-color)
+ color: var(--font-black-color)
.date
background: url("../../assets/icons/calendar-input.svg") no-repeat 100% 50%
&::-webkit-calendar-picker-indicator
diff --git a/src/components/base/BaseInputTime.vue b/src/components/base/BaseInputTime.vue
index 8b8fefe..2a586e8 100644
--- a/src/components/base/BaseInputTime.vue
+++ b/src/components/base/BaseInputTime.vue
@@ -42,5 +42,5 @@ export default {
.input-wrapper
border-radius: 4px
background-color: var(--default-white)
- color: var(--font-dark-blue-color)
+ color: var(--font-black-color)
diff --git a/src/components/base/BaseSelect.vue b/src/components/base/BaseSelect.vue
index 69e649d..7dca7c2 100644
--- a/src/components/base/BaseSelect.vue
+++ b/src/components/base/BaseSelect.vue
@@ -1,7 +1,9 @@
.base-select(@click="open = !open", :class="{'open': open, 'border-none': borderNone}")
.placeholder.text-base(:class="{'value-color': value}") {{ value || placeholder }}
- span.icon-down-arrow.open-icon(:class="{'open': open }")
+ .flex.items-center
+ .select-form-separator.cursor-pointer.mr-4(v-if="separator")
+ span.icon-down-arrow.open-icon(:class="{'open': open }")
base-menu(v-if="open")
.items-container(@click="open = false", @mouseleave="leaveSelect")
.item(v-for="item in items", :key="item.id" @click="clickItem(item.label)") {{ item.label }}
@@ -20,6 +22,7 @@ export default {
default: () => [],
},
borderNone: Boolean,
+ separator: Boolean,
},
emits: ["update:modelValue"],
data() {
@@ -96,4 +99,9 @@ export default {
border: none
.value-color
opacity: 1
+.select-form-separator
+ background-color: var(--btn-blue-color-3)
+ height: 24px
+ width: 1px
+ border-radius: 1px
diff --git a/src/pages/calendar/TheCalendar.vue b/src/pages/calendar/TheCalendar.vue
index b1d40cf..84ee736 100644
--- a/src/pages/calendar/TheCalendar.vue
+++ b/src/pages/calendar/TheCalendar.vue
@@ -18,6 +18,7 @@
@next-date="switchNextDate"
@selected-layout="changeCalendarLayout"
@open-change-form="openFormCreateEvent"
+ @update-events="fetchEventsData"
)
@@ -68,10 +69,7 @@ export default {
saveMembersData(res) {
this.membersData = res.results;
},
- fetchEventsData() {
- fetchWrapper
- .get("registry/event/")
- .then((res) => this.saveEventsData(res));
+ fetchPersonsData() {
fetchWrapper
.get("general/employee/")
.then((res) => this.saveEmployeesData(res));
@@ -79,6 +77,11 @@ export default {
.get("general/person/")
.then((res) => this.saveMembersData(res));
},
+ fetchEventsData() {
+ fetchWrapper
+ .get("registry/event/")
+ .then((res) => this.saveEventsData(res));
+ },
changeWidth(value) {
this.sidebarWidth = value;
},
@@ -90,6 +93,7 @@ export default {
},
},
mounted() {
+ this.fetchPersonsData();
this.fetchEventsData();
},
};
diff --git a/src/pages/calendar/components/CalendarFormAddEvent.vue b/src/pages/calendar/components/CalendarFormAddEvent.vue
index b0ad6a7..1199141 100644
--- a/src/pages/calendar/components/CalendarFormAddEvent.vue
+++ b/src/pages/calendar/components/CalendarFormAddEvent.vue
@@ -13,7 +13,7 @@
border-none
)
base-input(
- v-if="selectedEventData.employees",
+ v-else,
v-model:value="employeeName",
:width-input="72",
disabled,
@@ -46,7 +46,7 @@
border-none
)
base-input(
- v-if="selectedEventData.members",
+ v-else,
v-model:value="memberName",
disabled,
:width-input="346"
@@ -85,14 +85,22 @@
placeholder="E-mail"
:width-input="72"
)
- base-button.styled-button.text-base.font-semibold(
- :size="40"
- :disabled="disabledButton"
+ base-button.create-button.text-base.font-semibold(
+ v-if="!selectedEventData.id",
+ :size="40",
+ :disabled="disabledCreateButton",
@click="sendEventData"
) Создать событие
+ base-button.update-button.text-base.font-semibold(
+ v-else,
+ :size="40",
+ :disabled="disabledUpdateButton",
+ @click="updateEventData",
+ ) Сохранить