Skip to content
Snippets Groups Projects

Enhancement/subject table changes

Merged Carlos Vega requested to merge enhancement/subject_table_changes into master
All threads resolved!

Change log:

  • Added scroll on the X axis when subjects table is too wide. #240 (closed)
  • Added custom sort for screening number column and added tests. #207 (closed)
  • Removed search box from table. 0077b28d
  • Changed the order of operations in smash/web/api_views/subject.py:subjects f6f32d46

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • custom sort for screening number column doesn't work when screening number exceeds 3 digits (this is already the case in production)scheduling_system

  • Piotr Gawron assigned to @carlos.vega

    assigned to @carlos.vega

  • Piotr Gawron resolved all discussions

    resolved all discussions

  • Okey, can we assure that the format will always be <letter>-<number> ? This way I can add further process to sort by the number after sorting by letter. No problem on that. As soon as I get it I will push it to the branch.

  • Carlos Vega added 2 commits

    added 2 commits

    • e046489e - update function to consider numeric value of the screening number. Issue #204 (closed)
    • b0db6bae - matched part it's now highlighted to facilitate reading.

    Compare with previous version

  • Numerical sort instead of lexicographic sort

    Screenshot_2018-09-28_at_17.43.05

    Screenshot_2018-09-28_at_17.43.12

    Highlight of the matching part

    Screenshot_2018-09-28_at_17.43.23

    Edited by Carlos Vega
  • Numerical sorting is not applied if there is no filter available. For me it's a bit inconsistent behavior.

  • Piotr Gawron assigned to @carlos.vega

    assigned to @carlos.vega

  • Carlos Vega added 1 commit

    added 1 commit

    • 47b22f88 - Changed function so the reminder is sorted as well. If no filter is provided…

    Compare with previous version

  • Carlos Vega added 1 commit

    added 1 commit

    • b4c8209c - Fixed problem in commit 47b22f88. Tests didn't fail on my machine. God save…

    Compare with previous version

  • Numerical sorting is not applied if there is no filter available. For me it's a bit inconsistent behavior.

    Now it should work as expected.

  • what about failing unit tests?

    They started to fail last week only in this branch

  • Piotr Gawron assigned to @carlos.vega

    assigned to @carlos.vega

  • Is strange, the tests pass in both Macs (I got the new one today), it's something regarding the locale of the mail template...

    Traceback (most recent call last):
      File "/builds/NCER-PD/scheduling-system/smash/web/tests/models/test_mail_template.py", line 98, in test_appointment_with_unicode_flying_team
        appointment_template_french.apply(appointment, self.user, stream)
      File "/builds/NCER-PD/scheduling-system/smash/web/models/mail_template.py", line 178, in apply
        with setlocale(locale_name.encode('utf8')):
      File "/usr/local/lib/python2.7/contextlib.py", line 17, in __enter__
        return self.gen.next()
      File "/builds/NCER-PD/scheduling-system/smash/web/models/mail_template.py", line 33, in setlocale
        yield locale.setlocale(locale.LC_TIME, name)
      File "/usr/local/lib/python2.7/locale.py", line 581, in setlocale
        return _setlocale(category, locale)
    Error: unsupported locale setting
  • merged

  • Piotr Gawron mentioned in commit b796570f

    mentioned in commit b796570f

  • Please register or sign in to reply
    Loading