Merge commit 'ed5fa161f56b2d0f34abaa138d7df04292e55f07' into iipbs/wr/form_fuction

apps/wr/components/lib/func/TableData.tsx

@@ -90,7 +90,7 @@ export const chRowspanTable = (
   selectedIds: number[],
   handleCellClick: (index: number, headId: string) => void
 ) => {
-  let order =0
+  let order = 0
   // rowspan된 셀 렌더링 여부 추적용
   const renderedMap = new Map<string, Set<number>>();
   return (
@@ -100,68 +100,73 @@ export const chRowspanTable = (
           {headList
             .map((head) => {
 
+              const key = head.id;
+              const isMerged = head.rowSpan;
+              const value = row[key];
+              // 병합 대상이면 중복 렌더링 여부 판단
+              if (isMerged) {
+                const renderedSet = renderedMap.get(key) ?? new Set<number>();
+                if (renderedSet.has(rowIndex)) {
 
-            const key = head.id;
-            const isMerged = head.rowSpan;
-            const value = row[key];
-            // 병합 대상이면 중복 렌더링 여부 판단
-            if (isMerged) {
-              const renderedSet = renderedMap.get(key) ?? new Set<number>();
-              if (renderedSet.has(rowIndex)) {
-               
-                return null; // 이미 렌더링된 셀은 skip
+                  return null; // 이미 렌더링된 셀은 skip
+                }
+
+                const rowspan = row.rowspan ?? 1;
+                for (let i = 0; i < rowspan; i++) {
+                  renderedSet.add(rowIndex + i);
+                }
+                renderedMap.set(key, renderedSet);
+                return (
+                  <TableCell
+                    key={key}
+                    rowSpan={rowspan}
+                    className="align-middle text-center whitespace-nowrap"
+                  >
+                    {key === "checkBox" ? (
+                      <Checkbox
+                        checked={selectedIds.includes(row.chkgdnPk)}
+                        onCheckedChange={(checked) =>
+                          toggleSelection(row.chkgdnPk, checked === true)
+                        }
+                      ></Checkbox>
+                    ) : key === "order" ? (
+                      ++order
+                    ) : (
+                      value
+                    )}
+                  </TableCell>
+                );
               }
 
-              const rowspan = row.rowspan ?? 1;
-              for (let i = 0; i < rowspan; i++) {
-                renderedSet.add(rowIndex + i);
-              }
-              renderedMap.set(key, renderedSet);
+              // 기본 셀
               return (
                 <TableCell
                   key={key}
-                  rowSpan={rowspan}
-                  className="align-middle text-center whitespace-nowrap"
+                  className="text-center whitespace-nowrap"
+                  onClick={() => handleCellClick(rowIndex, head.id)}
                 >
-                  {key === "checkBox" ? (
-                    <Checkbox
-                      checked={selectedIds.includes(row.chkgdnPk)}
-                      onCheckedChange={(checked) =>
-                        toggleSelection(row.chkgdnPk, checked === true)
-                      }
-                    ></Checkbox>
-                  ) : key === "order" ? (
-                    ++order
+                  {head.edit === true ? (
+                    <Input
+                      className={`${head.type === "number" ? "text-right" : "text-center"} !text-xl`}
+                      type={head.type}
+                      onChange={(e) => {
+                        handleChange(rowIndex, head.id, e.target.value);
+                      }}
+                      value={value}
+                    />
                   ) : (
-                    value
+                    (head.id === "totalSplyUswtrUtztnQnt" || head.id === "totalRuseFcltUtztnQnt" || head.id === "splyUswtrUtztnQnt" || head.id === "ruseFcltUtztnQnt") ? (
+                      <span className="underline text-blue-600 cursor-pointer">
+                        {value}
+                      </span>
+                    ) : (
+                      <>{value}</>
+                    )
                   )}
                 </TableCell>
               );
-            }
 
-            // 기본 셀
-            return (
-              <TableCell
-                key={key}
-                className="text-center whitespace-nowrap"
-                onClick={() => handleCellClick(rowIndex, head.id)}
-              >
-                {head.edit === true ? (
-                  <Input
-                    className={`${head.type === "number" ? "text-right" : "text-center"} !text-xl`}
-                    type={head.type}
-                    onChange={(e) => {
-                      handleChange(rowIndex, head.id, e.target.value);
-                    }}
-                    value={value}
-                  />
-                ) : (
-                  `${value}`
-                )}
-              </TableCell>
-            );
-
-          })}
+            })}
         </TableRow>
       ))}
     </>
