Skip to content

Commit

Permalink
Rilis v2412.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@vickyrolanda
vickyrolanda committed Dec 18, 2024
1 parent 042471c commit 8f4987f
Show file tree
Hide file tree
Showing 397 changed files with 10,052 additions and 12,573 deletions.
5 changes: 5 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,17 @@ php.ini

# Ignore all files in Modules
Modules/*
/assets/modules/*

# Do not ignore Anjungan folder and its contents
!Modules/Anjungan/
!Modules/Anjungan/**
!Modules/Analisis/
!Modules/Analisis/**
!Modules/BukuTamu/
!Modules/BukuTamu/**
!Modules/Kehadiran/
!Modules/Kehadiran/**

# Do not ignore specific files
!Modules/.gitkeep
Expand Down
7 changes: 4 additions & 3 deletions ...s/Http/Controllers/Analisis_indikator.php → ...ntrollers/AnalisisIndikatorController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

defined('BASEPATH') || exit('No direct script access allowed');

class Analisis_indikator extends AdminModulController
class AnalisisIndikatorController extends AdminModulController
{
public $moduleName = 'Analisis';
public $modul_ini = 'analisis';
Expand All @@ -66,7 +66,7 @@ public function __construct()

public function index($master)
{
return view('analisis_indikator.index', [
return view('analisis::indikator.index', [
'tipeKategori' => AnalisisKategori::where(['id_master' => $master])->pluck('kategori', 'id'),
]);
}
Expand Down Expand Up @@ -132,7 +132,7 @@ public function form($master, $id = null)
$data['ubah'] = true;
}

return view('analisis_indikator.form', $data);
return view('analisis::indikator.form', $data);
}

public function insert($master): void
Expand Down Expand Up @@ -164,6 +164,7 @@ public function update($master, $id = null): void
if ($data->update($dataUpdate)) {
redirect_with('success', 'Berhasil Ubah Data', ci_route('analisis_indikator.' . $master));
}

redirect_with('error', 'Gagal Ubah Data', ci_route('analisis_indikator.' . $master));
}

Expand Down
6 changes: 3 additions & 3 deletions ...is/Http/Controllers/Analisis_kategori.php → ...ontrollers/AnalisisKategoriController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

defined('BASEPATH') || exit('No direct script access allowed');

class Analisis_kategori extends AdminModulController
class AnalisisKategoriController extends AdminModulController
{
public $moduleName = 'Analisis';
public $modul_ini = 'analisis';
Expand All @@ -62,7 +62,7 @@ public function __construct()

public function index($master)
{
return view('analisis_kategori.index');
return view('analisis::kategori.index');
}

public function datatables($master)
Expand Down Expand Up @@ -111,7 +111,7 @@ public function form($master, $id = null)
$data['analisis_kategori'] = null;
}

return view('analisis_kategori.form', $data);
return view('analisis::kategori.form', $data);
}

public function insert($master): void
Expand Down
8 changes: 5 additions & 3 deletions ...Http/Controllers/Analisis_klasifikasi.php → ...rollers/AnalisisKlasifikasiController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

defined('BASEPATH') || exit('No direct script access allowed');

class Analisis_klasifikasi extends AdminModulController
class AnalisisKlasifikasiController extends AdminModulController
{
public $moduleName = 'Analisis';
public $modul_ini = 'analisis';
Expand All @@ -62,7 +62,7 @@ public function __construct()

public function index($master)
{
return view('analisis_klasifikasi.index');
return view('analisis::klasifikasi.index');
}

public function datatables($master)
Expand Down Expand Up @@ -110,7 +110,7 @@ public function form($master, $id = null)
$data['analisis_klasifikasi'] = null;
}

return view('analisis_klasifikasi.form', $data);
return view('analisis::klasifikasi.form', $data);
}

public function insert($master): void
Expand All @@ -133,6 +133,7 @@ public function update($master, $id = null): void
if ($data->update($dataUpdate)) {
redirect_with('success', 'Berhasil Ubah Data', ci_route('analisis_klasifikasi.' . $master));
}

redirect_with('error', 'Gagal Ubah Data', ci_route('analisis_klasifikasi.' . $master));
}

Expand All @@ -143,6 +144,7 @@ public function delete($master, $id = null): void
if (AnalisisKlasifikasi::destroy($id ?? $this->request['id_cb']) !== 0) {
redirect_with('success', 'Berhasil Hapus Data', ci_route('analisis_klasifikasi.' . $master));
}

redirect_with('error', 'Gagal Hapus Data', ci_route('analisis_klasifikasi.' . $master));
}

Expand Down
32 changes: 16 additions & 16 deletions ...sis/Http/Controllers/Analisis_laporan.php → ...Controllers/AnalisisLaporanController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@

defined('BASEPATH') || exit('No direct script access allowed');

class Analisis_laporan extends AdminModulController
class AnalisisLaporanController extends AdminModulController
{
public $moduleName = 'Analisis';
public $modul_ini = 'analisis';
Expand All @@ -77,7 +77,7 @@ public function __construct()
]);
}

public function index($master): void
public function index($master)
{
$data = [
'judul' => Analisis::judul_subjek($this->analisisMaster->subjek_tipe),
Expand All @@ -87,7 +87,7 @@ public function index($master): void
'namaPeriode' => $this->periodeAktif->nama,
];

view('analisis_laporan.index', $data);
return view('analisis::laporan.index', $data);
}

public function datatables($master)
Expand Down Expand Up @@ -147,7 +147,7 @@ private function sumberData()
return $sumber;
}

public function form($master, $idSubjek): void
public function form($master, $idSubjek)
{
$analisis = new Analisis();

Expand All @@ -159,20 +159,20 @@ public function form($master, $idSubjek): void
$data['asubjek'] = $this->analisisMaster->subjek_tipe == AnalisisRefSubjekEnum::DESA ? ucwords(setting('sebutan_desa')) : AnalisisRefSubjekEnum::valueOf($this->analisisMaster->subjek_tipe);
$data['id'] = $idSubjek;

view('analisis_laporan.form', $data);
return view('analisis::laporan.form', $data);
}

// $aksi = cetak/unduh
public function dialog_kuisioner($master, $id, $aksi = ''): void
public function dialog_kuisioner($master, $id, $aksi = '')
{
$data = $this->modal_penandatangan();
$data['aksi'] = ucwords((string) $aksi);
$data['form_action'] = ci_route("analisis_laporan.{$master}.daftar.{$id}.{$aksi}");

view('admin.layouts.components.ttd_pamong', $data);
return view('analisis::admin.layouts.components.ttd_pamong', $data);
}

public function daftar($master, $idSubjek, $aksi = ''): void
public function daftar($master, $idSubjek, $aksi = '')
{
$analisis = new Analisis();
$data['total'] = AnalisisResponHasil::where(['id_subjek' => $idSubjek, 'id_periode' => $this->periodeAktif->id])->first()->akumulasi ?? 0;
Expand All @@ -187,21 +187,21 @@ public function daftar($master, $idSubjek, $aksi = ''): void
$data['pamong_ketahui'] = Pamong::selectData()->where(['pamong_id' => $this->input->post('pamong_ketahui')])->first()->toArray();
$data['aksi'] = $aksi;

view('analisis_laporan.form_cetak', $data);
return view('analisis::laporan.form_cetak', $data);
}

// $aksi = cetak/unduh
public function dialog($master, $aksi = ''): void
public function dialog($master, $aksi = '')
{
// Simpan session lama
$data = $this->modal_penandatangan();
$data['aksi'] = ucwords((string) $aksi);
$data['form_action'] = ci_route("analisis_laporan.{$master}.cetak.{$aksi}");

view('analisis_laporan.ttd_pamong', $data);
return view('analisis::laporan.ttd_pamong', $data);
}

public function cetak($master, $aksi = ''): void
public function cetak($master, $aksi = '')
{
$paramDatatable = json_decode((string) $this->input->post('params'), 1);
$_GET = $paramDatatable;
Expand All @@ -218,19 +218,19 @@ public function cetak($master, $aksi = ''): void
$data['main'] = $query->get();
$data['letak_ttd'] = ['2', '2', '1'];

view('admin.layouts.components.format_cetak', $data);
return view('analisis::admin.layouts.components.format_cetak', $data);
}

public function ajax_multi_jawab($master): void
public function ajax_multi_jawab($master)
{
$data['jawab'] = session('jawab') ?? '';
$data['main'] = (new Analisis())->multi_jawab($master);
$data['form_action'] = ci_route("analisis_laporan.{$master}.multi_jawab_proses");

view('analisis_laporan.ajax_multi', $data);
return view('analisis::laporan.ajax_multi', $data);
}

public function multi_jawab_proses($master): void
public function multi_jawab_proses($master)
{
if (isset($_POST['id_cb'])) {
unset($_SESSION['jawab'], $_SESSION['jmkf']);
Expand Down
21 changes: 12 additions & 9 deletions ...isis/Http/Controllers/Analisis_master.php → .../Controllers/AnalisisMasterController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,14 @@

defined('BASEPATH') || exit('No direct script access allowed');

class Analisis_master extends AdminModulController
class AnalisisMasterController extends AdminModulController
{
use Upload;

public $moduleName = 'Analisis';
public $modul_ini = 'analisis';
public $kategori_pengaturan = 'Analisis';
public $aliasController = 'analisis_master';

public function __construct()
{
Expand All @@ -69,7 +70,7 @@ public function __construct()

public function index()
{
return view('analisis.index');
return view('analisis::master.index');
}

public function datatables()
Expand Down Expand Up @@ -127,7 +128,7 @@ public function form($id = null)
$data['analisis_master'] = null;
}

return view('analisis.form', $data);
return view('analisis::master.form', $data);
}

public function insert(): void
Expand All @@ -137,6 +138,7 @@ public function insert(): void
if (AnalisisMaster::create(static::validate($this->request))) {
redirect_with('success', 'Berhasil Tambah Data');
}

redirect_with('error', 'Gagal Tambah Data');
}

Expand All @@ -149,6 +151,7 @@ public function update($id = null): void
if ($data->update(static::validate($this->request, $id))) {
redirect_with('success', 'Berhasil Ubah Data');
}

redirect_with('error', 'Gagal Ubah Data');
}

Expand All @@ -159,14 +162,15 @@ public function delete($id = null): void
if (AnalisisMaster::destroy($id ?? $this->request['id_cb']) !== 0) {
redirect_with('success', 'Berhasil Hapus Data');
}

redirect_with('error', 'Gagal Hapus Data');
}

public function import_analisis(): void
public function import_analisis()
{
isCan('u');

view('analisis.import', [
return view('analisis::master.import', [
'form_action' => ci_route('analisis_master.import'),
'formatImpor' => ci_route('unduh', encrypt(DEFAULT_LOKASI_IMPOR . 'analisis.xlsx')),
'formatPpls2' => ci_route('unduh', encrypt(DEFAULT_LOKASI_IMPOR . 'ppls2.xlsx')),
Expand All @@ -187,7 +191,6 @@ public function import(): void
} catch (Exception $e) {
redirect_with('error', 'Gagal import analisis ' . $e->getMessage());
}

}

public function ekspor($id): void
Expand Down Expand Up @@ -337,12 +340,12 @@ private function ekspor_klasifikasi(Writer $writer, array $master): void
}
}

public function import_gform(): void
public function import_gform()
{
isCan('u');
$data['form_action'] = ci_route('analisis_master.exec_import_gform');

view('analisis.import_gform', $data);
return view('analisis::master.import_gform', $data);
}

/**
Expand Down Expand Up @@ -451,7 +454,7 @@ public function menu($master)
'analisis_master' => AnalisisMaster::findOrFail($master),
];

return view('analisis.menu_default', $data);
return view('analisis::master.menu_default', $data);
}

protected static function validate(array $request = []): array
Expand Down
11 changes: 6 additions & 5 deletions ...s/Http/Controllers/Analisis_parameter.php → ...ntrollers/AnalisisParameterController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

defined('BASEPATH') || exit('No direct script access allowed');

class Analisis_parameter extends AdminModulController
class AnalisisParameterController extends AdminModulController
{
public $moduleName = 'Analisis';
public $modul_ini = 'analisis';
Expand All @@ -62,7 +62,7 @@ public function index($master, $indikator)
'baseRoute' => ci_route('analisis_indikator.' . $master . '.parameter.' . $indikator),
];

return view('analisis_parameter.index', $data);
return view('analisis::parameter.index', $data);
}

public function datatables($master, $indikator)
Expand Down Expand Up @@ -115,7 +115,7 @@ public function form($master, $indikator, $id = null)
$data['form_action'] = ci_route('analisis_indikator.' . $master . '.parameter.' . $indikator . '.insert');
}

return view('analisis_parameter.form', $data);
return view('analisis::parameter.form', $data);
}

public function insert($master, $indikator): void
Expand All @@ -130,6 +130,7 @@ public function insert($master, $indikator): void
if (AnalisisParameter::create($dataInsert)) {
redirect_with('success', 'Berhasil Tambah Data', ci_route('analisis_indikator.' . $master . '.parameter', $indikator));
}

redirect_with('error', 'Gagal Tambah Data', ci_route('analisis_indikator.' . $master . '.parameter', $indikator));
}

Expand All @@ -146,6 +147,7 @@ public function update($master, $indikator, $id = null): void
if ($data->update($dataUpdate)) {
redirect_with('success', 'Berhasil Ubah Data', ci_route('analisis_indikator.' . $master . '.parameter', $indikator));
}

redirect_with('error', 'Gagal Ubah Data', ci_route('analisis_indikator.' . $master . '.parameter', $indikator));
}

Expand All @@ -159,6 +161,7 @@ public function delete($master, $indikator, $id = null): void
if (AnalisisParameter::destroy($id ?? $this->request['id_cb']) !== 0) {
redirect_with('success', 'Berhasil Hapus Data', ci_route('analisis_indikator.' . $master . '.parameter', $indikator));
}

redirect_with('error', 'Gagal Hapus Data', ci_route('analisis_indikator.' . $master . '.parameter', $indikator));
}

Expand All @@ -169,7 +172,5 @@ protected static function validate(array $request = []): array
'jawaban' => htmlentities($request['jawaban']),
'nilai' => bilangan($request['nilai']),
];

return $data;
}
}
Loading

0 comments on commit 8f4987f

Please sign in to comment.