Merge pull request #7 from shellrean/master

Refer to beta v1.0-beta
shellrean · Jul 27, 2019 · c15b85c · c15b85c
2 parents b30d971 + 95ad7d8
commit c15b85c
Show file tree

Hide file tree

Showing 10 changed files with 494 additions and 23 deletions.
diff --git 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
@@ -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);
+  }
 
 } 
diff --git 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
@@ -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();
 ?>
 <table>
   <tr>
@@ -46,6 +39,26 @@
       <th style="width: 200px">Karakter yang dibangun</th>
       <th style="width: 500px">Deskripsi</th>
     </tr>
+    <tr>
+      <td>Integritas</td>
+      <td><?= $karakter->integritas ?></td>
+    </tr>
+    <tr>
+      <td>Religius</td>
+      <td><?= $karakter->religius ?></td>
+    </tr>
+    <tr>
+      <td>Nasionalis</td>
+      <td><?= $karakter->nasionalis ?></td>
+    </tr>
+    <tr>
+      <td>Mandiri</td>
+      <td><?= $karakter->mandiri ?></td>
+    </tr>
+    <tr>
+      <td>Gotong-royong</td>
+      <td><?= $karakter->gotong_royong ?></td>
+    </tr>
   </thead>
   <tbody>
   </tbody>
@@ -54,7 +67,7 @@
 <div class="strong">H.&nbsp;&nbsp;Catatan Perkembangan Karakter</div>
 <table width="100%" border="1">
   <tr>
-    <td style="padding:10px 10px 60px 10px;"></td>
+    <td style="padding:10px 10px 60px 10px;"><?= $karakter->catatan ?></td>
   </tr>
 </table> 
 <br>

diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php
@@ -1,10 +1,73 @@
+<style>
+	@import url('https://fonts.googleapis.com/css?family=Special+Elite');
+	blockquote {
+	font-weight: 100;
+	font-size: 1.5rem;
+	max-width: 600px;
+	line-height: 1.4;
+	position: relative;
+	margin: 0;
+	padding: .5rem;
+	}
+
+	blockquote:before,
+	blockquote:after {
+		position: absolute;
+		color: #f1efe6;
+		font-size: 8rem;
+		width: 4rem;
+		height: 4rem;
+	}
+
+	blockquote:before {
+		content: '“';
+		left: -5rem;
+		top: -2rem;
+	}
+
+	blockquote:after {
+		content: '”';
+		right: -5rem;
+		bottom: 1rem;
+	}
+
+	cite {
+		line-height: 3;
+		text-align: left;
+	}
+	.bg {
+		font-family: 'Special Elite', cursive;
+		background: #fffdf5;
+		color: #3f3f5a;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+</style>
+
 <div class="container-fluid">
     <div class="card mb-4">
         <div class="card-header py-3">
           For my teachers
         </div>
         <div class="card-body">
-            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.
+        	<div class="text-left">
+        		<table>
+        			<tr>
+        				<td>
+        					<img src="<?= base_url() ?>assets/img/dll/teac.svg" width="200px">
+        				</td>
+        				<td>
+		        		<div class="bg">
+		        			<blockquote>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.</blockquote>
+							<cite>Developer</cite>
+		        		</div>
+
+        				</td>
+        			</tr>
+        		</table>
+	        </div>
         </div>
     </div>
 </div> 
diff --git a/application/views/kelas/create.php b/application/views/kelas/create.php
@@ -27,7 +27,7 @@
           </div>
           <div class="form-group">
             <label>Wali kelas</label>
-            <select name="wali_kelas" class="form-control ">
+            <select name="wali_kelas" class="form-control select2">
               <?php foreach($gurus as $guru): ?>
                 <option value="<?= $guru->id ?>" <?= ($guru->id == set_value('wali_kelas')? "selected" : "") ?>><?= $guru->name ?></option>
               <?php endforeach; ?>

diff --git a/application/views/kelas/mapel.php b/application/views/kelas/mapel.php
@@ -21,7 +21,7 @@
 
 <div class="container-fluid">
     <?= $this->session->flashdata('message'); ?>
-    <div class="card shadow mb-4">
+    <div class="card mb-4">
         <div class="card-header py-3">
           <a href="<?= base_url('kelas') ?>" class="btn btn-sm btn-warning btn-icon-split">
             <span class="icon text-white-50">

diff --git a/application/views/rapor/perkembangan_karakter.php b/application/views/rapor/perkembangan_karakter.php
@@ -7,6 +7,12 @@
         </span>
         <span class="text">Download format</span>
       </a>
+      <a href="<?= base_url('rapor/karakter_reset') ?>" class="btn btn-sm btn-warning btn-icon-split" id="reset">
+        <span class="icon text-white-50">
+          <i class="fas fa-fw fa-sync"></i> 
+        </span>
+        <span class="text">Reset Data</span>
+      </a>
     </div>
     <form method="post" enctype="multipart/form-data">
     <div class="card-body">