feature/58889 - Hide attendance codes (#2500)

* hide absent attendance code * remove absent reason --------- Co-authored-by: Mohsen Qureshi <[email protected]>
DFEAGILEDEVOPS · May 3, 2023 · 9ebb24e · 9ebb24e
1 parent 0034c3b
commit 9ebb24e
Show file tree

Hide file tree

Showing 16 changed files with 29 additions and 21 deletions.
diff --git a/admin/controllers/pupils-not-taking-the-check.js b/admin/controllers/pupils-not-taking-the-check.js
@@ -11,7 +11,7 @@ const businessAvailabilityService = require('../services/business-availability.s
 const checkWindowPhaseConsts = require('../lib/consts/check-window-phase')
 
 /**
- * Pupils not taking the check: initial page.
+ * Pupils not taking the check: lists any pupils with attendance set.
  * @param req
  * @param res
  * @param next
@@ -51,7 +51,7 @@ const getPupilNotTakingCheck = async function getPupilNotTakingCheck (req, res,
 }
 
 /**
- * Pupils not taking the check: pupil selection to add a new reason or change a reason
+ * Pupils not taking the check: pupil selection to add a new reason or remove a reason
  * @param req
  * @param res
  * @param next

diff --git a/admin/services/data-access/attendance-code.data.service.js b/admin/services/data-access/attendance-code.data.service.js
@@ -11,7 +11,7 @@ const attendanceCodeDataService = {
    * @returns {Promise<[{id: number, reason: string, code: string, order: number}] | undefined>}
    */
   sqlFindAttendanceCodes: async () => {
-    const sql = `SELECT id, reason, code, [order] FROM ${sqlService.adminSchema}.[attendanceCode] WHERE isPrivileged = 0`
+    const sql = `SELECT id, reason, code, [order] FROM ${sqlService.adminSchema}.[attendanceCode] WHERE isPrivileged = 0 AND visible = 1`
     return sqlService.readonlyQuery(sql)
   },
 

diff --git a/admin/services/data-access/pupil-attendance.data.service.js b/admin/services/data-access/pupil-attendance.data.service.js
@@ -152,7 +152,7 @@ pupilAttendanceDataService.markAsNotAttending = async (slugs, code, userId, scho
   -- Mark pupils as not attending
   --
 
-  DECLARE @attendanceCode_id Int = (SELECT id from [mtc_admin].[attendanceCode] where code = @code AND isPrivileged = 0);
+  DECLARE @attendanceCode_id Int = (SELECT id from [mtc_admin].[attendanceCode] where code = @code AND isPrivileged = 0 AND visible = 1);
 
   IF @attendanceCode_id IS NULL
     THROW 51000, 'unknown attendanceCode.code', 1;

diff --git a/db/migrations/core-data/20230427142256.do.attendance-code-hide-absent.sql b/db/migrations/core-data/20230427142256.do.attendance-code-hide-absent.sql
@@ -0,0 +1 @@
+UPDATE mtc_admin.attendanceCode SET visible = 0 WHERE code = 'ABSNT'
diff --git a/db/migrations/core-data/20230427142256.undo.attendance-code-hide-absent.sql b/db/migrations/core-data/20230427142256.undo.attendance-code-hide-absent.sql
@@ -0,0 +1 @@
+UPDATE mtc_admin.attendanceCode SET visible = 1 WHERE code = 'ABSNT'
diff --git a/db/migrations/schema-objects/20230427134557.do.attendance-code-visible-column.sql b/db/migrations/schema-objects/20230427134557.do.attendance-code-visible-column.sql
@@ -0,0 +1,9 @@
+IF NOT EXISTS(
+                SELECT *
+                FROM sys.columns
+               WHERE object_ID = object_id('mtc_admin.attendanceCode')
+                 AND col_name(object_ID, column_Id) = 'visible')
+    BEGIN
+        ALTER TABLE [mtc_admin].[attendanceCode]
+            ADD [visible] bit NOT NULL CONSTRAINT DF_attendanceCode_visible_default DEFAULT 1;
+    END
diff --git a/db/migrations/schema-objects/20230427134557.undo.attendance-code-visible-column.sql b/db/migrations/schema-objects/20230427134557.undo.attendance-code-visible-column.sql
@@ -0,0 +1,2 @@
+ALTER TABLE [mtc_admin].[attendanceCode] DROP CONSTRAINT IF EXISTS [DF_attendanceCode_visible_default];
+ALTER TABLE [mtc_admin].[attendanceCode] DROP COLUMN IF EXISTS [visible];
diff --git a/test/admin-hpa/features/pupil_audit.feature b/test/admin-hpa/features/pupil_audit.feature
@@ -38,7 +38,6 @@ Feature:
     Examples:
       | reason                                         |
       | Incorrect registration                         |
-      | Absent during check window                     |
       | Left school                                    |
       | Unable to access                               |
       | Working below expectation                      |

diff --git a/test/admin-hpa/features/pupil_not_taking_check.feature b/test/admin-hpa/features/pupil_not_taking_check.feature
@@ -45,7 +45,7 @@ Feature:
   @pupil_not_taking_check
   Scenario: Sticky banner displays pupil count
     Given I am on the pupil reason page
-    When I select multiple pupils with the Absent during check window reason
+    When I select multiple pupils with the Incorrect registration reason
     Then the sticky banner should display the pupil count
 
   @pupil_not_taking_check
@@ -77,7 +77,6 @@ Feature:
     Examples:
       | reason                                         |
       | Incorrect registration                         |
-      | Absent during check window                     |
       | Left school                                    |
       | Unable to access                               |
       | Working below expectation                      |
@@ -86,7 +85,7 @@ Feature:
   @pupil_not_taking_check
   Scenario: Teachers can add multiple pupils
     Given I am on the pupil reason page for multiple new pupil
-    When I add Absent during check window as a reason for multiple pupils
+    When I add Incorrect registration as a reason for multiple pupils
     Then the reason should be stored against the pupils
     And I should see the updated pupils on the hub page
 

diff --git a/test/admin-hpa/features/pupil_status.feature b/test/admin-hpa/features/pupil_status.feature
@@ -32,8 +32,7 @@ Feature: Pupil Status Outcome
     Then I can see the status for the pupil is <reason> for pupil not taking the check
 
     Examples:
-      | reason                     |
-      | Absent during check window |
+      | reason                                         |
       | Incorrect registration                         |
       | Left school                                    |
       | Working below expectation                      |

diff --git a/test/admin-hpa/features/service_manager_pupil_search.feature b/test/admin-hpa/features/service_manager_pupil_search.feature
@@ -60,8 +60,7 @@ Feature:
     Then the summary page is displayed with the attendance status set to <reason> along with details of the pupil
 
     Examples:
-      | reason                     |
-      | Absent during check window |
+      | reason                                         |
       | Incorrect registration                         |
       | Left school                                    |
       | Working below expectation                      |

diff --git a/test/admin-hpa/features/step_definitions/declaration_review_pupil_steps.rb b/test/admin-hpa/features/step_definitions/declaration_review_pupil_steps.rb
@@ -21,14 +21,14 @@
   pupils_not_taking_check_page.add_reason.click
   page.execute_script "window.scrollBy(0,500)"
   @page = pupil_reason_page
-  pupil_reason_page.select_reason('Absent during check window')
+  pupil_reason_page.select_reason('Incorrect registration')
   @pupil_row = pupil_reason_page.pupil_list.rows.select {|row| row.name.text.include?(name)}
   @pupil_forename = @pupil_row.first.name.text.split(',')[1].strip
   @pupil_lastname = @pupil_row.first.name.text.split(',')[0].strip
   @pupil_row.first.checkbox.click
   pupil_reason_page.sticky_banner.confirm.click
 
-  step 'the Absent during check window reason should be stored against the pupils'
+  step 'the Incorrect registration reason should be stored against the pupils'
   pupil_status_page.load
   Timeout.timeout(20) {pupil_status_page.not_taking_checks.count.click until pupil_status_page.not_taking_checks_details.pupil_list.visible? }
   pupil_row = pupil_status_page.not_taking_checks_details.pupil_list.pupil_row.find { |r| r.text.include? @pupil_forename}

diff --git a/test/admin-hpa/features/step_definitions/generate_pupil_pins_steps.rb b/test/admin-hpa/features/step_definitions/generate_pupil_pins_steps.rb
@@ -15,8 +15,8 @@
 
 Given(/^I have a pupil not taking the check$/) do
   step 'I am on the pupil reason page for new pupil'
-  step 'I add Absent during check window as a reason for a particular pupil'
-  step 'the Absent during check window reason should be stored against the pupils'
+  step 'I add Incorrect registration as a reason for a particular pupil'
+  step 'the Incorrect registration reason should be stored against the pupils'
   sleep 3
 end
 

diff --git a/test/admin-hpa/features/step_definitions/pupil_not_taking_check.rb b/test/admin-hpa/features/step_definitions/pupil_not_taking_check.rb
@@ -218,8 +218,8 @@
 
 Given(/^I have previously added a reason for a pupil$/) do
   step 'I am on the pupil reason page for new pupil'
-  step 'I add Absent during check window as a reason for a particular pupil'
-  step 'the Absent during check window reason should be stored against the pupils'
+  step 'I add Incorrect registration as a reason for a particular pupil'
+  step 'the Incorrect registration reason should be stored against the pupils'
   step 'I should see the updated pupil on the hub page'
 end
 

diff --git a/test/admin-hpa/features/support/page_objects/pupil_reason_page.rb b/test/admin-hpa/features/support/page_objects/pupil_reason_page.rb
@@ -42,8 +42,7 @@ class PupilReasonPage < SitePrism::Page
 
 
   def attendance_code_mapping
-    {'attendance-code-ABSNT' => 'Absent during check window',
-     'attendance-code-INCRG' => 'Incorrect registration',
+    {'attendance-code-INCRG' => 'Incorrect registration',
      'attendance-code-LEFTT' => 'Left school',
      'attendance-code-NOACC' => 'Unable to access',
      'attendance-code-BLSTD' => 'Working below expectation',

diff --git a/test/admin-hpa/features/support/sql_db_helper.rb b/test/admin-hpa/features/support/sql_db_helper.rb
@@ -199,7 +199,7 @@ def self.check_form_details(check_form_name)
 
   def self.get_attendance_codes
     @array_of_attCode = []
-    sql = "SELECT * FROM [mtc_admin].[attendanceCode]"
+    sql = "SELECT * FROM [mtc_admin].[attendanceCode] where visible=1"
     result = SQL_CLIENT.execute(sql)
     @array_of_attCode = result.each {|row| row.map}
     result.cancel
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		UPDATE mtc_admin.attendanceCode SET visible = 0 WHERE code = 'ABSNT'
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ALTER TABLE [mtc_admin].[attendanceCode] DROP CONSTRAINT IF EXISTS [DF_attendanceCode_visible_default];
		ALTER TABLE [mtc_admin].[attendanceCode] DROP COLUMN IF EXISTS [visible];