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

fix seeder, add user roles during register

Browse Source
This commit is contained in:
Amir
2022-07-28 12:55:19 +08:00
parent 39ea2d83ca
commit c10d435e86
5 changed files with 129 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/PenggunaController.php
+13 -3
View File
@@ -35,12 +35,13 @@ class PenggunaController extends Controller
// $alluser = User::all();
$alluser = User::with('roles')->orderBy('id')->get();
$allroles = Role::all();
$allRolesPluck= $allroles->pluck('name');
$caw = Cawangan::all();
$user = User::with('roles')->first();
$userroles = $user->getRoleNames()->toArray();
// $user = Auth::user();
// $user->assignRole('admin');
return view('pengurusanpengguna.index',compact('alluser','allroles','caw','user','userroles'));
return view('pengurusanpengguna.index',compact('alluser','allroles','caw','user','userroles', 'allRolesPluck'));
}
@@ -87,9 +88,18 @@ class PenggunaController extends Controller
$user->email_verified_at = $currentdate;
$user->password = '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi'; //password
$user->user_type = 1;
// $user->user_type = 1;
$user->save();
$allroles = Role::all()->pluck('name');
$arraytaraf = [];
foreach($allroles as $index=>$taraf) {
$req = 'taraf'.$taraf;
if($request->$req)
{
array_push($arraytaraf,$taraf);
}
}
$user->syncRoles($arraytaraf);
return redirect()->route('pengguna.index')
->with('success', 'Pengguna Berjaya Disimpan');
}
@@ -112,7 +122,7 @@ class PenggunaController extends Controller
array_push($arraytaraf,$taraf);
}
}
//dd($arraytaraf);
// dd($arraytaraf);
$user->syncRoles($arraytaraf);
if($request->status == true)
database/migrations/2021_12_14_041545_create_simulasis_table.php
+1 -1
View File
@@ -65,7 +65,7 @@ class CreateSimulasisTable extends Migration
$table->decimal('upahsimpan', $precision = 11, $scale = 2)->nullable();
$table->decimal('ansuran', $precision = 11, $scale = 2)->nullable();
$table->decimal('nilaimarhun', $precision = 9, $scale = 2);
$table->decimal('pinjaman', $precision = 9, $scale = 2);
$table->decimal('pinjaman', $precision = 9, $scale = 2)->nullable();
$table->decimal('bakiupah', $precision = 7, $scale = 2);
$table->decimal('cajlain', $precision = 7, $scale = 2)->nullable();
$table->decimal('cajlelong', $precision = 7, $scale = 2);
database/seeders/KaratSeeder.php
-11
View File
@@ -73,16 +73,5 @@ class KaratSeeder extends Seeder
'keterangan' => '585.00',
'dariharga916' => -92.65
]);
JenisKarat::create([
'karat' => '9.0K',
'keterangan' => '375.00',
'dariharga916' => -139.71
]);
}
}
database/seeders/RolesSeeder.php
+1
View File
@@ -184,6 +184,7 @@ class RolesSeeder extends Seeder
$role6->givePermissionTo('kemaskinihargaasas');
$role6->givePermissionTo('importdata');
$role6->givePermissionTo('tetapan');
$role6->givePermissionTo('jananotis');
$role7 = Role::create(['name' => 'account']);
$role7->givePermissionTo('pengesahanbayaran');
resources/views/pengurusanpengguna/index.blade.php
+114 -134
View File
@@ -5,19 +5,19 @@
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
@endif
@if ($message = Session::get('failed'))
<div class="alert alert-danger">
<p>{{ $message }}</p>
</div>
<div class="alert alert-danger">
<p>{{ $message }}</p>
</div>
@endif
<?php
$totaluser = count($alluser);
$totaluser = count($alluser);
?>
<form id="exportform" action="{{route('pengguna.export')}}" method="POST">
@csrf
@@ -36,7 +36,7 @@
</tr>
</thead>
<tbody>
@foreach ($alluser as $user)
<tr>
<td><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $user->id }}"></td>
@@ -44,24 +44,24 @@
<td>{{ $user->username }}</td>
<td>{{ $user->email }}</td>
<td>{{ $user->kodcaw }}</td>
<td>
@foreach ($user->roles as $taraf)
@foreach ($user->roles as $taraf)
<button class="btn btn-primary btn-sm hovernone" disabled>{{$taraf->name}}</button>
@endforeach
@endforeach
</td>
<td>
@if ($user->status =='active')
<button class="btn btn-success btn-sm hovernone-success" disabled>{{$user->status}}</button>
<button class="btn btn-success btn-sm hovernone-success" disabled>{{$user->status}}</button>
@elseif ($user->status == 'inactive')
<button class="btn btn-warning btn-sm hovernone-warning" disabled>{{$user->status}}</button>
<button class="btn btn-warning btn-sm hovernone-warning" disabled>{{$user->status}}</button>
@elseif ($user->status =='banned')
<button class="btn btn-danger btn-sm hovernone-danger" disabled>{{$user->status}}</button>
@endif
</td>
<td class="text-center">
<a href="{{ route('pengguna.show',$user->id) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini" style="margin-right:30px" ><i class="far fa-edit"></i></a>
<a href="{{ route('pengguna.show',$user->id) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini" style="margin-right:30px"><i class="far fa-edit"></i></a>
<a class="confirmdel" href="{{ route('pengguna.delete',$user->id) }}" data-toggle="tooltip" data-placement="top" title="Padam"><i class="far fa-trash-alt"></i></a>
</td>
</tr>
@@ -74,93 +74,71 @@
</div>
</div>
<div class="modal fade" tabindex="-1" id="myModal">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal fade" tabindex="-1" id="myModal">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Tambah Pengguna</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
<h5 class="modal-title">Tambah Pengguna</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<form action="{{ route('pengguna.storepengguna') }}" method="POST" id="formpengguna">
@csrf
<div class="form-row">
<div class="form-group col-md-6">
<label for="name">Nama</label>
<input type="text" class="form-control" name="name" id="name" required>
</div>
<div class="form-group col-md-6">
<label for="username">Nama Pengguna</label>
<input type="text" class="form-control" name="username" id="username" required>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6">
<label for="name">Cawangan</label>
<select class="custom-select" name="caw" id="caw">
<option value="">Pilih Cawangan</option>
@foreach ($caw as $item)
<option value="{{$item->caw_code}}">{{$item->caw_name}}</option>
@endforeach
<!-- <option value="all">Select All</option> -->
</select>
</div>
<div class="form-group col-md-6">
<label for="email">Emel</label>
<input type="email" class="form-control" name="email" id="email" >
<label for="name">Nama</label>
<input type="text" class="form-control" name="name" id="name" required>
</div>
</div>
<!-- <div class="form-row">
<div class="form-group col-md-6">
<label for="name">Taraf</label>
<select required name="taraf" class="custom-select" name="allroles" id="allroles">
<option value="">Pilih Taraf</option>
@foreach ($allroles as $id =>$namataraf)
<option value="{{$namataraf}}" {{(isset($roles['name']) && $roles['name'] == $id) ? 'selected' : ''}}>{{$namataraf}}</option>
{{-- <option value="{{$namataraf}}">{{$namataraf}}</option> --}}
{{-- <option value="{{$namataraf->name}}"></option> --}}
@endforeach
</select>
</div> -->
<!-- <div class="form-row">
<label for="name">Taraf Pengguna</label>
<div class="form-group col-md-9">
@foreach ($allroles as $namataraf)
<div class="col-4 form-check form-check-inline">
<input class="form-check-input" name="taraf{{$namataraf}}" type="checkbox" id="taraf{{$namataraf}}" value="{{$namataraf}}" >
{{-- <input type="hidden" id="alltaraf" value=""> --}}
<label class="form-check-label" for="taraf{{$namataraf}}">{{$namataraf}}</label>
</div>
@endforeach
<label for="username">Nama Pengguna</label>
<input type="text" class="form-control" name="username" id="username" required>
</div>
</div>
</div> -->
<div class="form-row">
<div class="form-group col-md-9">
<div class="form-group col-md-6">
<label for="name">Cawangan</label>
<select class="custom-select" name="caw" id="caw">
<option disabled>Pilih Cawangan</option>
<option selected value="">-</option>
@foreach ($caw as $item)
<option value="{{$item->caw_code}}">{{$item->caw_name}}</option>
@endforeach
<!-- <option value="all">Select All</option> -->
</select>
</div>
<div class="form-group col-md-6">
<label for="email">Emel</label>
<input type="email" class="form-control" name="email" id="email">
</div>
</div>
</div>
</form>
<div class="form-row">
<h4 class="col-md-3">Taraf Pengguna</h4>
<div class="form-group col-md-9">
@foreach ($allRolesPluck as $namataraf)
<div class="col-4 form-check form-check-inline">
<input class="form-check-input" name="taraf{{$namataraf}}" type="checkbox" id="taraf{{$namataraf}}" value="{{$namataraf}}">
<label class="form-check-label" for="taraf{{$namataraf}}">{{$namataraf}}</label>
</div>
@endforeach
</div>
</div>
</form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Tutup</button>
<button type="button" class="btn btn-primary" onclick="storepengguna()">Simpan</button>
<button type="button" class="btn btn-secondary" data-dismiss="modal">Tutup</button>
<button type="button" class="btn btn-primary" onclick="storepengguna()">Simpan</button>
</div>
</div>
</div>
</div>
</div>
</div>
<script>
//Enable tooltips everywhere
$(function () {
//Enable tooltips everywhere
$(function() {
$('[data-toggle="tooltip"]').tooltip()
})
$('a.confirmdel').confirm({
@@ -171,83 +149,85 @@
buttons: {
Delete: {
btnClass: 'btn-warning',
action: function () {
action: function() {
location.href = this.$target.attr('href');
}
},
},
Batal: {
btnClass: 'btn-default',
action: function () {}
action: function() {}
}
}
});
var tablepengguna = $('#pengguna').DataTable( {
"columnDefs": [
{
var tablepengguna = $('#pengguna').DataTable({
"columnDefs": [{
"targets": 0,
"orderable": false
},
{
},
{
"targets": 4,
"orderable": false
},
{
},
{
"targets": 5,
"orderable": false
}
],
order: [
[1, 'asc']
],
// "ordering": false,
"info": false,
"lengthChange": false,
"pageLength": 15,
dom: 'Bfrtip',
buttons: [
// 'copy', 'excel', 'pdf'
// { text: 'copy', className: 'btn btn-primary' },
{
className: 'btn btn-outline-success pl-4 pr-4 btn-sm adduser',
text: '<i class="fas fa-plus" id="test"></i>',
titleAttr: 'Tambah Pengguna',
action: function(e, dt, node, config) {
//alert( 'Button activated' );
// console.log('hye');
$('#myModal').modal("show");
$('#myModal').on('shown.bs.modal', function() {
$('#rolename').trigger('focus')
})
}
],
order: [[1, 'asc']],
// "ordering": false,
"info": false,
"lengthChange": false,
"pageLength": 15,
dom: 'Bfrtip',
buttons: [
// 'copy', 'excel', 'pdf'
// { text: 'copy', className: 'btn btn-primary' },
{
className: 'btn btn-outline-success pl-4 pr-4 btn-sm adduser',
text: '<i class="fas fa-plus" id="test"></i>',
titleAttr: 'Tambah Pengguna',
action: function ( e, dt, node, config ) {
//alert( 'Button activated' );
// console.log('hye');
},
$('#myModal').modal("show");
$('#myModal').on('shown.bs.modal', function () {
$('#rolename').trigger('focus')
})
}
},
{
className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export',
titleAttr: 'Export to CSV',
text: '<i class="fas fa-download"></i>',
action: function ( e, dt, node, config ) {
$("#exportform").submit();
}
{
className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export',
titleAttr: 'Export to CSV',
text: '<i class="fas fa-download"></i>',
action: function(e, dt, node, config) {
$("#exportform").submit();
}
]
});
}
]
});
$('.adduser').tooltip();
$('.export').tooltip();
// $( '.dt-buttons').addClass('btn-group');
$( '.adduser').removeClass('dt-button');
$( '.export').removeClass('dt-button');
$('.adduser').tooltip();
$('.export').tooltip();
// $( '.dt-buttons').addClass('btn-group');
$('.adduser').removeClass('dt-button');
$('.export').removeClass('dt-button');
function selectall(cb) {
tablepengguna.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
tablepengguna.rows().nodes().to$().find('input[type="checkbox"]').each(function() {
$(this).prop('checked', cb.checked);
})
}
function storepengguna() {
$("#formpengguna").submit();
}
</script>
@endsection