@@ -170,13 +175,13 @@ export const chRowspanTable = (
 
 
 
-export const headVisibleChange= (headList: TableUpperProps[] , isEdit :boolean) => {
-    return headList.forEach(( head) => {
-      if(head.edit!== undefined)
-      head.edit=isEdit;
-      if(head.id==='checkBox' ){
-        head.visible=false
-      }
+export const headVisibleChange = (headList: TableUpperProps[], isEdit: boolean) => {
+  return headList.forEach((head) => {
+    if (head.edit !== undefined)
+      head.edit = isEdit;
+    if (head.id === 'checkBox') {
+      head.visible = false
+    }
 
-    });
+  });
 }

apps/wr/components/lib/func/commom.tsx

@@ -65,7 +65,7 @@ export const excelDownload = (
   fileNm: string,
   sampleFile: string,
   headerRange = "A1:V3",
-  writeLine=4
+  writeLine = 4
 ) => {
   if (excelList.length === 0) return;
   fetch(`/${sampleFile}`, {}).then(async (response) => {
@@ -82,7 +82,7 @@ export const excelDownload = (
 export const excelArrayDownload = (
   fileNm: string,
   sampleFile: string,
-  sheetArray:[typeof sheetParameter]
+  sheetArray: [typeof sheetParameter]
 ) => {
   if (!sheetArray) return;
   fetch(`/${sampleFile}`, {}).then(async (response) => {
@@ -131,4 +131,13 @@ export const getCityOrSgg = (ref: RefObject<ReturnType>) => {
 export const safeDate = (value: any): Date | undefined => {
   const date = new Date(value);
   return isNaN(date.getTime()) ? undefined : date;
-};
+};
+
+const currentYear = new Date().getFullYear();
+export const yearOptions: { val: string; text: string }[] = Array.from(
+  { length: currentYear - 1969 },
+  (_, i) => ({
+    val: String(1970 + i),
+    text: `${1970 + i}년`,
+  })
+);

apps/wr/components/ui/form/fcltReg/htdflReg/htdflRegForm.tsx

@@ -22,6 +22,7 @@ import {
   formatCommaNumber,
   handleCommaNumberChange,
 } from "@/components/lib/func/commom";
+import { formH1Class } from "@/components/lib/class/comClass";
 
 export default function HtdflRegForm({
   htdflForm,
@@ -82,17 +83,17 @@ export default function HtdflRegForm({
   }, [htdflForm]);
 
   return (
+    <div className="!mx-[1.6rem] !p-0r">
     <Form {...form}>
       <form onSubmit={form.handleSubmit(onSubmit)}>
         {/* <div className="flex justify-between items-center mx-3"> */}
         <div>
-          <div className="grid grid-cols-12">
-            <h1 className="pl-3 text-xl  col-span-10">○온배수 시설 정보</h1>
+          <div className="grid grid-cols-12 flex items-center card-header">
+            <h1 className="text-2xl font-medium text-label col-span-10">온배수 시설 정보</h1>
             <Button
               size={"sm"}
               type="submit"
-              className="col-start-12  col-span-1"
-            >
+              className="col-start-12  col-span-1">
               저장
             </Button>
           </div>
@@ -100,14 +101,14 @@ export default function HtdflRegForm({
 
         {isModal && htdflForm != undefined ? <BdstReg form={form} /> : <></>}
         {isModal ? (
-          <h1 className="pl-3 text-xl col-span-10  mt-4 ">
-            ○ 중수도 시설 정보{" "}
+          <h1 className="text-xl col-span-10 mt-4">
+            온배수 시설 정보{" "}
           </h1>
         ) : (
           <></>
         )}
 
-        <div className="grid grid-cols-6 gap-2 mt-4 pl-6">
+        <div className="grid grid-cols-6 gap-2 mt-4">
           <div className="col-span-2">
             <FormField
               control={form.control}
@@ -165,13 +166,13 @@ export default function HtdflRegForm({
           </div>
         </div>
         <div className=" my-4">
-          <h1 className="bg-gray-400 text-xl text-center border-2 p-2  mt-4 pl-6">
+          <h1 className={formH1Class}>
             온배수 시설 운영현황
           </h1>
         </div>
 
         <div className="grid grid-cols-10 gap-1 mt-4">
-          <div className="col-span-5 pl-6">
+          <div className="col-span-5">
             <FormField
               control={form.control}
               name="reuseBuilding.0.htdflObj.orgwtWtritSpt"
@@ -207,7 +208,7 @@ export default function HtdflRegForm({
               )}
             />
           </div>
-          <div className="col-span-5 pl-6">
+          <div className="col-span-5">
             <FormField
               control={form.control}
               name="reuseBuilding.0.htdflObj.wtritEntrcTp"
@@ -226,7 +227,7 @@ export default function HtdflRegForm({
               )}
             />
           </div>
-          <div className="col-span-5 pl-6">
+          <div className="col-span-5">
             <FormField
               control={form.control}
               name="reuseBuilding.0.htdflObj.amtgnr"
@@ -245,7 +246,7 @@ export default function HtdflRegForm({
               )}
             />
           </div>
-          <div className="col-span-5 pl-6">
+          <div className="col-span-5">
             <FormField
               control={form.control}
               name="reuseBuilding.0.htdflObj.prcsProcsYn"
@@ -263,7 +264,7 @@ export default function HtdflRegForm({
               )}
             />
           </div>
-          <div className="col-span-5 pl-6">
+          <div className="col-span-5">
             <FormField
               control={form.control}
               name="reuseBuilding.0.htdflObj.prcsFcltCpct"
@@ -282,7 +283,7 @@ export default function HtdflRegForm({
               )}
             />
           </div>
-          <div className="col-span-5 pl-6">
+          <div className="col-span-5">
             <FormField
               control={form.control}
               name="reuseBuilding.0.htdflObj.fmYn"
@@ -300,7 +301,7 @@ export default function HtdflRegForm({
               )}
             />
           </div>
-          <div className="col-span-5 pl-6">
+          <div className="col-span-5">
             <FormField
               control={form.control}
               name="reuseBuilding.0.htdflObj.utztnCpct"
@@ -319,7 +320,7 @@ export default function HtdflRegForm({
               )}
             />
           </div>
-          <div className="col-span-5 pl-6">
+          <div className="col-span-5">
             <FormField
               control={form.control}
               name="reuseBuilding.0.htdflObj.utztnUsg"
@@ -339,12 +340,12 @@ export default function HtdflRegForm({
         </div>
 
         <div className=" my-2">
-          <h1 className="bg-gray-400 text-xl text-center border-2 p-2 mt-4  ">
+          <h1 className={formH1Class}>
             요구수질
           </h1>
         </div>
 
-        <div className="grid grid-cols-12 gap-4  pl-6">
+        <div className="grid grid-cols-12 gap-4">
           <div className="col-span-6">
             <FormField
               control={form.control}
@@ -386,7 +387,7 @@ export default function HtdflRegForm({
           </div>
         </div>
 
-        <div className="grid grid-cols-12 gap-4  pl-6">
+        <div className="grid grid-cols-12 gap-4">
           <div className="col-span-6">
             <FormField
               control={form.control}
@@ -428,7 +429,7 @@ export default function HtdflRegForm({
           </div>
         </div>
 
-        <div className="grid grid-cols-12 gap-4  pl-6">
+        <div className="grid grid-cols-12 gap-4">
           <div className="col-span-6">
             <FormField
               control={form.control}
@@ -470,7 +471,7 @@ export default function HtdflRegForm({
           </div>
         </div>
 
-        <div className="grid grid-cols-12 gap-4  pl-6">
+        <div className="grid grid-cols-12 gap-4">
           <div className="col-span-6">
             <FormField
               control={form.control}
@@ -512,7 +513,7 @@ export default function HtdflRegForm({
           </div>
         </div>
 
-        <div className="grid grid-cols-12 gap-4  pl-6">
+        <div className="grid grid-cols-12 gap-4">
           <div className="col-span-6">
             <FormField
               control={form.control}
@@ -554,7 +555,7 @@ export default function HtdflRegForm({
           </div>
         </div>
 
-        <div className="grid grid-cols-12 gap-4  pl-6">
+        <div className="grid grid-cols-12 gap-4">
           <div className="col-span-6">
             <FormField
               control={form.control}
@@ -597,5 +598,6 @@ export default function HtdflRegForm({
         </div>
       </form>
     </Form>
+    </div>
   );
 }

apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx

@@ -122,7 +122,7 @@ export default function RainRegForm({
           </div>
           {isModal && rainForm != undefined ? <BdstReg form={form} /> : <></>}
           {isModal ? (
-            <h1 className="pl-3 text-xl col-span-10  mt-4 ">
+            <h1 className="pl-3 text-xl col-span-10 mt-4">
               빗물이용시설 정보{" "}
             </h1>
           ) : (

apps/wr/components/ui/modal/chkgd/chkgdExcel/chkgdExcel.tsx

@@ -15,6 +15,7 @@ import {
   Form,
   FormField,
   FormUi,
+  SelectBox,
   Title,
 } from "@common/business_components/ui";
 import { Button, Input } from "@common/components/ui";
@@ -37,7 +38,19 @@ export default function ChkgdExcel({ type }: { type: string }) {
   >();
   const [excelRswtData, setExcelRswtData] = useState<rswtChkZodType[]>();
 
-  const defaultValues: z.infer<typeof chkgdRegExcel> = chkgdRegExcel.parse({});
+  const currentYear = new Date().getFullYear();
+  const startYear = 1970;
+  const yearOptions: { val: string; text: string }[] = Array.from(
+    { length: currentYear - startYear + 1 },
+    (_, i) => {
+      const y = startYear + i;
+      return { val: String(y), text: `${y}년` };
+    }
+  );
+
+  const defaultValues: z.infer<typeof chkgdRegExcel> = chkgdRegExcel.parse({
+    chckYr: String(currentYear)
+  });
 
   const form = useForm<z.infer<typeof chkgdRegExcel>>({
     resolver: zodResolver(chkgdRegExcel),
@@ -178,8 +191,8 @@ export default function ChkgdExcel({ type }: { type: string }) {
               ></Title>
             </div>
             <div className="flex justify-between">
-              <h3 className="text-2xl font-bold text-gray-900">
-                {"○점검정보 입력"}
+              <h3 className="text-2xl font-bold text-gray-900 mt-1 ml-7">
+                {"점검정보 입력"}
               </h3>
 
               <Button className="" type="submit">
@@ -193,11 +206,13 @@ export default function ChkgdExcel({ type }: { type: string }) {
                 name="chckYr"
                 render={({ field }) => (
                   <FormUi label="등록년도">
-                    <Input
-                      className={`text-3xl`}
-                      type="text"
+                    <SelectBox
+                      className="w-1/4 text-3xl"
+                      selectClass={""}
+                      label=""
+                      selectArray={yearOptions}
                       value={field.value}
-                      onChange={field.onChange}
+                      onSelectValue={(val) => field.onChange(String(val))}
                     />
                   </FormUi>
                 )}

apps/wr/components/ui/modal/chkgd/chkgdModal/chkgdModal.tsx

@@ -224,14 +224,14 @@ export default function ChkgdModal({ type, obj }: { type: string; obj: any }) {
           <Title
             title={
               type === "RNB"
-                ? "빗물이용시설"
-                : "중수도 이용시설" + "지도점검 결과등록"
+                ? "빗물이용시설 " + "지도점검 결과등록"
+                : "중수도 이용시설 " + "지도점검 결과등록"
             }
           ></Title>
         </div>
         <div className="flex justify-between">
-          <h3 className="text-2xl font-bold text-gray-900">
-            {"○" + "" + `(${obj.bdstNm})`}
+          <h3 className="text-2xl font-bold text-gray-900 mt-2 ml-6">
+            {`(${obj.bdstNm})`}
           </h3>
           {!rainChkSttn.isSttn ? (
             <Button className="" onClick={allDataUpdate}>

apps/wr/components/ui/table/chkgdTable/guideDetailTable/guideDetailTable.tsx

@@ -60,19 +60,19 @@ export function GuideDetailsTable({
               <TableCell key={head.id + headIndex} className="w-36" >
                 {head.edit ===true && data.edit !==false?
                 <Input
-                  className={`${head.id !== "utztnUsgCd" ? "text-right" : "text-center"} !text-2xl h-10 w-full`}
+                  className={`${head.id !== "utztnUsgCd" ? "text-right" : "text-center"} !text-xl h-10 w-full`}
                   onChange={(e) =>
                     handleChange(dataIndex, head.id, e.target.value)
                   }
-                  value={data[head.id as keyof any] || ""}
+                  value={data[head.id as keyof any] ?? ""}
                 /> : (
                   <div
                     className={`
                       ${head.id !== "utztnUsgCd" ? "text-right" : "text-center"} 
-                      !text-2xl w-full h-10 
+                      !text-xl w-full h-10 
                     `}
                   >
-                    {data[head.id as keyof any] || ""}
+                    {data[head.id as keyof any] ?? ""}
                   </div>
                 )
                 }