From d7438c342b5864ba3c446d9602ce886972f34b2b Mon Sep 17 00:00:00 2001
From: "altob.rd" <altob.rd@gmail.com>
Date: Fri, 17 Nov 2017 09:43:27 +0800
Subject: [PATCH] add map

---
 views/qcar3/main_page.php    | 40 ++++++++++++++++++++++++++++++++++++----
 views/qcar3/result_page.php  |  6 +++---
 views/qcar3/result_page2.php |  6 +++---
 3 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/views/qcar3/main_page.php b/views/qcar3/main_page.php
index 1f657c7..1dabd64 100644
--- a/views/qcar3/main_page.php
+++ b/views/qcar3/main_page.php
@@ -170,7 +170,19 @@
 
 		</div>
 
-
+		<div data-items="B1" class="row" style="display:none;">
+			<div class="col-lg-12 col-sm-12">
+				<table class="table table-striped table-bordered table-hover"">
+					<tbody>
+						<tr>
+							<td style="text-align:center;vertical-align: middle;">
+								<canvas id="b1canvas"></canvas>
+							</td>
+						</tr>
+					</tbody>
+				</table>
+			</div>
+        </div>
 
 
         <!-- /#page-wrapper -->
@@ -201,6 +213,12 @@
 	<!-- moment -->
 	<script src="<?=WEB_LIB?>js/moment.min.js"></script>
 	
+	<!-- altob ats map -->
+	<script src="<?=WEB_LIB?>js/altob-ats-map.js"></script> 
+	
+	<!-- altob settings -->
+	<script src="<?=WEB_LIB?>js/altob.settings.js"></script>
+	
 	<!-- jQuery validate -->
 	<script src="<?=WEB_LIB?>form-validator/jquery.form-validator.min.js"></script>
 
@@ -212,6 +230,21 @@
 
 <script>
 
+
+	<?php /* 樓層平面圖 */ ?>
+	AltobObject.AtsMap({
+		mapInfo: {
+			map1: {
+				floorName: 'B1',
+				canvasId: 'b1canvas',
+				src: '<?=SERVER_URL?>i3/pics/b1_map.png',
+				initialImageRatio: AltobObject.settings.qcar3.result_page.B1.initialImageRatio,
+				shiftLeft: AltobObject.settings.qcar3.result_page.B1.shiftLeft,
+				shiftUp: AltobObject.settings.qcar3.result_page.B1.shiftUp
+			}
+		}
+	});
+
 <?php /* alertify function */ ?>
 function alertify_count_down($msg, $delay)
 {
@@ -324,9 +357,8 @@ function check_lpr(idx)
             	show_item("output_pks");
 
 				// 顯示位置圖
-				if (jdata["group_id"]){
-					//var groupSplit = jdata["group_id"].split('-'); // ex. B3-3
-					//var floor = groupSplit[0];
+				if (jdata["group_id"])
+				{
 					var floor = jdata["floors"];
 					var x = jdata["posx"];
 					var y = jdata["posy"];
diff --git a/views/qcar3/result_page.php b/views/qcar3/result_page.php
index 9cad94b..51afa52 100644
--- a/views/qcar3/result_page.php
+++ b/views/qcar3/result_page.php
@@ -426,9 +426,9 @@ $(document).ready(function()
 				floorName: 'B1',
 				canvasId: 'b1canvas',
 				src: '<?=SERVER_URL?>i3/pics/b1_map.png',
-				initialImageRatio: AltobObject.settings.qcar2.result_page.B1.initialImageRatio,
-				shiftLeft: AltobObject.settings.qcar2.result_page.B1.shiftLeft,
-				shiftUp: AltobObject.settings.qcar2.result_page.B1.shiftUp
+				initialImageRatio: AltobObject.settings.qcar3.result_page.B1.initialImageRatio,
+				shiftLeft: AltobObject.settings.qcar3.result_page.B1.shiftLeft,
+				shiftUp: AltobObject.settings.qcar3.result_page.B1.shiftUp
 			}
 		}
 	});
diff --git a/views/qcar3/result_page2.php b/views/qcar3/result_page2.php
index 95a108a..71903e5 100644
--- a/views/qcar3/result_page2.php
+++ b/views/qcar3/result_page2.php
@@ -461,9 +461,9 @@ $(document).ready(function()
 				floorName: 'B1',
 				canvasId: 'b1canvas',
 				src: '<?=SERVER_URL?>i3/pics/b1_map.png',
-				initialImageRatio: AltobObject.settings.qcar2.result_page2.B1.initialImageRatio,
-				shiftLeft: AltobObject.settings.qcar2.result_page2.B1.shiftLeft,
-				shiftUp: AltobObject.settings.qcar2.result_page2.B1.shiftUp
+				initialImageRatio: AltobObject.settings.qcar3.result_page.B1.initialImageRatio,
+				shiftLeft: AltobObject.settings.qcar3.result_page.B1.shiftLeft,
+				shiftUp: AltobObject.settings.qcar3.result_page.B1.shiftUp
 			}
 		}
 	});