Commit a57f7baa authored by FARDA ALAN MA'RUF's avatar FARDA ALAN MA'RUF

kategori bimbingan & konseling

parent ec4b6849
...@@ -17,7 +17,7 @@ use App\Models\Siswa\SiswaModel; ...@@ -17,7 +17,7 @@ use App\Models\Siswa\SiswaModel;
use App\Models\Siswa\OrtuModel; use App\Models\Siswa\OrtuModel;
use App\Models\Layanan\MutasiKonselingModel; use App\Models\Layanan\MutasiKonselingModel;
use App\Models\Master\KategoriBimbinganKonselingModel;
use PhpOffice\PhpWord\TemplateProcessor; use PhpOffice\PhpWord\TemplateProcessor;
class KonselingController extends Controller class KonselingController extends Controller
...@@ -40,6 +40,7 @@ public function __construct() ...@@ -40,6 +40,7 @@ public function __construct()
$this->mPekerjaan = new PekerjaanModel(); $this->mPekerjaan = new PekerjaanModel();
$this->mKonselor = new KonselorModel(); $this->mKonselor = new KonselorModel();
$this->mTempat = new TempatModel(); $this->mTempat = new TempatModel();
$this->mKategoriBimbinganKonseling = new KategoriBimbinganKonselingModel();
} }
public function index() public function index()
...@@ -60,6 +61,7 @@ public function __construct() ...@@ -60,6 +61,7 @@ public function __construct()
'url' => $this->url, 'url' => $this->url,
'page' => 'Data Konseling Siswa', 'page' => 'Data Konseling Siswa',
]; ];
return view($this->views . "/create", $data); return view($this->views . "/create", $data);
} }
...@@ -76,6 +78,7 @@ public function __construct() ...@@ -76,6 +78,7 @@ public function __construct()
}; };
$dataKonseling = [ $dataKonseling = [
'category_id' => $request->get('category_id'),
'idPSekolah' => session()->get('idPSekolah'), 'idPSekolah' => session()->get('idPSekolah'),
'idPKKode' => $request->idPKKode, 'idPKKode' => $request->idPKKode,
'idPPeriode' => session()->get('idPPeriode'), 'idPPeriode' => session()->get('idPPeriode'),
......
...@@ -84,6 +84,7 @@ public function __construct() ...@@ -84,6 +84,7 @@ public function __construct()
$dataPembinaan = [ $dataPembinaan = [
'category_id' => $request->get('category_id'),
'idPSekolah' => session()->get('idPSekolah'), 'idPSekolah' => session()->get('idPSekolah'),
'idPKKode' => $request->idPKKode, 'idPKKode' => $request->idPKKode,
'idPPeriode' => session()->get('idPPeriode'), 'idPPeriode' => session()->get('idPPeriode'),
......
...@@ -7,7 +7,7 @@ use Illuminate\Http\Request; ...@@ -7,7 +7,7 @@ use Illuminate\Http\Request;
use App\Models\Master\ProvinsiModel; use App\Models\Master\ProvinsiModel;
use App\Models\Master\DaerahModel; use App\Models\Master\DaerahModel;
use App\Models\Master\KategoriBimbinganKonselingModel;
use App\Models\Perpus\SekolahModel; use App\Models\Perpus\SekolahModel;
use App\Models\Perpus\JurusanModel; use App\Models\Perpus\JurusanModel;
use App\Models\Perpus\KelasModel; use App\Models\Perpus\KelasModel;
...@@ -27,6 +27,7 @@ public function __construct() ...@@ -27,6 +27,7 @@ public function __construct()
$this->mPerpusJurusan = new JurusanModel(); $this->mPerpusJurusan = new JurusanModel();
$this->mPerpusKelas = new KelasModel(); $this->mPerpusKelas = new KelasModel();
$this->mPerpusKelasKode = new KelasKodeModel(); $this->mPerpusKelasKode = new KelasKodeModel();
$this->mKategoriBimbinganKonseling = new KategoriBimbinganKonselingModel();
// $this->mGuruPiket = new MGuruPiketModel(); // $this->mGuruPiket = new MGuruPiketModel();
// $this->mGuru = new MGuruModel(); // $this->mGuru = new MGuruModel();
...@@ -42,6 +43,16 @@ public function __construct() ...@@ -42,6 +43,16 @@ public function __construct()
echo json_encode($data); echo json_encode($data);
} }
public function getKategoriBimbinganKonseling()
{
$kategori = $this->mKategoriBimbinganKonseling->get();
$data = [
'error_code' => 0,
'data' => $kategori,
];
echo json_encode($data);
}
public function getProvinsiDaerah($idMprovinsi = null) public function getProvinsiDaerah($idMprovinsi = null)
{ {
$daerah = $this->mDaerah->where('idMprovinsi', $idMprovinsi)->get(); $daerah = $this->mDaerah->where('idMprovinsi', $idMprovinsi)->get();
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
namespace App\Models\Layanan; namespace App\Models\Layanan;
use App\Models\Master\KategoriBimbinganKonselingModel;
use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
...@@ -29,4 +30,9 @@ class MutasiKonselingModel extends Model ...@@ -29,4 +30,9 @@ class MutasiKonselingModel extends Model
return $this->belongsTo(\App\Models\Stakeholder\KonselorModel::class, 'idSKonselor', 'id'); return $this->belongsTo(\App\Models\Stakeholder\KonselorModel::class, 'idSKonselor', 'id');
} }
public function category()
{
return $this->hasOne(KategoriBimbinganKonselingModel::class, 'id', 'category_id');
}
} }
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
namespace App\Models\Layanan; namespace App\Models\Layanan;
use App\Models\Master\KategoriBimbinganKonselingModel;
use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
...@@ -32,4 +33,9 @@ class MutasiPembinaanModel extends Model ...@@ -32,4 +33,9 @@ class MutasiPembinaanModel extends Model
{ {
return $this->belongsTo(\App\Models\Siswa\OrtuModel::class, 'idOrtu', 'id'); return $this->belongsTo(\App\Models\Siswa\OrtuModel::class, 'idOrtu', 'id');
} }
public function category()
{
return $this->hasOne(KategoriBimbinganKonselingModel::class, 'id', 'category_id');
}
} }
<?php
namespace App\Models\Master;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
// Library
use DB;
use Illuminate\Database\Eloquent\SoftDeletes;
class KategoriBimbinganKonselingModel extends Model
{
// softdelete itu untuk fitur dari laravel. User hapus, data untuk user hilang tapi di tabel tidak hilang. cuma di hiden
// Nama tabel
protected $table = 'bimbingan_konseling_kategori';
protected $guarded = ['id'];
}
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::create('bimbingan_konseling_kategori', function (Blueprint $table) {
$table->id();
$table->string('name');
$table->timestamps();
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::dropIfExists('bimbingan_konseling_kategori');
}
};
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('layanan_mutasi_konseling', function (Blueprint $table) {
$table->bigInteger('category_id')->after('id')->nullable();
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('layanan_mutasi_konseling', function (Blueprint $table) {
$table->dropColumn('category_id');
});
}
};
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('layanan_mutasi_pembinaan', function (Blueprint $table) {
$table->bigInteger('category_id')->after('id')->nullable();
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('layanan_mutasi_pembinaan', function (Blueprint $table) {
$table->dropColumn('category_id');
});
}
};
<script>
$.getJSON(baseUrl+'/getKategoriBimbinganKonselingKomplit/', (result) => {
if (result.error_code == '0') {
let opt = '<option value="">- Pilih Kategori -</option>';
// var dataSem = result.data;
// dataSem.sort(function(a, b){
// return a.id_semester - b.id_semester;
// });
$.each(result.data, function(i, item) {
opt += '<option value="'+item.id+'">'+item.name+'</option>';
});
$("#select-kategori").html(opt);
}else{
let opt = '<option value="">- Tidak Bisa -</option>';
$("#select-kategori").html(opt);
}
$("#select-kategori").select2({
placeholder: "Pilih Kategori",
});
});
</script>
\ No newline at end of file
...@@ -37,6 +37,12 @@ ...@@ -37,6 +37,12 @@
<form action="{{ url($url) }}/store" method="POST"> <form action="{{ url($url) }}/store" method="POST">
@csrf @csrf
<div class="card-body"> <div class="card-body">
<div class="mb-3">
<label class="col-sm-3 col-form-label">Pilih Kategori</label>
<select id="select-kategori" class="form-select select2" name="category_id" aria-label="Default select example" required>
<option value="">Pilih Kategori Terlebih Dahulu</option>
</select >
</div>
<div class="mb-3"> <div class="mb-3">
<label class="col-sm-3 col-form-label">Pilih Kelas</label> <label class="col-sm-3 col-form-label">Pilih Kelas</label>
<select id="select-kodekelas" class="form-select select2" name="idPKKode" aria-label="Default select example" required> <select id="select-kodekelas" class="form-select select2" name="idPKKode" aria-label="Default select example" required>
...@@ -84,6 +90,7 @@ ...@@ -84,6 +90,7 @@
$('#tabel-jquery').hide(); $('#tabel-jquery').hide();
</script> </script>
@include('admin.filter.kelaskomplit') @include('admin.filter.kelaskomplit')
@include('admin.filter.kategoriBimbinganKonseling')
@include('admin.filter.siswaKonselorKelas') @include('admin.filter.siswaKonselorKelas')
@endpush @endpush
......
...@@ -99,6 +99,7 @@ ...@@ -99,6 +99,7 @@
<th>Nama</th> <th>Nama</th>
<th>Kelas</th> <th>Kelas</th>
<th>Konseling</th> <th>Konseling</th>
<th>Kategori</th>
<th>Permasalahan</th> <th>Permasalahan</th>
<th>Penyelesaian</th> <th>Penyelesaian</th>
</tr> </tr>
...@@ -111,6 +112,7 @@ ...@@ -111,6 +112,7 @@
<td>{{ $r->siswa->nama }}</td> <td>{{ $r->siswa->nama }}</td>
<td>{{ $r->siswa->kelaskode->kelas->nama.' '.$r->siswa->kelaskode->kelas->jurusan->nama.' '.$r->siswa->kelaskode->nama }}</td> <td>{{ $r->siswa->kelaskode->kelas->nama.' '.$r->siswa->kelaskode->kelas->jurusan->nama.' '.$r->siswa->kelaskode->nama }}</td>
<td>{{ $r->konselor->guru->nama }}</td> <td>{{ $r->konselor->guru->nama }}</td>
<td>{{ $r->category->name }}</td>
<td>{{ $r->isian_permasalahan }}</td> <td>{{ $r->isian_permasalahan }}</td>
<td>{{ $r->isian_penyelesaian }}</td> <td>{{ $r->isian_penyelesaian }}</td>
</tr> </tr>
......
...@@ -37,6 +37,12 @@ ...@@ -37,6 +37,12 @@
<form action="{{ url($url) }}/store" method="POST"> <form action="{{ url($url) }}/store" method="POST">
@csrf @csrf
<div class="card-body"> <div class="card-body">
<div class="mb-3">
<label class="col-sm-3 col-form-label">Pilih Kategori</label>
<select id="select-kategori" class="form-select select2" name="category_id" aria-label="Default select example" required>
<option value="">Pilih Kategori Terlebih Dahulu</option>
</select >
</div>
<div class="mb-3"> <div class="mb-3">
<label class="col-sm-3 col-form-label">Pilih Kelas</label> <label class="col-sm-3 col-form-label">Pilih Kelas</label>
<select id="select-kodekelas" class="form-select select2" name="idPKKode" aria-label="Default select example" required> <select id="select-kodekelas" class="form-select select2" name="idPKKode" aria-label="Default select example" required>
...@@ -97,6 +103,7 @@ ...@@ -97,6 +103,7 @@
</script> </script>
@include('admin.filter.kelaskomplit') @include('admin.filter.kelaskomplit')
@include('admin.filter.kategoriBimbinganKonseling')
@include('admin.filter.siswaKonselorKelas') @include('admin.filter.siswaKonselorKelas')
@endpush @endpush
......
...@@ -91,6 +91,7 @@ ...@@ -91,6 +91,7 @@
<th>Kelas</th> <th>Kelas</th>
<th>Orang Tua</th> <th>Orang Tua</th>
<th>Konseling</th> <th>Konseling</th>
<th>Kategori</th>
<th>Masalah</th> <th>Masalah</th>
<th>Analisa</th> <th>Analisa</th>
<th>Tindakan</th> <th>Tindakan</th>
...@@ -107,6 +108,7 @@ ...@@ -107,6 +108,7 @@
<td>{{ $r->siswa->kelaskode->kelas->nama.' '.$r->siswa->kelaskode->kelas->jurusan->nama.' '.$r->siswa->kelaskode->nama }}</td> <td>{{ $r->siswa->kelaskode->kelas->nama.' '.$r->siswa->kelaskode->kelas->jurusan->nama.' '.$r->siswa->kelaskode->nama }}</td>
<td>{{ $r->ortu->nama }}</td> <td>{{ $r->ortu->nama }}</td>
<td>{{ $r->konselor->guru->nama }}</td> <td>{{ $r->konselor->guru->nama }}</td>
<td>{{ $r->category->name }}</td>
<td>{{ $r->isian_masalah }}</td> <td>{{ $r->isian_masalah }}</td>
<td>{{ $r->isian_analisa }}</td> <td>{{ $r->isian_analisa }}</td>
<td>{{ $r->isian_tindakan }}</td> <td>{{ $r->isian_tindakan }}</td>
......
...@@ -155,6 +155,7 @@ Route::middleware(['login:1,2,3'])->group(function () { ...@@ -155,6 +155,7 @@ Route::middleware(['login:1,2,3'])->group(function () {
Route::get('getAngkatanKomplit/{idPSekolah}', 'Api\DaerahController@getAngkatanKomplit'); Route::get('getAngkatanKomplit/{idPSekolah}', 'Api\DaerahController@getAngkatanKomplit');
Route::get('getKelasKomplit/{idPSekolah}', 'Api\DaerahController@getKelasKomplit'); Route::get('getKelasKomplit/{idPSekolah}', 'Api\DaerahController@getKelasKomplit');
Route::get('getKategoriBimbinganKonselingKomplit/', 'Api\DaerahController@getKategoriBimbinganKonseling');
// List Siswa // List Siswa
Route::get('getSiswaKelas/{idAngkatan}', 'Api\SiswaController@getSiswaKelas'); Route::get('getSiswaKelas/{idAngkatan}', 'Api\SiswaController@getSiswaKelas');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment