diff --git a/public_html/assets/css/mapMAPCSS.css b/public_html/assets/css/mapMAPCSS.css index db68f2a..ee2e4e0 100644 --- a/public_html/assets/css/mapMAPCSS.css +++ b/public_html/assets/css/mapMAPCSS.css @@ -104,7 +104,29 @@ background: #007bff; border: 1px solid #007bff; } - + + /* Pickup Qty 게이지: 타겟 대비 채움 비율 표시 */ + .btn-gauge { + text-shadow: + -1px -1px 0 #007bff, + 1px -1px 0 #007bff, + -1px 1px 0 #007bff, + 1px 1px 0 #007bff, + 0 0 2px #007bff; + background-clip: padding-box; + } + .btn-gauge .gauge-pct { + font-size: 12px; + opacity: 0.9; + } + .btn-gauge .gauge-sub { + display: block; + font-size: 11px; + font-weight: 400; + letter-spacing: 0; + opacity: 0.95; + } + .btn-red-map { margin-top: 5px; width: 100%; diff --git a/public_html/assets/internal_api.php b/public_html/assets/internal_api.php index c4b6bf0..96d53a8 100644 --- a/public_html/assets/internal_api.php +++ b/public_html/assets/internal_api.php @@ -1768,19 +1768,35 @@ class API extends CONF { $_POST['route_date'] = str_replace("-","",$_POST['route_date']); $sqQuantity = qry("SELECT - SUM(d_quantity) as pickupquantity + SUM(d_quantity) as pickupquantity, + COUNT(*) as pickupcnt FROM tbl_daily - WHERE - d_status = 'F' AND d_orderdate = '".$_POST['route_date']."' + WHERE + d_status = 'F' AND d_orderdate = '".$_POST['route_date']."' AND d_druid = '".$_POST['driver']."' "); $rstQuantity = fetch_array($sqQuantity); - + $curPickupQty = number_format((int)$rstQuantity['pickupquantity']); - - - $this->response($this->json(array("curPickupQty"=>$curPickupQty)), 200); + $curVisitCnt = (int)$rstQuantity['pickupcnt']; + + $sqTarget = qry("SELECT + dut_target_qty, + dut_target_visit_cnt + FROM + tbl_daily_uco_target + WHERE + dut_date = '".$_POST['route_date']."' + AND dut_druid = '".$_POST['driver']."' "); + + $rstTarget = fetch_array($sqTarget); + + $curTargetQty = number_format($rstTarget ? (int)$rstTarget['dut_target_qty'] : 0); + $curTargetVisitCnt = $rstTarget ? (int)$rstTarget['dut_target_visit_cnt'] : 0; + + + $this->response($this->json(array("curPickupQty"=>$curPickupQty, "curTargetQty"=>$curTargetQty, "curVisitCnt"=>$curVisitCnt, "curTargetVisitCnt"=>$curTargetVisitCnt)), 200); } catch(Exception $e) { $error = array($e->getMessage()); $this->response($this->json($error), 417); diff --git a/public_html/doc/install_order.php b/public_html/doc/install_order.php index 7e2a629..281f55e 100644 --- a/public_html/doc/install_order.php +++ b/public_html/doc/install_order.php @@ -1945,7 +1945,8 @@ async function initMap(){ center: { lat: 43.7, lng: -79.4 }, zoom: 11, mapId: "4504f8b37365c3d0", // waitlist와 동일 - disableDefaultUI: true // Map/Satellite 제거 + disableDefaultUI: true, // Map/Satellite 제거 + clickableIcons: false // POI 클릭 팝업 제거 } ); diff --git a/public_html/doc/install_wait_list.php b/public_html/doc/install_wait_list.php index ec3aec0..18e2a3e 100644 --- a/public_html/doc/install_wait_list.php +++ b/public_html/doc/install_wait_list.php @@ -1233,7 +1233,8 @@ $categoryLabels = [ center: { lat:43.65, lng:-79.38 }, zoom: 10, mapId: "4504f8b37365c3d0", - disableDefaultUI: true + disableDefaultUI: true, + clickableIcons: false }); // 새로고침 전에 작업하던 날짜/드라이버 복원 (loadDailyInstallPoints 호출 전) diff --git a/public_html/doc/map.php b/public_html/doc/map.php index 357e8a9..a92a447 100644 --- a/public_html/doc/map.php +++ b/public_html/doc/map.php @@ -73,17 +73,33 @@ $orderdateSTR = str_replace('-', "", $orderdateSTR); $sqQuantity = qry("SELECT - SUM(d_quantity) as pickupquantity + SUM(d_quantity) as pickupquantity, + COUNT(*) as pickupcnt FROM tbl_daily - WHERE - d_status = 'F' AND d_orderdate = '".$orderdateSTR."' + WHERE + d_status = 'F' AND d_orderdate = '".$orderdateSTR."' AND d_druid = '".$_SESSION['ss_DRUID']."' "); $rstQuantity = fetch_array($sqQuantity); - + $curPickupQty = (int)$rstQuantity['pickupquantity']; - + $curVisitCnt = (int)$rstQuantity['pickupcnt']; + + $sqTarget = qry("SELECT + dut_target_qty, + dut_target_visit_cnt + FROM + tbl_daily_uco_target + WHERE + dut_date = '".$orderdateSTR."' + AND dut_druid = '".$_SESSION['ss_DRUID']."' "); + + $rstTarget = fetch_array($sqTarget); + + $curTargetQty = $rstTarget ? (int)$rstTarget['dut_target_qty'] : 0; + $curTargetVisitCnt = $rstTarget ? (int)$rstTarget['dut_target_visit_cnt'] : 0; + } $strstr = "[".$_SESSION['ss_LEVEL']."][".$_SESSION['ss_UID']."][".$orderdateSTR."][".$rstQuantity['pickupquantity']."]"; @@ -121,8 +137,8 @@ - - + +