Skip to content
This repository has been archived by the owner on Sep 17, 2023. It is now read-only.

Commit

Permalink
Update rilis
Browse files Browse the repository at this point in the history 
Karena ada beberapa perubahan & penambahan struktur table database, maka setelah melalukan git pull diwajibkan untuk melakukan php artisan erapor:update

Terima Kasih
  • Loading branch information
@eraporsmk
eraporsmk committed Nov 30, 2022
1 parent 1c06dfc commit 6bc186b
Show file tree
Hide file tree
Showing 68 changed files with 1,869 additions and 920 deletions.
2 changes: 1 addition & 1 deletion app/Console/Commands/SinkronErapor.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public function handle()
}
private function hitung_data($hitung_data, $satuan, $sekolah, $semester, $args){
if($hitung_data && $hitung_data->dapodik){
$limit = 250;
$limit = 500;
$this->info('Memproses data '.$this->get_table($satuan));
$bar = $this->output->createProgressBar($hitung_data->dapodik);
$bar->start(0);
Expand Down
19 changes: 14 additions & 5 deletions app/Exports/TemplateTp.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@

namespace App\Exports;

use Illuminate\Support\Str;
use Illuminate\Contracts\View\View;
use Maatwebsite\Excel\Concerns\FromView;
use Maatwebsite\Excel\Concerns\Exportable;
use Maatwebsite\Excel\Concerns\WithColumnWidths;
use Maatwebsite\Excel\Concerns\WithEvents;
use Maatwebsite\Excel\Events\AfterSheet;
use App\Models\Capaian_pembelajaran;
use App\Models\Kompetensi_dasar;

class TemplateTp implements FromView, WithColumnWidths, WithEvents
{
Expand Down Expand Up @@ -47,17 +49,24 @@ public function registerEvents(): array
];
}

public function query($cp_id)
public function query($id)
{
$this->cp_id = $cp_id;
$this->id = $id;
return $this;
}
public function view(): View
{
$cp = Capaian_pembelajaran::with(['pembelajaran.rombongan_belajar'])->find($this->cp_id);
$params = array(
$cp = NULL;
$kd = NULL;
if(Str::isUuid($this->id)){
$kd = Kompetensi_dasar::with(['pembelajaran'])->find($this->id);
} else {
$cp = Capaian_pembelajaran::with(['pembelajaran.rombongan_belajar'])->find($this->id);
}
$params = [
'cp' => $cp,
);
'kd' => $kd
];
return view('content.unduhan.template_tp', $params);
}
}
15 changes: 15 additions & 0 deletions app/Helpers/erapor.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -345,4 +345,19 @@ function table_striped(){
return 'table-striped';
}
return '';
}
function tingkat_kelas($kelas_10, $kelas_11, $kelas_12, $kelas_13){
$data = collect([
['kelas' => $kelas_10, 'tingkat' => 10],
['kelas' => $kelas_11, 'tingkat' => 11],
['kelas' => $kelas_12, 'tingkat' => 12],
['kelas' => $kelas_13, 'tingkat' => 13]
]);
$filtered = $data->filter(function ($value, $key) {
//dump($key);
//dump($value['kelas']);
return $value['kelas'] > 0;
});
//dd($filtered->all());
return $filtered->implode('tingkat', ', ');
}
16 changes: 9 additions & 7 deletions app/Http/Controllers/CetakController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,15 +196,13 @@ public function rapor_nilai_akhir(Request $request){
'wali_kelas'
]);
},
'catatan_ppk' => function($query){
$query->with(['nilai_karakter' => function($query){
$query->with('sikap');
}]);
},
'kenaikan',
'all_prakerin',
'single_catatan_wali',
])->find($request->route('anggota_rombel_id'));
$budaya_kerja = Budaya_kerja::with(['catatan_budaya_kerja' => function($query){
$query->where('anggota_rombel_id', request()->route('anggota_rombel_id'));
}])->get();
$find_anggota_rombel_pilihan = Anggota_rombel::where(function($query) use ($get_siswa){
$query->whereHas('rombongan_belajar', function($query){
$query->where('jenis_rombel', 16);
Expand Down Expand Up @@ -244,6 +242,7 @@ public function rapor_nilai_akhir(Request $request){
}
$rombel_4_tahun = Rombel_empat_tahun::select('rombongan_belajar_id')->where('sekolah_id', session('sekolah_id'))->where('semester_id', session('semester_aktif'))->get()->keyBy('rombongan_belajar_id')->keys()->toArray();
$params = array(
'budaya_kerja' => $budaya_kerja,
'get_siswa' => $get_siswa,
'tanggal_rapor' => $tanggal_rapor,
'cari_tingkat_akhir' => $cari_tingkat_akhir,
Expand All @@ -270,14 +269,17 @@ public function rapor_nilai_akhir(Request $request){
$rapor_nilai = view('cetak.rapor_nilai_akhir', $params);
//dd($params);
$pdf->getMpdf()->WriteHTML($rapor_nilai);
if (strpos($get_siswa->rombongan_belajar->kurikulum->nama_kurikulum, 'Merdeka') == false){
/*if (strpos($get_siswa->rombongan_belajar->kurikulum->nama_kurikulum, 'Merdeka') == false){
$pdf->getMpdf()->WriteHTML('<pagebreak />');
$rapor_catatan = view('cetak.rapor_catatan', $params);
$pdf->getMpdf()->WriteHTML($rapor_catatan);
$rapor_karakter = view('cetak.rapor_karakter', $params);
$pdf->getMpdf()->WriteHTML('<pagebreak />');
$pdf->getMpdf()->WriteHTML($rapor_karakter);
}
}*/
$pdf->getMpdf()->WriteHTML('<pagebreak />');
$rapor_catatan = view('cetak.rapor_catatan', $params);
$pdf->getMpdf()->WriteHTML($rapor_catatan);
return $pdf->stream($general_title.'-NILAI.pdf');
}
public function rapor_semester(Request $request){
Expand Down
3 changes: 3 additions & 0 deletions app/Http/Controllers/EraporController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,9 @@ public function nilai_ekstrakurikuler(){
public function nilai_ekskul(){
return view('content.wali-kelas.nilai-ekstrakurikuler');
}
public function catatan_sikap(){
return view('content.wali-kelas.catatan-sikap');
}
public function pkl(){
return view('content.laporan.pkl');
}
Expand Down
22 changes: 16 additions & 6 deletions app/Http/Controllers/UnduhanController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@
namespace App\Http\Controllers;

use Illuminate\Http\Request;
use Illuminate\Support\Str;
use App\Models\Rombongan_belajar;
use App\Models\Pembelajaran;
use App\Models\Rencana_penilaian;
use App\Models\Capaian_pembelajaran;
use App\Models\Kompetensi_dasar;
use App\Exports\LeggerKDExport;
use App\Exports\LeggerNilaiAkhirExport;
use App\Exports\LeggerNilaiRaporExport;
Expand Down Expand Up @@ -89,12 +91,20 @@ public function template_nilai_tp(){
}
}
public function template_tp(){
if(request()->route('cp_id')){
$cp = Capaian_pembelajaran::with(['pembelajaran'])->find(request()->route('cp_id'));
$nama_file = 'Template TP '.$cp->elemen.' Mata Pelajaran ' . $cp->pembelajaran->nama_mata_pelajaran;
$nama_file = clean($nama_file);
$nama_file = $nama_file . '.xlsx';
return (new TemplateTp)->query(request()->route('cp_id'))->download($nama_file);
if(request()->route('id')){
if(Str::isUuid(request()->route('id'))){
$kd = Kompetensi_dasar::with(['pembelajaran'])->find(request()->route('id'));
$nama_file = 'Template TP '.$kd->id_kompetensi.' Mata Pelajaran ' . $kd->pembelajaran->nama_mata_pelajaran;
$nama_file = clean($nama_file);
$nama_file = $nama_file . '.xlsx';
return (new TemplateTp)->query(request()->route('id'))->download($nama_file);
} else {
$cp = Capaian_pembelajaran::with(['pembelajaran'])->find(request()->route('id'));
$nama_file = 'Template TP '.$cp->elemen.' Mata Pelajaran ' . $cp->pembelajaran->nama_mata_pelajaran;
$nama_file = clean($nama_file);
$nama_file = $nama_file . '.xlsx';
return (new TemplateTp)->query(request()->route('id'))->download($nama_file);
}
} else {
echo 'Akses tidak sah!';
}
Expand Down
96 changes: 8 additions & 88 deletions app/Http/Livewire/Dashboard/Guru.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,56 +45,15 @@ public function render()
{
$cara_penilaian = config('global.'.session('sekolah_id').'.'.session('semester_aktif').'.cara_penilaian');
return view('livewire.dashboard.guru-'.$cara_penilaian, [
'mapel_diampu_kurtilas' => Pembelajaran::where($this->kondisi('REV'))->with(['rombongan_belajar' => function($query){
'mapel_diampu' => Pembelajaran::where($this->kondisi())->with(['rombongan_belajar' => function($query){
$query->select('rombongan_belajar_id', 'nama', 'guru_id');
$query->withCount('anggota_rombel');
$query->with(['wali_kelas' => function($query){
$query->select('guru_id', 'nama');
}]);
}])->withCount([
'rencana_penilaian as rencana_pengetahuan' => function($query){
$query->where('kompetensi_id', 1);
},
'rencana_penilaian as rencana_keterampilan' => function($query){
$query->where('kompetensi_id', 2);
},
'rencana_penilaian as rencana_pk' => function($query){
$query->where('kompetensi_id', 3);
},
'rencana_penilaian as pengetahuan_dinilai' => function($query){
$query->where('kompetensi_id', 1);
$query->has('nilai');
},
'rencana_penilaian as keterampilan_dinilai' => function($query){
$query->where('kompetensi_id', 2);
$query->has('nilai');
},
'rencana_penilaian as pk_dinilai' => function($query){
$query->where('kompetensi_id', 3);
$query->has('nilai');
},
'nilai_akhir as na_pengetahuan' => function($query){
$query->where('kompetensi_id', 1);
},
'nilai_akhir as na_keterampilan' => function($query){
$query->where('kompetensi_id', 2);
},
'nilai_akhir as na_pk' => function($query){
$query->where('kompetensi_id', 3);
},
])->orderBy('mata_pelajaran_id', 'asc')->get(),
'mapel_diampu_merdeka' => Pembelajaran::where($this->kondisi('Merdeka'))->with(['rombongan_belajar' => function($query){
$query->select('rombongan_belajar_id', 'nama', 'guru_id');
$query->withCount('anggota_rombel');
$query->with(['wali_kelas' => function($query){
$query->select('guru_id', 'nama');
}]);
}])->withCount([
'rencana_penilaian' => function($query){
$query->where('kompetensi_id', 4);
},
'nilai_akhir' => function($query){
$query->where('kompetensi_id', 4);
'anggota_rombel',
'anggota_rombel as anggota_dinilai' => function($query){
$query->has('nilai_akhir_mapel');
},
])->orderBy('mata_pelajaran_id', 'asc')->get(),
'rombongan_belajar' => ($this->loggedUser()->hasRole('wali', session('semester_id'))) ? Rombongan_belajar::with([
Expand All @@ -110,37 +69,8 @@ public function render()
}
]);
$query->withCount([
'rencana_penilaian as rencana_pengetahuan' => function($query){
$query->where('kompetensi_id', 1);
},
'rencana_penilaian as rencana_keterampilan' => function($query){
$query->where('kompetensi_id', 2);
},
'rencana_penilaian as rencana_pk' => function($query){
$query->where('kompetensi_id', 3);
},
'rencana_penilaian as pengetahuan_dinilai' => function($query){
$query->where('kompetensi_id', 1);
$query->has('nilai');
},
'rencana_penilaian as keterampilan_dinilai' => function($query){
$query->where('kompetensi_id', 2);
$query->has('nilai');
},
'rencana_penilaian as pk_dinilai' => function($query){
$query->where('kompetensi_id', 3);
$query->has('nilai');
},
'nilai_akhir as na_pengetahuan' => function($query){
$query->where('kompetensi_id', 1);
},
'nilai_akhir as na_keterampilan' => function($query){
$query->where('kompetensi_id', 2);
},
'nilai_akhir as na_pk' => function($query){
$query->where('kompetensi_id', 3);
},
'anggota_rombel' => function($query){
'anggota_rombel',
'anggota_rombel as anggota_dinilai' => function($query){
$query->has('nilai_akhir_mapel');
}
]);
Expand Down Expand Up @@ -214,28 +144,18 @@ public function render()
private function loggedUser(){
return auth()->user();
}
private function kondisi($kurikulum){
return function($query) use ($kurikulum){
private function kondisi(){
return function($query){
$query->where('semester_id', session('semester_aktif'));
$query->where('sekolah_id', session('sekolah_id'));
$query->where('guru_id', $this->loggedUser()->guru_id);
$query->whereNotNull('kelompok_id');
$query->whereNotNull('no_urut');
$query->whereHas('rombongan_belajar', function($query) use ($kurikulum){
$query->whereHas('kurikulum', function($query) use ($kurikulum){
$query->where('nama_kurikulum', 'ILIKE', '%'.$kurikulum.'%');
});
});
$query->orWhere('guru_pengajar_id', $this->loggedUser()->guru_id);
$query->where('semester_id', session('semester_aktif'));
$query->where('sekolah_id', session('sekolah_id'));
$query->whereNotNull('kelompok_id');
$query->whereNotNull('no_urut');
$query->whereHas('rombongan_belajar', function($query) use ($kurikulum){
$query->whereHas('kurikulum', function($query) use ($kurikulum){
$query->where('nama_kurikulum', 'ILIKE', '%'.$kurikulum.'%');
});
});
};
}
public function generateNilai($pembelajaran_id, $kompentesi_id){
Expand Down
1 change: 1 addition & 0 deletions app/Http/Livewire/Laporan/Pkl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ public function mount(){
$query->where('semester_id', session('semester_aktif'));
$query->where('guru_id', $this->loggedUser()->guru_id);
})->first();
$this->tingkat = $rombel->tingkat;
if(Str::contains($rombel->kurikulum->nama_kurikulum, '2013')){
$tingkat_allowed = 11;
} elseif(Str::contains($rombel->kurikulum->nama_kurikulum, 'Merdeka')){
Expand Down
13 changes: 4 additions & 9 deletions app/Http/Livewire/Laporan/RaporNilaiAkhir.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use Jantinnerezo\LivewireAlert\LivewireAlert;
use Livewire\Component;
use Illuminate\Support\Str;
use App\Models\Pembelajaran;
use App\Models\Rombongan_belajar;
use App\Models\Peserta_didik;
Expand All @@ -17,6 +18,7 @@ class RaporNilaiAkhir extends Component
public $rombongan_belajar = [];
public $rombongan_belajar_id;
public $data_siswa = [];
public $merdeka;

public function render()
{
Expand All @@ -30,12 +32,6 @@ public function render()
private function loggedUser(){
return auth()->user();
}
public function mount_salah(){
if(check_walas()){
$this->show = TRUE;
$this->data_siswa = pd_walas();
}
}
private function check_walas($rombongan_belajar_id = NULL){
if($rombongan_belajar_id){
$rombongan_belajar = Rombongan_belajar::find($rombongan_belajar_id);
Expand Down Expand Up @@ -66,6 +62,7 @@ public function mount(){
$query->where('semester_id', session('semester_aktif'));
$query->where('sekolah_id', session('sekolah_id'));
})->first();
$this->merdeka = Str::contains($this->rombongan_belajar->kurikulum->nama_kurikulum, 'Merdeka');
}
}
public function updatedTingkat(){
Expand All @@ -76,9 +73,6 @@ public function updatedTingkat(){
$query->where('semester_id', session('semester_aktif'));
$query->where('sekolah_id', session('sekolah_id'));
$query->where('jenis_rombel', 1);
$query->whereHas('kurikulum', function($query){
$query->where('nama_kurikulum', 'ILIKE', '%Merdeka%');
});
})->get();
$this->dispatchBrowserEvent('data_rombongan_belajar', ['data_rombongan_belajar' => $data_rombongan_belajar]);
}
Expand All @@ -93,6 +87,7 @@ public function updatedRombonganBelajarId(){
$this->rombongan_belajar = Rombongan_belajar::with([
'kurikulum'
])->find($this->rombongan_belajar_id);
$this->merdeka = Str::contains($this->rombongan_belajar->kurikulum->nama_kurikulum, 'Merdeka');
$this->show = TRUE;
}
}
Loading

0 comments on commit 6bc186b

Please sign in to comment.