Improve LaTeX code and add corridor number for all items

[misc/hallinta-metro] / utils.php

diff --git a/utils.php b/utils.php
index 5bd6ce4..016f15b 100644 (file)
--- a/utils.php
+++ b/utils.php
@@ -147,7 +147,7 @@ function ordersatz_write($id, $dir, $send)
                 "JOIN metro_abteilung ON abteilung = metro_abteilung.id " .
                 "JOIN metro_vpe ON vpe = metro_vpe.id " .
                 "WHERE ordersatz = %d AND anzahl IS NOT NULL " .
-                "ORDER BY gang,metro_abteilung.name",
+                "ORDER BY gang,metro_abteilung.name,bezeichnung",
                 $id);
 
   $result = query_db($sql);
@@ -164,12 +164,13 @@ function ordersatz_write($id, $dir, $send)
     if (strlen($row['hinweis']))
       $bez .= sprintf("\\newline\\textbf{%s}", latex_encode($row['hinweis']));
 
-    fwrite($f, sprintf('\order{%d}{%s}{%s %s}{%s}'."\n",
+    fwrite($f, sprintf('\order{%d}{%s}{%s %s}{%s}{%s}'."\n",
                       $row['anzahl'],
                       $row['artnr'] ? (int)$row['artnr'] : '',
-                      $row['menge'],
+                      latex_encode($row['menge']),
                       $bez,
-                      latex_encode($row['vpname'])));
+                      latex_encode($row['vpname']),
+                      latex_encode($row['gang'])));
   }
 
   fclose($f);
@@ -214,4 +215,4 @@ function ordersatz_write($id, $dir, $send)
   return true;
 }
 
-?>
\ No newline at end of file
+?>