KoPKB/kaunter
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'new-super' of https://gitlab.com/online-sistem1/kaunter into lapfix

Browse Source
This commit is contained in:
hafifierahman
2022-01-25 22:47:53 +08:00
parent eefa30d73a 56e835f6c7
commit 28b02f2946
11 changed files with 236 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/khazanah/kakitangan.blade.php
+67 -28
View File
@@ -1,5 +1,10 @@
@extends('layouts.app')
<style>
.form-group.required .control-label:after {
content:"*";
color:red;
}
</style>
@section('content')
<div class="container">
<div class="row justify-content-center mt-3">
@@ -15,16 +20,12 @@
<div class="card-body">
<div class="row mb-4">
</div>
<form action="{{ route('kakitangan.harian') }}" method="post">
<form action="{{ route('kakitangan.harian') }}" onsubmit="validatekakitangan()" method="post">
@csrf
<div class="col-12 text-center">
<div class="row">
<div class="row col-6">
<label class="col-6">Pengurus Cawangan:</label>
<div class="row">
<div class="col-6 text-center">
<div class="row col-12">
<label class="col-6">Pengurus Cawangan :</label>
@if($pc != null)
<input type="text" class="form-control col-6" readonly name="pc" id="pc" value="{{ $pc['name'] }}"/>
<input type="text" class="form-control col-6" hidden name="pc_id" id="pc_id" value="{{ $pc['id'] }}"/>
@@ -32,22 +33,9 @@
<input type="text" class="form-control col-6" readonly name="pc" id="pc" value="Tiada Pengurus Cawangan"/>
@endif
</div>
<div class="row col-6">
<label class="col-6">Khazanah Cawangan:</label>
<select name="khazanah" id="khazanah" class="form-control col-6">
@foreach ($khazanah as $index=>$k)
<option value="{{ $k['id'] }}" {{ $k['role_harian'] == 'khazanah' ? 'selected' : ''}}>{{ $k['name'] }}</option>
@endforeach
</select>
</div>
</div>
</div>
<div class="col-12 mt-4 text-center">
<div class="row">
<div class="row col-6">
<label class="col-6">Pen. Peng. Cawangan:</label>
<div class="row col-12">
<label class="col-6">Pen. Peng. Cawangan :</label>
@if($ppc != null)
<input type="text" class="form-control col-6" readonly name="ppc" id="ppc" value="{{ $ppc['name'] }}"/>
<input type="text" class="form-control col-6" hidden name="ppc_id" id="ppc_id" value="{{ $ppc['id'] }}"/>
@@ -55,20 +43,43 @@
<input type="text" class="form-control col-6" readonly name="pc" id="pc" value="Tiada Penolong Pengurus Cawangan"/>
@endif
</div>
</div>
<div class="col-6 text-center">
<div class="row col-12">
<label class="col-6">Khazanah <span class="text-danger">*</span> :</label>
<select name="khazanah" id="khazanah" class="form-control col-6">
<option value="" selected disabled>Sila Pilih Khazanah</option>
@foreach ($khazanah as $index=>$k)
<option value="{{ $k['id'] }}" {{ $k['role_harian'] == 'khazanah' ? 'selected' : ''}}>{{ $k['name'] }}</option>
@endforeach
</select>
</div>
<div class="row col-6">
<label class="col-6">Penilai Cawangan:</label>
<div class="row col-12">
<label class="col-6">Penilai 1 <span class="text-danger">*</span> :</label>
<select name="penilai" id="penilai" class="form-control col-6">
<option value="" selected disabled>Sila Pilih Penilai 1</option>
@foreach ($teller as $index=>$t)
<option value="{{ $t['id'] }}" {{ $t['role_harian'] == 'penilai' ? 'selected' : ''}}>{{ $t['name'] }}</option>
@endforeach
</select>
</div>
<div class="row col-12">
<label class="col-6">Penilai 2 :</label>
<select name="penilai2" id="penilai2" class="form-control col-6">
<option value="" selected>Tiada Penilai 2</option>
@foreach ($teller as $index=>$t)
<option value="{{ $t['id'] }}" {{ $t['role_harian'] == 'penilai2' ? 'selected' : ''}}>{{ $t['name'] }}</option>
@endforeach
</select>
</div>
</div>
</div>
<div class="col-12 row justify-content-end mt-4 mb-4">
<!-- <button class="btn btn-info">Sahkan</button> -->
<input type="submit" class="btn btn-primary mr-4" value="Sahkan">
</div>
</form>
@@ -103,6 +114,34 @@
</div>
<script>
function validatekakitangan(){
var khazanah = $('#khazanah').val();
var penilai = $('#penilai').val();
var penilai2 = $('#penilai2').val();
console.log(penilai);
if(khazanah == null || penilai == null){
Swal.fire({
icon: 'error',
title: 'Amaran!',
text: 'Sila Pilih Khazanah dan Penilai Bertugas Hari Ini.'
});
event.preventDefault();
return false;
}
if(penilai == penilai2 && penilai != null){
Swal.fire({
icon: 'error',
title: 'Amaran!',
text: 'Penilai Sama'
});
event.preventDefault();
return false;
}
return true;
}
var tablekakitangan = $('#table-kakitangan').DataTable({
"scrollX": true
});
resources/views/user/index.blade.php
+13 -8
View File
@@ -14,24 +14,29 @@
<div class="card-body text-center">
<div class="col-md-12" style="margin-right:auto;margin-left:auto">
<div class="row form-group">
<div class="col-md-12">
<div class="col-md-6">
<div class="row form-group">
<div class="col-md-6">NAMA</div>
<div class="col-md-6"><input type="text" class="form-control" readonly value="{{ $auth_user->name }}"></div>
<div class="col-md-6">NO TELEFON</div>
<div class="col-md-6">Nama</div>
<div class="col-md-6"><input type="text" class="form-control" readonly value="{{ strtoupper($auth_user->name) }}"></div>
<div class="col-md-6">No Telefon</div>
<div class="col-md-6"><input type="text" class="form-control" readonly value="{{ $auth_user->no_telefon }}"></div>
<div class="col-md-6">Email</div>
<div class="col-md-6"><input type="text" class="form-control" readonly value="{{ $auth_user->email }}"></div>
</div>
</div>
<div class="col-md-12">
<div class="col-md-6">
<div class="row form-group">
<div class="col-md-6">NO KP</div>
<div class="col-md-6">No Kad Pengenalan</div>
<div class="col-md-6"><input type="text" class="form-control" readonly value="{{ $auth_user->no_kp }}"></div>
<div class="col-md-6">JAWATAN</div>
<div class="col-md-6"><input type="text" class="form-control" readonly value="{{ $auth_user->role_harian }}"></div>
<div class="col-md-6">Jawatan</div>
<div class="col-md-6"><input type="text" class="form-control" readonly value="{{ strtoupper($auth_user->role_harian) }}"></div>
<div class="col-md-6">Baki Perubatan</div>
<div class="col-md-6"><input type="text" class="form-control" readonly value="{{ 'RM '. number_format($auth_user->perubatan,2) }}"></div>
</div>
</div>
</div>
</div>
<a href="{{ route('user.password') }}" class="btn btn-primary">Kemaskini Katalaluan</a>
</div>
</div>
</div>
resources/views/user/update_password.blade.php
+62
View File
@@ -0,0 +1,62 @@
@extends('layouts.app')
@section('content')
<div class="container">
<div class="row justify-content-center">
<div class="col-md-8">
<nav aria-label="breadcrumb">
<ol class="breadcrumb pb-3">
<li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
<li class="breadcrumb-item"><a href="{{ route('profile') }}">Maklumat Pengguna</a></li>
<li class="breadcrumb-item active" aria-current="page">Kemaskini Katalaluan</li>
</ol>
</nav>
<div class="card">
<div class="card-body">
<form method="POST" action="{{ route('change.password') }}">
@csrf
@foreach ($errors->all() as $error)
<p class="text-danger">{{ $error }}</p>
@endforeach
<div class="form-group row">
<label for="password" class="col-md-4 col-form-label text-md-right">Current Password</label>
<div class="col-md-6">
<input id="password" type="password" class="form-control" name="current_password" autocomplete="current-password">
</div>
</div>
<div class="form-group row">
<label for="password" class="col-md-4 col-form-label text-md-right">New Password</label>
<div class="col-md-6">
<input id="new_password" type="password" class="form-control" name="new_password" autocomplete="current-password">
</div>
</div>
<div class="form-group row">
<label for="password" class="col-md-4 col-form-label text-md-right">New Confirm Password</label>
<div class="col-md-6">
<input id="new_confirm_password" type="password" class="form-control" name="new_confirm_password" autocomplete="current-password">
</div>
</div>
<div class="form-group row mb-0">
<div class="col-md-8 offset-md-4">
<button type="submit" class="btn btn-primary">
Simpan Katalaluan
</button>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
</div>
@endsection