bug fixes

#91, #95, #83
RaspberryPints · Feb 6, 2014 · a1b4b35 · a1b4b35
1 parent 83ba041
commit a1b4b35
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+admin/includes/configp.php
+admin/includes/conn.php
+includes/config.php
diff --git a/admin/includes/managers/tap_manager.php b/admin/includes/managers/tap_manager.php
@@ -6,6 +6,13 @@ class TapManager{
 
 	function Save($tap){
 		$sql = "";
+
+		$sql="UPDATE kegs k SET k.kegStatusCode = 'SERVING' WHERE id = " . $tap->get_kegId();
+		mysql_query($sql);
+
+		$sql="UPDATE taps SET active = 0, modifiedDate = NOW() WHERE active = 1 AND tapNumber = " . $tap->get_tapNumber();
+		mysql_query($sql);		
+
 		if($tap->get_id()){
 			$sql = 	"UPDATE taps " .
 					"SET " .
@@ -22,15 +29,9 @@ function Save($tap){
 					"WHERE id = " . $tap->get_id();
 
 		}else{
-			$sql="UPDATE kegs k, taps t SET k.kegStatusCode = 'SERVING' WHERE t.kegId = k.id AND t.Id = " . $tap->get_kegId();
-			mysql_query($sql);
-
-			$sql="UPDATE taps SET active = 0, modifiedDate = NOW() WHERE active = 1 AND tapNumber = " . $tap->get_tapNumber();
-			mysql_query($sql);		
-
 			$sql = 	"INSERT INTO taps(beerId, kegId, tapNumber, ogAct, fgAct, srmAct, ibuAct, startAmount, currentAmount, active, createdDate, modifiedDate ) " .
 					"VALUES(" . $tap->get_beerId() . ", " . $tap->get_kegId() . ", " . $tap->get_tapNumber() . ", " . $tap->get_og() . ", " . $tap->get_fg() . ", " . $tap->get_srm() . ", " . $tap->get_ibu() . ", " . $tap->get_startAmount() . ", " . $tap->get_startAmount() . ", " . $tap->get_active	() . ", NOW(), NOW())";
-		}
+		}		
 
 		//echo $sql; exit();
 

diff --git a/admin/tap_form.php b/admin/tap_form.php
@@ -34,17 +34,24 @@
 	redirect('tap_list.php');
 }
 
+
+$beerList = $beerManager->GetAll();
+$kegList = $kegManager->GetAllAvailable();
+
 $tapNumber = $_GET['tapNumber'];
 if( isset($_GET['id'])){
 	$tap = $tapManager->GetById($_GET['id']);
+
+	if( !array_key_exists($tap->get_kegId(), $kegList) ){
+		$kegList[$tap->get_kegId()] = $kegManager->GetById($tap->get_kegId());
+	}
+
 }else{
 	$tap = new Tap();
 	$tap->set_tapNumber($tapNumber);
 	$tap->set_active(true);
 }
 
-$beerList = $beerManager->GetAll();
-$kegList = $kegManager->GetAllAvailable();
 ?>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

diff --git a/index.php b/index.php
@@ -146,7 +146,7 @@
 										<h3><?php echo $beer['og']; ?> OG</h3>
 
 										<div class="srm-container">
-											<div class="srm-indicator" style="background-color: rgb(<?php echo $beer['srmRgb'] ?>)"></div>
+											<div class="srm-indicator" style="background-color: rgb(<?php echo $beer['srmRgb'] != "" ? $beer['srmRgb'] : "0,0,0" ?>)"></div>
 											<div class="srm-stroke"></div> 
 										</div>