daengdeni/lpj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

memperbaiki konflik pada branch staging - andydev

Browse Source
This commit is contained in:
Andy Chaerudin
2024-10-03 11:47:54 +07:00
parent d36a5ec666 bd96bab2a9
commit d5a45d054c
12 changed files with 1042 additions and 703 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -241,7 +241,8 @@
public function show($id)
{
return view('lpj::registrasi.show', compact('id'));
$permohonan = Permohonan::find($id);
return view('lpj::registrasi.show', compact('id','permohonan'));
}
public function showData(Request $request): JsonResponse

46
app/Http/Controllers/TeamsController.php
View File

@@ -2,18 +2,19 @@
namespace Modules\Lpj\Http\Controllers;
use App\Http\Controllers\Controller;
use Illuminate\Http\RedirectResponse;
use Exception;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Modules\Lpj\Models\Regions;
use Modules\Usermanagement\Models\User;
use Modules\Lpj\Models\Teams;
use Modules\Lpj\Models\TeamsUsers;
use Modules\Lpj\Http\Requests\TeamsRequest;
use Modules\Lpj\Models\Regions;
use Illuminate\Support\Facades\DB;
use Modules\Lpj\Exports\TeamPenilaianExport;
use Modules\Lpj\Models\TeamsUsers;
use App\Http\Controllers\Controller;
use Maatwebsite\Excel\Facades\Excel;
use Illuminate\Http\RedirectResponse;
use Modules\Usermanagement\Models\User;
use Modules\Lpj\Http\Requests\TeamsRequest;
use Modules\Lpj\Exports\TeamPenilaianExport;
class TeamsController extends Controller
{
@@ -39,8 +40,8 @@ class TeamsController extends Controller
// cek user apakah sudah ada di tabel teams_users
$userTeam = TeamsUsers::pluck('user_id')->toArray();
$user = User::whereNotIn('id', $userTeam)
->with('roles')
->get();
->with('roles')
->get();
return view('lpj::teams.form', compact('region', 'user'));
}
@@ -69,15 +70,15 @@ class TeamsController extends Controller
DB::commit();
return redirect()
->route('basicdata.teams.index')
->with('success', 'Data saved successfully. ');
->route('basicdata.teams.index')
->with('success', 'Data saved successfully. ');
} catch (Exception $e) {
DB::rollBack();
return redirect()
->route('basicdata.teams.create')
->with('error', 'Failed to save data. ');
->route('basicdata.teams.create')
->with('error', 'Failed to save data. ');
}
}
@@ -100,8 +101,8 @@ class TeamsController extends Controller
$region = Regions::all();
$usedUsers = TeamsUsers::where('teams_id', '!=', $id)->pluck('user_id')->toArray();
$user = User::whereNotIn('id', $usedUsers)
->with('roles')
->get();
->with('roles')
->get();
// Ambil user yang sudah ada di tim ini
$selectedUsers = $teams->teamsUsers->pluck('user_id')->toArray();
@@ -136,15 +137,15 @@ class TeamsController extends Controller
DB::commit();
return redirect()
->route('basicdata.teams.index')
->with('success', 'Data updated successfully. ');
->route('basicdata.teams.index')
->with('success', 'Data updated successfully. ');
} catch (Exception $e) {
DB::rollBack();
return redirect()
->route('basicdata.teams.create')
->with('error', 'Failed to update data. ');
->route('basicdata.teams.create')
->with('error', 'Failed to update data. ');
}
}
@@ -165,7 +166,6 @@ class TeamsController extends Controller
DB::commit();
echo json_encode(['success' => true, 'message' => 'Team has been deleted successfully']);
} catch (Exception $e) {
DB::rollBack();
echo json_encode(['success' => false, 'message' => 'Failed to delete Team']);
@@ -190,8 +190,8 @@ class TeamsController extends Controller
$search = $request->get('search');
$query->where(function ($q) use ($search) {
$q->where('teams.name', 'LIKE', "%$search%")
->orWhere('regions.name', 'LIKE', "%$search%")
->orWhere('users.name', 'LIKE', "%$search%");
->orWhere('regions.name', 'LIKE', "%$search%")
->orWhere('users.name', 'LIKE', "%$search%");
});
}
@@ -255,6 +255,4 @@ class TeamsController extends Controller
{
return Excel::download(new TeamPenilaianExport(), 'team-penilai.xlsx');
}
}

16
app/Http/Controllers/TenderController.php
View File

@@ -33,15 +33,14 @@ class TenderController extends Controller
*/
public function penawaran_create($id)
{
$penawaran = PenawaranTender::find($id);
$status = StatusPermohonan::all();
$tujuan_penilaian_kjpp = TujuanPenilaianKJPP::all();
$jenis_laporan = JenisLaporan::all();
$kjpp = KJPP::all();
$permohonan = Permohonan::find($id);
$permohonanId = $permohonan->id;
$permohonanNomorRegistrasi = $permohonan->nomor_registrasi;
return view('lpj::penawaran/create', compact('status', 'tujuan_penilaian_kjpp', 'jenis_laporan', 'kjpp', 'permohonanId', 'permohonanNomorRegistrasi'));
return view('lpj::penawaran/create', compact('status', 'tujuan_penilaian_kjpp', 'jenis_laporan', 'kjpp', 'penawaran', 'id'));
}
/**
@@ -52,10 +51,14 @@ class TenderController extends Controller
$validated = $request->validated();
if ($validated) {
$validated['nomor_registrasi'] = $request->nomor_registrasi;
$penawaran = PenawaranTender::find($id);
$validated['nomor_registrasi'] = $penawaran->nomor_registrasi;
$validated['nama_kjpp_sebelumnya'] = json_encode($request->input('nama_kjpp_sebelumnya'));
dd($validated);
PenawaranTender::create($validated);
return redirect()
@@ -73,7 +76,8 @@ class TenderController extends Controller
*/
public function penawaran_show($id)
{
return view('lpj::show');
$penawaran = PenawaranTender::find($id);
return view('lpj::penawaran.show', compact('id', 'penawaran'));
}
/**