-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Mutation for edit events #21 * Fixing another bit of sample data * Edit seminar mutation created * Removing unused functions * Fixed duplicates in newsfeed * Posting seminar is works * Updating EventUpdateInput to have required fields * start of edit event page, store stuff should be finished. * more stuff for edit event page * Fixing EventUpdateInput * edit events work now * starting on editing seminar * Fix to seminar type including #121 * fixed an error with merge conflict * edit seminars should work now * google location button on event and seminar works * location, website, location links now is pushed to db and is called when editting * changed the google maps link icon * error messages are put in alert for create events and seminars * capacity boxes only visible when the respective option is selected * create event now has error messages, but seminar should already have it so nothing was changed there * capacity boxes only visible when the respective option is selected now works for SEMINAR TOO * capacity types are on their own line, cancel button gives the right message all this applies to both events and seminar in theory * Fixing escaping of '?'s in event fields for edit * added hover for google maps location link for both events and seminars * location links are not viewable in edits for both events and seminar * fixed createSeminar errors that unable you to create seminars
- Loading branch information
Showing
19 changed files
with
882 additions
and
270 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,15 +11,13 @@ INSERT INTO doom_user (first_name, last_name, email, privacy_settings, password_ | |
INSERT INTO doom_user (first_name, last_name, email, privacy_settings, password_hash) VALUES ('Thor','Odinson','[email protected]', 'Private','$2b$12$rF.modokh7SuBpRHdg/xA.KN/zYvx0HmaxasTXmzWIiWcLPlhfWH2'); | ||
INSERT INTO doom_user (first_name, last_name, email, privacy_settings, password_hash) VALUES ('Loki','Laufeyson','[email protected]', 'Private','$2b$12$rF.modokh7SuBpRHdg/xA.KN/zYvx0HmaxasTXmzWIiWcLPlhfWH2'); | ||
|
||
|
||
-- 3 events | ||
insert into Event (creator_id, name, start_time, end_time, capacity_type, max_capacity, current_capacity, website, location_link) values (3,'CUSEC',TIMESTAMP '2019-10-23 8:30:00+02', TIMESTAMP '2019-11-27 10:30:00+02', 'FCFS_E',6,0,'http://2018.cusec.net/','https://goo.gl/maps/w38KNq2BNLB2'); | ||
INSERT INTO Event (creator_id, name, start_time, end_time, capacity_type, max_capacity) VALUES (2,'Animefest',TIMESTAMP '2019-10-21 12:30:00+02', TIMESTAMP '2019-11-29 10:30:00+02', 'FCFS_P',3); | ||
INSERT INTO Event (creator_id, name, start_time, end_time, capacity_type) VALUES (1,'Doomsday convention',TIMESTAMP '2018-10-30 1:00:00', TIMESTAMP '2018-11-02 10:30:00', 'FFA'); | ||
INSERT INTO Event (creator_id, name, start_time, end_time, capacity_type) VALUES (1,'Doomsday convention',TIMESTAMP '2018-09-04 1:00:00', TIMESTAMP '2018-12-13 10:30:00', 'FFA'); | ||
INSERT INTO Event (creator_id, name, start_time, end_time, capacity_type,max_capacity) VALUES (6,'Avenger Meetup',TIMESTAMP '2019-05-03 10:30:00', TIMESTAMP '2019-11-24 10:30:00', 'FCFS_E',5); | ||
INSERT INTO Event (creator_id, name, start_time, end_time, capacity_type,max_capacity) VALUES (5,'Wizarding War',TIMESTAMP '2018-11-03 10:30:00', TIMESTAMP '2019-12-24 10:30:00', 'FCFS_P',10); | ||
|
||
|
||
insert into Event_Organizer (user_id, event_id) values (3,1); | ||
insert into Event_Organizer (user_id, event_id) values (2,2); | ||
insert into Event_Organizer (user_id, event_id) values (1,3); | ||
|
@@ -30,8 +28,7 @@ insert into Event_Organizer (user_id, event_id) values (3,4); | |
insert into Event_Organizer (user_id, event_id) values (5,5); | ||
|
||
|
||
|
||
INSERT INTO Seminar (event_id, name, start_time, end_time, capacity_type) VALUES (3,'Preparing for your doom',TIMESTAMP '2019-10-20 10:30:00+02', TIMESTAMP '2019-11-20 12:30:00+02', 'FFA'); | ||
INSERT INTO Seminar (event_id, name, start_time, end_time, capacity_type) VALUES (3,'Preparing for your doom',TIMESTAMP '2018-09-10 10:30:00+02', TIMESTAMP '2018-10-22 12:30:00+02', 'FFA'); | ||
INSERT INTO Seminar (event_id, name, start_time, end_time, capacity_type, max_capacity) VALUES (2,'How to Weeb',TIMESTAMP '2019-10-22 12:30:00+02', TIMESTAMP '2019-11-22 13:30:00+02', 'FCFS_E',2); | ||
INSERT INTO Seminar (event_id, name, start_time, end_time, capacity_type, max_capacity) VALUES (1,'Hackathon',TIMESTAMP '2019-10-24 8:30:00+02', TIMESTAMP '2019-11-24 10:30:00+02', 'FCFS_P',6); | ||
INSERT INTO Seminar (event_id, name, start_time, end_time, capacity_type, max_capacity) VALUES (3,'Alpha Demo',TIMESTAMP '2018-10-31 14:50:00', TIMESTAMP '2018-10-31 15:00:00', 'FCFS_P',5); | ||
|
@@ -64,7 +61,7 @@ INSERT INTO Event_Participation (user_id, event_id, attending) VALUES (9,4,True) | |
INSERT INTO Event_Participation (user_id, event_id, following) VALUES (10,4,True); | ||
|
||
-- Adding users to seminars | ||
INSERT INTO Seminar_Participation (user_id, seminar_id, attending) VALUES (2,2,True); | ||
INSERT INTO Seminar_Participation (user_id, seminar_id, attending) VALUES (1,2,True); | ||
INSERT INTO Seminar_Participation (user_id, seminar_id, following) VALUES (3,2,True); | ||
INSERT INTO Seminar_Participation (user_id, seminar_id, attending) VALUES (5,2,True); | ||
|
||
|
@@ -79,14 +76,12 @@ INSERT INTO Seminar_Participation (user_id, seminar_id, attending) VALUES (5,5,T | |
INSERT INTO Seminar_Wait_list (user_id, seminar_id,date_added) VALUES (3,2, TIMESTAMP '2019-10-23 8:30:00+02'); | ||
INSERT INTO Event_Wait_list (user_id, event_id,date_added) VALUES (10,2, TIMESTAMP '2019-10-29 8:30:00+02'); | ||
|
||
|
||
-- 2 Annoucements | ||
INSERT INTO Event_Announcement (event_id, message, date_created, date_modified) VALUES (3,'The end is nigh, remember your wallet',TIMESTAMP '2018-10-31 8:30:00', TIMESTAMP '2018-10-31 19:00:00'); | ||
INSERT INTO Event_Announcement (event_id, message, date_created, date_modified) VALUES (3,'Remember your doom',TIMESTAMP '2018-10-31 8:30:00', TIMESTAMP '2018-11-01 8:45:00'); | ||
INSERT INTO Seminar_Announcement (seminar_id, message, date_created, date_modified) VALUES (4,'Bug Fixing Party',TIMESTAMP '2018-10-31 8:30:00', TIMESTAMP '2018-10-13 8:30:00'); | ||
INSERT INTO Seminar_Announcement (seminar_id, message, date_created, date_modified) VALUES (3,'Reminder to participants to bring laptops',TIMESTAMP '2018-10-23 8:30:00+02', TIMESTAMP '2018-10-23 8:30:00+02'); | ||
|
||
|
||
-- One user following | ||
INSERT INTO User_Following (user_id, following_user_id) VALUES (4,1); | ||
|
||
|
@@ -95,8 +90,6 @@ DO | |
$do$ | ||
BEGIN | ||
FOR i IN 1..5 LOOP | ||
|
||
|
||
UPDATE "event" | ||
SET current_capacity =subquery.count | ||
FROM | ||
|
@@ -112,9 +105,6 @@ BEGIN | |
FROM seminar_participation | ||
WHERE seminar_id = i AND attending = true) AS subquery | ||
WHERE seminar.id=i; | ||
|
||
|
||
|
||
END LOOP; | ||
END | ||
$do$; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.