update school schemas

SocialFinanceDigitalLabs · Jun 21, 2024 · 4cf24fa · 4cf24fa
1 parent a6fff80
commit 4cf24fa
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 92 deletions.
diff --git a/liiatools/school_census_pipeline/spec/school_census_schema_2018.diff.yml b/liiatools/school_census_pipeline/spec/school_census_schema_2018.diff.yml
@@ -5,6 +5,13 @@ Autumn:
     value:
       - annualsessiondetailsoffroll
       - annualsessiondetailsonroll
+  column_map.pupilnolongeronroll:
+    type: remove
+    description: Remove columns from pupilnolongeronroll
+    value:
+      - annualsessionspossible
+      - annualsessionsauthorised
+      - annualsessionsunauthorised
   column_map.pupilonroll.dafindicator:
     type: add
     description: Adds new column for pupilonroll
@@ -43,6 +50,9 @@ Autumn:
     description: Remove column from pupilonroll
     value:
       - proficiencyinenglish
+      - annualsessionspossible
+      - annualsessionsauthorised
+      - annualsessionsunauthorised
   column_map.pupilonroll.resourcedprovisionindicator:
     type: add
     description: Adds new column for pupilonroll

diff --git a/liiatools/school_census_pipeline/spec/school_census_schema_2020.diff.yml b/liiatools/school_census_pipeline/spec/school_census_schema_2020.diff.yml
@@ -75,6 +75,28 @@ Autumn:
       - code: "A"
       - code: "P"
       canbeblank: yes
+  column_map.termlyexclusionsoffroll.senprovision:
+    type: modify
+    description: Update codes for 2020 schema
+    value:
+      *sen-provision
+  column_map.termlyexclusionsonroll.senprovision:
+    type: modify
+    description: Update codes for 2020 schema
+    value:
+      *sen-provision
+
+Spring:
+  column_map.classes.ppa:
+    type: rename
+    description: Rename column in classes
+    value:
+      ppateachers
+  column_map.pupilonroll.senprovision:
+    type: modify
+    description: Update codes for 2020 schema
+    value:
+      *sen-provision
   column_map.termlyexclusionsoffroll.reinstatementdate:
     type: add
     description: Adds new column for termlyexclusionsoffroll
@@ -156,63 +178,6 @@ Autumn:
     value:
       *sen-provision
 
-Spring:
-  column_map.pupilonroll.senprovision:
-    type: modify
-    description: Update codes for 2020 schema
-    value:
-      *sen-provision
-  column_map.termlyexclusionsoffroll.reinstatementdate:
-    type: add
-    description: Adds new column for termlyexclusionsoffroll
-    value:
-      *date
-  column_map.termlyexclusionsoffroll.reviewdate:
-    type: add
-    description: Adds new column for termlyexclusionsoffroll
-    value:
-      *date
-  column_map.termlyexclusionsoffroll.reviewresult:
-    type: add
-    description: Adds new column for termlyexclusionsoffroll
-    value:
-      *review-result
-  column_map.termlyexclusionsoffroll.senexpert:
-    type: add
-    description: Adds new column for termlyexclusionsoffroll
-    value:
-      *sen-expert
-  column_map.termlyexclusionsoffroll.senprovision:
-    type: modify
-    description: Update codes for 2020 schema
-    value:
-      *sen-provision
-  column_map.termlyexclusionsonroll.reinstatementdate:
-    type: add
-    description: Adds new column for termlyexclusionsonroll
-    value:
-      *date
-  column_map.termlyexclusionsonroll.reviewdate:
-    type: add
-    description: Adds new column for termlyexclusionsonroll
-    value:
-      *date
-  column_map.termlyexclusionsonroll.reviewresult:
-    type: add
-    description: Adds new column for termlyexclusionsonroll
-    value:
-      *review-result
-  column_map.termlyexclusionsonroll.senexpert:
-    type: add
-    description: Adds new column for termlyexclusionsonroll
-    value:
-      *sen-expert
-  column_map.termlyexclusionsonroll.senprovision:
-    type: modify
-    description: Update codes for 2020 schema
-    value:
-      *sen-provision
-
 Summer:
   column_map.pupilonroll.senprovision:
     type: modify

diff --git a/liiatools/school_census_pipeline/spec/school_census_schema_2021.diff.yml b/liiatools/school_census_pipeline/spec/school_census_schema_2021.diff.yml
@@ -63,13 +63,6 @@ Autumn:
         canbeblank: yes
       progtype:
         *prog-type
-  column_map.pupilnolongeronroll:
-    type: remove
-    description: Remove columns from pupilnolongeronroll
-    value:
-      - annualsessionspossible
-      - annualsessionsauthorised
-      - annualsessionsunauthorised
   column_map.pupilnolongeronroll.tlevelnonqualhrs:
     type: add
     description: Adds new column for pupilnolongeronroll
@@ -83,13 +76,6 @@ Autumn:
     description: Adds new column for pupilnolongeronroll
     value:
       *int-blank
-  column_map.pupilonroll:
-    type: remove
-    description: Remove columns from pupilonroll
-    value:
-      - annualsessionspossible
-      - annualsessionsauthorised
-      - annualsessionsunauthorised
   column_map.pupilonroll.tlevelnonqualhrs:
     type: add
     description: Adds new column for pupilonroll
@@ -157,14 +143,6 @@ Autumn:
     description: Update codes for 2021 schema
     value:
       *attendance-reason
-  column_map.termlyexclusionsoffroll:
-    type: remove
-    description: Remove column termlyexclusionsoffroll
-    value:
-      - reinstatementdate
-      - reviewdate
-      - reviewresult
-      - senexpert
   column_map.termlyexclusionsoffroll.category:
     type: modify
     description: Update codes for 2021 schema
@@ -199,14 +177,6 @@ Autumn:
       - code: "MT"
       - code: "PH"
       canbeblank: yes
-  column_map.termlyexclusionsonroll:
-    type: remove
-    description: Remove column termlyexclusionsoffroll
-    value:
-      - reinstatementdate
-      - reviewdate
-      - reviewresult
-      - senexpert
   column_map.termlyexclusionsonroll.reason:
     type: modify
     description: Update codes for 2021 schema
@@ -283,11 +253,6 @@ Autumn:
         *int-blank
 
 Spring:
-  column_map.classes.ppa:
-    type: rename
-    description: Rename column in termlysessiondetailsoffroll
-    value:
-      ppateachers
   column_map.pupilnolongeronroll.termlysessionscoronavirus:
     type: add
     description: Adds new column for pupilnolongeronroll