diff --git a/application/controllers/Cetak.php b/application/controllers/Cetak.php index ee79328..4ec2009 100755 --- a/application/controllers/Cetak.php +++ b/application/controllers/Cetak.php @@ -92,16 +92,16 @@ public function rapor_debug($kur,$ajaran_id,$kelas_id,$siswa_nis){ $data['siswa_nis'] = $siswa_nis; $data['kurikulum_id'] = $kur; $this->load->view('cetak/rapor_header',$data); - $this->load->view('cetak/rapor_cover', $data,); - $this->load->view('cetak/rapor_identitas_sekolah', $data,); - $this->load->view('cetak/rapor_identitas_siswa', $data,); - $this->load->view('cetak/rapor_nilai', $data,); - $this->load->view('cetak/rapor_catatan_akademik', $data,); - $this->load->view('cetak/rapor_prakerin', $data,); - $this->load->view('cetak/rapor_ekskul', $data,); - $this->load->view('cetak/rapor_absen', $data,); - $this->load->view('cetak/rapor_karakter',$data,); - $this->load->view('cetak/rapor_footer', $data,); + $this->load->view('cetak/rapor_cover', $data); + $this->load->view('cetak/rapor_identitas_sekolah', $data); + $this->load->view('cetak/rapor_identitas_siswa', $data); + $this->load->view('cetak/rapor_nilai', $data); + $this->load->view('cetak/rapor_catatan_akademik', $data); + $this->load->view('cetak/rapor_prakerin', $data); + $this->load->view('cetak/rapor_ekskul', $data); + $this->load->view('cetak/rapor_absen', $data); + $this->load->view('cetak/rapor_karakter',$data); + $this->load->view('cetak/rapor_footer', $data); } public function legger($ajaran_id,$kelas_id,$kompetensi_id) diff --git a/application/controllers/Rapor.php b/application/controllers/Rapor.php index 556e825..e789438 100755 --- a/application/controllers/Rapor.php +++ b/application/controllers/Rapor.php @@ -572,6 +572,7 @@ public function import_karakter() $kelas_id = $v['kelas_id']; $siswa_nis = $v['siswa_nis']; $religius = $v['religius']; + $integritas = $v['integritas']; $nasionalis = $v['nasionalis']; $mandiri = $v['mandiri']; $gotong_royong = $v['gotong_royong']; @@ -580,7 +581,9 @@ public function import_karakter() $this->db->insert('perkembangan_karakter',[ 'ajaran_id' => $ajaran_id, 'kelas_id' => $kelas_id, + 'siswa_nis' => $siswa_nis, 'religius' => $religius, + 'integritas' => $integritas, 'nasionalis' => $nasionalis, 'mandiri' => $mandiri, 'gotong_royong'=> $gotong_royong, @@ -618,5 +621,20 @@ public function import_karakter() echo json_encode($status); } + public function karakter_reset() + { + $ajaran = get_ta(); + $guru = get_my_info(); + $kelas = get_kelas_by_id_guru($guru->id); + + $this->db->where(array('ajaran_id' => $ajaran->id, 'kelas_id' => $kelas->id)); + $this->db->delete('perkembangan_karakter'); + + $status['type'] = 'success'; + $status['title'] = 'Reset data sukses'; + $status['text'] = 'Data perkembangan karakter berhasil direset'; + + echo json_encode($status); + } } \ No newline at end of file diff --git a/application/models/M_config.php b/application/models/M_config.php index 12b8f6d..11cc810 100755 --- a/application/models/M_config.php +++ b/application/models/M_config.php @@ -150,7 +150,7 @@ public function create_tb_data_mapel() `kelas_X` int(11) DEFAULT '0', `kelas_XI` int(11) DEFAULT '0', `kelas_XII` int(11) DEFAULT '0', - `bobot1` varchar(10) DEFAULT '50:50', + `bobot` varchar(10) DEFAULT '50:50', PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1;"); } diff --git a/application/views/cetak/rapor_karakter.php b/application/views/cetak/rapor_karakter.php index d71159e..0955ad3 100755 --- a/application/views/cetak/rapor_karakter.php +++ b/application/views/cetak/rapor_karakter.php @@ -15,14 +15,7 @@ $setting = $this->db->get('setting')->row(); $ajaran = $this->db->get_where('ajaran',['id' => $ajaran_id])->row(); $kelas = $this->db->get_where('kelas',['id' => $kelas_id])->row(); - -$kelompok_a = preg_quote('A0', '~'); // don't forget to quote input string! -$kelompok_b = preg_quote('B0', '~'); // don't forget to quote input string! -$kelompok_c = preg_quote('C', '~'); // don't forget to ro input string! -$all_mapel = $this->db->get_where('kurikulum',[ - 'ajaran_id' => $ajaran_id, - 'kelas_id' => $kelas_id -])->result(); +$karakter = $this->db->get_where('perkembangan_karakter',array('siswa_nis' => $siswa_nis,'ajaran_id' => $ajaran_id))->row(); ?> @@ -46,6 +39,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -54,7 +67,7 @@
H.  Catatan Perkembangan Karakter
Karakter yang dibangun Deskripsi
Integritasintegritas ?>
Religiusreligius ?>
Nasionalisnasionalis ?>
Mandirimandiri ?>
Gotong-royonggotong_royong ?>
- +
catatan ?>

diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php index 492903b..c966af2 100755 --- a/application/views/dashboard/index.php +++ b/application/views/dashboard/index.php @@ -1,10 +1,73 @@ + +
For my teachers
- Thank you for being so patient, and helping me improve! Teachers like you are hard to find, and I’m eternally grateful for everything you’ve taught me. +
+ + + + + +
+ + +
+
Thank you for being so patient, and helping me improve! Teachers like you are hard to find, and I’m eternally grateful for everything you’ve taught me.
+ Developer +
+ +
+
\ No newline at end of file diff --git a/application/views/kelas/create.php b/application/views/kelas/create.php index e5e53d4..f431478 100755 --- a/application/views/kelas/create.php +++ b/application/views/kelas/create.php @@ -27,7 +27,7 @@
- diff --git a/application/views/kelas/mapel.php b/application/views/kelas/mapel.php index c2b804c..bdd2d1a 100755 --- a/application/views/kelas/mapel.php +++ b/application/views/kelas/mapel.php @@ -21,7 +21,7 @@
session->flashdata('message'); ?> -
+
diff --git a/application/views/rapor/perkembangan_karakter.php b/application/views/rapor/perkembangan_karakter.php index 85d7abb..0718483 100644 --- a/application/views/rapor/perkembangan_karakter.php +++ b/application/views/rapor/perkembangan_karakter.php @@ -7,6 +7,12 @@ Download format + + + + + Reset Data +
diff --git a/assets/img/dll/teac.svg b/assets/img/dll/teac.svg new file mode 100644 index 0000000..c3555f3 --- /dev/null +++ b/assets/img/dll/teac.svg @@ -0,0 +1,330 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/js/scripts.js b/assets/js/scripts.js index 134daae..12adde7 100755 --- a/assets/js/scripts.js +++ b/assets/js/scripts.js @@ -65,6 +65,47 @@ $("#sync").on('click',function(e){ }); }); +/** + * --------------------------------------------- + */ +$("#reset").on('click',function(e){ + var URL = $(this).attr('href') + e.preventDefault(); + swal({ + title: "Anda yakin?", + text: "Data yang anda input akan di reset seluruhnya", + type: "warning", + showCancelButton: true, + confirmButtonColor: "#DD6B55", + confirmButtonText: "Reset!", + showLoaderOnConfirm: true, + preConfirm: function() { + return new Promise(function(resolve) { + $.ajax({ + url: URL, + type: 'GET', + contentType: false, + cache: false, + processData:false, + beforeSend: function (){ + $("#loading").css('display','block'); + }, + success: function(data, textStatus, jqXHR){ + $("#loading").css('display','none'); + var enc = JSON.parse(data); + swal({title:'Sukses',type:'success'}).then(function() { + }) + }, + error: function(jqXHR, textStatus, errorThrown){ + alert("Error"); + } + }); + + }) + } + }); + +}); /**