tribikram
/
ET-VISA
1
0
Fork 0
Code Issues 24 Pull Requests 15 Packages Projects 1 Releases Wiki Activity

aapointment-navigation-for-admin

Browse Source
et#38
Mahesh Sharma 2 years ago
parent 7f836f06c2
commit f2d67186be
5 changed files with 81 additions and 37 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 67
      app/Http/Controllers/Admin/AppointmentController.php
  2. 22
      app/Http/Controllers/AppointmentController.php
  3. 20
      resources/views/admin/appointment/index.blade.php
  4. 6
      resources/views/admin/layouts/menubar.blade.php
  5. 3
      routes/web.php

67
app/Http/Controllers/Admin/AppointmentController.php
Unescape View File

@ -11,26 +11,60 @@ use Carbon\Carbon;
class AppointmentController extends Controller class AppointmentController extends Controller
{ {
protected $view= 'admin.appointment.'; protected $view = 'admin.appointment.';
protected $redirect = 'admin/appointments'; protected $redirect = 'admin/appointments';
// protected $service;
public function index(){ public function education_appointments()
$appointments = Appointment::orderBy('id','DESC'); {
if(\request('date')){ $appointments = Appointment::where('service_type', '1')->orderBy('id', 'DESC');
$key = \request('date'); if (\request('date')) {
$appointments = $appointments->whereDate('date',$key); $date = \request('date');
$appointments = $appointments->whereDate('date', $date);
}
if (\request('status')) {
$status = \request('status');
$appointments = $appointments->where('status', $status);
} }
if(\request('status')){ if (\request('is_booked')) {
$key = \request('status'); $is_booked = (\request('is_booked')) == '1' ? true : false;
$appointments = $appointments->where('status',$key); $appointments = $appointments->where('is_booked', $is_booked);
} }
$appointments = $appointments->paginate(30); $appointments = $appointments->paginate(20);
return view($this->view.'index',compact('appointments')); $service = 'Education';
$is_booked = $is_booked ?? null;
$date = $date ?? null;
$status = $status ?? null;
return view($this->view . 'index', compact('appointments', 'service', 'is_booked', 'date', 'status'));
}
public function visa_appointments()
{
$appointments = Appointment::where('service_type', '2')->orderBy('id', 'DESC');
if (\request('date')) {
$date = \request('date');
$appointments = $appointments->whereDate('date', $date);
}
if (\request('status')) {
$status = \request('status');
$appointments = $appointments->where('status', $status);
}
if (\request('is_booked')) {
$is_booked = (\request('is_booked')) == '1' ? true : false;
$appointments = $appointments->where('is_booked', $is_booked);
}
$appointments = $appointments->paginate(20);
$is_booked = $is_booked ?? null;
$date = $date ?? null;
$status = $status ?? null;
$service = 'Migration|Visa';
return view($this->view . 'index', compact('appointments', 'service', 'is_booked', 'date', 'status'));
} }
public function create() public function create()
{ {
return view($this->view.'create'); return view($this->view . 'create');
} }
public function store(Request $request) public function store(Request $request)
@ -68,7 +102,7 @@ class AppointmentController extends Controller
$end_time = $end_time[0]; $end_time = $end_time[0];
$appointment['start_time'] = $start_time; $appointment['start_time'] = $start_time;
$appointment['end_time'] = $end_time; $appointment['end_time'] = $end_time;
return view($this->view.'edit', compact('appointment')); return view($this->view . 'edit', compact('appointment'));
} }
public function update(Request $request, $id) public function update(Request $request, $id)
@ -96,11 +130,11 @@ class AppointmentController extends Controller
return redirect($this->redirect)->with('success', 'Appointment has been updated'); return redirect($this->redirect)->with('success', 'Appointment has been updated');
} }
public function show($id){ public function show($id)
{
$appointment = Appointment::with('appointment_booking_detail')->findorfail($id); $appointment = Appointment::with('appointment_booking_detail')->findorfail($id);
return view($this->view.'show', compact('appointment')); return view($this->view . 'show', compact('appointment'));
} }
public function destroy($id) public function destroy($id)
@ -111,4 +145,3 @@ class AppointmentController extends Controller
return redirect($this->redirect)->with('success', 'Appointment has been deleted'); return redirect($this->redirect)->with('success', 'Appointment has been deleted');
} }
} }

22
app/Http/Controllers/AppointmentController.php
Unescape View File

