Restrict Sort Order input number range

francoisjacquet · May 4, 2022 · 05ce3c2 · 05ce3c2
1 parent 1766bc5
commit 05ce3c2
Show file tree

Hide file tree

Showing 18 changed files with 19 additions and 18 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -75,6 +75,7 @@ Changes in 9.0
 - Remove photos on delete in Student.php & User.php, thank to @jo125ker
 - Remove Student Assignment Submission files on delete in Assignments.php, thank to @khanhchauminh
 - Add microseconds to filename format to make it harder to predict in Assignments.php & StudentAssignments.fnc.php, thanks to @khanhchauminh
+- Restrict Sort Order input number range, program wide
 
 Changes in 8.9.5
 ----------------

diff --git a/ProgramFunctions/Fields.fnc.php b/ProgramFunctions/Fields.fnc.php
@@ -437,7 +437,7 @@ function GetFieldsForm( $table, $title, $RET, $extra_category_fields = [], $type
 			issetVal( $RET['SORT_ORDER'], '' ),
 			'tables[' . $id . '][SORT_ORDER]',
 			_( 'Sort Order' ),
-			' type="number" step="any"'
+			' type="number" min="0" max="9999"'
 		) . '</td>';
 
 		$header .= '</tr></table>';
@@ -458,7 +458,7 @@ function GetFieldsForm( $table, $title, $RET, $extra_category_fields = [], $type
 			issetVal( $RET['SORT_ORDER'], '' ),
 			'tables[' . $category_id . '][SORT_ORDER]',
 			_( 'Sort Order' ),
-			' type="number" step="any"'
+			' type="number" min="0" max="9999"'
 		) . '</td>';
 
 		// Extra Fields.

diff --git a/modules/Attendance/AttendanceCodes.php b/modules/Attendance/AttendanceCodes.php
@@ -297,7 +297,7 @@ function _makeTextInput( $value, $name )
 
 	if ( $name === 'SORT_ORDER' )
 	{
-		$extra .= ' type="number" step="any"';
+		$extra .= ' type="number" min="0" max="9999"';
 	}
 	elseif ( $name === 'SHORT_NAME' )
 	{

diff --git a/modules/Discipline/DisciplineForm.php b/modules/Discipline/DisciplineForm.php
@@ -310,7 +310,7 @@ function _makeTextInput( $value, $name )
 
 	if ( $name === 'SORT_ORDER' )
 	{
-		$extra .= ' type="number" step="any"';
+		$extra .= ' type="number" min="0" max="9999"';
 
 		$comment = '<!-- ' . $value . ' -->';
 	}

diff --git a/modules/Food_Service/MenuItems.php b/modules/Food_Service/MenuItems.php
@@ -480,7 +480,7 @@ function makeTextInput( $value, $name )
 	}
 	elseif ( $name == 'SORT_ORDER' )
 	{
-		$extra = ' type="number" step="any"';
+		$extra = ' type="number" min="0" max="9999"';
 	}
 	elseif ( mb_strpos( $name, 'PRICE' ) !== false )
 	{

diff --git a/modules/Food_Service/Menus.php b/modules/Food_Service/Menus.php
@@ -338,7 +338,7 @@ function _makeTextInput( $value, $name )
 	}
 	elseif ( $name === 'SORT_ORDER' )
 	{
-		$extra = ' type="number" step="any"';
+		$extra = ' type="number" min="0" max="9999"';
 	}
 	else
 	{

diff --git a/modules/Grades/Assignments-new.php b/modules/Grades/Assignments-new.php
@@ -501,7 +501,7 @@ function _makeTypeInput( $value, $name )
 	}
 	elseif ( $name == 'SORT_ORDER' )
 	{
-		$extra = ' type="number" step="any"';
+		$extra = ' type="number" min="0" max="9999"';
 	}
 
 	return TextInput(

diff --git a/modules/Grades/Assignments.php b/modules/Grades/Assignments.php
@@ -836,7 +836,7 @@
 			issetVal( $RET['SORT_ORDER'] ),
 			'tables[' . $_REQUEST['assignment_type_id'] . '][SORT_ORDER]',
 			_( 'Sort Order' ),
-			' type="number" step="any"'
+			' type="number" min="0" max="9999"'
 		) . '</td>';
 
 		$header .= '<td>' . ColorInput(

diff --git a/modules/Grades/ReportCardCommentCodes.php b/modules/Grades/ReportCardCommentCodes.php
@@ -346,7 +346,7 @@ function _makeCommentsInput( $value, $name )
 	}
 	elseif ( $name === 'SORT_ORDER' )
 	{
-		$extra = ' type="number" step="any"';
+		$extra = ' type="number" min="0" max="9999"';
 	}
 	elseif ( $name === 'TITLE' )
 	{

diff --git a/modules/Grades/ReportCardComments.php b/modules/Grades/ReportCardComments.php
@@ -508,7 +508,7 @@ function _makeCommentsInput( $value, $name )
 
 	if ( $name === 'SORT_ORDER' )
 	{
-		$extra .= ' type="number" step="any"';
+		$extra .= ' type="number" min="0" max="9999"';
 
 		if ( $_REQUEST['tab_id'] > 0 && $id !== 'new' )
 		{

diff --git a/modules/Grades/ReportCardGrades.php b/modules/Grades/ReportCardGrades.php
@@ -425,7 +425,7 @@ function _makeTextInput( $value, $name )
 	}
 	elseif ( $name === 'SORT_ORDER' )
 	{
-		$extra = ' type="number" step="any"';
+		$extra = ' type="number" min="0" max="9999"';
 	}
 	else
 	{

diff --git a/modules/Scheduling/Courses.php b/modules/Scheduling/Courses.php
@@ -1411,7 +1411,7 @@ function createCell(cell, tr, i, newId) {
 					issetVal( $RET['SORT_ORDER'] ),
 					'tables[COURSE_SUBJECTS][' . $_REQUEST['subject_id'] . '][SORT_ORDER]',
 					_( 'Sort Order' ),
-					' type="number" step="any"'
+					' type="number" min="0" max="9999"'
 				) . '</td>';
 			}
 

diff --git a/modules/School_Setup/GradeLevels.php b/modules/School_Setup/GradeLevels.php
@@ -173,7 +173,7 @@ function _makeTextInput( $value, $name )
 
 	if ( $name === 'SORT_ORDER' )
 	{
-		$extra .= ' type="number" step="any"';
+		$extra .= ' type="number" min="0" max="9999"';
 
 		$comment = '<!-- ' . $value . ' -->';
 	}

diff --git a/modules/School_Setup/MarkingPeriods.php b/modules/School_Setup/MarkingPeriods.php
@@ -478,7 +478,7 @@
 			issetVal( $RET['SORT_ORDER'], '' ),
 			'tables[' . $_REQUEST['marking_period_id'] . '][SORT_ORDER]',
 			_( 'Sort Order' ),
-			'type="number" step="any"'
+			' type="number" min="0" max="9999"'
 		) . '</td></tr>';
 	}
 

