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

Jump to bottom

[ch22143] Remove SSFA from filter #1491

Open
wants to merge 2 commits into
base: epd
Choose a base branch
from
Open

[ch22143] Remove SSFA from filter #1491

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cf326a
removed ssfa from new pd and doc types
laza88 Oct 6, 2020
2626e5b
Merge branch 'epd' into fix--remove-ssfa-type
acory Oct 7, 2020
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
2 changes: 1 addition & 1 deletion src_ts/components/app-modules/interventions/interventions-module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ class InterventionsModule extends connect(store)(
<div slot="page-title">
<template is="dom-if" if="[[listActive]]"> PD/SPDs </template>
<template is="dom-if" if="[[newPageActive]]">
<span class="no-capitalization"> Add Programme Document or SSFA </span>
<span class="no-capitalization"> Add Programme Document </span>
</template>
<template is="dom-if" if="[[tabsActive]]">
<span>
Expand Down
28 changes: 10 additions & 18 deletions src_ts/components/app-modules/interventions/pages/list/interventions-list.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,7 @@ class InterventionsList extends connect(store)(
Filters
</paper-button>
<div slot="dropdown-content" class="clear-all-filters">
<paper-button on-tap="clearAllFilterValues" class="secondary-btn">
CLEAR ALL
</paper-button>
<paper-button on-tap="clearAllFilterValues" class="secondary-btn"> CLEAR ALL </paper-button>
</div>
<paper-listbox slot="dropdown-content" multi>
<template is="dom-repeat" items="[[listFilterOptions]]">
Expand All @@ -173,21 +171,11 @@ class InterventionsList extends connect(store)(
<etools-data-table-column class="col-3" field="partner_name" sortable>
Partner Name
</etools-data-table-column>
<etools-data-table-column class="flex-c" field="document_type">
Document Type
</etools-data-table-column>
<etools-data-table-column class="flex-c" field="status">
Status
</etools-data-table-column>
<etools-data-table-column class="col-2" field="title">
Title
</etools-data-table-column>
<etools-data-table-column class="flex-c" field="start" sortable>
Start Date
</etools-data-table-column>
<etools-data-table-column class="flex-c" field="end" sortable>
End Date
</etools-data-table-column>
<etools-data-table-column class="flex-c" field="document_type"> Document Type </etools-data-table-column>
<etools-data-table-column class="flex-c" field="status"> Status </etools-data-table-column>
<etools-data-table-column class="col-2" field="title"> Title </etools-data-table-column>
<etools-data-table-column class="flex-c" field="start" sortable> Start Date </etools-data-table-column>
<etools-data-table-column class="flex-c" field="end" sortable> End Date </etools-data-table-column>
</etools-data-table-header>

<template
Expand Down Expand Up @@ -460,6 +448,10 @@ class InterventionsList extends connect(store)(
}
if (!isJsonStrMatch(this.documentTypes, state.commonData!.interventionDocTypes)) {
this.documentTypes = [...state.commonData!.interventionDocTypes];
// remove after SSFA is removed from backend
this.documentTypes = this.documentTypes.filter((doc) => {
return doc.label !== 'SSFA' && doc.value !== 'SSFA';
});
}
if (!isJsonStrMatch(this.interventionStatuses, state.commonData!.interventionStatuses)) {
this.interventionStatuses = [...state.commonData!.interventionStatuses];
Expand Down