From eb2ac89f66b4b3775546fa30a4e37c85af4bea32 Mon Sep 17 00:00:00 2001
From: Julio <jsavigny@gmail.com>
Date: Tue, 17 May 2016 18:13:22 +0700
Subject: [PATCH] close
---
.../Http/Controllers/PegawaiController.php | 54 +++++--------------
.../Controllers/PertimbanganController.php | 2 +-
2 files changed, 15 insertions(+), 41 deletions(-)
diff --git a/kalungguhan/app/Http/Controllers/PegawaiController.php b/kalungguhan/app/Http/Controllers/PegawaiController.php
index 62f0fcf..8e206a8 100644
--- a/kalungguhan/app/Http/Controllers/PegawaiController.php
+++ b/kalungguhan/app/Http/Controllers/PegawaiController.php
@@ -24,12 +24,6 @@ class PegawaiController extends Controller
$pertimbangan = Pertimbangan::where('id_lowongan', $id_lowongan)->where('status', 0)->get();
$lowongan = Lowongan::where('id', $id_lowongan)->first();
-
- // $pertimbangan = Pertimbangan::find(1);
- // echo($pertimbangan->pegawai);
- // Anggap Semua recommended
-
-
$pendidikanVal = array(
"SMA" => 0,
"D1" => 1,
@@ -41,46 +35,26 @@ class PegawaiController extends Controller
"S3" => 7
);
+ $pegawaiPertimbangan= array();
+ foreach ($pertimbangan as $pertimbangan_item){
+ $pegawaiPertimbangan[]=$pertimbangan_item->pegawai->nama;
+ }
- $pegawaiRecommended = array();
+ $pegawaiRecommendedTemp = array();
foreach($pegawai as $pegawai_item) {
$pendidikan = $pegawai_item->penduduk->pendidikan;
$golongan = $pegawai_item->golongan;
if ($pendidikanVal[strtoupper($pendidikan)] >= $pendidikanVal[strtoupper($lowongan->pendidikan)] && $golongan >= $lowongan->golongan) {
- array_push($pegawaiRecommended, $pegawai_item);
+ if (!in_array($pegawai_item->nama,$pegawaiPertimbangan)){
+ array_push($pegawaiRecommendedTemp, $pegawai_item);
+ }
}
}
- // $is_recommended = false;
-
- // $pegawaiRecommended = array();
- // foreach ($pegawai as $pegawai_item) {
- // $penduduk_item = Penduduk::where('id', $pegawai_item->id_penduduk)->first();
- // if ($pegawai_item->golongan == $lowongan->golongan) {
- // $is_recommended = true;
- // }
-
- // if ($is_recommended) {
- // if ($lowongan->pendidikan === "SMA") {
- // array_push($pegawaiRecommended, $pegawai_item);
- // } else if ($lowongan->pendidikan === "D3") {
- // if ($penduduk_item->pendidikan !== "SMA") {
- // array_push($pegawaiRecommended, $pegawai_item);
- // }
- // } else if ($lowongan->pendidikan === "S1") {
- // if ($penduduk_item->pendidikan !== "SMA" && $penduduk_item->pendidikan !== "D3") {
- // array_push($pegawaiRecommended, $pegawai_item);
- // }
- // } else if ($lowongan->pendidikan === "S2") {
- // if ($penduduk_item->pendidikan === "S2" || $penduduk_item->pendidikan === "S3") {
- // array_push($pegawaiRecommended, $pegawai_item);
- // }
- // } else if ($lowongan->pendidikan === "S3") {
- // if ($penduduk_item->pendidikan === "S3") {
- // array_push($pegawaiRecommended, $pegawai_item);
- // }
- // }
- // }
- // }
+
+ foreach ($pegawaiRecommendedTemp as $pegawai_tem){
+
+ }
+ $pegawaiRecommended = $pegawaiRecommendedTemp;
return view('rekomendasi',compact('pegawaiRecommended', 'pertimbangan', 'id_lowongan'));
}
@@ -109,7 +83,7 @@ class PegawaiController extends Controller
$lowongan->delete();
- return redirect('/');
+ return redirect('/pegawaidiajukan');
}
function rekamjejak(){
diff --git a/kalungguhan/app/Http/Controllers/PertimbanganController.php b/kalungguhan/app/Http/Controllers/PertimbanganController.php
index 2d516fc..3f9e702 100644
--- a/kalungguhan/app/Http/Controllers/PertimbanganController.php
+++ b/kalungguhan/app/Http/Controllers/PertimbanganController.php
@@ -32,6 +32,6 @@ class PertimbanganController extends Controller
$id_pertimbangan = $Request->input('id_pertimbangan');
$pertimbangan = Pertimbangan::where('id', $id_pertimbangan);
$pertimbangan->delete();
- echo $id_pertimbangan;
+ return redirect('/pegawaidiajukan');
}
}
--
GitLab