scottish benefit stuff

Author: grahamstark

Artifacts.toml

@@ -14,6 +14,14 @@ lazy = true
     sha256 = "7ed1e796fc2e09a4c48f772ea3cd06b7c6aab721c183f6905b2fa83890d0184b"
     url = "http://stb-artifacts/disability.tar.gz"
 
+[example_data]
+git-tree-sha1 = "cb37e530a22923314e5c8a7edc2a55b45783b7f9"
+lazy = true
+
+    [[example_data.download]]
+    sha256 = "c7baac717d0acddae5189cbf0a44ba45b7e7b4074387c51a9446ac6c6ccca02e"
+    url = "https://virtual-worlds.biz/artifacts//example_data.tar.gz"
+
 [exampledata]
 git-tree-sha1 = "7853136d3530ea531e4f45a29f8fcef81d08fc1c"
 lazy = true

data/example_data/example_people-w-enums.tab

@@ -50,14 +50,14 @@ You’ll be able to apply from 24 March 2025 if you live in: [most areas]
 > You do not need to do anything to start the move to Pension Age Disability Payment. 
 
 ## Carer Support Payment 
-
+https://www.mygov.scot/carer-support-payment
 maps to Carer's Allowance
 
 > Some people’s benefits have already moved to Social Security Scotland. The process started in February 2024. It’ll take until spring 2025 to move everyone’s benefits across.
 
 (not in FRS)
 
-Carers_Allowance = 13
+Carers_Allowance = 13 => CARERS_SUPPORT_PAYMENT => carers_support_payment = 2029
 
 ## CHILD DLA FUCKUP
 
