esoftplay-event 0.0.2 → 0.0.3

package/event/tms_add_result.tsx

@@ -73,11 +73,16 @@ export default function m(props: EventTms_add_resultProps): any {
 
     new LibCurl('event_tms_access' + LibUtils.objectToUrlParam(post), null, (res, msg) => {
       if (is_add) {
-        const updatedPrice = res.price.map((item: any) => {
-          return { ...item, is_selected: "1" };
-        });
+        const updatedPrice = [...res.price]
+          .map((item: any) => {
+            return { ...item, is_selected: "1" }
+          })
+          .sort((a: any, b: any) =>
+            a.name.localeCompare(b.name, 'id', { sensitivity: 'base' })
+          )
+
+        const updatedData = { ...res, price: updatedPrice }
 
-        const updatedData = { ...res, price: updatedPrice }; // Menggabungkan kembali data dengan price yang telah diperbarui
         setTicketTypes(updatedData)
 
       } else {
@@ -139,7 +144,7 @@ export default function m(props: EventTms_add_resultProps): any {
 
         {
           ticketTypes &&
-          <View style={{ marginTop: 10 }}>
+          <View style={{ marginTop: 10, marginBottom: 10 }}>
             <LibTextstyle textStyle='m_overline' text={esp.lang("event/tms_add_result", "ticket_type")} style={{ fontSize: 12, marginTop: 15, marginBottom: 15 }} />
             {
               ticketTypes?.price?.map((item: any, i: number) => {

package/event/tms_check_ticket_result.tsx

@@ -248,16 +248,25 @@ export default function m(props: EventTms_check_ticket_resultProps): any {
                         <Text allowFontScaling={false} style={{ fontSize: 14 }}>{LibUtils.moment(item?.ondate).localeFormat('DD MMMM YYYY')}</Text>
                     }
                   </View>
-                  <View style={{ marginBottom: 10, flexDirection: 'row', flexWrap: 'wrap', marginLeft: -10 }}>
+                  <View style={{ marginBottom: 10, flexDirection: 'row', flexWrap: 'wrap' }}>
                     {
                       item?.tickets?.map((x: any, i: number) => {
+                        const [front, end] = x?.seat_label?.split("#") || ["", ""];
                         if (x.seat_label != "") {
-                          return (
-                            <View key={i} style={{ marginLeft: 10, paddingVertical: 5, marginBottom: 7, paddingHorizontal: 7, borderWidth: 1, borderColor: '#000', backgroundColor: '#fff', borderRadius: 5 }}>
-                              <Text allowFontScaling={false} style={{ fontWeight: 'bold', fontSize: 20, color: '#000' }}>{x.seat_label}</Text>
-                            </View>
-
-                          )
+                          if (x?.seat_label?.includes("#")) {
+                            return (
+                              <View key={i} style={{ flexDirection: 'row', alignItems: 'center', paddingVertical: 5, marginBottom: 7, paddingHorizontal: 5, backgroundColor: '#fff', borderRadius: 5, marginRight: 7, ...LibStyle.elevation(5), }}>
+                                <Text allowFontScaling={false} style={{ fontWeight: 'bold', fontSize: 16, color: "#000" }}> {front} </Text>
+                                <Text allowFontScaling={false} style={{ marginLeft: 3, fontWeight: 'bold', fontSize: 16, color: '#000', }}> {end} </Text>
+                              </View>
+                            )
+                          } else {
+                            return (
+                              <View key={i} style={{ flexDirection: 'row', alignItems: 'center', paddingVertical: 5, marginBottom: 7, paddingHorizontal: 5, backgroundColor: '#fff', borderRadius: 5, marginRight: 7, ...LibStyle.elevation(5), }}>
+                                <Text allowFontScaling={false} style={{ fontWeight: 'bold', fontSize: 16, color: "#000" }}>{x?.seat_label}</Text>
+                              </View>
+                            )
+                          }
                         } else {
                           return null
                         }

package/event/tms_dashboard.tsx

@@ -11,6 +11,11 @@ import esp from 'esoftplay/esp';
 import useGlobalState, { useGlobalReturn } from 'esoftplay/global';
 import { useRef } from 'react';
 
+import { EventTms_dashboardProperty } from 'esoftplay/cache/event/tms_dashboard/import';
+import { EventTms_gateProperty } from 'esoftplay/cache/event/tms_gate/import';
+import { LibCurl } from 'esoftplay/cache/lib/curl/import';
+import { LibDialog } from 'esoftplay/cache/lib/dialog/import';
+import { LibProgress } from 'esoftplay/cache/lib/progress/import';
 import React from 'react';
 import { ScrollView, Text, TouchableOpacity, View } from 'react-native';
 
@@ -36,9 +41,57 @@ export function closingDataState(): useGlobalReturn<any> {
   return stateClosingData
 }
 
+const stateEvent = useGlobalState({})
+
+export function stateSelectedEvent(): useGlobalReturn<any> {
+  return stateEvent
+}
+
 export default function m(props: EventTms_dashboardProps): any {
   const [user] = UserClass.state().useState()
   const dialogClosing = useRef<LibSlidingup>(null)
+  let dataEvent = user?.is_tms[0]
+
+
+  function loadGate(event_id: any, is_v2: boolean) {
+    let post = {
+      event_id: event_id
+    }
+    LibProgress?.show(esp.lang("event/tms_dashboard", "please_wait_loading_data_gate"))
+    new LibCurl('event_gate', post, (res, msg) => {
+      LibProgress.hide()
+      if (res.length == 1) {
+        let a = LibObject.set(EventTms_dashboardProperty.closingDataState().get(), res[0].id)('gate_id')
+        EventTms_dashboardProperty.closingDataState().set(a)
+        LibNavigation.navigate(is_v2 ? 'tms/tms_home' : 'event/tms_home', { selectedGate: res[0], typeScanner: "tms" })
+        EventTms_gateProperty?.stateSelectedGate()?.set(res?.[0])
+      } else {
+        LibNavigation.navigate('event/tms_gate', { typeScanner: 'tms', is_v2: is_v2 })
+      }
+    }, (error) => {
+      LibProgress.hide()
+      LibDialog.warning(esp.lang("event/tms_gate", "warning_load"), error?.message)
+    }, 1)
+  }
+
+  function loadHall(event_id: any, is_v2: boolean) {
+    let post = {
+      event_id: event_id
+    }
+    LibProgress?.show(esp.lang("event/tms_dashboard", "please_wait_loading_data_hall"))
+    new LibCurl('event_hall', post, (res, msg) => {
+      LibProgress.hide()
+      if (res.length == 1) {
+        LibNavigation.navigate(is_v2 ? 'tms/tms_home' : 'event/tms_home', { selectedGate: res[0], typeScanner: "hall" })
+        EventTms_gateProperty.stateSelectedHall().set(res?.[0])
+      } else {
+        LibNavigation.navigate('event/tms_gate', { typeScanner: 'hall', is_v2: is_v2 })
+      }
+    }, (error) => {
+      LibProgress.hide()
+      LibDialog.warning(esp.lang("event/tms_gate", "warning_loadhall"), error?.message)
+    }, 1)
+  }
 
   let menus = [
     {
@@ -48,12 +101,11 @@ export default function m(props: EventTms_dashboardProps): any {
       active: 1,
       color_accent: '#FFC523',
       onPress: () => {
-        LibNavigation.navigateForResult('event/tms_event_list', { data: user?.is_tms }).then((value) => {
-          let a = LibObject.set(stateClosingData?.get(), value?.id)('event_id')
-          let b = LibObject.set(a, value?.name)('event_name')
-          stateClosingData?.set(b)
-          LibNavigation.navigate('event/tms_gate', { is_scanner: value, typeScanner: 'tms' })
-        })
+        let a = LibObject.set(stateClosingData?.get(), dataEvent?.id)('event_id')
+        let b = LibObject.set(a, dataEvent?.name)('event_name')
+        stateClosingData?.set(b)
+        stateSelectedEvent()?.set(dataEvent)
+        loadGate(dataEvent?.id, false)
       }
     },
     {
@@ -63,9 +115,8 @@ export default function m(props: EventTms_dashboardProps): any {
       active: 1,
       color_accent: '#01D0FB',
       onPress: () => {
-        LibNavigation.navigateForResult('event/tms_event_list', { data: user?.is_tms }).then((value) => {
-          LibNavigation.navigate('event/tms_gate', { is_scanner: value, typeScanner: 'hall' })
-        })
+        stateSelectedEvent()?.set(dataEvent)
+        loadHall(dataEvent?.id, false)
       }
     },
     {
@@ -75,9 +126,7 @@ export default function m(props: EventTms_dashboardProps): any {
       active: 1,
       color_accent: '#800020',
       onPress: () => {
-        LibNavigation.navigateForResult('event/tms_event_list', { data: user?.is_tms }).then((value) => {
-          LibNavigation.navigate('event/exchange_ticket', { dataEvent: value })
-        })
+        LibNavigation.navigate('event/exchange_ticket', { dataEvent: dataEvent })
       }
     },
     {
@@ -90,6 +139,31 @@ export default function m(props: EventTms_dashboardProps): any {
         dialogClosing.current?.show()
       }
     },
+    {
+      id: 5,
+      title: esp.lang("user/profile", "tms_scanner") + " (Testing)",
+      icon: 'menu/ic_turnstile.png',
+      active: esp.isDebug("") ? 1 : 0,
+      color_accent: '#FFC523',
+      onPress: () => {
+        let a = LibObject.set(stateClosingData?.get(), dataEvent?.id)('event_id')
+        let b = LibObject.set(a, dataEvent?.name)('event_name')
+        stateClosingData?.set(b)
+        stateSelectedEvent()?.set(dataEvent)
+        loadGate(dataEvent?.id, true)
+      }
+    },
+    {
+      id: 6,
+      title: esp.lang("user/profile", "hall_scanner") + " (Testing)",
+      icon: 'menu/ic_hall.png',
+      active: esp.isDebug("") ? 1 : 0,
+      color_accent: '#01D0FB',
+      onPress: () => {
+        stateSelectedEvent()?.set(dataEvent)
+        loadHall(dataEvent?.id, true)
+      }
+    },
   ]
 
   const options = [
@@ -106,6 +180,7 @@ export default function m(props: EventTms_dashboardProps): any {
       title: esp.lang("event/tms_dashboard", "log_exchange"),
       onPress: () => {
         dialogClosing.current?.show()
+        LibNavigation.navigate('event/exchange_ticket_list')
       }
     },
   ]

package/event/tms_gate.tsx

@@ -11,6 +11,7 @@ import useSafeState from 'esoftplay/state';
 
 import { EventTms_dashboardProperty } from 'esoftplay/cache/event/tms_dashboard/import';
 import { LibObject } from 'esoftplay/cache/lib/object/import';
+import useGlobalState, { useGlobalReturn } from 'esoftplay/global';
 import React, { useEffect } from 'react';
 import { Pressable, ScrollView, Text, View } from 'react-native';
 
@@ -21,8 +22,21 @@ export interface EventTms_gateArgs {
 export interface EventTms_gateProps {
 
 }
+
+const stateGate = useGlobalState({})
+
+export function stateSelectedGate(): useGlobalReturn<any> {
+  return stateGate
+}
+
+const stateHall = useGlobalState({})
+
+export function stateSelectedHall(): useGlobalReturn<any> {
+  return stateHall
+}
+
 export default function m(props: EventTms_gateProps): any {
-  const { is_scanner, typeScanner } = LibNavigation.getArgsAll(props)
+  const { is_v2, typeScanner } = LibNavigation.getArgsAll(props)
 
   const [selectGate, setSelectGate] = useSafeState<any>()
   const [gates, setGates] = useSafeState<any>()
@@ -33,20 +47,15 @@ export default function m(props: EventTms_gateProps): any {
     } else {
       loadDataHall()
     }
+    return () => LibNavigation.cancelBackResult(LibNavigation.getResultKey(props))
   }, [])
 
   function loadDataGates() {
     let post = {
-      event_id: is_scanner?.id
+      event_id: EventTms_dashboardProperty.stateSelectedEvent()?.get()?.id
     }
     new LibCurl('event_gate', post, (res, msg) => {
       setGates(res)
-      if (res.length == 1) {
-        let a = LibObject.set(EventTms_dashboardProperty.closingDataState().get(), res[0].id)('gate_id')
-        EventTms_dashboardProperty.closingDataState().set(a)
-        LibNavigation.back()
-        LibNavigation.navigate('event/tms_home', { is_scanner: is_scanner, selectedGate: res[0], typeScanner: typeScanner })
-      }
     }, (error) => {
       LibDialog.warning(esp.lang("event/tms_gate", "warning_load"), error?.message)
       LibNavigation.back()
@@ -55,14 +64,10 @@ export default function m(props: EventTms_gateProps): any {
 
   function loadDataHall() {
     let post = {
-      event_id: is_scanner?.id
+      event_id: EventTms_dashboardProperty.stateSelectedEvent()?.get()?.id
     }
     new LibCurl('event_hall', post, (res, msg) => {
       setGates(res)
-      if (res.length == 1) {
-        LibNavigation.back()
-        LibNavigation.navigate('event/tms_home', { is_scanner: is_scanner, selectedGate: res[0], typeScanner: typeScanner })
-      }
     }, (error) => {
       LibDialog.warning(esp.lang("event/tms_gate", "warning_loadhall"), error?.message)
       LibNavigation.back()
@@ -73,10 +78,17 @@ export default function m(props: EventTms_gateProps): any {
     let _selectGate = item.id == selectGate?.id
     return (
       <Pressable key={i} onPress={() => {
+        if (typeScanner == "tms") {
+          stateSelectedGate().set(item)
+        } else {
+          stateSelectedHall()?.set(item)
+        }
+
         setSelectGate(item)
         let a = LibObject.set(EventTms_dashboardProperty.closingDataState().get(), item?.id)('gate_id')
         EventTms_dashboardProperty.closingDataState().set(a)
-        LibNavigation.navigate('event/tms_home', { is_scanner: is_scanner, selectedGate: item, typeScanner: typeScanner })
+        LibNavigation.back()
+        LibNavigation.navigate(is_v2 ? 'tms/tms_home' : 'event/tms_home', { selectedGate: item, typeScanner: typeScanner })
       }} style={{ flexDirection: 'row', alignContent: 'center', alignItems: 'center', backgroundColor: _selectGate ? LibStyle.colorGrey : '#fff', ...LibStyle.elevation(2), padding: 16, marginBottom: 10, marginHorizontal: 15, borderRadius: 5, flex: 1 }}>
         <LibIcon name={_selectGate ? "radiobox-marked" : "radiobox-blank"} size={18} color={_selectGate ? "#3ea4dc" : "#434343"} />
         <Text allowFontScaling={false} style={{ marginLeft: 10, fontSize: 17, fontWeight: "normal", fontStyle: "normal", letterSpacing: 0, textAlign: "center", color: '#9e9e9e', paddingLeft: 3, paddingRight: 3 }}>{item.name}</Text>
@@ -85,7 +97,12 @@ export default function m(props: EventTms_gateProps): any {
   }
 
   if (!gates) {
-    return <LibLoading />
+    return (
+      <View style={{ flex: 1 }}>
+        <EventHeader title={typeScanner == "tms" ? esp.lang("event/tms_gate", "header_title1") : esp.lang("event/tms_gate", "header_title2")} subtitle={esp.lang("event/tms_gate", "gate_sub")} />
+        <LibLoading />
+      </View>
+    )
   }
 
   return (