Request integration of Modules Taken Before Internship feature #34

tgqiang · 2017-03-15T10:49:11Z

Changes implemented in this branch:

Back-end for this feature implemented by @nlzz22
Front-end for this feature is implemented
List of UI changes:
a) Added hyperlinking to module codes for pages for Non-Overlapping Modules, Modules Taken Prior To Others
b) Renaming, reordering for home page and sidebar links
c) Standardizing navigation options section for Module Information, Fixed and Tentative Module Mounting pages

…ementation of highlevel 4

…ans table

…ernship

…efore internship

…class to the main table element

…en Prior To Others page

…ping Modules page

…ship

…en prior to internship

…tern page

…istent style

…ormation page

… Prior To Internship page

…ternship feature

Conflicts: components/model.py

helloqx · 2017-03-16T17:01:26Z

app.py

@@ -40,7 +40,8 @@
    'components.handlers.students_affected_by_module.StudentsAffectedByModule',
    '/addModule', 'components.handlers.add_module_handler.AddModule',
    '/moduleTakenPriorToOthers', 'components.handlers.module_taken_prior_to_others.TakePriorTo',
-    '/nonOverlappingModules', 'components.handlers.non_overlapping_modules.NonOverlappingModules'
+    '/nonOverlappingModules', 'components.handlers.non_overlapping_modules.NonOverlappingModules',
+    '/moduleTakenPriorToInternship', 'components.handlers.modules_taken_prior_to_internship.TakePriorInternship'


pylint: Line too long

I think this pylint issue should be ignored to make reading and modifying of the routes more easily.

helloqx · 2017-03-16T17:02:05Z

components/handlers/modules_taken_prior_to_internship.py

+        # will have input data as function is called from button
+        input_data = web.input()
+        ay_sem = input_data.sem
+        raise web.seeother('/moduleTakenPriorToInternship?sem=' + ay_sem)


pylint: Missing final newline

helloqx · 2017-03-16T17:03:18Z

test/test_app.py

        response = root.click(linkid="home-page", href="/nonOverlappingModules")
+


pylint: Trailing whitespace

helloqx

a) Added hyperlinking to module codes for pages for Non-Overlapping Modules, Modules Taken Prior To Others ✅

b) Renaming, reordering for home page and sidebar links ✅
See other comments

c) Standardizing navigation options section for Module Information, Fixed and Tentative Module Mounting pages ✅
Not urgent, but this box is pretty too huge

helloqx · 2017-03-16T17:07:47Z

templates/modulesTakenPriorToInternship.html

+    </div>
+	<br>
+
+	<table class="table display dataTable table-bordered table-hover text-center" id="modules-taken-prior-intern-table">


Should table be sortable?

Also, when no data, vs when data exists, column sizes vary greatly:

Should table be sortable?

Well it depends on what the users are looking for.
If they only want a list of modules, ignoring the number of students, sorting by module code/name will make it easier for them to check with their own list of modules.

If they want to consider the number of students as the primary concern, then sorting by number of students should be allowed.

Also, when no data, vs when data exists, column sizes vary greatly:

If really needed, I can try to find a fix for this (although this will NOT be in the priority list for UI fixes).

Should table be sortable?

Yeah, right now the table does not have sort/search, unlike the other pages

Really? The sortings exist on my side.

😱 appeared after resetting again
Resolved

helloqx · 2017-03-16T17:14:51Z

templates/base.html

-					   <li><a href="#">Before Specified Module</a></li>
-				        <li><a href="#">Before Internship</a></li>
-				    </ul-->
+					<li><a href="javascript:void(0)">Prior Modules Taken</a></li>


Useless link that closes sidebar, consider disabling

Sidebar will be redesigned at one of the refinement sprints. Please raise an issue in Github for this UI issue.

…modify into modsBeforeInternship

a0129998

Minor changes requested

bold all modules in description of module information to match the style of fixed module mountings and tentative module mountings
swap button value and tooltip of the buttons tentative module mountings and fixed module mountings

a0129998

Requested changes fulfilled, all functionalities implemented work as expected,

tgqiang and others added 29 commits March 14, 2017 14:00

Adjusted sidebar link color and styling for better contrast

b416816

Added more data to be populated to studentplans table to support impl…

39d8c0b

…ementation of highlevel 4

Fixed test case which crashes upon populating more data for studentpl…

14b26b0

…ans table

Merge remote-tracking branch 'origin/sprint4uibranch' into sprintFiveGq

2e52de5

Merge remote-tracking branch 'origin/sprint4uibranch' into sprintFiveGq

15e3a58

Merge remote-tracking branch 'origin/sprint4uibranch' into sprintFiveGq

