Added Excel export by requestor

accred_list.php

@@ -35,8 +35,15 @@
 	  }
 	 
 
-	if($_GET['o']=='excel' && $_GET['t']!='demandeur') {
+	if($_GET['o']=='excel') {
 
+	// Name we want to sort by and display
+	if($_GET['t']!='demandeur') {
+		$sortName = 'name';
+	}
+	else {
+		$sortName = 'reqname';
+	}
 	$spreadsheet = new Spreadsheet();
 	// Set properties
 	$spreadsheet->getProperties()->setCreator("Caribana festival");
@@ -153,7 +160,7 @@ $spreadsheet->getActiveSheet()->getStyle($coord.':AA'.($highestRow+2))->getFill(
 // ------
 // Go again this time sorted by name so we can create a worksheet per requestor
 
-$query = "SELECT * from submissions ORDER BY name";
+$query = "SELECT * from submissions ORDER BY $sortName";
 if ($result = $mysqli->query($query)) {
 
     $line = 1;
@@ -185,7 +192,7 @@ if ($result = $mysqli->query($query)) {
            }
 
         }
-        if($prevName!=$fr['name']) {
+	if($prevName!=$fr[$sortName]) {
             $keys = array_keys ( $header );
             // Create new worksheet
             if($prevSheet) {
@@ -207,7 +214,7 @@ if ($result = $mysqli->query($query)) {
             }
             $prevSheet = $spreadsheet->getActiveSheet();
             $myWorkSheet = $spreadsheet->createSheet();
-            $myWorkSheet->setTitle($fr['name']);
+            $myWorkSheet->setTitle($fr[$sortName]);
             $myWorkSheet
                 ->fromArray(
                     $keys,   // The data to set
@@ -217,7 +224,7 @@ if ($result = $mysqli->query($query)) {
                 );
             $myWorkSheet->getStyle('1')->getFont()->setBold(true);
             $line=2;
-            $prevName = $fr['name'];
+            $prevName = $fr[$sortName];
         }
 
         $myWorkSheet
@@ -320,6 +327,7 @@ if ($mysqli->connect_errno) {
 <?php } ?>
 <?php if($isAdmin) { ?>
     <li> <a href="./accred_list?o=excel">Export Excel</a></li>
+	    <li> <a href="./accred_list?o=excel&t=demandeur">Export Excel par demandeur</a></li>
 <?php } ?>
 </ul>