From 6e4e602bc9f089ee81c49e7b3e1fe23d8255a752 Mon Sep 17 00:00:00 2001 From: Ikhsan Satriadi Date: Sun, 21 Jul 2024 12:25:20 +0700 Subject: [PATCH 1/2] Remove commented school year --- app/Views/admin/data/create/create-data-guru.php | 2 +- app/Views/admin/data/create/create-data-siswa.php | 2 +- app/Views/admin/data/edit/edit-data-guru.php | 2 +- app/Views/admin/data/edit/edit-data-siswa.php | 2 +- app/Views/admin/petugas/edit-data-petugas.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Views/admin/data/create/create-data-guru.php b/app/Views/admin/data/create/create-data-guru.php index 82d4335..3ac2b7e 100644 --- a/app/Views/admin/data/create/create-data-guru.php +++ b/app/Views/admin/data/create/create-data-guru.php @@ -7,7 +7,7 @@

Form Tambah Guru

- +
diff --git a/app/Views/admin/data/create/create-data-siswa.php b/app/Views/admin/data/create/create-data-siswa.php index b0ff01d..4418695 100644 --- a/app/Views/admin/data/create/create-data-siswa.php +++ b/app/Views/admin/data/create/create-data-siswa.php @@ -7,7 +7,7 @@

Form Tambah Siswa

- +
diff --git a/app/Views/admin/data/edit/edit-data-guru.php b/app/Views/admin/data/edit/edit-data-guru.php index 8406d18..677cf81 100644 --- a/app/Views/admin/data/edit/edit-data-guru.php +++ b/app/Views/admin/data/edit/edit-data-guru.php @@ -7,7 +7,7 @@

Form Edit Guru

- +
diff --git a/app/Views/admin/data/edit/edit-data-siswa.php b/app/Views/admin/data/edit/edit-data-siswa.php index 9fb2cab..bd54d5f 100644 --- a/app/Views/admin/data/edit/edit-data-siswa.php +++ b/app/Views/admin/data/edit/edit-data-siswa.php @@ -7,7 +7,7 @@

Form Edit Siswa

- +
diff --git a/app/Views/admin/petugas/edit-data-petugas.php b/app/Views/admin/petugas/edit-data-petugas.php index 047e5bf..6fb3bcd 100644 --- a/app/Views/admin/petugas/edit-data-petugas.php +++ b/app/Views/admin/petugas/edit-data-petugas.php @@ -7,7 +7,7 @@

Form Edit Petugas

