Fix regression since 5.0, allow Administration of "Lunch" attendance …

…categories
francoisjacquet · May 24, 2022 · 18a3776 · 18a3776
1 parent b226e16
commit 18a3776
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 25 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -92,6 +92,7 @@ Changes in 9.0
 - JS Sanitize string for legal variable name in Export.php & Inputs.php
 - Remove deprecated `_makeTeacher()` function in ReportCards.fnc.php
 - Use multiple select input for grades list to gain space in Widget.php
+- Fix regression since 5.0, allow Administration of "Lunch" attendance categories in Administration.php, AttendanceCodes.fnc.php & colors.css
 
 Changes in 8.9.6
 ----------------

diff --git a/assets/themes/FlatSIS/css/colors.css b/assets/themes/FlatSIS/css/colors.css
@@ -479,36 +479,38 @@ hr {
 
 /* Attendance Codes */
 
-.attendance-code {
-	color: #fff;
-}
-
 .attendance-code.present {
+	color: #fff;
 	background-color: #20DD30;
 	/* Green */
 }
 
 .attendance-code.absent {
+	color: #fff;
 	background-color: #FF0000;
 	/* Red */
 }
 
 .attendance-code.half-day {
+	color: #fff;
 	background-color: #FFCC00;
 	/* Yellow */
 }
 
 .attendance-code.present-alt {
+	color: #fff;
 	background-color: #DDFFDD;
 	/* Green */
 }
 
 .attendance-code.absent-alt {
+	color: #fff;
 	background-color: #FFDDDD;
 	/* Red */
 }
 
 .attendance-code.half-day-alt {
+	color: #fff;
 	background-color: #FFEEDD;
 	/* Yellow */
 }

diff --git a/assets/themes/FlatSIS/stylesheet.css b/assets/themes/FlatSIS/stylesheet.css
diff --git a/assets/themes/FlatSIS/stylesheet_wkhtmltopdf.css b/assets/themes/FlatSIS/stylesheet_wkhtmltopdf.css
diff --git a/assets/themes/WPadmin/css/colors.css b/assets/themes/WPadmin/css/colors.css
@@ -425,36 +425,38 @@ hr {
 
 /* Attendance Codes */
 
-.attendance-code {
-	color: #fff;
-}
-
 .attendance-code.present {
+	color: #fff;
 	background-color: #20DD30;
 	/* Green */
 }
 
 .attendance-code.absent {
+	color: #fff;
 	background-color: #FF0000;
 	/* Red */
 }
 
 .attendance-code.half-day {
+	color: #fff;
 	background-color: #FFCC00;
 	/* Yellow */
 }
 
 .attendance-code.present-alt {
+	color: #fff;
 	background-color: #DDFFDD;
 	/* Green */
 }
 
 .attendance-code.absent-alt {
+	color: #fff;
 	background-color: #FFDDDD;
 	/* Red */
 }
 
 .attendance-code.half-day-alt {
+	color: #fff;
 	background-color: #FFEEDD;
 	/* Yellow */
 }

diff --git a/assets/themes/WPadmin/stylesheet.css b/assets/themes/WPadmin/stylesheet.css
diff --git a/assets/themes/WPadmin/stylesheet_wkhtmltopdf.css b/assets/themes/WPadmin/stylesheet_wkhtmltopdf.css
diff --git a/modules/Attendance/Administration.php b/modules/Attendance/Administration.php
@@ -516,7 +516,13 @@
 		_( 'Current Student' ) . '</a></td><td>';
 	}
 
-	$headerl = AttendanceCodesTipMessage();
+	if ( $headerl )
+	{
+		// Header already has Attendance categories: add spacing.
+		$headerl .= ' &mdash; ';
+	}
+
+	$headerl .= AttendanceCodesTipMessage( '', $_REQUEST['table'] );
 
 	$headerr = '<table style="float: right;"><tr><td class="align-right">' .
 	button(

diff --git a/modules/Attendance/includes/AttendanceCodes.fnc.php b/modules/Attendance/includes/AttendanceCodes.fnc.php
@@ -9,9 +9,10 @@
 /**
  * Make Attendance Code
  *
- * @todo use in TakeAttendance & oher reports than DailySummary.php.
+ * @todo use in TakeAttendance & other reports than DailySummary.php.
  *
  * @since 3.8
+ * @since 9.0 Allow empty State code.
  *
  * @param array  $state_code Attendance State code.
  * @param string $name       Name or HTML to display. Defaults to localized attendance code.
@@ -21,11 +22,6 @@
  */
 function MakeAttendanceCode( $state_code, $name = '', $title = '' )
 {
-	if ( empty( $state_code ) )
-	{
-		return '';
-	}
-
 	$attendance_codes_locale = [
 		// Attendance codes.
 		'P' => _( 'Present' ),
@@ -58,12 +54,15 @@ function MakeAttendanceCode( $state_code, $name = '', $title = '' )
 		$state_code = '0.5';
 	}
 
-	if ( $title === '' )
+	if ( $state_code )
 	{
-		$title = $attendance_codes_locale[ $state_code ];
-	}
+		if ( $title === '' )
+		{
+			$title = $attendance_codes_locale[ $state_code ];
+		}
 
-	$class .= ' ' . $attendance_code_classes[ $state_code ];
+		$class .= ' ' . $attendance_code_classes[ $state_code ];
+	}
 
 	if ( $name === '' )
 	{
@@ -82,6 +81,7 @@ function MakeAttendanceCode( $state_code, $name = '', $title = '' )
  * @since 3.8
  *
  * @since 3.9 Added $type param.
+ * @since 9.0 Added $table param.
  *
  * @uses MakeAttendanceCode
  * @uses MakeTipMessage
@@ -90,7 +90,7 @@ function MakeAttendanceCode( $state_code, $name = '', $title = '' )
  *
  * @return string Attendance Codes Tip Message.
  */
-function AttendanceCodesTipMessage( $type = '' )
+function AttendanceCodesTipMessage( $type = '', $table = '0' )
 {
 	static $attendance_codes_RET;
 
@@ -112,7 +112,7 @@ function AttendanceCodesTipMessage( $type = '' )
 		FROM ATTENDANCE_CODES
 		WHERE SYEAR='" . UserSyear() . "'
 		AND SCHOOL_ID='" . UserSchool() . "'
-		AND TABLE_NAME='0'" .
+		AND TABLE_NAME='" . (int) $table . "'" .
 		$type_where .
 		" ORDER BY TABLE_NAME,SORT_ORDER" );
 	}