a749642

Added test case for getting list of modules students taken before int…

05d05b6

…ernship

Implemented backend code for getting list of modules students taken b…

1483290

…efore internship

Replaced 'text-center' classes in 'td' elements and transferred that …

086865b

…class to the main table element

Added hyperlinking to view-module page on module codes in Modules Tak…

9dac4b9

…en Prior To Others page

Added hyperlinking to view-module page on module codes in Non-Overlap…

058c910

…ping Modules page

Added basic html page for getting list of modules taken before intern…

24084ea

…ship

Removed unused import from modules_taken_prior_to_internship.py file

4e05241

Added links from sidebar and homepage to the page to get all mods tak…

0ed83b9

…en prior to internship

Added javascript for datatables sorting for modules taken prior to in…

656119c

…tern page

Changed navigations for module information and mountings page to cons…

1e01e91

…istent style

Modified test case to reflect change in button styling for module inf…

d8f8b40

…ormation page

Merge remote-tracking branch 'origin/sprint4uibranch' into sprintFiveGq

7f8506e

Removed duplicate 'Non-Overlapping Modules' link in sidebar

f4d176b

Renamed links for view mountings (fixed and tentative) pages

596b550

Resolve merge conflict from pulling from highlevel4 branch

67adc4c

Added selection of AY-Sem for Modules Taken Prior To Internship page

3e4b357

Added new case to accomodate for error redirection from Modules Taken…

d8753a9

… Prior To Internship page

Added UI for Modules Taken Prior To Internship feature

e00c42d

Added test case for Modules Taken Prior To Internship page

40d189a

Renamed backend test file for Modules Taken Prior To Internship feature

c3b2343

Updated test case after implementing UI for Modules Taken Prior To In…

8ce2a4e

…ternship feature

Fixed linting for handler for Modules Taken Before Internship page

4c1bb7b

Fixed linting for test_app.py

f50e925

tgqiang requested a review from helloqx March 15, 2017 10:49

tgqiang requested a review from a0129998 March 15, 2017 10:49

tgqiang mentioned this pull request Mar 15, 2017

Implement Frontend for High Level #4 #29

Closed

Merge branch 'integration' into modsBeforeInternship

1b19d79

Conflicts: components/model.py

helloqx reviewed Mar 16, 2017

View reviewed changes

test/test_app.py Outdated

response = root.click(linkid="home-page", href="/nonOverlappingModules")

Copy link

Contributor

helloqx Mar 16, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pylint: Trailing whitespace

helloqx reviewed Mar 16, 2017

View reviewed changes

Merge branch 'modsBeforeInternship' of https://github.com/nus-mtp/cs-…

b1485c3

…modify into modsBeforeInternship

a0129998 requested changes Mar 17, 2017

View reviewed changes

tgqiang added 3 commits March 17, 2017 22:38

Renamed module mountings navigation buttons

e30b0b3

Fixed tentative module mounting navigation button

64ca9d3

Renamed fixed module mounting navigation button

fccd50a

a0129998 approved these changes Mar 17, 2017

View reviewed changes

a0129998 merged commit 591f0d4 into integration Mar 17, 2017

a0129998 deleted the modsBeforeInternship branch March 17, 2017 14:50

a0129998 restored the modsBeforeInternship branch March 17, 2017 14:51

helloqx deleted the modsBeforeInternship branch March 17, 2017 14:55

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Request integration of Modules Taken Before Internship feature #34

Request integration of Modules Taken Before Internship feature #34

tgqiang commented Mar 15, 2017

helloqx Mar 16, 2017

tgqiang Mar 17, 2017

helloqx Mar 16, 2017

helloqx Mar 16, 2017

helloqx left a comment •

edited

Loading

helloqx Mar 16, 2017

helloqx Mar 16, 2017

tgqiang Mar 17, 2017

helloqx Mar 17, 2017 •

edited

Loading

tgqiang Mar 17, 2017

helloqx Mar 17, 2017

helloqx Mar 16, 2017

tgqiang Mar 17, 2017

helloqx Mar 17, 2017

a0129998 left a comment

a0129998 left a comment

		response = root.click(linkid="home-page", href="/nonOverlappingModules")

Request integration of Modules Taken Before Internship feature #34

Request integration of Modules Taken Before Internship feature #34

Conversation

tgqiang commented Mar 15, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

helloqx left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

helloqx Mar 17, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

a0129998 left a comment

Choose a reason for hiding this comment

a0129998 left a comment

Choose a reason for hiding this comment

helloqx left a comment •

edited

Loading

helloqx Mar 17, 2017 •

edited

Loading