- Add category short form and divison&category field

- Move division short form to be in the same order.

admin/reports_students.inc.php

@@ -232,6 +232,12 @@ $report_students_fields = array(
 		'width' => 3.0,
 		'table' => 'projectdivisions.division' ),
 
+	'div' => array(
+		'name' => 'Project -- Division Short Form' ,
+		'header' => 'Div',
+		'width' => 0.4,
+		'table' => 'projectdivisions.division_shortform' ),
+
 	'fr_division' =>  array(
 		'name' => 'Project -- Division (French)',
 		'header' => i18n('Division', array(), array(), 'fr'),
@@ -239,12 +245,6 @@ $report_students_fields = array(
 		'table' => 'projectdivisions.division',
 		'exec_function' => 'report_students_i18n_fr'),
 
-	'div' => array(
-		'name' => 'Project -- Division Short Form' ,
-		'header' => 'Div',
-		'width' => 0.4,
-		'table' => 'projectdivisions.division_shortform' ),
-
 	'category' => array(
 		'name' => 'Project -- Category',
 		'header' => 'Category',
@@ -252,6 +252,12 @@ $report_students_fields = array(
 		'table_sort' => 'projectcategories.id',
 		'table' => 'projectcategories.category' ),
 
+	'cat' => array(
+		'name' => 'Project -- Category Short Form' ,
+		'header' => 'cat',
+		'width' => 0.4,
+		'table' => 'projectcategories.category_shortform' ),
+
 	'fr_category' => array(
 		'name' => 'Project -- Category (French)',
 		'header' => i18n('Category', array(), array(), 'fr'),
@@ -267,6 +273,13 @@ $report_students_fields = array(
 		'table_sort' => 'projectcategories.id',
 		'table' => "CONCAT(projectcategories.category,' - ', projectdivisions.division)"),
 
+	'divisioncategory' => array(
+		'name' => 'Project -- Division and Category',
+		'header' => 'Division/Category',
+		'width' => 3.5,
+		'table_sort' => 'projectdivisions.id',
+		'table' => "CONCAT(projectdivisions.division,' - ',projectcategories.category)"),
+
 	'summary' => array(
 		'name' => 'Project -- Summary',
 		'header' => 'Project Summary',