From 4b0301050ca988f0305e6a62da3a8fa22ac06fff Mon Sep 17 00:00:00 2001 From: Tamara Charchoghlyan Date: Mon, 12 Nov 2018 16:30:34 -0500 Subject: [PATCH 1/2] Manage Events small bug fix (#89) * Seminar mutation (#78) * Validates seminar start/end datetimes with each other and corresponding event #59, closes #46 * Ignore frontend package-lock file * Connect api (#80) * search page done * view seminar and event * Fix query string construction * displayed dates and follow/attend both events/seminars * scroll fix and my events * manage events done * suggestions done and scroll 2.0 * Vivian branch seminar (#49) * Parses input for create event page * Create event will add to the datebase * not broken * Transfer div kind of works * transfer model should add organizers to db * fixes for transfer model * create page event works * create seminar page can pull event names from database * trying fetch stuff * please take the fetch attempt things * calendar changes that apparently did not get pushed * create seminar page displays events and it is selectable * create seminar page connects to the database * fixes for createSeminar dropdown for events reflect selection and seminar created succesfully * transfer data div is fixed now it displays last name and it does not display yourself as a selectable user * create event fixed, pushes two of the current user before * Transfer data component is fixed, you as the user won't appear on the available organizer list. Event duration is ordered in terms of start date and time then end date and time. * Transfer data component is fixed, you as the user won't appear on the available organizer list. Event duration is ordered in terms of start date and time then end date and time. * Create event page now works like the seminar page with the date picker, time picker and transfer component fixed. * Vivian branch (#71) * Parses input for create event page * Create event will add to the datebase * not broken * Transfer div kind of works * transfer model should add organizers to db * fixes for transfer model * create page event works * create seminar page can pull event names from database * trying fetch stuff * please take the fetch attempt things * calendar changes that apparently did not get pushed * create seminar page displays events and it is selectable * create seminar page connects to the database * fixes for createSeminar dropdown for events reflect selection and seminar created succesfully * transfer data div is fixed now it displays last name and it does not display yourself as a selectable user * create event fixed, pushes two of the current user before * Transfer data component is fixed, you as the user won't appear on the available organizer list. Event duration is ordered in terms of start date and time then end date and time. * Transfer data component is fixed, you as the user won't appear on the available organizer list. Event duration is ordered in terms of start date and time then end date and time. * Create event page now works like the seminar page with the date picker, time picker and transfer component fixed. * Vivian branch seminar (#49) (#60) * Parses input for create event page * Create event will add to the datebase * not broken * Transfer div kind of works * transfer model should add organizers to db * fixes for transfer model * create page event works * create seminar page can pull event names from database * trying fetch stuff * please take the fetch attempt things * calendar changes that apparently did not get pushed * create seminar page displays events and it is selectable * create seminar page connects to the database * fixes for createSeminar dropdown for events reflect selection and seminar created succesfully * transfer data div is fixed now it displays last name and it does not display yourself as a selectable user * create event fixed, pushes two of the current user before * Transfer data component is fixed, you as the user won't appear on the available organizer list. Event duration is ordered in terms of start date and time then end date and time. * Transfer data component is fixed, you as the user won't appear on the available organizer list. Event duration is ordered in terms of start date and time then end date and time. * Create event page now works like the seminar page with the date picker, time picker and transfer component fixed. * News are no longer all the same date. Newsfeed completed. Create event and seminar has default of FFA if nothing is chosen and decimals are rounded to whole numbers. * merge fixes 2 * Changes to make newsfeed work that were deleted in last commit of VivianBranch * helper functions and big fixes * Connect api (#76) * search page done * view seminar and event * Fix query string construction * displayed dates and follow/attend both events/seminars * scroll fix and my events * manage events done * suggestions done and scroll 2.0 * helper functions and big fixes * bugs and profile * Closes #79, Added announcement root resolver and fixed queryAnnouncementByTypeID to return all parts of announcements (#82) * Delete clg * Connect api (#85) * search page done * view seminar and event * Fix query string construction * displayed dates and follow/attend both events/seminars * scroll fix and my events * manage events done * suggestions done and scroll 2.0 * Vivian branch seminar (#49) * Parses input for create event page * Create event will add to the datebase * not broken * Transfer div kind of works * transfer model should add organizers to db * fixes for transfer model * create page event works * create seminar page can pull event names from database * trying fetch stuff * please take the fetch attempt things * calendar changes that apparently did not get pushed * create seminar page displays events and it is selectable * create seminar page connects to the database * fixes for createSeminar dropdown for events reflect selection and seminar created succesfully * transfer data div is fixed now it displays last name and it does not display yourself as a selectable user * create event fixed, pushes two of the current user before * Transfer data component is fixed, you as the user won't appear on the available organizer list. Event duration is ordered in terms of start date and time then end date and time. * Transfer data component is fixed, you as the user won't appear on the available organizer list. Event duration is ordered in terms of start date and time then end date and time. * Create event page now works like the seminar page with the date picker, time picker and transfer component fixed. * Vivian branch (#71) * Parses input for create event page * Create event will add to the datebase * not broken * Transfer div kind of works * transfer model should add organizers to db * fixes for transfer model * create page event works * create seminar page can pull event names from database * trying fetch stuff * please take the fetch attempt things * calendar changes that apparently did not get pushed * create seminar page displays events and it is selectable * create seminar page connects to the database * fixes for createSeminar dropdown for events reflect selection and seminar created succesfully * transfer data div is fixed now it displays last name and it does not display yourself as a selectable user * create event fixed, pushes two of the current user before * Transfer data component is fixed, you as the user won't appear on the available organizer list. Event duration is ordered in terms of start date and time then end date and time. * Transfer data component is fixed, you as the user won't appear on the available organizer list. Event duration is ordered in terms of start date and time then end date and time. * Create event page now works like the seminar page with the date picker, time picker and transfer component fixed. * Vivian branch seminar (#49) (#60) * Parses input for create event page * Create event will add to the datebase * not broken * Transfer div kind of works * transfer model should add organizers to db * fixes for transfer model * create page event works * create seminar page can pull event names from database * trying fetch stuff * please take the fetch attempt things * calendar changes that apparently did not get pushed * create seminar page displays events and it is selectable * create seminar page connects to the database * fixes for createSeminar dropdown for events reflect selection and seminar created succesfully * transfer data div is fixed now it displays last name and it does not display yourself as a selectable user * create event fixed, pushes two of the current user before * Transfer data component is fixed, you as the user won't appear on the available organizer list. Event duration is ordered in terms of start date and time then end date and time. * Transfer data component is fixed, you as the user won't appear on the available organizer list. Event duration is ordered in terms of start date and time then end date and time. * Create event page now works like the seminar page with the date picker, time picker and transfer component fixed. * News are no longer all the same date. Newsfeed completed. Create event and seminar has default of FFA if nothing is chosen and decimals are rounded to whole numbers. * merge fixes 2 * Changes to make newsfeed work that were deleted in last commit of VivianBranch * helper functions and big fixes * Connect api (#76) * search page done * view seminar and event * Fix query string construction * displayed dates and follow/attend both events/seminars * scroll fix and my events * manage events done * suggestions done and scroll 2.0 * helper functions and big fixes * bugs and profile * bug fixes[ * Connect api (#86) * search page done * view seminar and event * Fix query string construction * displayed dates and follow/attend both events/seminars * scroll fix and my events * manage events done * suggestions done and scroll 2.0 * Vivian branch seminar (#49) * Parses input for create event page * Create event will add to the datebase * not broken * Transfer div kind of works * transfer model should add organizers to db * fixes for transfer model * create page event works * create seminar page can pull event names from database * trying fetch stuff * please take the fetch attempt things * calendar changes that apparently did not get pushed * create seminar page displays events and it is selectable * create seminar page connects to the database * fixes for createSeminar dropdown for events reflect selection and seminar created succesfully * transfer data div is fixed now it displays last name and it does not display yourself as a selectable user * create event fixed, pushes two of the current user before * Transfer data component is fixed, you as the user won't appear on the available organizer list. Event duration is ordered in terms of start date and time then end date and time. * Transfer data component is fixed, you as the user won't appear on the available organizer list. Event duration is ordered in terms of start date and time then end date and time. * Create event page now works like the seminar page with the date picker, time picker and transfer component fixed. * Vivian branch (#71) * Parses input for create event page * Create event will add to the datebase * not broken * Transfer div kind of works * transfer model should add organizers to db * fixes for transfer model * create page event works * create seminar page can pull event names from database * trying fetch stuff * please take the fetch attempt things * calendar changes that apparently did not get pushed * create seminar page displays events and it is selectable * create seminar page connects to the database * fixes for createSeminar dropdown for events reflect selection and seminar created succesfully * transfer data div is fixed now it displays last name and it does not display yourself as a selectable user * create event fixed, pushes two of the current user before * Transfer data component is fixed, you as the user won't appear on the available organizer list. Event duration is ordered in terms of start date and time then end date and time. * Transfer data component is fixed, you as the user won't appear on the available organizer list. Event duration is ordered in terms of start date and time then end date and time. * Create event page now works like the seminar page with the date picker, time picker and transfer component fixed. * Vivian branch seminar (#49) (#60) * Parses input for create event page * Create event will add to the datebase * not broken * Transfer div kind of works * transfer model should add organizers to db * fixes for transfer model * create page event works * create seminar page can pull event names from database * trying fetch stuff * please take the fetch attempt things * calendar changes that apparently did not get pushed * create seminar page displays events and it is selectable * create seminar page connects to the database * fixes for createSeminar dropdown for events reflect selection and seminar created succesfully * transfer data div is fixed now it displays last name and it does not display yourself as a selectable user * create event fixed, pushes two of the current user before * Transfer data component is fixed, you as the user won't appear on the available organizer list. Event duration is ordered in terms of start date and time then end date and time. * Transfer data component is fixed, you as the user won't appear on the available organizer list. Event duration is ordered in terms of start date and time then end date and time. * Create event page now works like the seminar page with the date picker, time picker and transfer component fixed. * News are no longer all the same date. Newsfeed completed. Create event and seminar has default of FFA if nothing is chosen and decimals are rounded to whole numbers. * merge fixes 2 * Changes to make newsfeed work that were deleted in last commit of VivianBranch * helper functions and big fixes * Connect api (#76) * search page done * view seminar and event * Fix query string construction * displayed dates and follow/attend both events/seminars * scroll fix and my events * manage events done * suggestions done and scroll 2.0 * helper functions and big fixes * bugs and profile * bug fixes[ * show add semianr bug --- .../src/components/Profile/ProfileEdit.vue | 5 +++-- frontend/src/views/pages/ManageEvents.vue | 12 ++++++++--- .../src/views/pages/authentication/Login.vue | 21 ++++++++++++------- 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/frontend/src/components/Profile/ProfileEdit.vue b/frontend/src/components/Profile/ProfileEdit.vue index 2c656fb..b4287b0 100644 --- a/frontend/src/components/Profile/ProfileEdit.vue +++ b/frontend/src/components/Profile/ProfileEdit.vue @@ -163,7 +163,7 @@ Save - Cancel + Cancel @@ -250,7 +250,8 @@ export default { this.twitter = this.$store.state.user.twitter this.facebook = this.$store.state.user.facebook this.insta = this.$store.state.user.instagram - + this.edit = false + } }, mounted() { diff --git a/frontend/src/views/pages/ManageEvents.vue b/frontend/src/views/pages/ManageEvents.vue index bbdb332..d272a2d 100644 --- a/frontend/src/views/pages/ManageEvents.vue +++ b/frontend/src/views/pages/ManageEvents.vue @@ -5,7 +5,7 @@ - +
- + +

Create an event to see you seminars

item.__typename === "Event") + console.log(this.$store.state.user.associate) + if(res.length !== 0) this.showAddSeminar = true }, methods: { getAll(){ diff --git a/frontend/src/views/pages/authentication/Login.vue b/frontend/src/views/pages/authentication/Login.vue index 68bdbaa..ea7b430 100644 --- a/frontend/src/views/pages/authentication/Login.vue +++ b/frontend/src/views/pages/authentication/Login.vue @@ -134,15 +134,22 @@ export default { .then(res => { if (res.data){ user.manage = [] - res.data.getMyManagingEventsAndSeminars.forEach(element => { - if (element.creator_id === user.id) { - user.manage.push(element) - } else if (element.__typename === "Seminar") { - user.manage.push(element) - } - }) + user.associate = [] + console.log(res.data.getMyManagingEventsAndSeminars) + if(res.data.getMyManagingEventsAndSeminars.length > 0){ + user.associate = res.data.getMyManagingEventsAndSeminars + res.data.getMyManagingEventsAndSeminars.forEach(element => { + if (element.creator_id === user.id) { + user.manage.push(element) + } else if (element.__typename === "Seminar") { + user.manage.push(element) + } + }) + } } else { user.manage = [] + console.log("no manging") + } console.log(user) this.$store.commit("setLogin", user); From cd50715b8385cbb094bc979b1668a9c6d43762d7 Mon Sep 17 00:00:00 2001 From: Tamara Charchoghlyan Date: Mon, 12 Nov 2018 17:56:41 -0500 Subject: [PATCH 2/2] Small frontend fixes (#91) * Seminar mutation (#78) * Validates seminar start/end datetimes with each other and corresponding event #59, closes #46 * Ignore frontend package-lock file * Connect api (#80) * search page done * view seminar and event * Fix query string construction * displayed dates and follow/attend both events/seminars * scroll fix and my events * manage events done * suggestions done and scroll 2.0 * Vivian branch seminar (#49) * Parses input for create event page * Create event will add to the datebase * not broken * Transfer div kind of works * transfer model should add organizers to db * fixes for transfer model * create page event works * create seminar page can pull event names from database * trying fetch stuff * please take the fetch attempt things * calendar changes that apparently did not get pushed * create seminar page displays events and it is selectable * create seminar page connects to the database * fixes for createSeminar dropdown for events reflect selection and seminar created succesfully * transfer data div is fixed now it displays last name and it does not display yourself as a selectable user * create event fixed, pushes two of the current user before * Transfer data component is fixed, you as the user won't appear on the available organizer list. Event duration is ordered in terms of start date and time then end date and time. * Transfer data component is fixed, you as the user won't appear on the available organizer list. Event duration is ordered in terms of start date and time then end date and time. * Create event page now works like the seminar page with the date picker, time picker and transfer component fixed. * Vivian branch (#71) * Parses input for create event page * Create event will add to the datebase * not broken * Transfer div kind of works * transfer model should add organizers to db * fixes for transfer model * create page event works * create seminar page can pull event names from database * trying fetch stuff * please take the fetch attempt things * calendar changes that apparently did not get pushed * create seminar page displays events and it is selectable * create seminar page connects to the database * fixes for createSeminar dropdown for events reflect selection and seminar created succesfully * transfer data div is fixed now it displays last name and it does not display yourself as a selectable user * create event fixed, pushes two of the current user before * Transfer data component is fixed, you as the user won't appear on the available organizer list. Event duration is ordered in terms of start date and time then end date and time. * Transfer data component is fixed, you as the user won't appear on the available organizer list. Event duration is ordered in terms of start date and time then end date and time. * Create event page now works like the seminar page with the date picker, time picker and transfer component fixed. * Vivian branch seminar (#49) (#60) * Parses input for create event page * Create event will add to the datebase * not broken * Transfer div kind of works * transfer model should add organizers to db * fixes for transfer model * create page event works * create seminar page can pull event names from database * trying fetch stuff * please take the fetch attempt things * calendar changes that apparently did not get pushed * create seminar page displays events and it is selectable * create seminar page connects to the database * fixes for createSeminar dropdown for events reflect selection and seminar created succesfully * transfer data div is fixed now it displays last name and it does not display yourself as a selectable user * create event fixed, pushes two of the current user before * Transfer data component is fixed, you as the user won't appear on the available organizer list. Event duration is ordered in terms of start date and time then end date and time. * Transfer data component is fixed, you as the user won't appear on the available organizer list. Event duration is ordered in terms of start date and time then end date and time. * Create event page now works like the seminar page with the date picker, time picker and transfer component fixed. * News are no longer all the same date. Newsfeed completed. Create event and seminar has default of FFA if nothing is chosen and decimals are rounded to whole numbers. * merge fixes 2 * Changes to make newsfeed work that were deleted in last commit of VivianBranch * helper functions and big fixes * Connect api (#76) * search page done * view seminar and event * Fix query string construction * displayed dates and follow/attend both events/seminars * scroll fix and my events * manage events done * suggestions done and scroll 2.0 * helper functions and big fixes * bugs and profile * Closes #79, Added announcement root resolver and fixed queryAnnouncementByTypeID to return all parts of announcements (#82) * Delete clg * Connect api (#85) * search page done * view seminar and event * Fix query string construction * displayed dates and follow/attend both events/seminars * scroll fix and my events * manage events done * suggestions done and scroll 2.0 * Vivian branch seminar (#49) * Parses input for create event page * Create event will add to the datebase * not broken * Transfer div kind of works * transfer model should add organizers to db * fixes for transfer model * create page event works * create seminar page can pull event names from database * trying fetch stuff * please take the fetch attempt things * calendar changes that apparently did not get pushed * create seminar page displays events and it is selectable * create seminar page connects to the database * fixes for createSeminar dropdown for events reflect selection and seminar created succesfully * transfer data div is fixed now it displays last name and it does not display yourself as a selectable user * create event fixed, pushes two of the current user before * Transfer data component is fixed, you as the user won't appear on the available organizer list. Event duration is ordered in terms of start date and time then end date and time. * Transfer data component is fixed, you as the user won't appear on the available organizer list. Event duration is ordered in terms of start date and time then end date and time. * Create event page now works like the seminar page with the date picker, time picker and transfer component fixed. * Vivian branch (#71) * Parses input for create event page * Create event will add to the datebase * not broken * Transfer div kind of works * transfer model should add organizers to db * fixes for transfer model * create page event works * create seminar page can pull event names from database * trying fetch stuff * please take the fetch attempt things * calendar changes that apparently did not get pushed * create seminar page displays events and it is selectable * create seminar page connects to the database * fixes for createSeminar dropdown for events reflect selection and seminar created succesfully * transfer data div is fixed now it displays last name and it does not display yourself as a selectable user * create event fixed, pushes two of the current user before * Transfer data component is fixed, you as the user won't appear on the available organizer list. Event duration is ordered in terms of start date and time then end date and time. * Transfer data component is fixed, you as the user won't appear on the available organizer list. Event duration is ordered in terms of start date and time then end date and time. * Create event page now works like the seminar page with the date picker, time picker and transfer component fixed. * Vivian branch seminar (#49) (#60) * Parses input for create event page * Create event will add to the datebase * not broken * Transfer div kind of works * transfer model should add organizers to db * fixes for transfer model * create page event works * create seminar page can pull event names from database * trying fetch stuff * please take the fetch attempt things * calendar changes that apparently did not get pushed * create seminar page displays events and it is selectable * create seminar page connects to the database * fixes for createSeminar dropdown for events reflect selection and seminar created succesfully * transfer data div is fixed now it displays last name and it does not display yourself as a selectable user * create event fixed, pushes two of the current user before * Transfer data component is fixed, you as the user won't appear on the available organizer list. Event duration is ordered in terms of start date and time then end date and time. * Transfer data component is fixed, you as the user won't appear on the available organizer list. Event duration is ordered in terms of start date and time then end date and time. * Create event page now works like the seminar page with the date picker, time picker and transfer component fixed. * News are no longer all the same date. Newsfeed completed. Create event and seminar has default of FFA if nothing is chosen and decimals are rounded to whole numbers. * merge fixes 2 * Changes to make newsfeed work that were deleted in last commit of VivianBranch * helper functions and big fixes * Connect api (#76) * search page done * view seminar and event * Fix query string construction * displayed dates and follow/attend both events/seminars * scroll fix and my events * manage events done * suggestions done and scroll 2.0 * helper functions and big fixes * bugs and profile * bug fixes[ * Connect api (#86) * search page done * view seminar and event * Fix query string construction * displayed dates and follow/attend both events/seminars * scroll fix and my events * manage events done * suggestions done and scroll 2.0 * Vivian branch seminar (#49) * Parses input for create event page * Create event will add to the datebase * not broken * Transfer div kind of works * transfer model should add organizers to db * fixes for transfer model * create page event works * create seminar page can pull event names from database * trying fetch stuff * please take the fetch attempt things * calendar changes that apparently did not get pushed * create seminar page displays events and it is selectable * create seminar page connects to the database * fixes for createSeminar dropdown for events reflect selection and seminar created succesfully * transfer data div is fixed now it displays last name and it does not display yourself as a selectable user * create event fixed, pushes two of the current user before * Transfer data component is fixed, you as the user won't appear on the available organizer list. Event duration is ordered in terms of start date and time then end date and time. * Transfer data component is fixed, you as the user won't appear on the available organizer list. Event duration is ordered in terms of start date and time then end date and time. * Create event page now works like the seminar page with the date picker, time picker and transfer component fixed. * Vivian branch (#71) * Parses input for create event page * Create event will add to the datebase * not broken * Transfer div kind of works * transfer model should add organizers to db * fixes for transfer model * create page event works * create seminar page can pull event names from database * trying fetch stuff * please take the fetch attempt things * calendar changes that apparently did not get pushed * create seminar page displays events and it is selectable * create seminar page connects to the database * fixes for createSeminar dropdown for events reflect selection and seminar created succesfully * transfer data div is fixed now it displays last name and it does not display yourself as a selectable user * create event fixed, pushes two of the current user before * Transfer data component is fixed, you as the user won't appear on the available organizer list. Event duration is ordered in terms of start date and time then end date and time. * Transfer data component is fixed, you as the user won't appear on the available organizer list. Event duration is ordered in terms of start date and time then end date and time. * Create event page now works like the seminar page with the date picker, time picker and transfer component fixed. * Vivian branch seminar (#49) (#60) * Parses input for create event page * Create event will add to the datebase * not broken * Transfer div kind of works * transfer model should add organizers to db * fixes for transfer model * create page event works * create seminar page can pull event names from database * trying fetch stuff * please take the fetch attempt things * calendar changes that apparently did not get pushed * create seminar page displays events and it is selectable * create seminar page connects to the database * fixes for createSeminar dropdown for events reflect selection and seminar created succesfully * transfer data div is fixed now it displays last name and it does not display yourself as a selectable user * create event fixed, pushes two of the current user before * Transfer data component is fixed, you as the user won't appear on the available organizer list. Event duration is ordered in terms of start date and time then end date and time. * Transfer data component is fixed, you as the user won't appear on the available organizer list. Event duration is ordered in terms of start date and time then end date and time. * Create event page now works like the seminar page with the date picker, time picker and transfer component fixed. * News are no longer all the same date. Newsfeed completed. Create event and seminar has default of FFA if nothing is chosen and decimals are rounded to whole numbers. * merge fixes 2 * Changes to make newsfeed work that were deleted in last commit of VivianBranch * helper functions and big fixes * Connect api (#76) * search page done * view seminar and event * Fix query string construction * displayed dates and follow/attend both events/seminars * scroll fix and my events * manage events done * suggestions done and scroll 2.0 * helper functions and big fixes * bugs and profile * bug fixes[ * show add semianr bug