Skip to content

Conversation

@Jennit07
Copy link
Collaborator

@Jennit07 Jennit07 commented Dec 8, 2025

Setting up this PR to merge the December 25 update branch into master. We can leave this open until the SLFs are released.

OluwatobiOni and others added 30 commits September 23, 2025 07:37
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.
@Jennit07 Jennit07 requested a review from lizihao-anu December 8, 2025 10:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants