Merge pull request 'Checking all the popups and adding header on it.' (#120) from Kartik_Enhancement#308 into Issue_May_3W

Reviewed-on: #120

src/components/Activities/CheckCheckOutForm.jsx

@@ -33,25 +33,21 @@ const CheckCheckOutmodel = ({modeldata,closeModal,handleSubmitForm,}) => {
     mode: "onChange"
   });
 
-  const onSubmit = ( data ) =>
+  const onSubmit = (data) => {
-  {
     let record = { ...data, date: new Date().toLocaleDateString(), latitude: coords.latitude, longitude: coords.longitude, employeeId: modeldata.employeeId, action: modeldata.action, id: modeldata?.id || null }
     if (modeldata.forWhichTab === 1) {
       handleSubmitForm(record)
-   } else
+    } else {
-   {
 
       //  if ( modeldata?.currentDate && checkIfCurrentDate( modeldata?.currentDate ) )
       //  {
       dispatch(markAttendance(record))
         .unwrap()
-         .then( ( data ) =>
+        .then((data) => {
-         {
 
           showToast("Attendance Marked Successfully", "success");
         })
-         .catch( ( error ) =>
+        .catch((error) => {
-         {
 
           showToast(error, "error");
 
@@ -71,6 +67,11 @@ const CheckCheckOutmodel = ({modeldata,closeModal,handleSubmitForm,}) => {
 
     <form className="row g-2" onSubmit={handleSubmit(onSubmit)}>
 
+      <div className="col-12 col-md-12">
+        <label className="fs-5 text-dark text-center d-flex align-items-center flex-wrap">
+          {modeldata?.checkInTime && !modeldata?.checkOutTime ? 'Check-out :' : 'Check-in :'}
+        </label>
+      </div>
       <div className="col-12 col-md-12">
         <TimePicker
           label="Choose a time"
@@ -82,7 +83,6 @@ const CheckCheckOutmodel = ({modeldata,closeModal,handleSubmitForm,}) => {
         {errors.markTime && <p className="text-danger">{errors.markTime.message}</p>}
       </div>
 
-    
       <div className="col-12 col-md-12">
         <label className="form-label" htmlFor="description">
           Description
@@ -147,8 +147,7 @@ export const Regularization = ({modeldata,closeModal,handleSubmitForm})=>{
   };
 
 
-  const onSubmit = ( data ) =>
+  const onSubmit = (data) => {
-  {
 
     let record = { ...data, date: new Date().toLocaleDateString(), latitude: coords.latitude, longitude: coords.longitude, }
     handleSubmitForm(record)

src/components/master/CreateJobRole.jsx

@@ -70,7 +70,9 @@ const CreateJobRole = ({onClose}) => {
     const maxDescriptionLength = 255;    
   return (<>
     <form  className="row g-2" onSubmit={handleSubmit(onSubmit)}>
-      
+      <div className="col-12 col-md-12">
+        <label className="fs-5 text-dark text-center d-flex align-items-center justify-content-center flex-wrap">Create Job Role</label>
+      </div>
         <div className="col-12 col-md-12">
           <label className="form-label">Role</label>
           <input type="text" 

src/components/master/CreateRole.jsx

@@ -96,7 +96,10 @@ const CreateRole = ({ modalType, onClose }) => {
   return (
 
     <form className="row g-2" onSubmit={handleSubmit(onSubmit)}>
+      <div className="col-12 col-md-12">
+        <label className="fs-5 text-dark text-center d-flex align-items-center justify-content-center flex-wrap">Create Application Role</label>
 
+      </div>
       <div className="col-12 col-md-12">
         <label className="form-label">Role</label>
         <input type="text"

src/components/master/CreateWorkCategory.jsx

@@ -70,6 +70,9 @@ const CreateWorkCategory = ({onClose}) => {
     const maxDescriptionLength = 255;    
   return (<>
     <form  className="row g-2" onSubmit={handleSubmit(onSubmit)}>
+      <div className="col-12 col-md-12">
+        <label className="fs-5 text-dark text-center d-flex align-items-center justify-content-center flex-wrap">Create Work Category</label>        
+      </div>
       
         <div className="col-12 col-md-12">
           <label className="form-label">Category Name</label>

src/components/master/EditJobRole.jsx

@@ -77,6 +77,9 @@ const EditJobRole = ({data,onClose}) => {
      
   return (<>
     <form  className="row g-2" onSubmit={handleSubmit(onSubmit)}>
+      <div className="col-12 col-md-12">
+        <label className="fs-5 text-dark text-center d-flex align-items-center justify-content-center flex-wrap">Edit Job Role</label>        
+      </div>
         <div className="col-12 col-md-12">
           <label className="form-label">Role</label>
           <input type="text" 

src/components/master/EditRole.jsx

@@ -146,7 +146,9 @@ const EditMaster = ({ master, onClose }) => {
   return (
 
     <form className="row g-2 " onSubmit={handleSubmit(onSubmit)}>
-
+      <div className="col-12 col-md-12">
+        <label className="fs-5 text-dark text-center d-flex align-items-center justify-content-center flex-wrap">Edit Application Role</label>
+      </div>
       <div className="col-12 col-md-12">
         <label className="form-label">Role</label>
         <input type="text"

src/components/master/EditWorkCategory.jsx

@@ -77,6 +77,10 @@ const EditWorkCategory = ({data,onClose}) => {
      
   return (<>
     <form  className="row g-2" onSubmit={handleSubmit(onSubmit)}>
+      <div className="col-12 col-md-12">
+        <label className="fs-5 text-dark text-center d-flex align-items-center justify-content-center flex-wrap">Edit Work Category</label>        
+      </div>
+      
         <div className="col-12 col-md-12">
           <label className="form-label">Category Name</label>
           <input type="text"