@ -30,7 +30,7 @@ class AppointmentController extends Controller
$month_number = date_parse($date_parts[1])['month']; $month_number = date_parse($date_parts[1])['month'];
$carbon = Carbon::createFromDate($date_parts[3], $month_number, $date_parts[2]); $carbon = Carbon::createFromDate($date_parts[3], $month_number, $date_parts[2]);
$date = $carbon->format('Y-m-d'); $date = $carbon->format('Y-m-d');
$type_id = $request->id; $type_id = $request->id;
$appointments_all = Appointment::whereDate('date',$date)->where(['service_type' => $type_id,'is_booked' => false,'status' => 1])->get(); $appointments_all = Appointment::whereDate('date',$date)->where(['service_type' => $type_id,'is_booked' => false,'status' => 1])->get();
$old_date = Carbon::createFromFormat('Y-m-d', $date); $old_date = Carbon::createFromFormat('Y-m-d', $date);
@ -45,12 +45,12 @@ class AppointmentController extends Controller
array_push($appointments, $appointment); array_push($appointments, $appointment);
} }
} }
return response()->json(['appointment' => $appointments,'formated_date' => $formated_date]); return response()->json(['appointment' => $appointments,'formated_date' => $formated_date]);
} }
public function form_submit(Request $request){ public function form_submit(Request $request){
$request->validate([ $request->validate([
'name' => 'required', 'name' => 'required',
'email' => 'required|email', 'email' => 'required|email',
@ -70,7 +70,7 @@ class AppointmentController extends Controller
$phone = $request['phone']; $phone = $request['phone'];
if($appointment_detail->save()){ if($appointment_detail->save()){
$date = Carbon::createFromFormat('Y-m-d', $appointment->date); $date = Carbon::createFromFormat('Y-m-d', $appointment->date);
$formated_date = $date->format('M d, Y'); $formated_date = $date->format('M d, Y');
$appointment->is_booked = true; $appointment->is_booked = true;
@ -81,7 +81,7 @@ class AppointmentController extends Controller
\Mail::send('appointment_confirmed', array( \Mail::send('appointment_confirmed', array(
'full_name' =>$name, 'full_name' =>$name,
'email' =>$email, 'email' =>$email,
'date' => $formated_date, 'date' => $formated_date,
@ -89,19 +89,19 @@ class AppointmentController extends Controller
'start_time' => $appointment['start_time'], 'start_time' => $appointment['start_time'],
'end_time' => $appointment['end_time'], 'end_time' => $appointment['end_time'],
'phone' =>$phone, 'phone' =>$phone,
'subject' =>$subject 'subject' =>$subject
), function($message) use ($subject,$email,$name){ ), function($message) use ($subject,$email,$name){
// $subject=($service!= '') ? 'Enquiry for '.$service : 'Contact/Feedback'; // $subject=($service!= '') ? 'Enquiry for '.$service : 'Contact/Feedback';
$message->subject($subject); $message->subject($subject);
$message->to($email, $name)->subject($subject); $message->to($email, $name)->subject($subject);
// $message->cc('extratechweb@gmail.com', 'Extratech')->subject($subject); // $message->cc('extratechweb@gmail.com', 'Extratech')->subject($subject);
// $message->cc('suman@extratechs.com.au', 'Extratech')->subject($subject); // $message->cc('suman@extratechs.com.au', 'Extratech')->subject($subject);
}); });
}); });
} }

20
resources/views/admin/appointment/index.blade.php
Unescape View File

@ -21,7 +21,7 @@
<div class="col-md-12"> <div class="col-md-12">
<div class="card"> <div class="card">
<div class="card-header"> <div class="card-header">
<h3 class="card-title">Appointments</h3> <h3 class="card-title">{{ $service }} Appointments</h3>
<div class="card-tools"> <div class="card-tools">
<a class="btn btn-green" href="{{url('admin/appointments/create')}}" role="button">Create</a> <a class="btn btn-green" href="{{url('admin/appointments/create')}}" role="button">Create</a>
</div> </div>
@ -35,19 +35,29 @@
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-4">
<div class="input-group input-group-sm mb-3 table-search w-100"> <div class="input-group input-group-sm mb-3 table-search w-100">
<input type="date" name="date" class="form-control ds-input" placeholder="Date" aria-label="Small" aria-describedby="inputGroup-sizing-sm" onchange="filterList()"> <input type="date" name="date" value = "{{ $date ?? null }}" class="form-control ds-input" placeholder="Date" aria-label="Small" aria-describedby="inputGroup-sizing-sm" onchange="filterList()">
</div>
</div>
<div class="col-md-4">
<div class="input-group input-group-sm mb-3 table-search w-100">
<select name="is_booked" class="form-control ds-input" onchange="filterList()">
<option value="" {{ is_null($is_booked) ? 'selected' : '' }} disabled >Filter By Booking Status</option>
<option {{ $is_booked ? 'selected' : '' }} value="1">Booked</option>
<option {{ (!is_null($is_booked) && !$is_booked) ? 'selected' : '' }} value="2">Open</option>
</select>
</div> </div>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<div class="input-group input-group-sm mb-3 table-search w-100"> <div class="input-group input-group-sm mb-3 table-search w-100">
<select name="status" class="form-control ds-input" onchange="filterList()"> <select name="status" class="form-control ds-input" onchange="filterList()">
<option value="" disabled selected>Search By Status</option> <option value="" disabled selected>Filter By Status</option>
@foreach(config('custom.status') as $in => $val) @foreach(config('custom.status') as $in => $val)
<option value="{{$in}}">{{$val}}</option> <option value="{{$in}}" {{($status ==$in) ? 'selected':''}} >{{$val}}</option>
@endforeach @endforeach
</select> </select>
</div> </div>
</div> </div>
</div> </div>
</form> </form>
@ -74,7 +84,7 @@
@if($setting->is_booked) @if($setting->is_booked)
<td class="text-center"><span class="badge booked text-bg-secondary">Booked</span></td> <td class="text-center"><span class="badge booked text-bg-secondary">Booked</span></td>
@else @else
<td class="text-center"><span class="badge notbooked text-bg-secondary">Available</span></td> <td class="text-center"><span class="badge notbooked text-bg-secondary">Open</span></td>
@endif @endif
<td class="d-flex justify-content-center action-icons"> <td class="d-flex justify-content-center action-icons">

6
resources/views/admin/layouts/menubar.blade.php
Unescape View File

@ -129,7 +129,7 @@
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link {{(Request::segment(2) == 'appointments') ? 'active' : ''}}"> <a class="nav-link ">
<div class="sidebar-icon w-100" id="myAppointmentBtn"> <div class="sidebar-icon w-100" id="myAppointmentBtn">
<i class="fa-regular fa-calendar-check"></i> <i class="fa-regular fa-calendar-check"></i>
<span class="menu-title w-100"> <span class="menu-title w-100">
@ -140,12 +140,12 @@
<div class="collapse" id="myAppointment"> <div class="collapse" id="myAppointment">
<ul class="nav flex-column sub-menu"> <ul class="nav flex-column sub-menu">
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="{{url('admin/appointments')}}"> <a class="nav-link {{(Request::segment(2) == 'education') ? 'active' : ''}}" href="{{url('admin/appointments/education')}}">
<i class="fa-solid fa-book-open-reader"></i> <p>Education Services</p> <i class="fa-solid fa-book-open-reader"></i> <p>Education Services</p>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="{{url('admin/appointments')}}"> <a class="nav-link" href="{{url('admin/appointments/visa')}}">
<i class="fa-brands fa-cc-visa"></i> <p>Visa Services</p> <i class="fa-brands fa-cc-visa"></i> <p>Visa Services</p>
</a> </a>
</li> </li>

3
routes/web.php
Unescape View File

@ -272,7 +272,8 @@ Route::group(['middleware' => ['auth']], function () {
Route::post('careers/{id}', [CareerController::class, 'update']); Route::post('careers/{id}', [CareerController::class, 'update']);
Route::get('careers/{id}', [CareerController::class, 'show']); Route::get('careers/{id}', [CareerController::class, 'show']);
Route::get('appointments', [AppointmentController::class, 'index']); Route::get('appointments/education', [AppointmentController::class, 'education_appointments']);
Route::get('appointments/visa', [AppointmentController::class, 'visa_appointments']);
Route::get('appointments/create', [AppointmentController::class, 'create']); Route::get('appointments/create', [AppointmentController::class, 'create']);
Route::post('appointments', [AppointmentController::class, 'store']); Route::post('appointments', [AppointmentController::class, 'store']);
Route::get('appointments/{id}/edit', [AppointmentController::class, 'edit']); Route::get('appointments/{id}/edit', [AppointmentController::class, 'edit']);

Write Preview
Loading…
Cancel
Save