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

BI-1548 - Experiments: User and Creation Date Refinement #296

Merged
merged 2 commits into from
Feb 2, 2023
Merged

BI-1548 - Experiments: User and Creation Date Refinement #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34ece8f
Populated date and created by columns in experiments table
nickpalladino Jan 20, 2023
89d4d5f
Added createdBy and createdDate filtering to experiments table
nickpalladino Jan 24, 2023
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
4 changes: 3 additions & 1 deletion src/breeding-insight/model/Sort.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,9 @@ export class GermplasmSort {
// experiments
export enum ExperimentSortField {
Name = "name",
Active = "active"
Active = "active",
CreatedBy = "createdBy",
CreatedDate = "createdDate"
}

export class ExperimentSort {
Expand Down
10 changes: 6 additions & 4 deletions src/components/experiments/ExperimentsObservationsTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@
<b-table-column label="Status" field="active" sortable v-slot="props" :th-attrs="(column) => ({scope:'col'})" >
{{ getStatus(props.row.data.active) }}
</b-table-column>
<b-table-column label="Date Created" sortable v-slot="props" :th-attrs="(column) => ({scope:'col'})">
{{ }}
<b-table-column label="Date Created" field="createdDate" sortable v-slot="props" :th-attrs="(column) => ({scope:'col'})" searchable>
{{ props.row.data.additionalInfo.createdDate }}
</b-table-column>
<b-table-column label="Created By" sortable v-slot="props" :th-attrs="(column) => ({scope:'col'})">
{{ }}
<b-table-column label="Created By" field="createdBy" sortable v-slot="props" :th-attrs="(column) => ({scope:'col'})" searchable>
{{ props.row.data.additionalInfo.createdBy.userName }}
</b-table-column>
<b-table-column label="Datasets" cell-class="fixed-width-wrapped" sortable v-slot="props" :th-attrs="(column) => ({scope:'col'})">
<template v-for="dataset in props.row.data.additionalInfo.datasets">
Expand Down Expand Up @@ -136,6 +136,8 @@ export default class ExperimentsObservationsTable extends Vue {
private fieldMap: any = {
'name': ExperimentSortField.Name,
'active': ExperimentSortField.Active,
'createdDate': ExperimentSortField.CreatedDate,
'createdBy': ExperimentSortField.CreatedBy
};

mounted() {
Expand Down