From 708bcdf50ce32ffcdc82e55ed13045aa70e2c0cc Mon Sep 17 00:00:00 2001
From: JHM69 <jahangirhmarup@gmail.com>
Date: Fri, 10 May 2024 21:10:18 -0700
Subject: [PATCH] Add Waste Entry

---
 .../dncc_eco_sync/service/UploadService.java  |  2 +-
 react-app/components/WasteEntryForm/index.js  | 47 +++++++++++++++++++
 react-app/pages/vehicle-entry/[stsId].js      | 26 +++++-----
 3 files changed, 63 insertions(+), 12 deletions(-)

diff --git a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/service/UploadService.java b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/service/UploadService.java
index 9ff58d5..edee313 100644
--- a/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/service/UploadService.java
+++ b/android-app/app/src/main/java/com/quantum_guys/dncc_eco_sync/service/UploadService.java
@@ -279,7 +279,7 @@ private void uploadPost(int notification_id, String currentUser_id, String descr
                         postMapFinal.put(getSaltString(), postMap);
 
 
-                        if(posttype.equals("issue")){
+                        if(posttype != null && posttype.equals("issue")){
                             postMapFinal.put("posttype", "issue");
                             postMap.put("isAnonymous", isAnonymous);
                             postMap.put("states", "Pending");
diff --git a/react-app/components/WasteEntryForm/index.js b/react-app/components/WasteEntryForm/index.js
index 6f0da51..c2937e5 100644
--- a/react-app/components/WasteEntryForm/index.js
+++ b/react-app/components/WasteEntryForm/index.js
@@ -21,6 +21,9 @@ const WasteEntryForm = ({ type, defaultValues, onFormSubmit, ...props }) => {
         ? new Date(defaultValues.timeOfArrival).toISOString().slice(0, 16)
         : '' // Converts to "YYYY-MM-DDTHH:MM" format
       setValue('timeOfArrival', formattedTimeOfArrival)
+      setValue('contractorId', defaultValues.contractorId)
+      setValue('wasteType', defaultValues.wasteType)
+      setValue('vehicleType', defaultValues.vehicleType) 
     }
   }, [defaultValues, setValue])
 
@@ -52,6 +55,50 @@ const WasteEntryForm = ({ type, defaultValues, onFormSubmit, ...props }) => {
           })}
         />
 
+        <Input
+          name="contractorId"
+          label="Contractor ID"
+          placeholder="Contractor ID..."
+          type="text"
+          error={errors.contractorId ? errors.contractorId.message : false}
+          register={register('contractorId', {
+            required: {
+              value: true,
+              message: 'Contractor ID is required'
+            }
+          })}
+        />
+
+        <Input
+          name="wasteType"
+          label="Waste Type"
+          placeholder="Waste Type..."
+          type="text"
+          error={errors.wasteType ? errors.wasteType.message : false}
+          register={register('wasteType', {
+            required: {
+              value: true,
+              message: 'Waste Type is required'
+            }
+          })}
+        />
+
+        <Input
+          name="vehicleType"
+          label="Vehicle Type"
+          placeholder="Vehicle Type..."
+          type="text"
+          error={errors.vehicleType ? errors.vehicleType.message : false}
+          register={register('vehicleType', {
+            required: {
+              value: true,
+              message: 'Vehicle Type is required'
+            }
+          })}
+        />
+
+        
+
         {/* <Input
           name="timeOfArrival"
           label="Time of Arrival"
diff --git a/react-app/pages/vehicle-entry/[stsId].js b/react-app/pages/vehicle-entry/[stsId].js
index 5dc0c4b..9688063 100644
--- a/react-app/pages/vehicle-entry/[stsId].js
+++ b/react-app/pages/vehicle-entry/[stsId].js
@@ -140,38 +140,42 @@ export default function VehicleEntry () {
         )}
       </div>
 
-      <div className="flex flex-row gap-3 md:px-6">
-        <div className="flex w-2/3   flex-col">
+      <div className="flex flex-col gap-3 md:px-6">
+
+      <div className="flex w-full   flex-col">
           <div className="mt-3 flex items-center justify-between">
             <h1 className="text-2xl font-bold text-gray-700">
-              Vehicle Entries{' '}
+              Waste Entries
             </h1>
             <div className="flex items-center space-x-2">
-                {stsId && <AddStsEntry stsId={stsId} />}  
+              {stsId && <AddWasteEntry stsId={stsId} />}
             </div>
           </div>
           {loading ? (
-            <StsItemsSkeleton />
+            <WasteItemsSkeleton />
           ) : (
-            <StsEntryItems vehicleEntries={vehicleEntries} />
+            <WasteEntryItems wasteEntries={wasteEntries} />
           )}
         </div>
 
-        <div className="flex w-1/3   flex-col">
+
+        <div className="flex  w-full   flex-col">
           <div className="mt-3 flex items-center justify-between">
             <h1 className="text-2xl font-bold text-gray-700">
-              Waste Entries
+              Vehicle Entries{' '}
             </h1>
             <div className="flex items-center space-x-2">
-              {stsId && <AddWasteEntry stsId={stsId} />}
+                {stsId && <AddStsEntry stsId={stsId} />}  
             </div>
           </div>
           {loading ? (
-            <WasteItemsSkeleton />
+            <StsItemsSkeleton />
           ) : (
-            <WasteEntryItems wasteEntries={wasteEntries} />
+            <StsEntryItems vehicleEntries={vehicleEntries} />
           )}
         </div>
+
+       
       </div>
     </div>
     </NoSSR>