Skip to content

Commit

Permalink
UPDATE - Popups
Browse files Browse the repository at this point in the history
  • Loading branch information
poorna2152 committed Dec 14, 2020
1 parent 0c5d720 commit 7f75c71
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 34 deletions.
25 changes: 3 additions & 22 deletions partials/popups/admin_popup.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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">
Expand All @@ -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">
Expand Down
4 changes: 2 additions & 2 deletions partials/popups/common.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
12 changes: 3 additions & 9 deletions partials/popups/vpmo_popup.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion routes/AddDriver.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
'ProfilePicturePath' => null
]);
$object['error'] = false;
$object['request'] = $driver;
$object['object'] = $driver;
$object['message'] = "Driver " . Input::get('driverId') . " successfully added";
}
}
Expand Down

0 comments on commit 7f75c71

Please sign in to comment.