Renaming v2 by sarasoko · Pull Request #1025 · abtassociates/eva

sarasoko · 2026-07-06T19:35:11Z

branch for renaming scripts

Please make suggestions if you don't like how I classified the numbering of the servers to correspond with the back end scripts (01-07 and 08 reserved for bed unit inventory)

I made a few name changes that weren't exclusively server scripts:

01_get_Export.R -> 01_get_export.R
05_DataQuality.R -> 05_data_quality.R
06_PDDE_Checker.R -> 06_PDDE_checker.R
helper_functions.R -> functions_00_helper.R
system_performance_functions.R -> functions_07_system_performance.R

To clean up the organization I would additionally suggest that we

move 'hardcodes.R' into 'global.R' (or functionalize into functions_00_helper.R)
move 'eva_chart_colors.R' into 'global.R' (or functionalize into functions_00_helper.R)
rename or eliminate (by moving into another script) 'detect_invalid_values.R' ( I couldn't find where this gets run but it's not functionalized)
move 'demo.zip' into 'tests' folder (with other test zip files)
move 'system_pptx_template.pptx' into 'www' folder (with other downloadable content like the glossary and excel download template)
maybe rename 'tab_instructions.R' but not sure to what since it's front end. This could also be moved into global.R

- for merging, leave out client_level_export_server.R which didn't get recognized as a file renaming and instead added a new file and deleted the old one

- this time it properly recognized this rename instead of adding the new file and deleting the old file

- resolve conflicts in those files and add renaming of additional files that get called from 'server' -- system_exits_server.R -> server_07.4_system_exits.R -- syse_types_server.R -> server_07.4.1_syse_types.R -- syse_time_server.R -> server_07.4.2_syse_time.R -- syse_subpop_server.R -> server_07.4.3_syse_subpop.R -- syse_phd_server.R -> server_07.4.4_syse_phd.R - Additionally rename functipn scripts -- system_performance_functions -> functions_07_system_performance.R -- helper_functions.R -> functions_00_helper.R - and rename how they are called in 'server' and 'global'

sarasoko · 2026-07-09T18:53:46Z

move 'hardcodes.R' into 'global.R' (or functionalize into functions_00_helper.R)

move 'eva_chart_colors.R' into 'global.R' (or functionalize into functions_00_helper.R)

more scripts rather than condensing
directory 'utilities'

rename or eliminate (by moving into another script) 'detect_invalid_values.R' ( I couldn't find where this gets run but it's not functionalized)

Alex to rename in his branch

move 'demo.zip' into 'tests' folder (with other test zip files)

not just a 'test' so rather move to new 'utilities' folder

move 'system_pptx_template.pptx' into 'www' folder (with other downloadable content like the glossary and excel download template)

www is a common rshiny path method

maybe rename 'tab_instructions.R' but not sure to what since it's front end. This could also be moved into global.R

directory 'utilities'

move the powerpoint template into the 'www' subdirectory

…ere()' to get subdirectory paths in new folders 'utilities' and 'rcode'

…ed counterpart! Merge branch 'dev' into renaming_v2 # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.

update server_01_upload - to remove logToConsole which I added during troubleshooting - add more sections in function 'process_upload' - uncomment out the browser() line on errors in the mirai call (process_upload)

…r_01_upload.R

…est_datasets.R' update filepath to power point template in 'functions_07_system_performance.R'

This branch shouldn't have any changes except renaming things and updating the filepaths

changes were mapped to the proper renamed/moved file Merge branch 'dev' into renaming_v2 # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.

mlfurman3 · 2026-07-15T19:29:28Z

@sarasoko A few suggested edits, but open to others' thoughts on these:

Can we just source all of the util subfolder scripts at once in global.R?
I would switch the order of server_07_... scripts to match this hierarchy and order them in same way as tabs from left to right:
- System Overview: server_07.1_system_overview.R
  - system status: server_07.1.1_system_status.R
  - system inflow/outflow: server_07.1.2_system_inflow_outflow.R
  - system composition: server_07.1.3_system_composition_server.R
- System Exits: server_07.2_system_exits.R
  - exits by type: server_07.2.1_syse_types.R
  - exits by year: server_07.2.2_syse_time.R
  - exits by subpop: server_07.2.3_syse_subpop.R
  - ph demographics: server_07.2.4_syse_phd.R

