-
Notifications
You must be signed in to change notification settings - Fork 2
Dec25 update #1212
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
Open
Jennit07
wants to merge
61
commits into
master
Choose a base branch
from
dec25-update
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Dec25 update #1212
Conversation
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
Although the checks passed, I noticed the document.yaml workflow was failing on the smr-cost-uplift branch. It looks like this issue is also present in the master and dec25-update branches when I checked the document workflow in the actions tab for those branches too. I inspected the error and it was a git push rejection. This happened because the workflow's automated git-auto-commit-action tried to push documentation updates, but the remote branch on GitHub already had newer commits. To fix this, I've committed a change to the document.yaml workflow. The solution was to add a step to git pull the latest changes from the remote branch before the auto-commit action runs. This ensures the workflow is always working on the most up-to-date version of the branch and can push its changes without conflict. The workflow should now run and pass correctly. Let me know if you have any questions.
Reverting changes as it failed because of an overall changed workflow
Created a function to uplift costs at extract stage. Applied the uplift to relevant recids (00B, 01B, 02B, 04B, AE2).
SC extract tests issue #1185 Two issues are fixed in this pull request: 1. The way we count client number is count distinct anon_chi. Lots of clients have only social_care_id and no anon_chi. So the number is less. AT, CH, HC, SDS, clients are all affected. This is fixed by considering distinct social_care_id alongside distinct anon_chi 2. n_missing_chi shows 1 in the sc extract tests. This is because we calculate distinct anon_chi and therefore all NAs are regarded as 1 (distinct). To fix this, the sum of NAs is first calculated and this is used in the process tests comparison table, therefore showing the correct number of n_missing_chi.
* Change order - aligns with sc methods * Move postcode code to own section * Add latest record flag notes from sc team * Style code * Move arrange to make it more clear this is done * Use SC methodology to select latest record flag * remove redundant code * sc: demog lookup by fy and align with sc slice demog graphics file by financial year and remove care home postcode, enforce 1chi to multi scid * sc: replace scid with latest grouped by anon_chi * sc: to adapt at with demog lookup * sc: to adapt ch with demog lookup * sc: to adapt hc with demog lookup * sc: to adapt sds with demog lookup * sc: to adapt join_sc_client with demog lookup use linking_id to link ep with sc_client information * Style code * Update documentation * bug fix for process_lookup_sc_demographics * update targets and join_sc_client() * update process_lookup_sc_demographics.R * Update documentation * remove latest_record_flag --------- Co-authored-by: jennit07 <Jennifer.Thom@phs.scot> Co-authored-by: Jennit07 <67372904+Jennit07@users.noreply.github.com> Co-authored-by: Oluwatobi Oni <Oluwatobi.Oni@phs.scot>
* Update new HL1 file path * Update HL1 workbook to include new cols * Style code
I have fixed the sink code block to export the console output to the correct directory making sure to close sink off when the process is complete or if code breaks due to error. I have tested it to make sure it works too.
Linking ID was dropped from the sc year specific extracts. This is required for joining on the client file. This PR should include them again
lizihao-anu
approved these changes
Dec 8, 2025
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.
Setting up this PR to merge the December 25 update branch into master. We can leave this open until the SLFs are released.