fix category sort within roles administration

Author: Fasse

adm_program/modules/roles/roles.php

@@ -101,13 +101,16 @@
 // create array with all column heading values
 $columnHeading = array(
     $gL10n->get('SYS_CATEGORY'),
+    'ORDER',
     $listDescription,
     $gL10n->get('SYS_AUTHORIZATION'),
     $gL10n->get('ROL_PREF'),
     $gL10n->get('SYS_FEATURES'));
-$table->setColumnAlignByArray(array('left', 'left', 'left', 'left', 'right'));
+$table->setColumnAlignByArray(array('left', 'left', 'left', 'left', 'left', 'right'));
 $table->setColumnWidth(3, '40%');
-$table->disableDatatablesColumnsSort(array(3, 4, 5));
+$table->disableDatatablesColumnsSort(array(4, 5, 6));
+$table->setDatatablesAlternativOrderColumns(1, 2);
+$table->setDatatablesColumnsHide(2);
 $table->setDatatablesGroupColumn(1);
 $table->addRowHeadingByArray($columnHeading);
 
@@ -301,6 +304,7 @@
     // create array with all column values
     $columnValues = array(
         $categoryName,
+        $role->getValue('cat_sequence'),
         '<a href="'.$g_root_path.'/adm_program/modules/roles/roles_new.php?rol_id='.$role->getValue('rol_id').'" title="'.$role->getValue('rol_description').'">'.$role->getValue('rol_name').'</a>',
         $assignRoles,
         $listView,

adm_program/system/classes/tablecategory.php

@@ -177,14 +177,18 @@ public function getValue($columnName, $format = '')
         return $value;
     }
 
-    // die Kategorie wird um eine Position in der Reihenfolge verschoben
+    /** Change the internal sequence of this category. It can be moved one place up or down
+     *  @param $mode This could be @b UP or @b DOWN. 
+     */
     public function moveSequence($mode)
     {
         global $gCurrentOrganization;
 
-        // Anzahl orgaunabhaengige ermitteln, da diese nicht mit den abhaengigen vermischt werden duerfen
+        // count all categories that are organization independent because these categories should not
+        // be mixed with the organization categories. Hidden categories are sidelined.
         $sql = 'SELECT COUNT(1) as count FROM '. TBL_CATEGORIES. '
                  WHERE cat_type = \''. $this->getValue('cat_type'). '\'
+                   AND cat_name_intern NOT LIKE \'CONFIRMATION_OF_PARTICIPATION\'
                    AND cat_org_id IS NULL ';
         $this->db->query($sql);
         $row = $this->db->fetch_array();