From 4cda055b03c10dfb0eddc2df5d79845082eba1fd Mon Sep 17 00:00:00 2001
From: "altob.rd" <altob.rd@gmail.com>
Date: Wed, 17 Jan 2018 10:18:05 +0800
Subject: [PATCH] upd for G1

---
 controllers/Parkingquery.php  | 27 +++++++++++++++++++++------
 models/Parkingquery_model.php |  6 +++++-
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/controllers/Parkingquery.php b/controllers/Parkingquery.php
index 423c566..ebfa003 100644
--- a/controllers/Parkingquery.php
+++ b/controllers/Parkingquery.php
@@ -172,24 +172,39 @@ class Parkingquery extends CI_Controller
     // 空車位導引
 	public function get_valid_seat() 
 	{                                          
-    	$pksno = $this->uri->segment(3, 0);	// 從某一個車位開始, 若無則設0 
-        $data = $this->parkingquery_model->get_valid_seat($pksno);
+    	$pksno = $this->uri->segment(3, 0);		// 從某一個車位開始, 若無則設0 
+		$group_id = $this->uri->segment(4, 0);	// 指定樓層群組
+		
+		if(empty($group_id))
+			$group_id = '';
+		
+        $data = $this->parkingquery_model->get_valid_seat($pksno, 1, $group_id);
         echo json_encode($data, JSON_UNESCAPED_UNICODE); 
     }    
 	
 	// 空車位導引 (身障)
 	public function get_valid_seat2() 
 	{                                          
-    	$pksno = $this->uri->segment(3, 0);	// 從某一個車位開始, 若無則設0 
-        $data = $this->parkingquery_model->get_valid_seat($pksno, 3);
+    	$pksno = $this->uri->segment(3, 0);		// 從某一個車位開始, 若無則設0 
+		$group_id = $this->uri->segment(4, 0);	// 指定樓層群組
+		
+		if(empty($group_id))
+			$group_id = '';
+		
+        $data = $this->parkingquery_model->get_valid_seat($pksno, 3, $group_id);
         echo json_encode($data, JSON_UNESCAPED_UNICODE); 
     }
     
 	// 空車位導引 (婦友)
 	public function get_valid_seat3() 
 	{                                          
-    	$pksno = $this->uri->segment(3, 0);	// 從某一個車位開始, 若無則設0 
-        $data = $this->parkingquery_model->get_valid_seat($pksno, 4);
+    	$pksno = $this->uri->segment(3, 0);		// 從某一個車位開始, 若無則設0 
+		$group_id = $this->uri->segment(4, 0);	// 指定樓層群組
+		
+		if(empty($group_id))
+			$group_id = '';
+		
+        $data = $this->parkingquery_model->get_valid_seat($pksno, 4, $group_id);
         echo json_encode($data, JSON_UNESCAPED_UNICODE); 
     }
     
diff --git a/models/Parkingquery_model.php b/models/Parkingquery_model.php
index fb2d06a..ce1a61a 100644
--- a/models/Parkingquery_model.php
+++ b/models/Parkingquery_model.php
@@ -186,11 +186,13 @@ class Parkingquery_model extends CI_Model
     } 	
 	
 	// 空車位導引
-	public function get_valid_seat($pksno, $group_type=1)
+	public function get_valid_seat($pksno, $group_type=1, $group_id='')
 	{           
     	$data = array();   
         $this->db->trans_start(); 
 		
+		$where_group_id = empty($group_id) ? '' : " and pks_group_member.group_id = '{$group_id}' ";	// 指定車位群組
+		
 		$sql = '';
         if ($pksno > 0)	// 限制從某一個車位開始指派車位
         {   
@@ -218,6 +220,7 @@ class Parkingquery_model extends CI_Model
 						where 
 							pks.status = 'VA' and prioritys != 0 and (pks.book_time is null or pks.book_time <= now()) 
 							and pks_groups.group_type = {$group_type}
+							{$where_group_id}
 						order by v asc limit 1 for update;
 						";
 			}
@@ -233,6 +236,7 @@ class Parkingquery_model extends CI_Model
 							AND pks.prioritys != 0 
 							AND (pks.book_time IS NULL OR pks.book_time <= now()) 
 							AND pks_groups.group_type = {$group_type}
+							{$where_group_id}
 						ORDER BY pks.prioritys ASC LIMIT 1 FOR UPDATE;"; 
 						
 		trigger_error(__FUNCTION__ . "..sql: {$sql}..");