anandazakias
/
MIF_E31210529
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing Bug

This commit is contained in:
Zakiaass 2024-03-15 12:20:08 +07:00
parent 89ef419afe
commit 39d74750a4
5 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Exports/UserTemplateExport.php
View File

@ -4,8 +4,9 @@
use App\Models\User; use App\Models\User;
use Maatwebsite\Excel\Concerns\FromCollection; use Maatwebsite\Excel\Concerns\FromCollection;
use Maatwebsite\Excel\Concerns\ShouldAutoSize;
class UserTemplateExport implements FromCollection class UserTemplateExport implements FromCollection, ShouldAutoSize
{ {
/** /**
* @return \Illuminate\Support\Collection * @return \Illuminate\Support\Collection

3
app/Http/Controllers/AuthController.php
View File

@ -114,7 +114,6 @@ public function showLinkRequestForm(Request $request)
return view('auth.forgot-password'); return view('auth.forgot-password');
} }
// Mengirim email tautan reset password
public function sendResetLinkEmail(Request $request) public function sendResetLinkEmail(Request $request)
{ {
$request->validate(['email' => 'required|email']); $request->validate(['email' => 'required|email']);
@ -128,7 +127,6 @@ public function sendResetLinkEmail(Request $request)
: back()->withErrors(['email' => __($status)]); : back()->withErrors(['email' => __($status)]);
} }
// Menangani proses reset password
public function resetPassword(Request $request) public function resetPassword(Request $request)
{ {
$request->validate([ $request->validate([
@ -144,7 +142,6 @@ function ($user, $password) {
'password' => bcrypt($password), 'password' => bcrypt($password),
'remember_token' => Str::random(60), 'remember_token' => Str::random(60),
])->save(); ])->save();
// Hapus token "remember me" setelah reset password
$user->tokens()->delete(); $user->tokens()->delete();
} }
); );

6
app/Http/Controllers/DataUserController.php
View File

@ -22,13 +22,9 @@ public function userexport(){
public function userimport(Request $request) public function userimport(Request $request)
{ {
$request->validate([ $request->validate([
'file' => 'required|file|mimes:xlsx,xls|max:2048', 'file' => 'required|file|mimes:xlsx',
]); ]);
if ($request->fails()) {
return redirect()->back()->withErrors($request->errors());
}
$file = $request->file('file'); $file = $request->file('file');
$nameFile = $file->getClientOriginalName(); $nameFile = $file->getClientOriginalName();
$file->move('DataUser', $nameFile); $file->move('DataUser', $nameFile);

2
app/Http/Controllers/SubCriteriaController.php
View File

@ -51,7 +51,7 @@ public function index(Request $request)
{ {
if ($request->has('search')) { if ($request->has('search')) {
$subcriterias = SubCriteria::where('nama', 'LIKE', '%'.$request->search.'%') $subcriterias = SubCriteria::where('nama', 'LIKE', '%'.$request->search.'%')
->orWhere('criteria_id', 'LIKE', '%'.$request->search.'%') ->orWhere('deskripsi', 'LIKE', '%'.$request->search.'%')
->paginate(10); ->paginate(10);
} else { } else {
$subcriterias = SubCriteria::paginate(10); $subcriterias = SubCriteria::paginate(10);

10
resources/views/user/user.blade.php
View File

@ -107,9 +107,9 @@ class="badge btn-primary" data-toggle="modal"
</div> </div>
</div> </div>
</div> </div>
</div> <div class="footer-wrap pd-20 mb-20 card-box">
<div class="footer-wrap pd-20 mb-20 card-box"> <strong>Sistem Pendukung Keputusan Pemilihan Ekstrakurikuler Metode SMARTER</strong>
<strong>Sistem Pendukung Keputusan Pemilihan Ekstrakurikuler Metode SMARTER</strong> </div>
</div> </div>
</div> </div>
@ -173,9 +173,9 @@ class="badge btn-primary" data-toggle="modal"
<label class="col-sm-2 col-form-label">Role</label> <label class="col-sm-2 col-form-label">Role</label>
<div class="col-sm-10"> <div class="col-sm-10">
<select class="form-control" name="role" id="role" required> <select class="form-control" name="role" id="role" required>
<option value="" disabled {{ $user->role ? 'selected' : '' }}>Pilih Role</option> <option value="" disabled>Pilih Role</option>
@foreach(\App\Models\User::getPossibleEnumValues('role') as $role) @foreach(\App\Models\User::getPossibleEnumValues('role') as $role)
<option value="{{ $role }}">{{ $role }}</option> <option value="{{ $role }}" {{ Auth::user()->role == $role ? 'selected' : '' }}>{{ $role }}</option>
@endforeach @endforeach
</select> </select>
<div class="valid-feedback"> <div class="valid-feedback">