Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Post events #30

Open
wants to merge 51 commits into
base: master
Choose a base branch
from
Open

Conversation

dheeraj-coding
Copy link

@dheeraj-coding dheeraj-coding commented Dec 15, 2018

Description

Implement the post events feature to collect data after completion of event.

Type of Change:

  • New feature (non-breaking change which adds functionality)

firebase: 4.13.1 -> 5.7.0
react: 15.4.2 -> 16.6.3
react-dom: 15.4.2 -> 16.6.3.
 Changes to be committed:
	modified:   package-lock.json
	modified:   package.json
 Changes to be committed:
	modified:   src/components/ClassroomComponent/BookingComponent/BookingComponent.js
	modified:   src/components/ClassroomComponent/MyEventsComponent/MyEventsComponent.js
	new file:   src/components/ClassroomComponent/PostEventComponent/FinishedContainer.js
	new file:   src/components/ClassroomComponent/PostEventComponent/postEventContainer.js
	new file:   src/components/EditTable/EditTable.js
	modified:   src/index.js
	modified:   src/reducers/userReducer.js
@bhawesh96
Copy link
Member

Run npm run test

Fix all issues thrown when npm run test is used.
	modified:   src/components/ClassroomComponent/BookingComponent/BookingComponent.js
	modified:   src/components/ClassroomComponent/MyEventsComponent/MyEventsComponent.js
	modified:   src/components/ClassroomComponent/PostEventComponent/FinishedContainer.js
	modified:   src/components/ClassroomComponent/PostEventComponent/postEventContainer.js
	modified:   src/components/EditTable/EditTable.js
	modified:   src/index.js
	modified:   src/reducers/userReducer.js
@dheeraj-coding
Copy link
Author

Fixed linting issues.

@bhawesh96 bhawesh96 force-pushed the master branch 2 times, most recently from 89e89fa to 37c8f16 Compare December 21, 2018 06:20
@rsarky rsarky force-pushed the master branch 2 times, most recently from e9a1a87 to 1e6c233 Compare January 9, 2019 15:37
	modified:   package-lock.json
	modified:   package.json
	modified:   src/components/ClassroomComponent/PostEventComponent/postEventContainer.js
	new file:   src/components/ClassroomComponent/PostEventComponent/postEventContainer1.js
	new file:   src/components/ClassroomComponent/PostEventComponent/styles.js
	modified:   src/components/ClassroomComponent/PostEventComponent/postEventContainer.js
	modified:   src/components/ClassroomComponent/PostEventComponent/postEventContainer.js
	modified:   src/components/ClassroomComponent/PostEventComponent/postEventContainer.js
@dheeraj-coding
Copy link
Author

@bhawesh96 @rsarky check the new updates and tell me for further changes.

@rsarky rsarky force-pushed the master branch 2 times, most recently from 66c278c to ee9a445 Compare January 13, 2019 17:22
@rsarky
Copy link
Member

rsarky commented Jan 14, 2019

Can you rebase on master.

@dheeraj-coding
Copy link
Author

so the feature is fine?

@Arushi1912
Copy link
Member

Arushi1912 commented Jan 15, 2019

There are some issues.

  1. postEventContainer.js and postEventContainer1.js
  2. this.handleNotes does not exist in postEventContainer.js
  3. Db updates are skewed.
  4. Where are you using postEventFlag?
  5. I can submit the details without entering required fields - number of participants (total and external)

@rsarky
Copy link
Member

rsarky commented Jan 21, 2019

ping @dheeraj-coding

dheeraj-coding and others added 9 commits January 27, 2019 11:42
     Skewed DB updates
     checking for required fields.
	modified:   src/components/ClassroomComponent/PostEventComponent/postEventContainer.js
Add welcome bot configurations to config.yml
Add BACKEND_API env var and use that as baseURL in services

Closes cribbl#43
Allow SC to approve/reject/flag an event before FA, AD, SO

Closes cribbl#50
rsarky and others added 26 commits March 15, 2019 23:53
AB5 310A and 310B weren't handled properly in the code. Treat them as
special cases.

style: Style fixes
Changed API endpoint of `sendEmailTemplate` to remove the hardcoded
firebase link and just send `event.key` instead.

Change case of SO by moving sendEmailTemplate after generatePDF

Change API of sendEmailTemplate
Student Council requires to keep track of which rooms are occupied by
which club so that they can control the room bookings. This feature
helps achieve the Council to get information regarding which event is
going to be held at a particular room at a particular day.

feat: Additional feature requests by SC on View Bookings (cribbl#69)

* Add error message if no event is found

* Allow Operations to access View Bookings page

Change name from ViewBookings to ViewBookings component
This fixes the mysterious anonymous rooms in roomsx error.
For eg. Consider there is a booking for the 29th. Now when someone
books rooms from 28-30 the rooms for 29th will incorrectly be added to
the roomsx array for 28 and 30 also. This was caused because taken rooms
was calculated across all booking dates and then when roomsx was to be
updated the same array of takenRooms concatenated with selectedRooms was
used to update all dates.
Bookings tab.

This is necessary so the floor incharges can verify event receipts.
Earlier all approved rooms were fetched. In this commit only approved
rooms for the selected date are fetched.
Added a `blocked` node on the database that contains blocked rooms for
respective days. `fetchRooms` will now fetch the `takenRooms` along with
the `blockedRooms`.

_TODO_ : Make corresponding changes in View Bookings.
 Changes to be committed:
	modified:   src/components/ClassroomComponent/MyEventsComponent/MyEventsComponent.js
@Arushi1912
Copy link
Member

There are some issues.

  1. postEventContainer.js and postEventContainer1.js
  2. this.handleNotes does not exist in postEventContainer.js
  3. Db updates are skewed.
  4. Where are you using postEventFlag?
  5. I can submit the details without entering required fields - number of participants (total and external)

@dheeraj-coding can you please check these points? I don't see the changes.

@bhawesh96
Copy link
Member

@rsarky , do you think we should scrap this and start afresh on this feature?
I'm not in sync with this PR at all and I don't think we have support from Dheeraj.

@rsarky
Copy link
Member

rsarky commented Apr 8, 2020

Not sure if any existing work can salvaged from this. We could start afresh if there is someone willing to pick this up!
Although I have come to realise some feature additions to the portal tend to get dropped as the contributor loses interest/ has other priorities.
Maybe we can set some milestones that can be merged independently for features that are significant sized like this one. That way even if the assignee drops off without completing we have some mergeable work.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants