Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix sorting of Requirements table #82

Merged
merged 4 commits into from
Sep 12, 2022
Merged

fix sorting of Requirements table #82

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd8a880
fix sorting of Requirements table
eagr Sep 10, 2022
ccc6fe1
better section sorting
eagr Sep 10, 2022
cf1fa3e
desc-first ordering
eagr Sep 10, 2022
32b24bc
Merge branch 'main' into fix-sorting
camshaft Sep 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions www/src/spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,10 @@ export function Requirements({ requirements, showSection }) {
field: "section",
headerName: "Section",
valueGetter(params) {
return params.row.section.id;
return params.row;
},
sortComparator(v1, v2, row1, row2) {
return row1.row.cmp(row2.row);
eagr marked this conversation as resolved.
Show resolved Hide resolved
sortComparator(v1, v2) {
return v2.cmp(v1);
eagr marked this conversation as resolved.
Show resolved Hide resolved
},
renderCell(params) {
const requirement = params.row;
Expand Down Expand Up @@ -113,17 +113,15 @@ export function Requirements({ requirements, showSection }) {
field: "status",
headerName: "Status",
width: 150,
sortComparator(v1, v2, row1, row2) {
const a = requirementStatus(row1.row)[0];
const b = requirementStatus(row2.row)[0];
return b - a;
},
valueGetter(params) {
return requirementStatus(params.row) || [];
},
valueFormatter(params) {
return (params.value || requirementStatus(params.row))[1];
},
sortComparator(v1, v2) {
return v2[0] - v1[0];
},
cellClassName(params) {
const cls = (params.value || requirementStatus(params.row))[2];
return classes[cls];
Expand All @@ -135,7 +133,7 @@ export function Requirements({ requirements, showSection }) {
function listColumn(params) {
columns.push({
width: 150,
sortComparator(v1, v2, row1, row2) {
sortComparator(v1, v2) {
const a = v1.join(", ");
const b = v2.join(", ");
return a.localeCompare(b);
Expand Down Expand Up @@ -259,14 +257,16 @@ function StatsRow({ title, stats, ...props }) {
}

function requirementStatus(requirement) {
if (requirement.isComplete) return [1, "Complete", "success"];
if (requirement.isOk) return [2, "Exception", "info"];

if (requirement.isComplete)
return [1, "Complete", "success"];
if (requirement.isOk)
return [2, "Exception", "info"];
if (requirement.spec === requirement.citation)
return [4, "Missing test", "missingTest"];
if (requirement.spec === requirement.test)
return [5, "Missing citation", "missingCitation"];
if (requirement.todo) return [7, "Not started", "error"];
if (requirement.todo)
return [7, "Not started", "error"];
if (requirement.incomplete === requirement.spec)
return [8, "Unknown", "error"];

Expand Down