Skip to content

Commit

Permalink
Manage Events small bug fix (#89)
Browse files Browse the repository at this point in the history 
* 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
  • Loading branch information
Tamara Charchoghlyan authored Nov 12, 2018
1 parent 52d8d40 commit 4b03010
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 12 deletions.
5 changes: 3 additions & 2 deletions frontend/src/components/Profile/ProfileEdit.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
<el-col v-if="edit" class="col-p">
<el-form-item>
<el-button type="primary" @click="onSubmit">Save</el-button>
<el-button>Cancel</el-button>
<el-button @click="onCancel">Cancel</el-button>
</el-form-item>
</el-col>
</el-form>
Expand Down Expand Up @@ -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() {
Expand Down
12 changes: 9 additions & 3 deletions frontend/src/views/pages/ManageEvents.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<el-tabs type="border-card" style="width:100%" @tab-click="changeTab">
<el-tab-pane label="All">
<add-event/>
<add-seminar/>
<add-seminar v-if="showAddSeminar"/>
<div v-for="(item,key) in currentList" :key="key">
<div v-if="item" >
<seminar-card v-if="item.event_id"
Expand Down Expand Up @@ -33,7 +33,8 @@
</div>
</el-tab-pane>
<el-tab-pane label="Seminar">
<add-seminar/>
<add-seminar v-if="showAddSeminar"/>
<p v-else style="text-align:center"> Create an event to see you seminars </p>
<div v-for="(item,key) in currentList" :key="key">
<div v-if="item" >
<seminar-card v-if="item.event_id"
Expand Down Expand Up @@ -67,11 +68,16 @@ export default {
activeName: 'all',
filter: "None",
currentList: [],
user: this.$store.state.user
user: this.$store.state.user,
showAddSeminar: false
};
},
mounted() {
this.getAll()
var res = this.$store.state.user.associate.filter(item => item.__typename === "Event")
console.log(this.$store.state.user.associate)
if(res.length !== 0) this.showAddSeminar = true
},
methods: {
getAll(){
Expand Down
21 changes: 14 additions & 7 deletions frontend/src/views/pages/authentication/Login.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 4b03010

Please sign in to comment.