From 74ed45c8fd77c946d103bdf7076b891c56eeafb4 Mon Sep 17 00:00:00 2001
From: rizky <rizky@avolut.com>
Date: Wed, 25 Sep 2024 21:25:24 -0700
Subject: [PATCH] checkpoint

---
 comps/custom/QrReader.tsx           | 10 +++-------
 comps/custom/typings.ts             |  3 +++
 comps/filter/FilterField.tsx        |  1 -
 comps/form/Form.tsx                 |  4 +---
 comps/form/field/Field.tsx          | 22 ----------------------
 comps/form/field/type/TypeInput.tsx |  2 +-
 comps/form/field/type/TypeMoney.tsx |  2 +-
 comps/list/TableList.tsx            |  1 -
 comps/md/MasterDetail.tsx           |  2 +-
 exports.tsx                         |  1 +
 utils/format-value.tsx              | 11 +++++++++--
 11 files changed, 20 insertions(+), 39 deletions(-)
 create mode 100755 comps/custom/typings.ts

diff --git a/comps/custom/QrReader.tsx b/comps/custom/QrReader.tsx
index 7626d8b..60ab6f0 100755
--- a/comps/custom/QrReader.tsx
+++ b/comps/custom/QrReader.tsx
@@ -1,7 +1,8 @@
 import { FC, useEffect, useRef, useState } from "react";
 import QrScanner from "qr-scanner";
+import { QrReaderType } from "./typings";
 
