admin/astra-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #106 from dderbentsov/UC-43

Browse Source 
WIP Исправила event create
This commit is contained in:
Daria Golova
2022-11-08 11:36:26 +03:00
committed by GitHub
parent 9e46a20ec5 dd3d0f8572
commit 1b58bfdf95
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/pages/calendar/components/CalendarFormAddEvent.vue
View File

@@ -319,18 +319,22 @@ export default {
start: this.mergeDate(this.eventDate, this.startTime), start: this.mergeDate(this.eventDate, this.startTime),
end: this.mergeDate(this.eventDate, this.endTime), end: this.mergeDate(this.eventDate, this.endTime),
kind: this.kind, kind: this.kind,
employees: this.findPerson( employees: [
this.findPerson(
this.ownersData, this.ownersData,
this.ownersList, this.ownersList,
this.employees, this.employees,
"employee" "employee"
), ),
members: this.findPerson( ],
members: [
this.findPerson(
this.membersData, this.membersData,
this.membersList, this.membersList,
this.members, this.members,
"person" "person"
), ),
],
}; };
this.postCreateEvent(this.eventData); this.postCreateEvent(this.eventData);
this.clearForm(); this.clearForm();

1
src/pages/calendar/components/CalendarSchedule.vue
View File

@@ -356,6 +356,7 @@ export default {
<style lang="sass" scoped> <style lang="sass" scoped>
.schedule .schedule
position: relative position: relative
border-top-left-radius: 4px
background-color: var(--default-white) background-color: var(--default-white)
width: calc(100% - (var(--sidebar-width) + 8px)) width: calc(100% - (var(--sidebar-width) + 8px))
height: calc(100vh - 56px - 8px) height: calc(100vh - 56px - 8px)