- +
From a0be08bbaa0f474845f70e05dc982f56c8106089 Mon Sep 17 00:00:00 2001 From: Ikhsan Satriadi Date: Sun, 21 Jul 2024 12:25:42 +0700 Subject: [PATCH 2/2] Add school year / tahun ajaran config --- README.md | 8 +++++++- app/Config/AbsensiSekolah.php | 9 +++++++++ app/Controllers/Admin/GenerateLaporan.php | 8 ++++++-- app/Views/admin/data/data-guru.php | 2 +- app/Views/admin/data/data-siswa.php | 2 +- app/Views/admin/generate-laporan/laporan-guru.php | 2 +- app/Views/admin/generate-laporan/laporan-siswa.php | 2 +- app/Views/admin/kelas/index.php | 4 ++-- 8 files changed, 28 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index b0497c6..d6a047b 100644 --- a/README.md +++ b/README.md @@ -130,10 +130,16 @@ Aplikasi Web Sistem Absensi Sekolah Berbasis QR Code adalah sebuah proyek yang b > > - Konfigurasi file `.env` untuk mengatur base url(terutama jika melakukan hosting), koneksi database dan pengaturan lainnya sesuai dengan lingkungan pengembangan Anda. > -> - Untuk mengubah identitas nama sekolah, buka file konfigurasi `app/Config/AbsensiSekolah.php` dan ubah pada: +> - Untuk mengubah konfigurasi nama sekolah, tahun ajaran dll, buka file konfigurasi `app/Config/AbsensiSekolah.php` dan ubah pada: > > ```php +> // NAMA SEKOLAH > const SCHOOL_NAME = 'SMK 1 Indonesia'; +> +> // TAHUN AJARAN +> const SCHOOL_YEAR = '2024/2025'; +> +> // ... > ``` > > - Ganti/replace logo sekolah di `public/assets/img/logo_sekolah.jpg`. diff --git a/app/Config/AbsensiSekolah.php b/app/Config/AbsensiSekolah.php index 0fbc248..3084245 100644 --- a/app/Config/AbsensiSekolah.php +++ b/app/Config/AbsensiSekolah.php @@ -14,4 +14,13 @@ class AbsensiSekolah extends BaseConfig * Pengaturan untuk nama sekolah */ const SCHOOL_NAME = 'SMK 1 Indonesia'; + + /** + * -------------------------------------------------------------------------- + * Tahun Ajaran + * -------------------------------------------------------------------------- + * + * Pengaturan untuk tahun ajaran + */ + const SCHOOL_YEAR = '2024/2025'; } diff --git a/app/Controllers/Admin/GenerateLaporan.php b/app/Controllers/Admin/GenerateLaporan.php index 06de387..11a9acd 100644 --- a/app/Controllers/Admin/GenerateLaporan.php +++ b/app/Controllers/Admin/GenerateLaporan.php @@ -26,6 +26,7 @@ class GenerateLaporan extends BaseController protected PresensiGuruModel $presensiGuruModel; protected string $namaSekolah; + protected string $tahunAjaran; public function __construct() { @@ -38,6 +39,7 @@ public function __construct() $this->presensiGuruModel = new PresensiGuruModel(); $this->namaSekolah = ConfigAbsensiSekolah::SCHOOL_NAME; + $this->tahunAjaran = ConfigAbsensiSekolah::SCHOOL_YEAR; } public function index() @@ -128,7 +130,8 @@ public function generateLaporanSiswa() ], 'kelas' => $kelas, 'grup' => "kelas " . $kelas['kelas'] . " " . $kelas['jurusan'], - 'namaSekolah' => $this->namaSekolah + 'namaSekolah' => $this->namaSekolah, + 'tahunAjaran' => $this->tahunAjaran ]; if ($type == 'doc') { @@ -204,7 +207,8 @@ public function generateLaporanGuru() 'perempuan' => count($guru) - $laki ], 'grup' => 'guru', - 'namaSekolah' => $this->namaSekolah + 'namaSekolah' => $this->namaSekolah, + 'tahunAjaran' => $this->tahunAjaran ]; if ($type == 'doc') { diff --git a/app/Views/admin/data/data-guru.php b/app/Views/admin/data/data-guru.php index 9b807c8..414cb82 100644 --- a/app/Views/admin/data/data-guru.php +++ b/app/Views/admin/data/data-guru.php @@ -20,7 +20,7 @@

Daftar Guru

-

Angkatan 2022/2023

+

Angkatan

diff --git a/app/Views/admin/data/data-siswa.php b/app/Views/admin/data/data-siswa.php index 1733a89..c97c20f 100644 --- a/app/Views/admin/data/data-siswa.php +++ b/app/Views/admin/data/data-siswa.php @@ -23,7 +23,7 @@

Daftar Siswa

-

Angkatan 2022/2023

+

Angkatan

diff --git a/app/Views/admin/generate-laporan/laporan-guru.php b/app/Views/admin/generate-laporan/laporan-guru.php index 684a090..e1405d4 100644 --- a/app/Views/admin/generate-laporan/laporan-guru.php +++ b/app/Views/admin/generate-laporan/laporan-guru.php @@ -7,7 +7,7 @@

DAFTAR HADIR GURU

-

TAHUN PELAJARAN 2022/2023

+

TAHUN PELAJARAN

diff --git a/app/Views/admin/generate-laporan/laporan-siswa.php b/app/Views/admin/generate-laporan/laporan-siswa.php index 98683b9..62a13f3 100644 --- a/app/Views/admin/generate-laporan/laporan-siswa.php +++ b/app/Views/admin/generate-laporan/laporan-siswa.php @@ -7,7 +7,7 @@

DAFTAR HADIR SISWA

-

TAHUN PELAJARAN 2022/2023

+

TAHUN PELAJARAN

diff --git a/app/Views/admin/kelas/index.php b/app/Views/admin/kelas/index.php index f561366..5445ffa 100644 --- a/app/Views/admin/kelas/index.php +++ b/app/Views/admin/kelas/index.php @@ -22,7 +22,7 @@

Daftar Kelas

-

Angkatan 2022/2023

+

Angkatan

@@ -57,7 +57,7 @@

Daftar Jurusan

-

Angkatan 2022/2023

+

Angkatan