Remove Directorat and subdirectorat

This commit is contained in:
daeng.deni@dharma.or.id 2023-05-20 21:19:49 +07:00
parent 0569aabcf0
commit 514c2d4222
6 changed files with 11 additions and 62 deletions

View File

@ -15,8 +15,6 @@ return new class extends Migration
{ {
Schema::create('users', function (Blueprint $table) { Schema::create('users', function (Blueprint $table) {
$table->id(); $table->id();
$table->foreignIdFor('Modules\Cetaklabel\Entities\Directorat', 'directorat_id')->nullable();
$table->foreignIdFor('Modules\Cetaklabel\Entities\SubDirectorat', 'sub_directorat_id')->nullable();
$table->string('name'); $table->string('name');
$table->string('email')->unique(); $table->string('email')->unique();
$table->timestamp('email_verified_at')->nullable(); $table->timestamp('email_verified_at')->nullable();

View File

@ -24,9 +24,7 @@
protected $fillable = [ protected $fillable = [
'name', 'name',
'email', 'email',
'password', 'password'
'directorat_id',
'sub_directorat_id',
]; ];
/** /**

View File

@ -8,7 +8,6 @@
use Illuminate\Http\Response; use Illuminate\Http\Response;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Hash;
use Modules\Cetaklabel\Entities\Directorat;
use Modules\Usermanager\DataTables\UsersDataTable; use Modules\Usermanager\DataTables\UsersDataTable;
use Modules\Usermanager\Entities\User; use Modules\Usermanager\Entities\User;
use Spatie\Permission\Models\Role; use Spatie\Permission\Models\Role;
@ -39,9 +38,8 @@
addVendor('chained-select'); addVendor('chained-select');
$directorat = Directorat::all();
$roles = Role::all(); $roles = Role::all();
return $dataTable->render('usermanager::users.users.index', compact('directorat', 'roles')); return $dataTable->render('usermanager::users.users.index', compact( 'roles'));
} }
/** /**
@ -86,8 +84,6 @@
$user = new User(); $user = new User();
$user->name = $request->name; $user->name = $request->name;
$user->email = $request->email; $user->email = $request->email;
$user->directorat_id = $request->directorat_id;
$user->sub_directorat_id = $request->sub_directorat_id;
$user->password = Hash::make($request->password); $user->password = Hash::make($request->password);
$user->save(); $user->save();
@ -184,8 +180,6 @@
try { try {
$user->name = $request->name; $user->name = $request->name;
$user->email = $request->email; $user->email = $request->email;
$user->directorat_id = $request->directorat_id;
$user->sub_directorat_id = $request->sub_directorat_id;
if ($request->password) { if ($request->password) {
$user->password = Hash::make($request->password); $user->password = Hash::make($request->password);

View File

@ -58,39 +58,6 @@
</div> </div>
<!--end::Input group--> <!--end::Input group-->
<!--begin::Input group-->
<div class="d-flex flex-column mb-8 fv-row">
<!--begin::Label-->
<label class="d-flex align-items-center fs-6 fw-semibold mb-2" for="directorat_id">
<span class="required">Directorat</span>
<span class="ms-1" data-bs-toggle="tooltip"
title="Specify a target name for future usage and reference"></span>
</label>
<!--end::Label-->
<select class="form-select" name="directorat_id" id="directorat_id">
<option>Select Directorat</option>
@foreach($directorat as $item)
<option value="{{$item->id}}">{{$item->name}}</option>
@endforeach
</select>
</div>
<!--end::Input group-->
<!--begin::Input group-->
<div class="d-flex flex-column mb-8 fv-row">
<!--begin::Label-->
<label class="d-flex align-items-center fs-6 fw-semibold mb-2" for="sub_directorat_id">
<span class="required">Sub Directorat</span>
<span class="ms-1" data-bs-toggle="tooltip"
title="Specify a target name for future usage and reference"></span>
</label>
<!--end::Label-->
<select class="form-select" name="sub_directorat_id" id="sub_directorat_id">
<option>Select Sub Directorat</option>
</select>
</div>
<!--end::Input group-->
<div class="mb-7"> <div class="mb-7">
<!--begin::Label--> <!--begin::Label-->
<label class="required fw-bold fs-6 mb-5">Role</label> <label class="required fw-bold fs-6 mb-5">Role</label>

View File

@ -68,8 +68,6 @@
success: function (response) { success: function (response) {
console.log(response); console.log(response);
$('#title_form').text('Edit {{ ucfirst(str_replace('-',' ',$route[0].' '.$route[1])) }}'); $('#title_form').text('Edit {{ ucfirst(str_replace('-',' ',$route[0].' '.$route[1])) }}');
$('#directorat_id').val(response.data.directorat_id).change();
$('#sub_directorat_id').val(response.data.directorat_id).change();
$('#{{$route[0].'_'.$route[1]}}_id').val(response.data.id); $('#{{$route[0].'_'.$route[1]}}_id').val(response.data.id);
$('#{{$route[0].'_'.$route[1]}}_name').val(response.data.name); $('#{{$route[0].'_'.$route[1]}}_name').val(response.data.name);
$('#{{$route[0].'_'.$route[1]}}_email').val(response.data.email); $('#{{$route[0].'_'.$route[1]}}_email').val(response.data.email);

View File

@ -125,16 +125,10 @@
$('#kt_modal_user_users').on('hidden.bs.modal', function (e) { $('#kt_modal_user_users').on('hidden.bs.modal', function (e) {
$(".form_user_users")[0].reset(); $(".form_user_users")[0].reset();
$("#sub_directorat_id").html("").append("<option value=''>Select Sub Directorat</option>");
$(".form_user_users").attr('action', "{{ route('user.users.store') }}"); $(".form_user_users").attr('action', "{{ route('user.users.store') }}");
$(".form_user_users").find('input[name="_method"]').remove(); $(".form_user_users").find('input[name="_method"]').remove();
$("#title_form").html("Create User"); $("#title_form").html("Create User");
}); });
$("#sub_directorat_id").remoteChained({
parents : "#directorat_id",
url : "/sub-directorat"
});
}); });
</script> </script>
@endpush @endpush