Skip to content
Snippets Groups Projects

merge feature/COMP-152-EC-PROJECTS-TABLE into develop

Merged Bjarke Madsen requested to merge feature/COMP-152-EC-PROJECTS-TABLE into develop
2 unresolved threads

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
55 const nrenData = ecProjectsForYear.get(project.nren) || [];
56 nrenData.push(project);
57 ecProjectsForYear.set(project.nren, nrenData);
58
59 });
60
61 function nrensort(a: ECProject, b: ECProject) {
62 const byNREN = a.nren < b.nren ? -1 : a.nren > b.nren ? 1 : 0;
63 const byYear = a.year < b.year ? -1 : a.year > b.year ? 1 : 0;
64 return byYear || byNREN;
65 }
66
67 // sort projectDataByYear by year and nren, maps keep insertion order
68 projectDataByYear.forEach((nrenData, year) => {
69 const sortedNrenData = new Map<string, ECProject[]>();
70 [...nrenData.entries()].sort((a, b) => nrensort(a[1][0], b[1][0])).forEach(([nren, projects]) => {
  • 140 --bs-btn-disabled-bg: #0d6efd;
    141 --bs-btn-disabled-border-color: #0d6efd
    142 142 }
    143 143
    144 144 .fit-max-content {
    145 145 min-width: max-content;
    146 146 }
    147
    148 .table-bg-highlighted {
    149 tr:nth-child(even) {
    150 background-color: rgba(102, 121, 139, 0.178);
    151 }
    152
    153 tr:hover {
    154 background-color: rgba(102, 121, 139, 0.521);
    155 }
  • Remco Tukker approved this merge request

    approved this merge request

  • Bjarke Madsen added 1 commit

    added 1 commit

    • 551d61c2 - Refactor ECProjects page code a bit to make it more readable

    Compare with previous version

  • Bjarke Madsen added 1 commit

    added 1 commit

    • d29aa29a - nren is unique by itself when keyed

    Compare with previous version

  • Bjarke Madsen added 2 commits

    added 2 commits

    • f2ae0a7b - 1 commit from branch develop
    • 6ade0d08 - Merge branch 'develop' into feature/COMP-152-EC-PROJECTS-TABLE

    Compare with previous version

  • Bjarke Madsen added 7 commits

    added 7 commits

    Compare with previous version

  • Bjarke Madsen mentioned in commit aea63516

    mentioned in commit aea63516

  • merged

  • Please register or sign in to reply
    Loading