diff --git a/modules/School_Setup/Periods.php b/modules/School_Setup/Periods.php
@@ -190,7 +190,7 @@ function _makeTextInput( $value, $name )
 	}
 	elseif ( $name === 'SORT_ORDER' )
 	{
-		$extra = ' type="number" step="any"';
+		$extra = ' type="number" min="0" max="9999"';
 	}
 	elseif ( $name !== 'TITLE' )
 	{

diff --git a/modules/School_Setup/PortalNotes.php b/modules/School_Setup/PortalNotes.php
@@ -275,7 +275,7 @@ function _makeTextInput( $value, $name )
 
 	if ( $name === 'SORT_ORDER' )
 	{
-		$extra = ' type="number" step="any"';
+		$extra = ' type="number" min="0" max="9999"';
 	}
 	elseif ( $name !== 'TITLE' )
 	{

diff --git a/modules/School_Setup/PortalPolls.php b/modules/School_Setup/PortalPolls.php
@@ -312,7 +312,7 @@ function _makeTextInput( $value, $name )
 
 	if ( $name === 'SORT_ORDER' )
 	{
-		$extra = ' type="number" step="any"';
+		$extra = ' type="number" min="0" max="9999"';
 	}
 	elseif ( $name !== 'TITLE' )
 	{

diff --git a/modules/Students/EnrollmentCodes.php b/modules/Students/EnrollmentCodes.php
@@ -159,7 +159,7 @@ function _makeTextInput( $value, $name )
 	}
 	elseif ( $name === 'SORT_ORDER' )
 	{
-		$extra = ' type="number" step="any"';
+		$extra = ' type="number" min="0" max="9999"';
 	}
 	elseif ( $name === 'TITLE' )
 	{