@@ -104,3 +104,15 @@ mpers[(mpers.income_dlamobility.>0).&(mpers.income_personal_independence_payment
 27 cases in pooled UK dataset
 
 ```
+
+## Carer's Allowance Supplement
+
+https://www.mygov.scot/carers-allowance-supplement
+
+SCOTTISH_CARERS_SUPPLEMENT => carers_allowance_supplement => SCOTTISH_CARERS_SUPPLEMENT
+
+Carer's Allowance Supplement is an extra payment for people in Scotland who get Carer Support Payment or Carer's Allowance on a particular date.
+
+Carer's Allowance Supplement is paid 2 times a year.
+
+The Carer’s Allowance Supplement 2025 eligibility dates will be available soon.

docs/scottish-benefit-notes-2025.md

@@ -97,7 +97,7 @@
     STUDENT_LOANS = 92
     COUNCIL_TAX_BENEFIT = 93
     CONTRIB_EMPLOYMENT_AND_SUPPORT_ALLOWANCE = 94
-    SCOTTISH_CARERS_SUPPLEMENT = 95
+    CARERS_ALLOWANCE_SUPPLEMENT = 95
     SPARE_BEN_1 = 96
     SPARE_BEN_2 = 97
     SPARE_BEN_3 = 98

scripts/income_enum.jl

@@ -1197,6 +1197,9 @@ export wages,
        adp_mobility,
        pension_age_disability_daily_living,
        pension_age_disability_care,
+       carers_allowance_supplement,
+       carers_support_payment,
+       discretionary_housing_payment,
        other_benefits
 
 @enum Incomes_Type begin
@@ -1294,9 +1297,11 @@ export wages,
    pupil_development_grant = 2123
    adp_daily_living = 2124
    adp_mobility = 2125
-   pension_age_disability_daily_living = 2126
-   pension_age_disability_care = 2127
-other_benefits = 3000
+   pension_age_disability = 2126
+   carers_allowance_supplement = 2028
+   carers_support_payment = 2029
+   discretionary_housing_payment = 2999
+   other_benefits = 3000
 end
 
 Incomes_Dict = Dict{Incomes_Type,T} where T<:Real
@@ -1869,6 +1874,7 @@ export DLAself_care,
        Child_Disability_Payment_Care, # _Scotland_only,
        Child_Disability_Payment_Mobility, # _Scotland_only,
        Pension_Age_Disability,
+       Carers_Allowance_Supplement,
        School_clothing_grant,
        One_off_IRB_Payment
 
@@ -1951,6 +1957,8 @@ export Missing_Benefit_Type
    Pupil_Development_Grant = 123
    Disability_Topup = 125 # 2022 only so far
    Pension_Topup = 126  # 2022 only so far
+   Carers_Allowance_Supplement = 999
+   Carers_Support_Payment = 997 # FIXME not yet in data - numbers wrong
    Pension_Age_Disability = 998 # FIXME not yet in data - numbers wrong
 end
 

src/Definitions.jl

@@ -48,35 +48,39 @@ export SS_Examples, cpl_w_2_children_hh, single_parent_hh, single_hh, childless_
 
 @enum SS_Examples cpl_w_2_children_hh single_parent_hh single_hh childless_couple_hh mbu
 
+const EXAMPLES = Dict{SS_Examples, Household}()
+
 """
 
 """
-function get_ss_examples( settings = Settings() )::Dict{SS_Examples, Household}
-    d = Dict{SS_Examples, Household}()
+function make_ss_examples( settings = Settings() )
     settings = Settings() 
     settings.benefit_generosity_estimates_available = false
     settings.indirect_method = matching # force loading indirect tax stuff
     @time names = ExampleHouseholdGetter.initialise( settings )
-    d[cpl_w_2_children_hh] = ExampleHouseholdGetter.get_household( "example_hh1" )
-    d[single_parent_hh] = ExampleHouseholdGetter.get_household( "single_parent_1" )
-    d[single_hh] = ExampleHouseholdGetter.get_household( "example_hh2" )
-    d[childless_couple_hh] = ExampleHouseholdGetter.get_household("mel_c2_scot")
-    d[mbu] =  ExampleHouseholdGetter.get_household("mbu_example")
-    return d
+    EXAMPLES[cpl_w_2_children_hh] = ExampleHouseholdGetter.get_household( "example_hh1" )
+    EXAMPLES[single_parent_hh] = ExampleHouseholdGetter.get_household( "single_parent_1" )
+    EXAMPLES[single_hh] = ExampleHouseholdGetter.get_household( "example_hh2" )
+    EXAMPLES[childless_couple_hh] = ExampleHouseholdGetter.get_household("mel_c2_scot")
+    EXAMPLES[mbu] =  ExampleHouseholdGetter.get_household("mbu_example")
 end
 
-const EXAMPLES = get_ss_examples()
+
+function get_ss_examples()::Dict{SS_Examples, Household}
+   if length( EXAMPLES) == 0 
+      make_ss_examples()
+   end
+   return EXAMPLES
+end
 
 function get_example( which :: SS_Examples ) :: Household
-   return deepcopy(EXAMPLES[ which ])
+   return deepcopy(get_ss_examples()[ which ])
 end
 
 function get_all_examples()
-   return deepcopy( EXAMPLES )
+   return deepcopy(get_ss_examples())
 end
 
-const SPARE_CHILD = get_example(cpl_w_2_children_hh).people[320190000104]
-const SPARE_ADULT = get_head( get_example(single_hh))
 
 function unemploy!( pers::Person )
     pers.usual_hours_worked = 0
@@ -171,8 +175,9 @@ end
  Add a child to the 1st benefit unit
  """
  function add_child!( hh :: Household, age :: Integer, sex :: Sex )::BigInt
-    head = get_head(hh)   
-    np = deepcopy( SPARE_CHILD )
+    head = get_head(hh)  
+    spare_child = get_example(cpl_w_2_children_hh).people[320190000104] 
+    np = deepcopy( spare_child )
     empty!( np.income )
     np.relationships[head.pid] = Son_or_daughter_incl_adopted
     # TODO fill in other relationships
@@ -199,7 +204,8 @@ end
     sex :: Sex ) :: BigInt
 
     head = get_head(hh)
-    np = deepcopy( SPARE_ADULT )
+    spare_adult = get_head( get_example(single_hh))
+    np = deepcopy( spare_adult )
     bus = get_benefit_units( hh )
     nbus = size(bus)[1]
     np.pid = maximum( keys( hh.people ))+1

src/ExampleHelpers.jl

@@ -21,9 +21,9 @@ using .RunSettings
 
 export  initialise, get_household
 
-EXAMPLE_HOUSEHOLDS = Dict{String,Household}()
+const EXAMPLE_HOUSEHOLDS = Dict{String,Household}()
 
-KEYMAP = Vector{AbstractString}()
+const KEYMAP = Vector{AbstractString}()
 
 function find_consumption_for_example!( hh, settings )
     @argcheck settings.indirect_method == matching
@@ -56,6 +56,7 @@ function find_wealth_for_example!( hh, settings )
 end
 
 
+
 """
 return number of households available
 """
@@ -71,19 +72,13 @@ function initialise(
     # lazy load cons data if needs be
     tmp_data_source = settings.data_source 
     settings.data_source = ExampleSource
-    # tmpsource = settings.data_source # hack to work round datasource being wired in to settings
     if settings.indirect_method == matching
         ConsumptionData.init( settings ) 
     end
     if settings.wealth_method == matching
         WealthData.init( settings ) 
     end
     KEYMAP = Vector{AbstractString}()
-    
-    # ds = example_datasets( settings )
-    # hh_dataset = CSV.File( ds.hhlds, delim='\t' ) |> DataFrame
-    # people_dataset = CSV.File(ds.people, delim='\t' ) |> DataFrame
-    # @show ds 
     hh_dataset = HouseholdFromFrame.read_hh( 
         joinpath(artifact"exampledata","households.tab" ))# CSV.File( ds.hhlds ) |> DataFrame
     people_dataset = 
@@ -117,12 +112,17 @@ function example_names()
 end
 
 function get_household( pos :: Integer ) :: Household
+    if length(EXAMPLE_HOUSEHOLDS) == 0
+        initialise( Settings())
+    end
     key = KEYMAP[pos]
     return EXAMPLE_HOUSEHOLDS[key]
 end
 
 function get_household( name :: AbstractString ) :: Household
-    # global EXAMPLE_HOUSEHOLDS
+    if length(EXAMPLE_HOUSEHOLDS) == 0
+        initialise( Settings())
+    end
     return EXAMPLE_HOUSEHOLDS[name]
 end
 

src/ExampleHouseholdGetter.jl

@@ -94,9 +94,9 @@ module STBIncomes
         CONTRIB_EMPLOYMENT_AND_SUPPORT_ALLOWANCE 
 
         SCOTTISH_CHILD_PAYMENT
-        SCOTTISH_CARERS_SUPPLEMENT
+        CARERS_ALLOWANCE_SUPPLEMENT
 
-        DISCRESIONARY_HOUSING_PAYMENT # not just Scottish, but, hey..
+        DISCRETIONARY_HOUSING_PAYMENT # not just Scottish, but, hey..
         CHILD_DISABILITY_PAYMENT_CARE
         CHILD_DISABILITY_PAYMENT_MOBILITY
         PENSION_AGE_DISABILITY

src/Incomes_New_Start.jl

@@ -487,7 +487,7 @@ module NonMeansTestedBenefits
 
                 if hh.region == Scotland
                     if pres.income[sys.carers.slot] > 0
-                        pres.income[SCOTTISH_CARERS_SUPPLEMENT] = sys.carers.scottish_supplement
+                        pres.income[CARERS_ALLOWANCE_SUPPLEMENT] = sys.carers.scottish_supplement
                     end
                 end
                 # NON-overlapping rules p1178 go here 

src/NonMeansTestedBenefits.jl

@@ -901,6 +901,15 @@ module Results
                 out[GUARDIANS_ALLOWANCE] = incd[Definitions.guardians_allowance]
             end
 
+            out[SCOTTISH_CHILD_PAYMENT] = get(incd,Definitions.scottish_child_payment , 0.0 )
+            out[CARERS_ALLOWANCE_SUPPLEMENT] = get( incd, Definitions. carers_allowance_supplement, 0.0 )
+            out[DISCRETIONARY_HOUSING_PAYMENT] = get( incd, Definitions.discretionary_housing_payment, 0.0 )
+            out[CARERS_SUPPORT_PAYMENT] = get( incd, Definitions.carers_support_payment, 0.0 )
+            out[CHILD_DISABILITY_PAYMENT_CARE] = get( incd, Definitions.child_disability_payment_care, 0.0 )
+            out[CHILD_DISABILITY_PAYMENT_MOBILITY] = get( incd, Definitions.child_disability_payment_mobility, 0.0 )
+            out[PENSION_AGE_DISABILITY] = get( incd, Definitions.pension_age_disability, 0.0 )
+            out[ADP_DAILY_LIVING] = get( incd, Definitions.adp_daily_living, 0.0 )
+            out[ADP_MOBILITY] = get( incd, Definitions.adp_mobility, 0.0 )
             # FIXME 6/7/2023 add 
             #=
             scottish_child_payment = 2112