Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
ArdianS18 committed Jul 16, 2024
2 parents 0253f45 + 8580660 commit 41c3e63
Show file tree
Hide file tree
Showing 9 changed files with 871 additions and 730 deletions.
2 changes: 2 additions & 0 deletions app/Contracts/Repositories/EmployeeRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
5 changes: 3 additions & 2 deletions app/Http/Controllers/Teacher/TeacherController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;


Expand All @@ -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'));
}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 21 additions & 7 deletions resources/views/school/layouts/sidebar.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -170,11 +170,11 @@ class="icon icon-tabler icons-tabler-outline icon-tabler-aperture">
<a class="sidebar-link has-arrow" href="javascript:void(0)" aria-expanded="false">
<span class="d-flex">
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20"
viewBox="0 0 14 14">
<path fill="none" stroke="currentColor" stroke-linecap="round"
stroke-linejoin="round"
d="M9 .5v6l3.59 4.57a1.5 1.5 0 0 1-1.18 2.43H2.59a1.5 1.5 0 0 1-1.18-2.43L5 6.5v-6M3.5.5h7" />
</svg>
viewBox="0 0 14 14">
<path fill="none" stroke="currentColor" stroke-linecap="round"
stroke-linejoin="round"
d="M9 .5v6l3.59 4.57a1.5 1.5 0 0 1-1.18 2.43H2.59a1.5 1.5 0 0 1-1.18-2.43L5 6.5v-6M3.5.5h7" />
</svg>
</span>
<span class="hide-menu">Mata Pelajaran</span>
</a>
Expand Down Expand Up @@ -257,6 +257,19 @@ class="icon icon-tabler icons-tabler-outline icon-tabler-aperture">

</ul>
</li>
<li class="sidebar-item">
<a class="sidebar-link" href="/attendance-test" aria-expanded="false">
<span>
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20"
viewBox="0 0 24 24">
<path fill="none" stroke="currentColor" stroke-linecap="round"
stroke-linejoin="round" stroke-width="2"
d="M9 12V8m6 4v-2m-3 2v-1M3 4h18M4 4v10a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V4m-8 12v4m-3 0h6" />
</svg>
</span>
<span class="hide-menu">Test Absensi</span>
</a>
</li>
<li class="sidebar-item">
<a class="sidebar-link has-arrow" href="javascript:void(0)" aria-expanded="false">
<span class="d-flex">
Expand Down Expand Up @@ -299,11 +312,12 @@ class="icon icon-tabler icons-tabler-outline icon-tabler-aperture">
</a>
</li>
<li class="sidebar-item">
<a href="/school/rfid-active" class="sidebar-link" style="display: flex; align-items: center; margin-left: 20px;">
<a href="/school/rfid-active" class="sidebar-link"
style="display: flex; align-items: center; margin-left: 20px;">
<div class="round-16 d-flex align-items-center justify-content-center ms-3">
<i class="ti ti-circle"></i>
</div>
<span class="hide-menu ">Sudah Digunakan</span>
<span class="hide-menu ">Sudah Digunakan</span>
</a>
</li>
</ul>
Expand Down
80 changes: 80 additions & 0 deletions resources/views/school/layouts/testapp.blade.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
<!DOCTYPE html>
<html lang="en">

<head>
<!-- Title -->
<title>MiSchool | School</title>
{{-- <title>{{ env('APP_NAME') }} | School</title> --}}
<!-- Required Meta Tag -->
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="handheldfriendly" content="true" />
<meta name="MobileOptimized" content="width" />
<meta name="description" content="Mordenize" />
<meta name="author" content="" />
<meta name="keywords" content="Mordenize" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<!-- Favicon -->
<link rel="shortcut icon" type="image/png" href="{{ asset('assets/images/logo/logo-M.png') }}" />
<!-- Owl Carousel -->
<link rel="stylesheet" href="{{ asset('admin_assets/dist/libs/owl.carousel/dist/owl.carousel.min.js') }}">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/toastr.min.js">
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/toastr.min.css">

<!-- Core Css -->
<link id="themeColors" rel="stylesheet" href="{{ asset('admin_assets/dist/css/style.min.css') }}" />
<link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/toastr.css">
@yield('style')

</head>

<body>
<!-- Preloader -->
<div class="preloader">
<img src="{{ asset('assets/images/logo/logo-M.png') }}" style="width:100px" alt="loader" class="lds-ripple" />
</div>
<!-- Preloader -->
<div class="preloader">
<img src="{{ asset('assets/images/logo/logo-M.png') }}" style="width:100px" alt="loader" class="lds-ripple" />
</div>
<!-- Body Wrapper -->
<div class="page-wrapper" id="main-wrapper" data-theme="blue_theme" data-layout="vertical" data-sidebartype="full"
data-sidebar-position="fixed" data-header-position="fixed">
<!-- Sidebar Start -->
{{-- @include('school.layouts.sidebar') --}}
<!-- Sidebar End -->
<!-- SignIn modal content -->

<!-- Main wrapper -->
<div class="px-2 pt-2">
@yield('content')

</div>
</div>

<!-- Customizer -->

<!-- Customizer -->
<!-- Import Js Files -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js" integrity="sha512-v2CJ7UaYy4JwqLDIrZUI/4hqeoQieOmAZNXBeQyjo21dadnwR+8ZaIJVT8EE2iyI61OV8e6M8PP2/4hpQINQ/g==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>

@yield('script')
<script src="{{ asset('admin_assets/dist/libs/jquery/dist/jquery.min.js') }}"></script>
<script src="{{ asset('admin_assets/dist/libs/simplebar/dist/simplebar.min.js') }}"></script>
<script src="{{ asset('admin_assets/dist/libs/bootstrap/dist/js/bootstrap.bundle.min.js') }}"></script>
<!-- core files -->
<script src="{{ asset('admin_assets/dist/js/app.min.js') }}"></script>
<script src="{{ asset('admin_assets/dist/js/app.init.js') }}"></script>
<script src="{{ asset('admin_assets/dist/js/app-style-switcher.js') }}"></script>
<script src="{{ asset('admin_assets/dist/js/sidebarmenu.js') }}"></script>
<script src="{{ asset('admin_assets/dist/js/custom.js') }}"></script>
<!-- current page js files -->
<script src="{{ asset('admin_assets/dist/libs/owl.carousel/dist/owl.carousel.min.js') }}"></script>
<script src="{{ asset('admin_assets/dist/libs/apexcharts/dist/apexcharts.min.js') }}"></script>
<script src="{{ asset('admin_assets/dist/js/dashboard.js') }}"></script>
</body>

</html>
Loading

0 comments on commit 41c3e63

Please sign in to comment.