Added changes for status and location (#117)

1. Backend allow application status to have a null value in which case frontend will display "no decision yet". <img width="715" alt="image" src="https://github.com/gcivil-nyu-org/INET-Monday-Fall2023-Team-1/assets/57152208/7280a070-1e29-4606-b0f4-b78953651868"> 2. This PR also contains changes to display the full line of locations i.e address, city, zipcode <img width="678" alt="image" src="https://github.com/gcivil-nyu-org/INET-Monday-Fall2023-Team-1/assets/57152208/53881e1e-cb96-45f8-9ede-421e8bfe70b5"> --------- Co-authored-by: Sameer Kolhar <[email protected]>
gcivil-nyu-org · Dec 6, 2023 · a0373c3 · a0373c3
1 parent 2c1e776
commit a0373c3
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 18 deletions.
diff --git a/frontend/src/Dashboard.tsx b/frontend/src/Dashboard.tsx
@@ -35,6 +35,7 @@ interface Location {
   address: string;
   city: string;
   country: string;
+  zipcode: string;
 }
 
 interface Application {
@@ -111,12 +112,13 @@ const Dashboard = () => {
             const jobDetailsResponse = await axios.get(API_ROUTES.JOBS, {
               params: { id: myApplications.job },
             });
-            const locationDetailsResponse = await axios.get(`${API_ROUTES.USER.LOCATION}`);
-            const locationDetail = locationDetailsResponse.data;
-
-            //console.log("job details response", jobDetailsResponse.data);
             const jobDetail = jobDetailsResponse.data;
 
+            const locationDetailsResponse = await axios.get(
+              `${API_ROUTES.USER.LOCATION}?location_id=${jobDetail.location}`
+            );
+            const locationDetail = locationDetailsResponse.data;
+
             const petDetailsResponse = await axios.get(`${API_ROUTES.PETS}${jobDetail.pet}`);
             const petDetail = petDetailsResponse.data;
 
@@ -208,7 +210,10 @@ const Dashboard = () => {
                           <div>
                             <p className="font-bold mb-2">Pet Name: {job.pet.name}</p>
                             <p>Job Status: {job.status}</p>
-                            <p>Location: {job?.location?.address ?? ""}</p>
+                            <p>
+                              Location: {job?.location?.address ?? ""}, {job?.location?.city ?? ""},{" "}
+                              {job?.location?.zipcode ?? ""}
+                            </p>
                             <p>Pay: ${job.pay}</p>
                             <p>Start: {job.start}</p>
                             <p>End: {job.end}</p>
@@ -240,11 +245,19 @@ const Dashboard = () => {
                       className="border border-gray-300 mb-4 p-4 rounded-md"
                     >
                       <div>
-                        <p>Application Status: {myApplications.status}</p>
-                        <p>Pet:{myApplications.pet.name}</p>
-                        <p>Start:{myApplications.job.start}</p>
-                        <p>End:{myApplications.job.end}</p>
-                        <p>Pay:{myApplications.job.pay}</p>
+                        <p className="font-bold mb-2">Pet Name : {myApplications.pet.name}</p>
+                        <p>
+                          Location: {myApplications?.location?.address ?? ""},{" "}
+                          {myApplications?.location?.city ?? ""},{" "}
+                          {myApplications?.location?.zipcode ?? ""}
+                        </p>
+                        <p>Pay: ${myApplications.job.pay}</p>
+                        <p>Start: {myApplications.job.start}</p>
+                        <p>End: {myApplications.job.end}</p>
+                        <p className="font-bold mb-2">
+                          Application Status:{" "}
+                          {!myApplications.status ? "No Decision" : myApplications.status}
+                        </p>
                       </div>
                     </li>
                   ))}

diff --git a/frontend/src/Jobs.tsx b/frontend/src/Jobs.tsx
@@ -21,6 +21,7 @@ interface Location {
   address: string;
   city: string;
   country: string;
+  zipcode: string;
 }
 
 interface Pet {
@@ -207,15 +208,18 @@ const Jobs: React.FC = () => {
             <div>
               <p className="font-bold mb-2">Pet Name: {job.pet.name}</p>
               <p>Status: {job.status}</p>
-              <p>Location: {job?.location?.address ?? ""}</p>
+              <p>
+                Location: {job?.location?.address ?? ""}, {job?.location?.city ?? ""},{" "}
+                {job?.location?.zipcode ?? ""}
+              </p>
               <p>Pay: {job.pay}</p>
               <p>Start: {job.start}</p>
               <p>End: {job.end}</p>
             </div>
             <div className="mt-4 flex">
               <button
                 onClick={() => handleDelete(job.id)}
-                className="bg-red-500 text-white px-4 py-2 rounded-md"
+                className="bg-red-500 text-white px-4 py-2 rounded-md mr-2"
               >
                 Delete
               </button>

diff --git a/frontend/src/auth/AuthProvider.tsx b/frontend/src/auth/AuthProvider.tsx
@@ -79,7 +79,8 @@ const AuthProvider = ({ children }: React.PropsWithChildren<unknown>) => {
       .then((response) => {
         if (response.status === 201) {
           toast.success(
-            `An account has been created for ${response.data?.data?.email ?? ""
+            `An account has been created for ${
+              response.data?.data?.email ?? ""
             }. Redirecting to login page...`
           );
           navigate("/login");

diff --git a/furbaby/api/migrations/0015_alter_applications_status.py b/furbaby/api/migrations/0015_alter_applications_status.py
@@ -4,15 +4,14 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('api', '0014_merge_20231127_1811'),
+        ("api", "0014_merge_20231127_1811"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='applications',
-            name='status',
+            model_name="applications",
+            name="status",
             field=models.TextField(null=True),
         ),
     ]
diff --git a/furbaby/api/views.py b/furbaby/api/views.py
@@ -947,7 +947,7 @@ def post(self, request, *args, **kwargs):
                         application_data = {
                             "user": request.user.id,
                             "job": job_id,
-                            "status": "rejected",  # You can set an initial status here
+                            "status": None,  # You can set an initial status here
                             "details": {},  # You can add more details if needed
                         }
                         application_serializer = ApplicationSerializer(