@movvjs/svelte-schedule-view 0.2.4 → 0.2.6-beta-1

package/dist/schedule-view/BookingInfo.svelte

@@ -15,7 +15,7 @@ import FlightSearch from "./components/flight-search/FlightSearch.svelte";
 import PhoneNumberInput from "./PhoneNumberInput.svelte";
 import FileUploader from "./FileUploader.svelte";
 import CarSearch from "./CarSearch.svelte";
-const { stdt, fullName, pax, extraServices, files, plans } = originalBooking;
+const { stdt, fullName, pax, extraServices, files, plans, isFlightService } = originalBooking;
 const {
   withPreserveAndPreview,
   hour,
@@ -44,9 +44,11 @@ async function copyContents() {
   texts.push(`${$t("booking.startTime")} : ${dayjs($stdt).format("HH:mm")}`);
   texts.push(`${$t("booking.carInfo")} : ${getCarName($originalBooking.carInfo, { seat: true, seatPostfix: $t("booking.seater") })}`);
   texts.push(`${$t("booking.pax")} : ${$pax}`);
-  texts.push(
-    `${$t("booking.flight")} : ${$originalBooking.flight?.name || "- -"} ${$originalBooking.flight?.selectType === "AUTO" && $originalBooking.flight?.arrivalTerminal ? `/ ${$t("flight.terminal", { values: { number: $originalBooking.flight.arrivalTerminal } })}` : ""}`
-  );
+  if ($isFlightService) {
+    texts.push(
+      `${$t("booking.flight")} : ${$originalBooking.flight ? [$originalBooking.flight?.name, getTerminalName($originalBooking.flight)].filter(Boolean).join(" / ") || "- -" : "- -"}`
+    );
+  }
   texts.push(`${$t("booking.guestName")} : ${$fullName}`);
   texts.push(`${$t("booking.telNo")} : ${PhoneNumberBiz.format($originalBooking.countryCode, $originalBooking.tel) || "- -"}`);
   const extraServiceText = $originalBooking.extra?.length > 0 ? $originalBooking.extra.map((s) => $t(`extraServiceType.${s.type}`)).join(", ") : "- -";
@@ -103,13 +105,46 @@ async function toggleAutoPicket(e) {
 function openFlightSearch() {
   flightSearch$.open({
     dateTime: $copiedBooking.ymd,
-    iata: $copiedBooking.origin?.iata
+    airport: (() => {
+      if ($copiedBooking.serviceType === BookingServiceType.pickup) {
+        return {
+          iata: $copiedBooking.origin?.iata || null,
+          code: $copiedBooking.origin?.code || null
+        };
+      } else if ($copiedBooking.serviceType === BookingServiceType.sending) {
+        return {
+          iata: $copiedBooking.dest?.iata || null,
+          code: $copiedBooking.dest?.code || null
+        };
+      } else {
+        return null;
+      }
+    })(),
+    terminalOnly: $copiedBooking.serviceType === BookingServiceType.sending
   }).then((flight) => {
     $copiedBooking.flight = flight;
   }).catch((e) => {
     alert.open({ title: $t("alert.error"), text: e.message });
   });
 }
+function getTerminalName(flight) {
+  if (!flight?.arrivalTerminal)
+    return null;
+  if (flight.selectType === "AUTO") {
+    switch (flight.arrivalTerminal) {
+      case "I":
+        return "International";
+      case "D":
+        return "Domestic";
+      default:
+        return `Terminal ${flight.arrivalTerminal}`;
+    }
+  } else if (flight.selectType === "MANUAL") {
+    return flight.arrivalTerminal;
+  } else {
+    return null;
+  }
+}
 </script>
 
 <Translation bind:this={translation$} />
@@ -167,17 +202,17 @@ function openFlightSearch() {
 					</td>
 				</tr>
 
-				{#if $originalBooking.serviceType === BookingServiceType.pickup}
+				{#if $isFlightService}
 					<tr>
 						<th>{$t('booking.flight')}</th>
 						<td>
 							{#if !$isEdit}
 								{#if $originalBooking.flight}
 									<p class="indie_value-text flight">
-										<b>{$originalBooking.flight.name}</b>
-										{#if $originalBooking.flight.selectType === 'AUTO' && $originalBooking.flight.arrivalTerminal}
-											/ {$t('flight.terminal', { values: { number: $originalBooking.flight.arrivalTerminal } })}
-										{/if}
+										{@html [$originalBooking.flight.name, getTerminalName($originalBooking.flight)]
+											.map((value, i) => (value ? (i === 0 ? `<b>${value}</b>` : value) : null))
+											.filter(Boolean)
+											.join(' / ')}
 									</p>
 									{#if $originalBooking.flight.selectType === 'MANUAL'}
 										<div class="indie_exclamation_mark_box sm black">
@@ -191,10 +226,10 @@ function openFlightSearch() {
 								<!--  -->
 								{#if $copiedBooking.flight}
 									<p class="indie_value-text flight">
-										<b>{$copiedBooking.flight.name}</b>
-										{#if $copiedBooking.flight.selectType === 'AUTO' && $copiedBooking.flight.arrivalTerminal}
-											/ {$t('flight.terminal', { values: { number: $copiedBooking.flight.arrivalTerminal } })}
-										{/if}
+										{@html [$copiedBooking.flight.name, getTerminalName($copiedBooking.flight)]
+											.map((value, i) => (value ? (i === 0 ? `<b>${value}</b>` : value) : null))
+											.filter(Boolean)
+											.join(' / ')}
 									</p>
 									<button type="button" class="indie_btn_squre only refresh_black mgl10" on:click={() => openFlightSearch()}>다시선택</button>
 									{#if $copiedBooking.flight.selectType !== 'AUTO'}

package/dist/schedule-view/PlaceSearch.svelte

@@ -1,16 +1,35 @@
-<script>import { CommonAPI } from "./api";
+<script>import center from "@turf/center";
+import { points } from "@turf/helpers";
+import { CommonAPI } from "./api";
 import { loader } from "./components/loader";
 import BaseSearchInput, {} from "./BaseSearchInput.svelte";
+import { copiedBooking } from "./stores/booking";
 export let placeholder = "Title / Detailed address";
 export let inputId;
 export let title;
+const { coordinates } = copiedBooking;
+$:
+  centerCoordinate = (() => {
+    if ($coordinates.length === 0) {
+      return null;
+    } else {
+      try {
+        const features = points($coordinates.map(({ lng: lng2, lat: lat2 }) => [lng2, lat2]));
+        const centerFeature = center(features);
+        const [lng, lat] = centerFeature?.geometry?.coordinates;
+        return { lng, lat };
+      } catch (e) {
+        return null;
+      }
+    }
+  })();
 let list = [];
 async function search(keyword) {
   if (!keyword?.trim())
     return;
   try {
     loader.show();
-    const data = await CommonAPI.searchPlace(keyword);
+    const data = await CommonAPI.searchPlace(keyword, centerCoordinate);
     list = data.map((item) => ({
       title: item.title,
       subTitle: item.address,

package/dist/schedule-view/api/common/index.d.ts

@@ -14,5 +14,9 @@ export declare class CommonAPI {
         name: string;
         url: string;
     }>;
-    static searchPlace(keyword: string): Promise<BookingLocation[]>;
+    static searchPlace(keyword: string, center: {
+        lat: number;
+        lng: number;
+    }): Promise<BookingLocation[]>;
+    static getPoiTerminals(code: string): Promise<string[]>;
 }

package/dist/schedule-view/api/common/index.js

@@ -1,6 +1,7 @@
 import { axios } from '../../../axios';
 import { get } from 'svelte/store';
 import { env } from '../../../store/env';
+import QS from 'qs';
 export class CommonAPI {
     static async getPickupPoint(ppno) {
         const { target } = get(env);
@@ -90,10 +91,14 @@ export class CommonAPI {
             throw Error('Invalid target');
         }
     }
-    static async searchPlace(keyword) {
+    static async searchPlace(keyword, center) {
         const { target } = get(env);
+        const queryString = QS.stringify({
+            title: keyword,
+            ...(center ? { lat: center.lat, lng: center.lng } : {})
+        }, { skipNulls: true });
         if (target === 'B2B') {
-            const { data } = await axios.get(`/booking/scheduleView/place?title=${keyword}`);
+            const { data } = await axios.get(`/booking/scheduleView/place?${queryString}`);
             if (data.mode === false) {
                 throw new Error(data.msg || data.message || JSON.stringify(data));
             }
@@ -102,7 +107,7 @@ export class CommonAPI {
             }
         }
         else if (target === 'FMS' || target === 'MOVV') {
-            const { data } = await axios.get(`/common/v2/place?title=${keyword}`);
+            const { data } = await axios.get(`/common/v2/place?${queryString}`);
             if (data.mode === false) {
                 throw new Error(data.msg || data.message || JSON.stringify(data));
             }
@@ -114,4 +119,13 @@ export class CommonAPI {
             throw Error('Invalid target');
         }
     }
+    static async getPoiTerminals(code) {
+        const { data } = await axios.get(`/common/poiTerminal/list/${code}`);
+        if (data.mode === false) {
+            throw new Error(data.msg);
+        }
+        else {
+            return data.list;
+        }
+    }
 }

package/dist/schedule-view/assets/scss/indie_booking.scss

@@ -3038,8 +3038,9 @@
 
         .map_box{
             flex-grow: 1;
-            background-color: Azure;
+            background-color: royalblue;
             position: relative;
+            overflow: hidden;
 
             .indie_ic_map_loca{
                 position: relative;
@@ -4611,5 +4612,61 @@
         }
     }
 
+
+
+    
+    //마진 값
+    .mg{
+        @for $i from 0 through 40{
+            @if(($i % 5) == 0){
+                &t#{$i}{margin-top: #{$i}px;}
+                &l#{$i}{margin-left: #{$i}px;}
+                &r#{$i}{margin-right: #{$i}px;}
+                &b#{$i}{margin-bottom: #{$i}px;}
+            }
+        }
+
+        &TMinus{
+            margin-top: -1px;
+        }
+
+        &-l-auto{
+            margin-left: auto;
+        }
+        &-r-auto{
+            margin-right: auto;
+        }
+    }
+
+    //패딩 값
+    .pd{
+        @for $i from 0 through 40{
+            @if(($i % 5) == 0){
+                &t#{$i}{padding-top: #{$i}px;}
+                &l#{$i}{padding-left: #{$i}px;}
+                &r#{$i}{padding-right: #{$i}px;}
+                &b#{$i}{padding-bottom: #{$i}px;}
+            }
+        }
+    }
+
+    // 넓이 값 - 퍼센트
+    .w{
+        @for $i from 0 through 100{
+            @if(($i % 5) == 0){
+                &#{$i}{width: #{$i + '%'};}
+            }
+        }
+    }
+
+    // 넓이 값 - 픽셀
+    .w{
+        @for $i from 0 through 500{
+            @if(($i % 10) == 0){
+                &#{$i}px{width: #{$i + 'px'};}
+            }
+        }
+    }
+
 }