Merge branch 'alwi'

src/pages/master/municipios/blocks/AddDialog.tsx

@@ -37,6 +37,9 @@ const AddDialog = () => {
   };
 
   const [formField, setFormField] = useState(initialState);
+  const created_time = new Date();
+  const formattedTime = created_time.toISOString().slice(0, 19).replace('T', ' ');
+
   const resetForm = () => {
     setFormField(initialState);
   };
@@ -49,8 +52,13 @@ const AddDialog = () => {
       if (response?.status) {
         handleAddDialog(false);
         resetForm();
+<<<<<<< HEAD
         toast.success('Municipio created successfully!');
         reload();
+=======
+        reload();
+        toast.success('Municipio created successfully!');
+>>>>>>> alwi
         // const createActivity = {
         //   module: 'Manage Municipio',
         //   description: `Create Municipio => ${selectedMunicipios}`,
@@ -80,17 +88,19 @@ const AddDialog = () => {
     //   created_at: formattedTime
     // });
 
-    // doCreateMunicipio(e);
+    doCreateMunicipio(e);
     console.log(parsedUser.email);
     console.log(formField);
     setAlert({ show: false, message: '' });
   };
 
   const handleReset = () => {
-    setFormField(initialState);
+    resetForm();
+    setAlert({ show: false, message: '' });
   };
 
   useEffect(() => {
+<<<<<<< HEAD
     const created_time = new Date();
     const formattedTime = created_time.toISOString().slice(0, 19).replace('T', ' ');
     if (showAddDialog) {
@@ -101,6 +111,16 @@ const AddDialog = () => {
       });
     }
   }, [showAddDialog]);
+=======
+    if (showAddDialog) {
+      setFormField({
+        name: formField.name,
+        created_by: parsedUser?.username,
+        created_at: formattedTime
+      });
+    }
+  }, [formattedTime]);
+>>>>>>> alwi
 
   return (
     <Dialog open={showAddDialog} onOpenChange={(open) => handleAddDialog(open)}>

src/pages/master/municipios/blocks/EditDialog.tsx

@@ -39,6 +39,8 @@ const EditDialog = () => {
   };
 
   const [formField, setFormField] = useState(initialState);
+  const created_time = new Date();
+  const formattedTime = created_time.toISOString().slice(0, 19).replace('T', ' ');
 
   const resetForm = () => {
     setFormField(initialState);
@@ -96,8 +98,6 @@ const EditDialog = () => {
   // }, []);
 
   useEffect(() => {
-    const created_time = new Date();
-    const formattedTime = created_time.toISOString().slice(0, 19).replace('T', ' ');
     if (selectedMunicipios) {
       setFormField({
         name: formField.name,
@@ -105,7 +105,7 @@ const EditDialog = () => {
         updated_at: formattedTime
       });
     }
-  }, [selectedMunicipios]);
+  }, [formattedTime]);
 
   // console.log(selectedMunicipios);
   return (