From 7f75c71811c633e9374c28a508c42ae442866d98 Mon Sep 17 00:00:00 2001
From: poorna2152 <poorn2152@gmail.com>
Date: Mon, 14 Dec 2020 20:50:25 +0530
Subject: [PATCH] UPDATE - Popups

---
 partials/popups/admin_popup.php | 25 +++----------------------
 partials/popups/common.php      |  4 ++--
 partials/popups/vpmo_popup.php  | 12 +++---------
 routes/AddDriver.php            |  2 +-
 4 files changed, 9 insertions(+), 34 deletions(-)

diff --git a/partials/popups/admin_popup.php b/partials/popups/admin_popup.php
index f16cf61..42c86ce 100644
--- a/partials/popups/admin_popup.php
+++ b/partials/popups/admin_popup.php
@@ -16,10 +16,6 @@
                         <input class="form-control inputs" placeholder="Employee ID" type="text" name="EmpID" required>
                         <div id="EmpID-error" class="text-danger"></div>
                     </div>
-                    <!-- <div class="form-group">
-                        <input class="form-control inputs" placeholder="Employee ID" type="text" name="EmpID" required>
-                        <div id="EmpID-error" class="text-danger"></div>
-                    </div> -->
                     <div class="form-group">
                         <input class="form-control inputs" placeholder="First Name" type="text" name="FirstName" required>
                         <div id="FirstName-error" class="text-danger"></div>
@@ -55,17 +51,6 @@
                     <div class="form-group">
                         <input name="Email" class="form-control inputs" placeholder="Email" type="text" required>
                         <div id="Email-error" class="text-danger"></div>
-
-                    </div>
-                    <div class="form-group">
-                        <input name="Password" class="form-control inputs" placeholder="Password" type="password" required>
-                        <div id="Password-error" class="text-danger"></div>
-
-                    </div>
-                    <div class="form-group">
-                        <input name="ConfirmPassword" class="form-control inputs" placeholder="Confirm Password" type="password" required>
-                        <div id="ConfirmPassword-error" class="text-danger"></div>
-
                     </div>
                     <input type="button" value="Submit" class="btn btn-success" id="EmployeeAddForm_Confirm">
                 </form>
@@ -255,15 +240,11 @@
                         <div id="Email-error" class="text-danger"></div>
                     </div>
                     <div class="form-group">
-                        <input class="form-control inputs" placeholder="Address" type="text" name="Address" required>
-                        <div id="Address-error" class="text-danger"></div>
-                    </div>
-                    <div class="form-group">
-                        <input type="number" name="ContactNo" class="form-control inputs" placeholder="Contact Number" required>
+                        <input type="tel" minlength="10" maxlength="10" name="ContactNo" class="form-control inputs" placeholder="Contact Number" required>
                         <div id="ContactNo-error" class="text-danger"></div>
                     </div>
                     <div class="form-group">
-                        <input name="DateOfAdmission" class="form-control inputs" placeholder="Date Of Admission" type="date">
+                        <input name="DateOfAdmission" class="form-control inputs" placeholder="Date Of Admission" type="text" onfocus="(this.type='date')">
                         <div id="DateOfAdmission-error" class="text-danger"></div>
                     </div>
                     <div class="form-group">
@@ -275,7 +256,7 @@
                         <div id="LicenseType-error" class="text-danger"></div>
                     </div>
                     <div class="form-group">
-                        <input name="LicenseExpirationDay" class="form-control inputs" placeholder="License Expire Data" type="date">
+                        <input name="LicenseExpirationDay" class="form-control inputs" placeholder="License Expire Data" type="text" onfocus="(this.type='date')">
                         <div id="LicenseExpirationDay-error" class="text-danger"></div>
                     </div>
                     <input type="button" value="Submit" class="btn btn-success" id="DriverAddForm_Confirm">
diff --git a/partials/popups/common.php b/partials/popups/common.php
index 8e4f08e..7bb81ee 100644
--- a/partials/popups/common.php
+++ b/partials/popups/common.php
@@ -16,12 +16,12 @@
             <div id="submit-form-wrapper">
                 <form id="RequestAdd_form">
                     <div class="form-group">
-                        <input type="date" class="form-control inputs" name="date" id="date-VehicleRequestForm" placeholder="Date" autocomplete="off" required>
+                        <input type="text" class="form-control inputs" name="date" id="date-VehicleRequestForm" placeholder="Date" autocomplete="off" required onfocus="(this.type='date')">
                         <div id="date-error" class="text-danger"></div>
                     </div>
 
                     <div class="form-group">
-                        <input type="time" class="form-control inputs" name="time" placeholder="Time" id="time-VehicleRequestForm" autocomplete="off" required>
+                        <input type="text" class="form-control inputs" name="time" placeholder="Time" id="time-VehicleRequestForm" autocomplete="off" required onfocus="(this.type='time')">
                         <div id="time-error" class="text-danger"></div>
                     </div>
 
diff --git a/partials/popups/vpmo_popup.php b/partials/popups/vpmo_popup.php
index 0606af7..ad94012 100644
--- a/partials/popups/vpmo_popup.php
+++ b/partials/popups/vpmo_popup.php
@@ -121,7 +121,7 @@
                         <div id="RegistrationNo-error" class="text-danger"></div>
                     </div>
                     <div class="form-group">
-                        <input type="date" name="PurchasedYear" class="form-control my-3 inputs" placeholder="Date of purchase">
+                        <input type="text" name="PurchasedYear" class="form-control my-3 inputs" placeholder="Date of purchase" onfocus="(this.type='date')">
                         <div id="PurchasedYear-error" class="text-danger"></div>
                     </div>
                     <div class="form-group">
@@ -166,12 +166,12 @@
 
                         </div>
                         <div class="form-group">
-                            <input type="date" name="LeasedPeriodFrom" class="form-control my-3 inputs" placeholder="Lease period (from)">
+                            <input type="text" name="LeasedPeriodFrom" class="form-control my-3 inputs" placeholder="Lease period (from)" onfocus="(this.type='date')">
                             <div id="LeasedPeriodFrom-error" class="text-danger"></div>
 
                         </div>
                         <div class="form-group">
-                            <input type="date" name="LeasedPeriodTo" class="form-control my-3 inputs" placeholder="Lease period (to)">
+                            <input type="text" name="LeasedPeriodTo" class="form-control my-3 inputs" placeholder="Lease period (to)" onfocus="(this.type='date')">
                             <div id="LeasedPeriodTo-error" class="text-danger"></div>
 
                         </div>
@@ -937,12 +937,6 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="form-group row mb-4 mx-auto">
-                            <label>Address</label>
-                            <div class="input-group">
-                                <input class="form-control py-2 border-right-0 border" id="Address-DriverProfileForm" type="text" name="Address" disabled>
-                            </div>
-                        </div>
                         <div class="form-group row mb-4">
                             <div class="form-group col-md-4">
                                 <label>Assigned Vehicle</label>
diff --git a/routes/AddDriver.php b/routes/AddDriver.php
index 8e79a39..fa9d439 100644
--- a/routes/AddDriver.php
+++ b/routes/AddDriver.php
@@ -28,7 +28,7 @@
             'ProfilePicturePath' => null
         ]);
         $object['error'] = false;
-        $object['request'] = $driver;
+        $object['object'] = $driver;
         $object['message'] = "Driver " . Input::get('driverId') . " successfully added";
     }
 }