diff --git a/src/components/dashboard/Dashboard.vue b/src/components/dashboard/Dashboard.vue index d16cf38f..335801c1 100644 --- a/src/components/dashboard/Dashboard.vue +++ b/src/components/dashboard/Dashboard.vue @@ -647,7 +647,7 @@ (item) => { if (parent === 'TestResults') return ( - item.field !== 'dateCreated' && + // item.field !== 'dateCreated' && item.field !== 'status' && item.field !== 'actions' && item.field !== 'addToTest' @@ -655,9 +655,9 @@ else return ( item.field !== 'testDate' && - item.field !== 'outputDate' && + // item.field !== 'dateCreated' && item.field !== 'groundTruth' && - item.field !== 'outputTest' && + item.field !== 'scores' && item.field !== 'addToTest' ); } @@ -1194,7 +1194,7 @@ export default { } return ( - column.field !== "dateCreated" && + //column.field !== "dateCreated" && column.field !== "status" && column.field !== "actions" ); @@ -1211,9 +1211,9 @@ export default { return ( column.field !== "testDate" && - column.field !== "outputDate" && + //column.field !== "dateCreated" && column.field !== "groundTruth" && - column.field !== "outputTest" && + column.field !== "scores" && column.field !== "status" && column.field !== "actions" ); @@ -1230,12 +1230,12 @@ export default { this.columns = this.columns.filter((column) => { return ( column.field !== "testDate" && - column.field !== "outputDate" && + //column.field !== "dateCreated" && column.field !== "unit" && column.field !== "externalSource" && column.field !== "workflowStep" && column.field !== "groundTruth" && - column.field !== "outputTest" && + column.field !== "scores" && column.field !== "actions" && column.field !== "addToTest" ); diff --git a/src/components/dashboard/DashboardFilters/DateFilter.vue b/src/components/dashboard/DashboardFilters/DateFilter.vue index 5f5a3bfc..1eb97a18 100644 --- a/src/components/dashboard/DashboardFilters/DateFilter.vue +++ b/src/components/dashboard/DashboardFilters/DateFilter.vue @@ -11,7 +11,7 @@ v-on:click="setFilterFlags" > {{ - label ? label : parent === "TestResults" ? "Output Date" : "Date range" + label ? label : parent === "TestResults" ? "Date" : "Date" }}
{{ new Date(rec.testDate) | LOCAL_DATE_VALUE }} - - - {{ new Date(rec.outputDate) | LOCAL_DATE_VALUE }} - + {{ rec.submitter }} {{ rec.unitName }} @@ -132,7 +132,7 @@ {{ rec.itemName }} {{ rec.primaryfileName }} {{ rec.outputName }} {{ rec.outputLabel }} {{ rec.groundTruth }} - - {{ rec.outputTest }} + + {{ rec.scores }} { dashboardColumns: [ { order: "a", label: "Date", field: "dateCreated" }, { order: "b", label: "Test Date", field: "testDate" }, - { order: "c", label: "Output Date", field: "outputDate" }, + //{ order: "c", label: "Output Date", field: "outputDate" }, { order: "d", label: "Submitter", field: "submitter" }, { order: "e", label: "Unit", field: "unit" }, { order: "f", label: "Collection", field: "collectionName" }, @@ -104,7 +104,7 @@ describe('Dashboard.vue', () => { { order: "m", label: "Output", field: "outputName" }, { order: "n", label: "Alias", field: "outputLabel" }, { order: "o", label: "Ground Truth", field: "groundTruth" }, - { order: "p", label: "Test Output", field: "outputTest" }, + { order: "p", label: "Test Scores", field: "scores" }, { order: "q", label: "Status", field: "status" }, { order: "r", label: "Actions", field: "actions" }, { order: "s", label: "Add to Test", field: "addToTest" },