Skip to content

Add homepage and improve assignment page

Bornemann, Henrik requested to merge feature/homepage into main

Features:

  • Export
  • Statistik
  • (Pre) Filter
  • Group Details
  • automatic Assignment
  • Error Summary
  • Unassigned groups List
  • locked slots
  • Assignment Modal

Commit log:

0cb11c6 - Terhörst, Lukas: Merge branch 'feature/toasties' into 'feature/homepage'
f3f5bc5 - Terhörst, Lukas: Feature/toasties
9652fff - Bornemann, Henrik: fixed broken searchbar closes #43
d7d120c - Bornemann, Henrik: fixed wrong merge
9957591 - Bornemann, Henrik: Merge remote-tracking branch 'origin/feature/32-user-statistic' into feature/homepage
a784e64 - Bornemann, Henrik: Merge remote-tracking branch 'origin/feature/9-scoring_31-fehlercounter' into feature/homepage
293c4c0 - Bornemann, Henrik: fixed merge problems
539a8fe - Bornemann, Henrik: Merge branch 'feature/35-title-href' into 'feature/homepage'
88f4306 - Bornemann, Henrik: WebpageTitle Weiterleitung
eef1c78 - Bornemann, Henrik: Merge branch 'feature/33-topic-hide-and-show' into 'feature/homepage'
fad2826 - Bornemann, Henrik: Topics Einklappbar
d968068 - Bornemann, Henrik: implemented feature
d3f1ad9 - Bornemann, Henrik: implemented feature removed old css from filter refactored method for getting all slot errors. updated filter handling with queue for fast changes
d170fb2 - Bornemann, Henrik: Merge branch 'feature/28-statistik-filter' into 'feature/homepage'
cefee48 - Bornemann, Henrik: Updated Filter Handling
ff2b2d4 - Bornemann, Henrik: Merge remote-tracking branch 'origin/userstudy-hotfix' into feature/homepage
7ab2d6a - LukasKlenner: fix searchbar again
907e554 - Jöst, Daniel: finalized db for user-study
8a90310 - Lukas: - Merged styles for both filters into one global style - Added a select / unselect all filters chip to each category to activate / deactivate only that category
24d3f2f - Lukas: - Select / unselect all for filters added - Fixed filter opens and closes immediately - Fixed preselected filters
3666550 - LukasKlenner: change color of unselected filters; fix free slot count; add filter button
a2c5437 - LukasKlenner: cleanup filters
f70a4e7 - LukasKlenner: highlight selected group in applications modal
a525e5d - LukasKlenner: sort group details by the priorities of the application
6c56b72 - Lukas: Unfinished filter modal
2dffe46 - LukasKlenner: fix searchbar
8309cf9 - Lukas: home.html:  - set auto assignment button to display none for user study assignment.html:  - changed name for assignment home page button to home page  - fixed group details reload when opening directly from url  - added info icon to choices in group
 details models.py  - changed displayed text for better understanding
