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.

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: remove expired proposals for instrument scientists #650

Merged
Merged
Changes from 3 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
8f7feef
Remove expired proposals for instrument scientists
ellen-wright Jul 9, 2024
dfffdf3
Merge branch 'develop' into 1089-remove-expired-proposals-for-instrum…
ellen-wright Jul 9, 2024
7b1ec33
Merge branch 'develop' into 1089-remove-expired-proposals-for-instrum…
ellen-wright Jul 9, 2024
6b295fa
Add filter to remove proposals of given status
ellen-wright Jul 17, 2024
39d862a
Merge branch '1089-remove-expired-proposals-for-instrument-scientists…
ellen-wright Jul 17, 2024
b34f5cd
Merge branch 'develop' into 1089-remove-expired-proposals-for-instrum…
ellen-wright Jul 17, 2024
9245c8e
Remove unneeded sql
ellen-wright Jul 17, 2024
b4dff39
Merge branch '1089-remove-expired-proposals-for-instrument-scientists…
ellen-wright Jul 17, 2024
aab5995
Remove status filter from frontend
ellen-wright Jul 19, 2024
4e7243c
Merge branch 'develop' into 1089-remove-expired-proposals-for-instrum…
ellen-wright Jul 19, 2024
bd2fb83
Merge branch 'develop' into 1089-remove-expired-proposals-for-instrum…
ellen-wright Jul 23, 2024
41e383c
Merge branch 'develop' into 1089-remove-expired-proposals-for-instrum…
ellen-wright Jul 24, 2024
fd67f00
Merge branch 'develop' into 1089-remove-expired-proposals-for-instrum…
ellen-wright Jul 26, 2024
2453863
Merge branch 'develop' into 1089-remove-expired-proposals-for-instrum…
ellen-wright Aug 7, 2024
ab70821
Fix lint error
ellen-wright Aug 7, 2024
3be132b
Merge branch 'develop' into 1089-remove-expired-proposals-for-instrum…
ellen-wright Aug 7, 2024
c57f06f
Merge branch 'develop' into 1089-remove-expired-proposals-for-instrum…
ellen-wright Aug 8, 2024
f8b3f82
Merge branch 'develop' into 1089-remove-expired-proposals-for-instrum…
ellen-wright Aug 8, 2024
f6bcde5
Merge branch 'develop' into 1089-remove-expired-proposals-for-instrum…
ellen-wright Aug 9, 2024
6ae108a
Hide Expired status from filter
ellen-wright Aug 12, 2024
876b694
Merge branch '1089-remove-expired-proposals-for-instrument-scientists…
ellen-wright Aug 12, 2024
bcf7c5c
Merge branch 'develop' into 1089-remove-expired-proposals-for-instrum…
ellen-wright Aug 12, 2024
4496d74
Merge branch 'develop' into 1089-remove-expired-proposals-for-instrum…
mutambaraf Aug 15, 2024
0000d74
Merge branch 'develop' into 1089-remove-expired-proposals-for-instrum…
ellen-wright Aug 19, 2024
580ae30
Merge branch 'develop' into 1089-remove-expired-proposals-for-instrum…
ellen-wright Aug 19, 2024
52d0338
Merge branch 'develop' into 1089-remove-expired-proposals-for-instrum…
ellen-wright Aug 20, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ export default class StfcProposalDataSource extends PostgresProposalDataSource {
.from('proposal_table_view')
.whereIn('proposal_pk', proposals)
.orderBy('proposal_pk', 'desc')
.where('proposal_status_id', '<>', '9')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this be made to be a filter rather than hardcoding it we can pass a list of status which must be excluded

.modify((query) => {
if (filter?.text) {
query.where(function () {
Expand Down
Loading