Resolve "Anmelderegel "höheres Fachsemester bevorzugen" zufällige Darstellung...

Resolve "Anmelderegel "höheres Fachsemester bevorzugen" zufällige Darstellung der Studiengangsbedingungen"

lib/classes/admission/UserFilter.class.php

@@ -101,6 +101,9 @@ class UserFilter
      */
     public function getFields()
     {
+        uasort($this->fields, function($a, $b) {
+            return $a->sortOrder -  $b->sortOrder;
+        });
         return $this->fields;
     }
 

lib/classes/admission/UserFilterField.class.php

@@ -51,6 +51,12 @@ class UserFilterField
      */
     public $value = null;
 
+    /*
+     * Provide some kind of sort order for filter fields. By default,
+     * all subclasses without an explicitly given order will be sorted at the end.
+     */
+    public $sortOrder = 99;
+
     public static $isParameterized = false;
 
     /**

lib/classes/admission/userfilter/DatafieldCondition.class.php

@@ -18,6 +18,8 @@ class DatafieldCondition extends UserFilterField
 
     public $datafield_id, $null_yields, $datafield_name;
 
+    public $sortOrder = 6;
+
     public static function getParameterizedTypes()
     {
         $ret = [];

lib/classes/admission/userfilter/DegreeCondition.class.php

@@ -22,6 +22,8 @@ class DegreeCondition extends UserFilterField
     public $userDataDbTable = 'user_studiengang';
     public $userDataDbField = 'abschluss_id';
 
+    public $sortOrder = 1;
+
     /**
      * @see UserFilterField::__construct
      */

lib/classes/admission/userfilter/PermissionCondition.class.php

@@ -15,6 +15,8 @@
  */
 class PermissionCondition extends UserFilterField
 {
+    public $sortOrder = 7;
+
     /**
      * @see UserFilterField::__construct
      */

lib/classes/admission/userfilter/SemesterOfStudyCondition.class.php

@@ -22,6 +22,8 @@ class SemesterOfStudyCondition extends UserFilterField
     public $userDataDbTable = 'user_studiengang';
     public $userDataDbField = 'semester';
 
+    public $sortOrder = 4;
+
     // --- OPERATIONS ---
 
     /**

lib/classes/admission/userfilter/StgteilVersionCondition.class.php

@@ -22,6 +22,8 @@ class StgteilVersionCondition extends UserFilterField
     public $userDataDbTable = 'user_studiengang';
     public $userDataDbField = 'version_id';
 
+    public $sortOrder = 5;
+
     public static $isParameterized = true;
 
     public static function getParameterizedTypes()

lib/classes/admission/userfilter/SubjectCondition.class.php

@@ -22,6 +22,8 @@ class SubjectCondition extends UserFilterField
     public $userDataDbTable = 'user_studiengang';
     public $userDataDbField = 'fach_id';
 
+    public $sortOrder = 2;
+
     // --- OPERATIONS ---
 
     /**

lib/classes/admission/userfilter/SubjectConditionAny.class.php

@@ -25,6 +25,8 @@ class SubjectConditionAny extends UserFilterField
     public $userDataDbTable = 'user_studiengang';
     public $userDataDbField = 'fach_id';
 
+    public $sortOrder = 3;
+
     // --- OPERATIONS ---
 
     /**