Mercurial > bms / file diff

--- a/www/inv_yeastlab.php	Sun Mar 08 17:43:55 2020 +0100
+++ b/www/inv_yeastlab.php	Sun Mar 08 19:52:39 2020 +0100
@@ -82,8 +82,8 @@
 		global $yeasttype;
 		global $yeastform;
 		global $my_lab;
-		$this->AddCol( 20,'Product','L');
-		$this->AddCol( 70,'Gist','L');
+		$this->AddCol( 60,'Gist','L');
+		$this->AddCol( 50,'Omschrijving','L');
 		$this->AddCol( 18,'Soort','L');
 		$this->AddCol( 18,'Vorm','L');
 		$this->AddCol( 20,'Voorraad','R');
@@ -101,7 +101,7 @@
 		$this->ColorIndex=0;
 		$this->ProcessingTable=true;
 
-		$sql  = "SELECT name,product_id,type,form,inventory,production_date FROM inventory_yeasts ";
+		$sql  = "SELECT name,type,form,inventory,production_date,short_desc FROM inventory_yeasts ";
 		$sql .= "WHERE inventory > 0 AND laboratory = '".$my_lab."' ORDER BY product_id";
 		$result = mysqli_query($link, $sql);
 
@@ -115,8 +115,8 @@
 			$this->SetX($this->TableX);
 			$ci=$this->ColorIndex;
 			$this->SetFillColor($this->RowColors[$ci][0],$this->RowColors[$ci][1],$this->RowColors[$ci][2]);
-			$this->Cell(20,5,iconv('UTF-8','windows-1252',$row['product_id']),0,0,'L',true);
-			$this->Cell(70,5,iconv('UTF-8','windows-1252',$row['name']),0,0,'L',true);
+			$this->Cell(60,5,iconv('UTF-8','windows-1252',$row['name']),0,0,'L',true);
+			$this->Cell(50,5,iconv('UTF-8','windows-1252',$row['short_desc']),0,0,'L',true);
 			$this->Cell(18,5,iconv('UTF-8','windows-1252',$yeasttype[$row['type']]),0,0,'L',true);
 			$this->Cell(18,5,iconv('UTF-8','windows-1252',$yeastform[$row['form']]),0,0,'L',true);
 			$this->Cell(20,5,sprintf("%10.1f ",$stock).$form[$row['form']],0,0,'R',true);