-export const QrReader: FC<{ url: string }> = ({ url }) => {
+export const QrReader: FC<{ onSuccess: (result: QrReaderType) => {} }> = ({ onSuccess }) => {
     const scanner = useRef<QrScanner>();
     const videoEl = useRef<HTMLVideoElement>(null);
     const qrBoxEl = useRef<HTMLDivElement>(null);
@@ -12,9 +13,6 @@ export const QrReader: FC<{ url: string }> = ({ url }) => {
 
     // Success
     const onScanSuccess = (result: QrScanner.ScanResult) => {
-        // console.log(result);
-        // navigate("/hasil/scan");
-        // setScannedResult(result?.data);
         if (!hasScanned) {
             console.log(result);
             setScannedResult(result?.data);
@@ -22,9 +20,7 @@ export const QrReader: FC<{ url: string }> = ({ url }) => {
             scanner.current?.stop();
 
             setTimeout(() => {
-                // console.log("Mencoba trigger hasil scan");
-                // navigate(`/hasil/scan?id_asset=${result?.data}`);
-                navigate(url + result?.data);
+                onSuccess(result);
             }, 1000);
         }
     };
diff --git a/comps/custom/typings.ts b/comps/custom/typings.ts
new file mode 100755
index 0000000..4b1e32c
--- /dev/null
+++ b/comps/custom/typings.ts
@@ -0,0 +1,3 @@
+import QrScanner from "qr-scanner";
+
+export type QrReaderType = QrScanner.ScanResult;
diff --git a/comps/filter/FilterField.tsx b/comps/filter/FilterField.tsx
index 7449415..88868f2 100755
--- a/comps/filter/FilterField.tsx
+++ b/comps/filter/FilterField.tsx
@@ -35,7 +35,6 @@ export const FilterField: FC<{
   }, [filter.form]);
 
   let show_modifier = filter.mode !== "inline";
-
   return (
     <BaseField
       {...filter.form.fieldProps({
diff --git a/comps/form/Form.tsx b/comps/form/Form.tsx
index e81cea3..c623ca6 100755
--- a/comps/form/Form.tsx
+++ b/comps/form/Form.tsx
@@ -27,9 +27,7 @@ export const Form: FC<FMProps> = (props) => {
     },
     save_status: "init",
     fields: {},
-    events: {
-      on_change(name: string, new_value: any) {},
-    },
+    events: null as any,
     internal: {},
     submit: null as any,
     error: {} as any,
diff --git a/comps/form/field/Field.tsx b/comps/form/field/Field.tsx
index 2eafded..0a307ad 100755
--- a/comps/form/field/Field.tsx
+++ b/comps/form/field/Field.tsx
@@ -42,28 +42,6 @@ export const Field: FC<FieldProp> = (arg) => {
 
   useEffect(() => {
     if (fm.save_status === "init" || fm.status !== "ready") return;
-    if (local.prev_val === undefined) {
-      if (typeof fm.data[name] === "object" && fm.deps.md) {
-        const sfied = hashSum(prepForSum(fm.data[name]));
-
-        if (sfied !== local.prev_val) {
-          local.prev_val = sfied;
-        } else {
-          return;
-        }
-      } else {
-        local.prev_val = fm.data[name];
-      }
-
-      if (!fm.events) {
-        fm.events = {
-          on_change(name, new_value) {},
-        };
-      }
-
-      fm.events.on_change(name, fm.data[name]);
-      return;
-    }
 
     if (local.prev_val !== fm.data[name]) {
       if (typeof fm.data[name] === "object") {
diff --git a/comps/form/field/type/TypeInput.tsx b/comps/form/field/type/TypeInput.tsx
index db657f1..08bd74a 100755
--- a/comps/form/field/type/TypeInput.tsx
+++ b/comps/form/field/type/TypeInput.tsx
@@ -116,7 +116,7 @@ export const FieldTypeInput: FC<{
   switch (type_field) {
     case "toggle":
       return (
-        <div className="c-px-2">
+        <div className="c-px-2">ad
           <div
             className={cx(
               "c-relative",
diff --git a/comps/form/field/type/TypeMoney.tsx b/comps/form/field/type/TypeMoney.tsx
index 3461f25..bf2a6f3 100755
--- a/comps/form/field/type/TypeMoney.tsx
+++ b/comps/form/field/type/TypeMoney.tsx
@@ -10,7 +10,7 @@ export const FieldMoney: FC<{
   arg: FieldProp;
 }> = ({ field, fm, prop, arg }) => {
   let type_field = prop.sub_type;
-  let value: any = fm.data[field.name];
+  let value: any = Number(fm.data[field.name]);
   const input = useLocal({
     value: 0 as any,
     ref: null as any,
diff --git a/comps/list/TableList.tsx b/comps/list/TableList.tsx
index c65d03c..9a9b13e 100755
--- a/comps/list/TableList.tsx
+++ b/comps/list/TableList.tsx
@@ -183,7 +183,6 @@ export const TableList: FC<TableListProp> = ({
       reloading: null as any,
       reload: (arg?: { toast: boolean }) => {
         if (local.reloading) return local.reloading;
-
         local.reloading = new Promise<void>(async (done) => {
           let should_toast = true;
           if (arg?.toast === false) should_toast = false;
diff --git a/comps/md/MasterDetail.tsx b/comps/md/MasterDetail.tsx
index 1592972..4b86c10 100755
--- a/comps/md/MasterDetail.tsx
+++ b/comps/md/MasterDetail.tsx
@@ -128,7 +128,7 @@ export const MasterDetail: FC<MDProps> = (arg) => {
       md.header.render();
     }, [title]);
   }
-
+  // return <>MD</>
   return (
     <div
       className={cx(
diff --git a/exports.tsx b/exports.tsx
index d92e387..6ad018b 100755
--- a/exports.tsx
+++ b/exports.tsx
@@ -193,3 +193,4 @@ export { formatTime, longDate, shortDate, timeAgo } from "lib/utils/date";
 export { getBasename, getPathname } from "lib/utils/pathname";
 
 export { formatMoney } from "lib/comps/form/field/type/TypeMoney";
+export {Flow} from "lib/comps/ui/flow"
diff --git a/utils/format-value.tsx b/utils/format-value.tsx
index dc40f7b..d072266 100755
--- a/utils/format-value.tsx
+++ b/utils/format-value.tsx
@@ -12,7 +12,7 @@ export const FormatValue: FC<{
   value: any;
   name: string;
   gen_fields: string[];
-  mode?: "money" | "datetime" | "timeago" | "date";
+  mode?: "money" | "datetime" | "timeago" | "date" | "monthly";
 }> = (prop) => {
   const { value, gen_fields, name, mode } = prop;
   if (mode === "money") {
@@ -25,7 +25,14 @@ export const FormatValue: FC<{
     } catch (ex: any) {
       return "-";
     }
-  } else if (mode === "date") {
+  } else if (mode === "monthly") {
+    if (!value || isEmptyString(value)) return "-";
+    try {
+      return formatDate(dayjs(value), "MMMM YYYY");
+    } catch (ex: any) {
+      return "-";
+    }
+  }  else if (mode === "date") {
     if (!value || isEmptyString(value)) return "-";
     try {
       return formatDate(dayjs(value), "DD MMMM YYYY");