all changes seem properly mapped to the renamed/moved files Merge branch 'dev' into renaming_v2 # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.

# functions_00_helper.R -> helper_functions.R - moved from `rcode` to `util` # functions_07_system_performance.R -> server_07.0_system_performance.R # renumber server_07 scripts according to Marschall's suggestion

# functions_00_helper.R -> helper_functions.R - moved from `rcode` to `util` # functions_07_system_performance.R -> server_07.0_system_performance.R # renumber server_07 scripts according to Marschall's suggestion Code Changes # global.R - source all files ending in .R or .r from the `util` folder - in the mirai section, update loading helper_functions to new name and location # server.R - update server renaming and order

…to renaming_v2

- remove unnecessary sourcing helper functions (this was misc added when trying to troubleshoot issues in mirai sourcing)

- update name and location of helper_functions.r

# 07_system_overview.R -> 07_system_performance.R # server_06.1_client_level_export.R -> server_07.0_system_performance_export.R # server_06_client_counts.R -> server_06_project_dashboard.R # server.R & server_01_upload.R - update names of scripts being sourced

Sara Sokolinski added 4 commits July 6, 2026 14:34

cherry pick re-naming from my old brack

62d6bb9

- for merging, leave out client_level_export_server.R which didn't get recognized as a file renaming and instead added a new file and deleted the old one

re-implement renaming of client_level_export_server.R

3fb084b

- this time it properly recognized this rename instead of adding the new file and deleting the old file

Rename back end scripts be in lowercase snake case

74af84e

sarasoko requested review from alex-silverman and mlfurman3 July 6, 2026 19:35

Sara Sokolinski added 8 commits July 10, 2026 14:14

create subdirectories 'utilities' and 'rcode' and move files into them

6e73ce1

move the powerpoint template into the 'www' subdirectory

update 'gobal.R', 'server.R' and 'rcode/server_01_upload.R' to use 'h…

8f17bb3

…ere()' to get subdirectory paths in new folders 'utilities' and 'rcode'

rename utilities folder to util and update file sourcing in global.R

646033d

update server_01_upload - to remove logToConsole which I added during troubleshooting - add more sections in function 'process_upload' - uncomment out the browser() line on errors in the mirai call (process_upload)

update file paths for demo.zip on server_00_demo_management.R & serve…

cb0f7c5

…r_01_upload.R

update filepaths/names to helper functions and hardcodes in 'create_t…

65d8207

…est_datasets.R' update filepath to power point template in 'functions_07_system_performance.R'

reverse a delete that must have been an accident.

43443b2

This branch shouldn't have any changes except renaming things and updating the filepaths

Sara Sokolinski added 7 commits July 16, 2026 12:41

Renamings & reorgs

fcd1d7e

# functions_00_helper.R -> helper_functions.R - moved from `rcode` to `util` # functions_07_system_performance.R -> server_07.0_system_performance.R # renumber server_07 scripts according to Marschall's suggestion

Merge branch 'renaming_v2' of https://github.com/abtassociates/eva in…

4ab7122

…to renaming_v2

# server_01_upload.R

32d7579

- remove unnecessary sourcing helper functions (this was misc added when trying to troubleshoot issues in mirai sourcing)

# create_test_datasets.R

90ca7fd

- update name and location of helper_functions.r

Renaming

3168c70

# 07_system_overview.R -> 07_system_performance.R # server_06.1_client_level_export.R -> server_07.0_system_performance_export.R # server_06_client_counts.R -> server_06_project_dashboard.R # server.R & server_01_upload.R - update names of scripts being sourced

Navigation Menu

Uh oh!

Renaming v2 - #1025

Renaming v2#1025
sarasoko wants to merge 19 commits into
devfrom
renaming_v2

sarasoko commented Jul 6, 2026

Uh oh!

sarasoko commented Jul 9, 2026

Uh oh!

mlfurman3 commented Jul 15, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

sarasoko commented Jul 6, 2026

Uh oh!

sarasoko commented Jul 9, 2026

Uh oh!

mlfurman3 commented Jul 15, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants