Newaddcomplementarylayout by tomaswolfgang · Pull Request #18 · Simvo/SIMVO

tomaswolfgang · 2016-07-20T18:07:33Z

Add course button corresponding to particular semesters
Unified complementary/elective/custom course modals
Fixed drop down menu for Required courses in the initial required placement;
Added a transition/Tutorial modal that appears after placing the last required course in the schedule.
adding semesters include/dont include the add course button depending on whether last required course has been placed.
Users can select courses in Electives menu and Complementary menu and clicking add will add all of them
These added courses update the credit counter and progress bar

This change is

Made all complementary courses appear on the same modal with mdl tabs Adding complementary courses adds to selected semester!

Dynamically adds complementary/elective courses into semester Courses are removable/buttons work Reveal modal is centralized with tabs

Some styling for the add-course button -- STILL LOOKS WEIRD Put both Complementary and Elective courses on the same modal with different tabs Corrected issues with removing courses from exemption semester Animation after all req courses are moved into the schedule -- NOT DONE -- this will trigger the adding complementary courses tutorial complementary courses added now appear the correct color

Mini Tutorial appears after adding your last required course! (this will only happen once because required courses are not removable) Dynamic add course buttons on all the semesters are added on this transition. Adding semesters before transition doesn't have add courses and after there is add course option

tekaratzas · 2016-07-21T06:59:31Z

Damn nice job!

Overall the functionality is great. The buttons could use some more styling but thats just a minor detail. The one thing is that you are forgetting to check if complementary[] is set in the flowchart.blade view. hence when a new user registers it throws an error. There are also variables called "class" that are present in the view that don't belong and also throw errors.

tekaratzas · 2016-07-21T07:00:46Z

public/js/flowchart.js

+    var semester = $(target_sem.find("div.sortable")).attr("id");
+    semester = semester.split(" ");
+    semester = semester[0] + " " + semester[1];
+    console.log(semester);


Make sure you delete all the console.log(). EDIT: nevermind you totally did in the later commit

tekaratzas · 2016-07-21T07:07:32Z

Ill look into splitting up views. The flowchart.blade is turning into a blob. Ill also try and find a cool style for the button.

tristanrenondin · 2016-07-21T07:49:30Z

Ill test it out tonight. What i noticed was the UI for new users was confusing, but looks like you added a drop down menu so it's probably better now

tekaratzas · 2016-07-22T06:13:00Z

Ive been thinking and i feel the add course buttons should be there the entire time. Also, if we have them there the entire time maybe the required courses should be a tab in that modal also? not too sure about that but it think it could use some thought.

What do you guys think about this?

I accidentally had an incorrect variable name! Also added a check if there exists complementary courses before adding them

Removed the required section at the very bottom Added a new required tab to the course modal ability to add required courses

NOTE: we need to expand how the complementary/elective courses are parsed (from the SET_TEXT_ENGLISH)

tekaratzas · 2016-07-23T03:00:27Z

I like this A LOT better, Great job.

-Just small things. We should add a button on exemption semester.
-Place the Add button on the (modal) on top thats way its easier to see
-If a Group has no courses, dont add the tab.

Tristan, give this thing a shot and tell us how you like it.

tekaratzas · 2016-07-23T03:02:41Z

resources/views/flowchart.blade.php

          <div class="mdl-tabs mdl-js-tabs mdl-js-ripple-effect">
            <div class="mdl-tabs__tab-bar">
-                <a href="#complementary_tab" class="mdl-tabs__tab is-active">Complementaries</a>
+                <a href="#required_tab" class="mdl-tabs__tab is-active">Required</a>


I think these should be put in a array that is created in the controller and have it iterated in a for loop. It will make it much more dynamic.

tekaratzas · 2016-07-24T22:50:30Z

resources/views/flowchart.blade.php

-                <a href="#elective_tab" class="mdl-tabs__tab">Electives</a>
-                <a href="#custom_tab" class="mdl-tabs__tab">Custom</a>
+                <a href="#Required_tab" class="mdl-tabs__tab is-active">Required</a>
+                <a href="#Complementary_tab" class="mdl-tabs__tab">Complementary</a>


can you use a for loop here also? Something like:

@foreach ($groupsWithCourses as $key=>$value)
@if(count($value) > 0)
{{ $key }}
@endif
@Endforeach

Tab is removed if it is empty Add button is centered and at the top for ease of access Add course button added to exemption semester Re-adds header and course if all courses in a single groups are added then a single one is removed

tekaratzas · 2016-07-25T06:54:05Z

resources/views/flowchart.blade.php

-                <a href="#Elective_tab" class="mdl-tabs__tab">Electives</a>
+              @foreach($groupsWithCourses as $tabtitle => $Courses)
+                @if(!is_null($Courses))
+                  @if($tabtitle == 'Complementary')


Can you do a check and make sure groups with no courses dont get added as a tab? for example, software engineering has to complementary courses (in the new curriculum) but the tab still shows up. Maybe just make the first entry in the array the active one?

tekaratzas · 2016-07-25T06:57:14Z

Aight almost there. Can you add an "Add Course" button on the exemption semester and put the "add" button on the top of the modal?

tabs now dynamically appear and disappear! disappear happens if the last course from a tab is added. appear happens when a course from tab that doesn't exist is removed from the schedule. Additionally, I minified some repetitive js code within the add course listener function. Specific groups will also appear and disappear in the same manner that tabs operate with respect to particular groups.

Required courses are now removable (they appear in a required tab in the modal after being removed)

tekaratzas · 2016-07-26T01:05:12Z

Alright looks good

tomaswolfgang · 2016-07-27T01:58:07Z

Registration bug fixed!

tekaratzas · 2016-07-30T17:30:34Z

Did you commit? And its supposed to be on the other pull request. This one is closed

tomaswolfgang added 5 commits July 18, 2016 17:23

Centralizing adding courses

919dba2

Made all complementary courses appear on the same modal with mdl tabs Adding complementary courses adds to selected semester!

Adds in Complementary/Elective Courses into the correct semester

eff69d2

Dynamically adds complementary/elective courses into semester Courses are removable/buttons work Reveal modal is centralized with tabs

credit counter increments upon adding complementary courses

e0619bd

tekaratzas reviewed Jul 21, 2016
View reviewed changes

tomaswolfgang added 3 commits July 22, 2016 17:21

fixed back end bug on new user registration

a513a43

I accidentally had an incorrect variable name! Also added a check if there exists complementary courses before adding them

Adding required courses from course modal

ada4b4c

Removed the required section at the very bottom Added a new required tab to the course modal ability to add required courses

Fixed bug that modal wouldn't appear if course count was 0

5ade92f

NOTE: we need to expand how the complementary/elective courses are parsed (from the SET_TEXT_ENGLISH)

tekaratzas reviewed Jul 23, 2016
View reviewed changes

tomaswolfgang added 2 commits July 23, 2016 21:46

All the Course tabs are generated from a loop in the php

75e2235

composer lock update

51dcb8f

tekaratzas reviewed Jul 24, 2016
View reviewed changes

Minor improvements

791f81a

Tab is removed if it is empty Add button is centered and at the top for ease of access Add course button added to exemption semester Re-adds header and course if all courses in a single groups are added then a single one is removed

tekaratzas reviewed Jul 25, 2016
View reviewed changes

tomaswolfgang added 2 commits July 25, 2016 20:12

Removable required courses!

e25daca

Required courses are now removable (they appear in a required tab in the modal after being removed)

tekaratzas merged commit 2ca8794 into dev Jul 26, 2016

Conversation

tomaswolfgang commented Jul 20, 2016 • edited by tekaratzas Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tekaratzas commented Jul 21, 2016

Uh oh!

tekaratzas Jul 21, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tekaratzas commented Jul 21, 2016

Uh oh!

tristanrenondin commented Jul 21, 2016

Uh oh!

tekaratzas commented Jul 22, 2016

Uh oh!

tekaratzas commented Jul 23, 2016

Uh oh!

tekaratzas Jul 23, 2016

Choose a reason for hiding this comment

Uh oh!

tekaratzas Jul 24, 2016

Choose a reason for hiding this comment

Uh oh!

tekaratzas Jul 25, 2016

Choose a reason for hiding this comment

Uh oh!

tekaratzas commented Jul 25, 2016

Uh oh!

tekaratzas commented Jul 26, 2016

Uh oh!

tomaswolfgang commented Jul 27, 2016

Uh oh!

tekaratzas commented Jul 30, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

tomaswolfgang commented Jul 20, 2016 •

edited by tekaratzas

Loading

tekaratzas Jul 21, 2016 •

edited

Loading