diff --git a/app/Contracts/Repositories/EmployeeRepository.php b/app/Contracts/Repositories/EmployeeRepository.php index 4e287826..2f8d5cbe 100644 --- a/app/Contracts/Repositories/EmployeeRepository.php +++ b/app/Contracts/Repositories/EmployeeRepository.php @@ -77,6 +77,8 @@ public function whereSchool(mixed $id, $query, Request $request): mixed }) ->when($request->filter === "terlama", function($query) { $query->oldest(); + }) ->when($request->status, function($query) use ($request) { + $query->where('status', $request->status); }) ->latest() ->paginate(10); diff --git a/app/Http/Controllers/Teacher/TeacherController.php b/app/Http/Controllers/Teacher/TeacherController.php index 05f628ac..892a4a3a 100644 --- a/app/Http/Controllers/Teacher/TeacherController.php +++ b/app/Http/Controllers/Teacher/TeacherController.php @@ -11,6 +11,7 @@ use App\Http\Requests\UpdateEmployeeRequest; use App\Models\Employee; use App\Services\TeacherService; +use Illuminate\Http\Request; use Illuminate\Support\Str; @@ -34,9 +35,9 @@ public function __construct(UserInterface $user, EmployeeInterface $employee, Te /** * Display a listing of the resource. */ - public function index() + public function index(Request $request) { - $teachers = $this->employee->whereSchool(auth()->user()->school->id, RoleEnum::TEACHER->value); + $teachers = $this->employee->whereSchool(auth()->user()->school->id, RoleEnum::TEACHER->value, $request); $religions = $this->religion->get(); return view('school.pages.teacher.index', compact('teachers', 'religions')); } diff --git a/public/admin_assets/dist/images/ilustrations/absensi.png b/public/admin_assets/dist/images/ilustrations/absensi.png new file mode 100644 index 00000000..a47ef0a6 Binary files /dev/null and b/public/admin_assets/dist/images/ilustrations/absensi.png differ diff --git a/public/admin_assets/dist/images/ilustrations/scan.png b/public/admin_assets/dist/images/ilustrations/scan.png new file mode 100644 index 00000000..1301b61d Binary files /dev/null and b/public/admin_assets/dist/images/ilustrations/scan.png differ diff --git a/resources/views/school/layouts/sidebar.blade.php b/resources/views/school/layouts/sidebar.blade.php index ac608046..d36b7660 100644 --- a/resources/views/school/layouts/sidebar.blade.php +++ b/resources/views/school/layouts/sidebar.blade.php @@ -170,11 +170,11 @@ class="icon icon-tabler icons-tabler-outline icon-tabler-aperture"> @@ -257,6 +257,19 @@ class="icon icon-tabler icons-tabler-outline icon-tabler-aperture"> +
  • + +
  • - +
    - Sudah Digunakan + Sudah Digunakan
    • diff --git a/resources/views/school/layouts/testapp.blade.php b/resources/views/school/layouts/testapp.blade.php new file mode 100644 index 00000000..8baa92e2 --- /dev/null +++ b/resources/views/school/layouts/testapp.blade.php @@ -0,0 +1,80 @@ + + + + + + MiSchool | School + {{-- {{ env('APP_NAME') }} | School --}} + + + + + + + + + + + + + + + + + + + + + + @yield('style') + + + + + +
    + loader +
    + +
    + loader +
    + +
    + + {{-- @include('school.layouts.sidebar') --}} + + + + +
    + @yield('content') + +
    +
    + + + + + + + + + @yield('script') + + + + + + + + + + + + + + + + diff --git a/resources/views/school/pages/teacher/index.blade.php b/resources/views/school/pages/teacher/index.blade.php index 8d9e644e..379c78ed 100644 --- a/resources/views/school/pages/teacher/index.blade.php +++ b/resources/views/school/pages/teacher/index.blade.php @@ -1,828 +1,776 @@ @extends('school.layouts.app') @section('style') - - + + @endsection @section('content') -
    -
    -
    +
    +
    +
    +
    - +
    - -
    - + + - - - - + + -
    -
    - +
    + +
    + +
    +
    - - - +
    + +