Merge branch 'omis_dharma' of ssh://bibgit.com:22022/dharmaraj/New-OMIS

This commit is contained in:
2024-04-16 10:57:27 +05:45
148 changed files with 6372 additions and 695 deletions

View File

@ -9,32 +9,28 @@
<title>{{ config('app.name', 'Laravel') }}</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta content="Education Consultancy" name="description" />
<meta content="Themesbrand" name="author" />
<meta content="OMIS" name="description" />
<!-- App favicon -->
<link rel="shortcut icon" href="{{ asset('assets/images/favicon.ico') }}">
<!--datatable css-->
<link rel="stylesheet" href="https://cdn.datatables.net/1.11.5/css/dataTables.bootstrap5.min.css" />
<!--datatable responsive css-->
<link rel="stylesheet" href="https://cdn.datatables.net/responsive/2.2.9/css/responsive.bootstrap.min.css" />
<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.2.2/css/buttons.dataTables.min.css">
<!-- Layout config Js -->
<script src="{{ asset('assets/js/layout.js') }}"></script>
<!-- Bootstrap Css -->
<link href="{{ asset('assets/css/bootstrap.min.css') }}" rel="stylesheet" type="text/css" />
<!-- Toastr Css -->
<link href="{{ asset('assets/css/toastr.css') }}" rel="stylesheet" type="text/css" />
<!-- Nepali DatePicker Css -->
<link href="{{ asset('assets/css/nepali.datepicker.v4.0.1.min.css') }}" rel="stylesheet" type="text/css" />
<!-- Filepond css -->
<link href="https://unpkg.com/filepond/dist/filepond.css" rel="stylesheet" />
<link href="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.css"
rel="stylesheet" />
<!-- App Css-->
<link href="{{ asset('assets/css/app.min.css') }}" rel="stylesheet" type="text/css" />
@ -58,10 +54,13 @@
<!-- removeNotificationModal -->
@include('layouts.partials.notification-modal')
<!-- /.modal -->
<!-- ========== App Menu ========== -->
@include('layouts.partials.sidebar')
<!-- Left Sidebar End -->
<!-- Vertical Overlay-->
<div class="vertical-overlay"></div>
@ -106,23 +105,37 @@
<!-- JAVASCRIPT -->
<script src="{{ asset('assets/libs/bootstrap/js/bootstrap.bundle.min.js') }}"></script>
<script src="{{ asset('assets/libs/jquery/jquery.min.js') }}"></script>
{{-- <script src="{{ asset('assets/libs/simplebar/simplebar.min.js') }}"></script> --}}
{{-- <script src="{{ asset('assets/libs/node-waves/waves.min.js') }}"></script> --}}
{{-- <script src="{{ asset('assets/libs/feather-icons/feather.min.js') }}"></script> --}}
<script src="{{ asset('assets/libs/simplebar/simplebar.min.js') }}"></script>
<script src="{{ asset('assets/libs/node-waves/waves.min.js') }}"></script>
<script src="{{ asset('assets/libs/feather-icons/feather.min.js') }}"></script>
{{-- <script src="{{ asset('assets/js/pages/plugins/lord-icon-2.1.0.js') }}"></script> --}}
{{-- <script src="{{ asset('assets/js/plugins.js') }}"></script> --}}
<script src="{{ asset('assets/js/plugins.js') }}"></script>
<script src="{{ asset('assets/libs/@ckeditor/ckeditor5-build-classic/build/ckeditor.js') }}"></script>
<script src="{{ asset('assets/libs/toastr/toastr.min.js') }}"></script>
<script src="{{ asset('assets/libs/nepalidatepicker/nepali.datepicker.v4.0.1.min.js') }}"></script>
<script src="{{ asset('assets/libs/flatpickr/flatpickr.min.js') }}"></script>
<script src="https://cdn.datatables.net/1.11.5/js/jquery.dataTables.min.js"></script>
<script src="https://cdn.datatables.net/1.11.5/js/dataTables.bootstrap5.min.js"></script>
<script src="{{ asset('assets/libs/fullcalendar/index.global.min.j') }}s"></script>
<script src="{{ asset('assets/js/pages/calendar.init.js') }}"></script>
{{-- <script src="https://cdn.datatables.net/responsive/2.2.9/js/dataTables.responsive.min.js"></script>
<script src="https://cdn.datatables.net/buttons/2.2.2/js/dataTables.buttons.min.js"></script>
<script src="https://cdn.datatables.net/buttons/2.2.2/js/buttons.print.min.js"></script>
<script src="https://cdn.datatables.net/buttons/2.2.2/js/buttons.html5.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.53/vfs_fonts.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.53/pdfmake.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script> --}}
<script src="{{ asset('assets/js/pages/datatables.init.js') }}"></script>
<!--apexcharts-->
@ -136,16 +149,14 @@
<!-- projects js -->
{{-- <script src="{{ asset('assets/js/pages/dashboard-projects.init.js') }}"></script> --}}
<!-- filepond js -->
{{-- <script src="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.js"></script>
<script src="https://unpkg.com/filepond/dist/filepond.js"></script> --}}
<!-- App js -->
<script src="{{ asset('assets/js/app.js') }}"></script>
<!-- Custom js -->
<script src="{{ asset('assets/js/custom.js') }}"></script>
@stack('js')
</body>
</html>

View File

@ -9,7 +9,6 @@
<li class="breadcrumb-item active">{{ $title }}</li>
</ol>
</div>
</div>
</div>
</div>

View File

@ -1,7 +1,7 @@
<footer class="footer">
<div class="container-fluid">
<div class="row">
<div class="col-sm-6">@php echo date('Y') @endphp © Education Consultancy.
<div class="col-sm-6">@php echo date('Y') @endphp © Bibhuti Solutions.
</div>
<div class="col-sm-6">
<div class="text-sm-end d-none d-sm-block">

View File

@ -43,12 +43,12 @@
<ul class="nav nav-sm flex-column">
<li class="nav-item">
<a href="{{ route('companytypes.index') }}"
class="nav-link @if (\Request::is('companytype') || \Request::is('companytype/*')) active @endif">Company Type</a>
<a href="{{ route('companyType.index') }}"
class="nav-link @if (\Request::is('company-type') || \Request::is('company-type/*')) active @endif">Company Type</a>
</li>
<li class="nav-item">
<a href="{{ route('companies.index') }}"
<a href="{{ route('company.index') }}"
class="nav-link @if (\Request::is('company') || \Request::is('company/*')) active @endif">Company</a>
</li>
@ -85,6 +85,13 @@
</a>
</li>
<li class="nav-item">
<a class="nav-link menu-link @if (\Request::is('calendar') || \Request::is('calendar/*')) active @endif"
href="{{ route('calendar.index') }}">
<i class="ri-team-line"></i> <span data-key="t-widgets">Calendar</span>
</a>
</li>
<li class="nav-item">
<a class="nav-link menu-link" href="#leave" data-bs-toggle="collapse" role="button" aria-expanded="false"
aria-controls="leave">
@ -94,14 +101,15 @@
<ul class="nav nav-sm flex-column">
<li class="nav-item">
<a href="{{ route('leave.index') }}"
class="nav-link @if (\Request::is('leave') || \Request::is('leave/*')) active @endif">Apply</a>
<a href="{{ route('leaveType.index') }}"
class="nav-link @if (\Request::is('leavetype') || \Request::is('leavetype/*')) active @endif">Leave Type</a>
</li>
<li class="nav-item">
<a href="{{ route('leaveType.index') }}"
class="nav-link @if (\Request::is('leave-type') || \Request::is('leave-type/*')) active @endif">Leave Type</a>
<a href="{{ route('leave.index') }}"
class="nav-link @if (\Request::is('leave') || \Request::is('leave/*')) active @endif">Apply Leave</a>
</li>
</ul>
</div>
</li>
@ -140,6 +148,7 @@
class="nav-link @if (\Request::is('role') || \Request::is('role/*')) active @endif">Roles</a>
</li>
<li class="nav-item">
<a href="{{ route('countries.index') }}"
class="nav-link @if (\Request::is('country') || \Request::is('country/*')) active @endif">Countries</a>
@ -172,6 +181,18 @@
class="nav-link @if (\Request::is('nationality') || \Request::is('nationality/*')) active @endif">Nationalities</a>
</li>
</ul>
</div>
</li>
<li class="nav-item">
<a class="nav-link menu-link" href="#MenuFour" data-bs-toggle="collapse" role="button"
aria-expanded="false" aria-controls="MenuFour">
<i class="ri-dashboard-2-line"></i> <span data-key="t-hrs">HR</span>
</a>
<div class="menu-dropdown collapse" id="MenuFour">
<ul class="nav nav-sm flex-column">
<li class="nav-item">
<a href="{{ route('department.index') }}"
class="nav-link @if (\Request::is('department') || \Request::is('department/*')) active @endif">Departments</a>
@ -181,6 +202,47 @@
<a href="{{ route('designation.index') }}"
class="nav-link @if (\Request::is('desgination') || \Request::is('desgination/*')) active @endif">Designations</a>
</li>
<li class="nav-item">
<a href="{{ route('promotionDemotion.index') }}"
class="nav-link @if (\Request::is('promotion-demotion') || \Request::is('promotion-demotion/*')) active @endif">Promotion/ Demotions</a>
</li>
<li class="nav-item">
<a href="{{ route('appreciation.index') }}"
class="nav-link @if (\Request::is('appreciation') || \Request::is('appreciation/*')) active @endif">Appreciations</a>
</li>
<li class="nav-item">
<a href="{{ route('complaint.index') }}"
class="nav-link @if (\Request::is('complaint') || \Request::is('complaint/*')) active @endif">Complaints</a>
</li>
<li class="nav-item">
<a href="{{ route('resignation.index') }}"
class="nav-link @if (\Request::is('resignation') || \Request::is('resignation/*')) active @endif">Resignations</a>
</li>
<li class="nav-item">
<a href="{{ route('transfer.index') }}"
class="nav-link @if (\Request::is('transfer') || \Request::is('transfer/*')) active @endif">Transfers</a>
</li>
<li class="nav-item">
<a href="{{ route('warning.index') }}"
class="nav-link @if (\Request::is('warning') || \Request::is('warning/*')) active @endif">Warnings</a>
</li>
<li class="nav-item">
<a href="{{ route('event.index') }}"
class="nav-link @if (\Request::is('event') || \Request::is('event/*')) active @endif">Manage Events</a>
</li>
<li class="nav-item">
<a href="{{ route('holiday.index') }}"
class="nav-link @if (\Request::is('holiday') || \Request::is('holiday/*')) active @endif">Manage Holidays</a>
</li>
</ul>
</div>
</li>