e84cc38 - LukasKlenner: add database for user study
6fb8951 - Terhörst, Lukas: Merge branch '23-statistik-fenster' into 'feature/homepage'
091691e - Terhörst, Lukas: Resolve "Statistik Fenster"
63d7cc2 - Lukas: Written deployment instructions and changed some relevant scripts for that
32f9292 - Jöst, Daniel: Merge branch 'feature/27-gelockte-slots-und-assignments' into 'feature/homepage'
4d7a3d9 - Jöst, Daniel: 27 - Gelockte Slots und Assignments
9c260cb - Bornemann, Henrik: fixed algorith for topics with multiple slots
22cfe42 - Jöst, Daniel: Merge branch 'feature/13-new-page-out-of-popup' into 'feature/homepage'
d12df43 - Jöst, Daniel: forwarding to additional page showing groupinfo
8a891c9 - Jöst, Daniel: Merge branch 'feature/16-filterauswahl' into 'feature/homepage'
e812d48 - Terhörst, Lukas: Prefilter for assignment page
39bd515 - Bornemann, Henrik: Merge branch 'feature/18-fehlerauflistung' into 'feature/homepage'
7f53bb6 - Bornemann, Henrik: Fehlerauflistung
f27d621 - Bornemann, Henrik: updated gitignore to include migrations. pushed fixed databases added migrations
72a6006 - Jöst, Daniel: fixed export selection
9948508 - Jöst, Daniel: Merge remote-tracking branch 'origin/feature/3-export-filtered' into feature/homepage
7a5836a - Jöst, Daniel: removed dead code
d735702 - Bornemann, Henrik: Merge remote-tracking branch 'origin/feature/homepage' into feature/homepage
f919cfa - Bornemann, Henrik: small improvements
2c8fd35 - Bornemann, Henrik: small improvements
8123eef - Klenner, Lukas: Merge branch 'feature/17-statistik' into 'feature/homepage'
34c55ba - Klenner, Lukas: add assignment statistic to homepage
11a7c95 - Jöst, Daniel: Merge branch 'feature/19-algorithm' into 'feature/homepage'
1d1361a - Bornemann, Henrik: Algorithm for automatic assignments
6b061e4 - LukasKlenner: cleanup of previous merge
c7356c8 - Klenner, Lukas: Merge branch 'feature/13-gruppendetails-minipage-rechts' into 'feature/homepage'
b5ab697 - Terhörst, Lukas: Group details minipage and assignment modal
6fde23a - Jöst, Daniel: extended the export function to support an export filtered by faculty
7d83ac6 - Bornemann, Henrik: Merge branch 'feature/14-Gruppenzuweisungsinfo' into 'feature/homepage'
8d3ec22 - Bornemann, Henrik: Gruppenzuweisungsinfo
c29083b - Jöst, Daniel: Merge branch 'feature/3-fix-export' into 'feature/homepage'
4e3abbb - Jöst, Daniel: Export
52e4b6f - LukasKlenner: add tests for filter
cb99476 - LukasKlenner: re-add old test for assignment view
e906f7b - Jöst, Daniel: fixed the export to match the new database structure
ad1c48d - Klenner, Lukas: Merge branch 'feature/15-filter' into 'feature/homepage'
eb6c3b3 - Klenner, Lukas: Feature/15 filter
f9410ad - Jöst, Daniel: Merge branch 'feature/3-export' into feature/homepage
7f58887 - Jöst, Daniel: updated header layout, added block to display additional content; implemented export for the manual assignment; added new page for the filedownload (added page in pages folder, added new view in views.py and added new url in urls.py); added 
class TopicSelectionResource in admin.py to format the data in preparation of the download
e24a31d - Jöst, Daniel: updated header layout, added block to display additional content; implemented export for the manual assignment; added new page for the filedownload (added page in pages folder, added new view in views.py and added new url in urls.py); added 
class TopicSelectionResource in admin.py to format the data in preparation of the download
b5729f7 - Jöst, Daniel: updated header layout, added block to display additional content; implemented export for the manual assignment; added new page for the file download (added page in pages folder, added new view in views.py and added new url in urls.py); added
 class TopicSelectionResource in admin.py to format the data in preparation of the download
f81698a - Bornemann, Henrik: Merge branch 'main' into feature/homepage
ed865cf - Bornemann, Henrik: edited gitignore
a8c71e3 - Bornemann, Henrik: Merge branch '7-drag-and-drop-rework' into 'main'
61df746 - Bornemann, Henrik: reworked drag and drop
ee71466 - Bornemann, Henrik: Merge branch '7-drag-and-drop' into 'main'
2865ec2 - Bornemann, Henrik: fix broken git history
e0e8cc5 - LukasKlenner: revert changes in frontend and requirements.txt
Edited by Klenner, Lukas

Merge request reports