SWE-4103-Group-3 / Project

https://unbtracker.herokuapp.com/
The Unlicense
5 stars 0 forks source link

SWE43 Student Seating #71

Closed jsmith closed 7 years ago

jsmith commented 7 years ago

Fixes #43

This PR allows students to choose a seat, move to a different seat and remove themselves from a seat.

Changes Proposed in this Pull Request:

Additional Comments and Documentation:

One thing that we need to implement on the next spring is a better confirm modal!

dsteen338 commented 7 years ago

What does the current confirm modal look like? I know Brandon implemented something in his now merged pr. My issue also needs one.

jsmith commented 7 years ago

It's just using a confirmation alert!

mwalz1 commented 7 years ago

@jacsmith21 I don't think it is appropriate to be able to reserve a seat as an instructor. Was this intentional?

jsmith commented 7 years ago

No it wasn't. I actually fixed this with my latest commit! I don't think we will be able to merge this before the lab this afternoon though.

jsmith commented 7 years ago

@dsteen338 @mwalz1 @brandon1024 This branch should be good now! It's working flawlessly in my environment at least. Since the demo this afternoon, I've added mdb modals & I've made it so only courses that students have signed up in actually display on the sidebar (or courses that they've made if they're an instructor)!

mwalz1 commented 7 years ago

@jacsmith21 Was there a reson you removed the ability for a student to remove themselves from the seating-grid? Note- It's not a requirement.

jsmith commented 7 years ago

At the moment, a student should be able to remove themselves from the seating grid. Is that functionality not working for you?

mwalz1 commented 7 years ago

@jacsmith21 I fetched instead of pulled your branch down. Give me 5 to re-test, this is likely just my mistake.

jsmith commented 7 years ago

Is the Submit button supposed to be that far away from the cancel button?

image

jsmith commented 7 years ago

Everything seems to be working great with the merge except for one thing. When I use a seating template from another course the seat states don't seem to transfer. @brandon1024 do you know why this might be happening?

jsmith commented 7 years ago

Also, I updated the data.sql to insert both an instructor & student and a course.

INSERT INTO user (id, username, email, password, has_extended_privileges)  VALUES (1, 'student', 'example@example.com', '$2a$10$5fh0xrsnizwp5WKqSO1kYeMPIeulnjUV.mBsgOGg7hrGoT9ZphcMW', FALSE );
 INSERT INTO user (id, username, email, password, has_extended_privileges)  VALUES (2, 'instructor', 'example@example.com', '$2a$10$5fh0xrsnizwp5WKqSO1kYeMPIeulnjUV.mBsgOGg7hrGoT9ZphcMW', TRUE);
 INSERT INTO course (id, name, section, rows, cols, instructor_id)  VALUES (1, 'name', 'section', 5, 5, 2);

Let me know if you guys want to keep this change!

brandon1024 commented 7 years ago

@jacsmith21 The seat states should be transferring over too :/ Not too sure why that's happening. I'm spread unbelievably thin until later next week, so I don't have time to look into it sadly :(