Repository navigation
Conversation
…ffice-core into update-fapproposal-and-meeting-table
2 tasks
….com/UserOfficeProject/user-office-core into update-fapproposal-and-meeting-table
zacharyjhankin
self-requested a review
October 16, 2026 10:00
Collaborator
|
Hi I just want to say that this is an excellent pull request. This change will be a big improvement long term for us. I can assume that you would want to have the same change to the fap_reviews table where the PK will involve the fap_proposal_id? |
TCMeldrum
marked this pull request as ready for review
October 22, 2026 09:32
TCMeldrum
requested review from
Scott-James-Hurley
and removed request for
a team
October 22, 2026 09:32
…ffice-core into update-fapproposal-and-meeting-table
| > | ||
| {getFapCodeById(fmd.fapId)} - {t('FAP')} Meeting decision | ||
| (Instrument: {getInstrumentNameById(fmd.instrumentId)}) | ||
| (Instrument: {getInstrumentNameById(fmd.recommendedInstrumentId)}) |
Collaborator
There was a problem hiding this comment.
I am not against changing fmd.instrumentId to fmd.recommendedInstrumentId but I really think it would be easier to do that seperately in a different PR. This one can be the DB changes, and do that one later
Contributor
Author
|
I have updated the fmd table to be recommend instrument id. Its a just a rename with no other effects so hope thats ok to keep in. |
yoganandaness
self-requested a review
October 28, 2026 13:28
…ffice-core into update-fapproposal-and-meeting-table
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
This PR refactors and updates the FAP reviews and meetings tables to improve the data structure and relations (what).
Motivation and Context
The changes are necessary for better data integrity, optimizing the database structure, and improving the performance of data retrieval processes. This also making the link between the fap_proposal and fap_meetings tables more explicted and not based on the instrument as (at least at ISIS) want to be able to set a different instrument in the meeting than has been requested.
I have move the time allocation to the meeting table as it part of the final meeting form not part of the fap proposal. I have also updated the ui to reflect this.
Changes
recommended_time_allocationandfap_proposal_idin thefap_meeting_decisionstable and updated them based on existing data.meeting_status,meeting_notes, andmeeting_scorein thefap_meeting_decisionstable.recommended_time_allocationandinstrument_has_proposals_idfrom thefap_proposalstable.FapDataSourceinterface and its mock implementation to reflect the changes in the database schema (how).How Has This Been Tested?
Fixes Jira Issue
https://jira.ess.eu//browse/
Depends On
Tests included/Docs Updated?