merge feature/COMP-152-EC-PROJECTS-TABLE into develop
2 unresolved threads
2 unresolved threads
Merge request reports
Activity
requested review from @saket.agrahari
assigned to @remco.tukker
- webapp/src/pages/ECProjects.tsx 0 → 100644
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]) => { changed this line in version 2 of the diff
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 } added 1 commit
- 551d61c2 - Refactor ECProjects page code a bit to make it more readable
added 7 commits
-
6ade0d08...dae43cc8 - 6 commits from branch
develop
- 2cb832de - Merge branch 'develop' into feature/COMP-152-EC-PROJECTS-TABLE
-
6ade0d08...dae43cc8 - 6 commits from branch
mentioned in commit aea63516
Please register or sign in to reply