Commit 2236b2ea authored by deddy's avatar deddy

redmine#15010

* tambah kolom action (edit, delete) di index.php * tambah function update_pembayaran(), delete_pembayaran() di Konsolidasi.php * tambah function update_pembayaran(), delete_pembayaran() di Data.php
parent 1e1e00e7
...@@ -31,6 +31,11 @@ class Home extends Core_Controller ...@@ -31,6 +31,11 @@ class Home extends Core_Controller
$this->session->set_userdata('sessxusername', $data[0]->username); $this->session->set_userdata('sessxusername', $data[0]->username);
$this->session->set_userdata('sessxnama', $data[0]->nama); $this->session->set_userdata('sessxnama', $data[0]->nama);
$this->session->set_userdata('sessxlevel', $data[0]->level); $this->session->set_userdata('sessxlevel', $data[0]->level);
$this->session->set_userdata('admin', $data[0]->sys_admin);
$this->session->set_userdata('kd_kecamatan', $data[0]->kd_kecamatan);
$this->session->set_userdata('nm_kecamatan', $data[0]->nm_kecamatan);
$this->session->set_userdata('kd_kelurahan', $data[0]->kd_kelurahan);
$this->session->set_userdata('nm_kelurahan', $data[0]->nm_kelurahan);
$this->session->set_userdata('sessx', '1'); $this->session->set_userdata('sessx', '1');
redirect(base_url(), "location"); redirect(base_url(), "location");
} else { } else {
......
...@@ -12,8 +12,9 @@ class Konsolidasi extends Core_Controller{ ...@@ -12,8 +12,9 @@ class Konsolidasi extends Core_Controller{
} }
public function index(){ public function index(){
$kecamatan=$this->master->kecamatan(); $kecamatan=$this->master->kecamatan();
$tempatpembayaran = $this->master->tempatpembayaran();
$this->load->view('header'); $this->load->view('header');
$this->load->view('pbb/konsolidasi/index',array('kecamatan'=>$kecamatan)); $this->load->view('pbb/konsolidasi/index',array('kecamatan'=>$kecamatan, 'tempatpembayaran'=>$tempatpembayaran));
$this->load->view('footer'); $this->load->view('footer');
} }
public function tampilkan() { public function tampilkan() {
...@@ -48,4 +49,44 @@ class Konsolidasi extends Core_Controller{ ...@@ -48,4 +49,44 @@ class Konsolidasi extends Core_Controller{
$this->load->view('pbb/konsolidasi/grid',array('data'=>$data)); $this->load->view('pbb/konsolidasi/grid',array('data'=>$data));
} }
public function data_edit($id) {
$kondisi =" where a.id='".$id."'";
$data=$this->data->laporan($kondisi);
echo json_encode($data);
}
public function update_pembayaran() {
$kd_kanwil ="";
$kd_kantor ="";
$kd_tp ="";
$tempatbayar = $this->input->post('tempatbayar')?$this->input->post('tempatbayar'):'';
$kd_tempatbayar = explode(".", $tempatbayar);
if (count($kd_tempatbayar) == 3) {
$kd_kanwil = $kd_tempatbayar[0];
$kd_kantor = $kd_tempatbayar[1];
$kd_tp = $kd_tempatbayar[2];
}
$data = array(
'id' => $this->input->post('id')?$this->input->post('id'):0,
'tahun' => $this->input->post('tahun')?$this->input->post('tahun'):NULL,
'jmlbayar' => $this->input->post('jmlbayar')?$this->input->post('jmlbayar'):0,
'denda' => $this->input->post('denda')?$this->input->post('denda'):0,
'admin' => $this->input->post('admin')?$this->input->post('admin'):0,
'kodechannel' => $this->input->post('kodechannel')?$this->input->post('kodechannel'):'',
'kd_kanwil' => $kd_kanwil,
'kd_kantor' => $kd_kantor,
'kd_tp' => $kd_tp,
'petugas' => $this->input->post('petugas')?$this->input->post('petugas'):''
);
$this->data->update_pembayaran($this->input->post('id'), $data);
echo json_encode(array("status" => TRUE));
}
public function delete_pembayaran($id) {
$this->data->delete_pembayaran($id);
echo json_encode(array("status" => TRUE));
}
} }
\ No newline at end of file
...@@ -44,7 +44,7 @@ class Pembayaran extends Core_Controller{ ...@@ -44,7 +44,7 @@ class Pembayaran extends Core_Controller{
$Months = $d2->diff($d1); $Months = $d2->diff($d1);
$month = ((($Months->y) * 12) + ($Months->m)) + 1; $month = ((($Months->y) * 12) + ($Months->m)) + 1;
$denda = floor(0.02 * $rs->pbb_yg_harus_dibayar_sppt * $month); $denda = ceil(0.02 * $rs->pbb_yg_harus_dibayar_sppt * $month);
} }
$arr_row=array(); $arr_row=array();
......
...@@ -221,7 +221,15 @@ class Data extends CI_Model{ ...@@ -221,7 +221,15 @@ class Data extends CI_Model{
return $data->result(); return $data->result();
} }
public function update_pembayaran($id, $data) {
$this->db->where('id', $id);
$this->db->update('bumdes.bayar',$data);
return $this->db->affected_rows();
}
public function delete_pembayaran($id) {
$this->db->where('id', $id);
$this->db->delete('bumdes.bayar');
}
} }
\ No newline at end of file
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
<script src="<?php echo base_url(); ?>assets/libs/moment/moment.js"></script> <script src="<?php echo base_url(); ?>assets/libs/moment/moment.js"></script>
<script src="<?php echo base_url(); ?>assets/libs/bootstrap-datepicker/dist/js/bootstrap-datepicker.min.js"></script> <script src="<?php echo base_url(); ?>assets/libs/bootstrap-datepicker/dist/js/bootstrap-datepicker.min.js"></script>
<script type="text/javascript" src="<?php echo base_url()?>assets/js/preview.js"></script> <script type="text/javascript" src="<?php echo base_url()?>assets/js/preview.js"></script>
<script src="<?php echo base_url(); ?>assets/js/sweetalert.min.js"></script>
<script> <script>
var root = '<?php echo base_url();?>'; var root = '<?php echo base_url();?>';
function preview(param){ function preview(param){
......
...@@ -15,11 +15,17 @@ ...@@ -15,11 +15,17 @@
<th>Tempat Pembayaran</th> <th>Tempat Pembayaran</th>
<th>Kode Channel</th> <th>Kode Channel</th>
<th>Status</th> <th>Status</th>
<th>Action</th>
</tr> </tr>
</thead> </thead>
<?php <?php
$i=0; $i=0;
foreach($data as $rs){ foreach($data as $rs){
if ($this->session->userdata('admin') && $rs->st <> "1")
$link = "<a href='javascript:;' class='edit-form' data-id='".$data[$i]->id."' ><i class='fa fa-edit'></i></a>&nbsp;&nbsp;<a href='javascript:;' class='delete-form' data-id='".$data[$i]->id."' ><i class='fa fa-trash'></i></a>";
else
$link = '-';
$i++; $i++;
$kodechannel = ""; $kodechannel = "";
...@@ -51,12 +57,13 @@ ...@@ -51,12 +57,13 @@
<td><?php echo $rs->nm_kecamatan?></td> <td><?php echo $rs->nm_kecamatan?></td>
<td><?php echo $rs->nm_kelurahan?></td> <td><?php echo $rs->nm_kelurahan?></td>
<td><?php echo $rs->tahun?></td> <td><?php echo $rs->tahun?></td>
<td align="right"><?php echo number_format($rs->jmlbayar)?></td> <td align="right"><?php echo number_format($rs->jmlbayar - $rs->admin)?></td>
<td align="right"><?php echo number_format($rs->denda)?></td> <td align="right"><?php echo number_format($rs->denda)?></td>
<td><?php echo date('d-m-Y', strtotime($rs->createdtime))?></td> <td><?php echo date('d-m-Y', strtotime($rs->createdtime))?></td>
<td><?php echo $rs->nm_tp?></td> <td><?php echo $rs->nm_tp?></td>
<td><?php echo $kodechannel?></td> <td><?php echo $kodechannel?></td>
<td><?php echo $status?></td> <td><?php echo $status?></td>
<td><?php echo $link?></td>
</tr> </tr>
<?php }?> <?php }?>
</table> </table>
......
This diff is collapsed.
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<td><?php echo $rs->nm_kecamatan?></td> <td><?php echo $rs->nm_kecamatan?></td>
<td><?php echo $rs->nm_kelurahan?></td> <td><?php echo $rs->nm_kelurahan?></td>
<td><?php echo $rs->tahun?></td> <td><?php echo $rs->tahun?></td>
<td align="right"><?php echo number_format($rs->jmlbayar)?></td> <td align="right"><?php echo number_format($rs->jmlbayar - $rs->admin)?></td>
<td align="right"><?php echo number_format($rs->denda)?></td> <td align="right"><?php echo number_format($rs->denda)?></td>
<td><?php echo date('d-m-Y', strtotime($rs->createdtime))?></td> <td><?php echo date('d-m-Y', strtotime($rs->createdtime))?></td>
<td><?php echo $rs->nm_tp?></td> <td><?php echo $rs->nm_tp?></td>
......
...@@ -125,32 +125,6 @@ ...@@ -125,32 +125,6 @@
$("#kd_kecamatan").change(function(){ $("#kd_kecamatan").change(function(){
loadKecamatan(); loadKecamatan();
}); });
/* function getkelurahan(url, kd_kecamatan) {
clearCombo(document.form.kd_kelurahan);
$.get(url + "pbb/daftar/getkelurahan", {
kd_kecamatan: kd_kecamatan
}, function(result) {
var update = new Array();
update = result.split('|');
if (result.indexOf('|' != -1)) {
appendCombo(document.form.kd_kelurahan, "-", "");
for (i = update.length - 1; i >= 0; i--) {
if (update[i] == "") {} else {
var update2 = new Array();
update2 = update[i].split(':');
if (update[i].indexOf(':' != -1)) {
appendCombo(document.form.kd_kelurahan, update2[0] + " - " + update2[1], update2[
0]);
}
}
}
}
// if (namax == "") { namax = namakota; }
// selectCombo(document.form.kabupaten, namax);
});
} */
$("#btn-cetak_laporan").on("click", function(e) { $("#btn-cetak_laporan").on("click", function(e) {
dataPrint = { dataPrint = {
......
...@@ -75,63 +75,65 @@ ...@@ -75,63 +75,65 @@
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button> <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<form role="form" class="form-horizontal" name="form" id="form-modal" >
<input type="hidden" value="" name="id" id="id"/> <input type="hidden" value="" name="id" id="id"/>
<div class="form-body"> <div class="form-body">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3">Nama</label> <label class="control-label col-md-3">Nama</label>
<div class="col-md-9"> <div class="col-md-9">
<input id="nama" name="nama" placeholder="Nama" class="form-control" type="text"> <input id="nama" name="nama" placeholder="Nama" class="form-control" type="text">
</div> </div>
</div>
<div class="form-group">
<label class="control-label col-md-3">Username</label>
<div class="col-md-9">
<input id="username" name="username" placeholder="username" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="control-label col-md-3">Password</label>
<div class="col-md-9">
<input id="password" name="password" placeholder="Password" class="form-control" type="password">
</div>
</div>
<div class="form-group">
<label class="control-label col-md-3">Ulang Password</label>
<div class="col-md-9">
<input id="repassword" name="repassword" placeholder="repassword" class="form-control" type="password">
</div>
</div>
<div class="form-group">
<label class="control-label col-md-3">Kecamatan</label>
<div class="col-md-9">
<select class="form-control form-select" id="kd_kecamatan" name="kd_kecamatan" onchange="">
<option value="">-</option>
<?php $i=0; foreach ($kecamatan as $rs) { ?>
<option value="<?php echo $rs->kd_kecamatan;?>">
<?php echo $rs->kd_kecamatan." - ".$rs->nm_kecamatan;?></option>
<?php }?>
</select>
</div> </div>
</div> <div class="form-group">
<div class="form-group"> <label class="control-label col-md-3">Username</label>
<label class="control-label col-md-3">Kelurahan</label> <div class="col-md-9">
<div class="col-md-9"> <input id="username" name="username" placeholder="username" class="form-control" type="text">
<select class="form-control form-select" id="kd_kelurahan" name="kd_kelurahan"> </div>
<option value="">-</option>
</select>
</div>
</div>
<div class="form-group">
<label class="control-label col-md-3">Admin</label>
<div class="col-md-9">
<select class="form-select" aria-label="Default select example" id="sys_admin">
<option value="0">Tidak</option>
<option value="1">Ya</option>
</select>
</div> </div>
</div> <div class="form-group">
<p>&nbsp;</p> <label class="control-label col-md-3">Password</label>
</div> <div class="col-md-9">
<input id="password" name="password" placeholder="Password" class="form-control" type="password">
</div>
</div>
<div class="form-group">
<label class="control-label col-md-3">Ulang Password</label>
<div class="col-md-9">
<input id="repassword" name="repassword" placeholder="repassword" class="form-control" type="password">
</div>
</div>
<div class="form-group">
<label class="control-label col-md-3">Kecamatan</label>
<div class="col-md-9">
<select class="form-control form-select" id="kd_kecamatan" name="kd_kecamatan" onchange="">
<option value="">-</option>
<?php $i=0; foreach ($kecamatan as $rs) { ?>
<option value="<?php echo $rs->kd_kecamatan;?>">
<?php echo $rs->kd_kecamatan." - ".$rs->nm_kecamatan;?></option>
<?php }?>
</select>
</div>
</div>
<div class="form-group">
<label class="control-label col-md-3">Kelurahan</label>
<div class="col-md-9">
<select class="form-control form-select" id="kd_kelurahan" name="kd_kelurahan">
<option value="">-</option>
</select>
</div>
</div>
<div class="form-group">
<label class="control-label col-md-3">Admin</label>
<div class="col-md-9">
<select class="form-select" aria-label="Default select example" id="sys_admin">
<option value="0">Tidak</option>
<option value="1">Ya</option>
</select>
</div>
</div>
<p>&nbsp;</p>
</div>
</form>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-primary" id="save_user">Simpan</button> <button type="button" class="btn btn-primary" id="save_user">Simpan</button>
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Tutup</button> <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Tutup</button>
...@@ -141,7 +143,7 @@ ...@@ -141,7 +143,7 @@
</div> </div>
<script src="<?php echo base_url(); ?>assets/libs/bootstrap/dist/js/bootstrap.min.js"></script> <script src="<?php echo base_url(); ?>assets/libs/bootstrap/dist/js/bootstrap.min.js"></script>
<script src="<?php echo base_url(); ?>assets/js/sweetalert.min.js"></script>
<script src="<?php echo base_url(); ?>assets/js/jquery.dataTables.min.js"></script> <script src="<?php echo base_url(); ?>assets/js/jquery.dataTables.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
...@@ -153,7 +155,7 @@ ...@@ -153,7 +155,7 @@
$(".btn_add").click(function(){ $(".btn_add").click(function(){
save_method = 'add'; save_method = 'add';
$('#form')[0].reset(); // reset form on modals $('#form-modal')[0].reset(); // reset form on modals
$("#modal_form").modal('show'); $("#modal_form").modal('show');
}); });
}); });
...@@ -161,13 +163,13 @@ ...@@ -161,13 +163,13 @@
function add_user() function add_user()
{ {
save_method = 'add'; save_method = 'add';
$('#form')[0].reset(); // reset form on modals $('#form-modal')[0].reset(); // reset form on modals
} }
$('body').on('click', '.edit-data', (function(e){ $('body').on('click', '.edit-data', (function(e){
var id = $(e.currentTarget).attr('data-id'); var id = $(e.currentTarget).attr('data-id');
save_method = 'update'; save_method = 'update';
$('#form')[0].reset(); // reset form on modals $('#form-modal')[0].reset(); // reset form on modals
$.ajax({ $.ajax({
url: "<?php echo base_url()?>pbb/user/user_edit/"+ id, url: "<?php echo base_url()?>pbb/user/user_edit/"+ id,
......
This source diff could not be displayed because it is too large. You can view the blob instead.
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<TfrxReport Version="5.2" DotMatrixReport="False" EngineOptions.UseFileCache="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.Zoom="1" PreviewOptions.PictureCacheInFile="True" PrintOptions.Printer="Default" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="45139,3623691319" ReportOptions.Description.Text="" ReportOptions.LastChange="45149,5664150926" ScriptLanguage="PascalScript" ScriptText.Text="&#13;&#10;begin&#13;&#10;&#13;&#10;end."> <TfrxReport Version="5.2" DotMatrixReport="False" EngineOptions.UseFileCache="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.Zoom="1" PreviewOptions.PictureCacheInFile="True" PrintOptions.Printer="Default" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="45139,3623691319" ReportOptions.Description.Text="" ReportOptions.LastChange="45159,5916539931" ScriptLanguage="PascalScript" ScriptText.Text="&#13;&#10;begin&#13;&#10;&#13;&#10;end.">
<Datasets> <Datasets>
<item DataSet="qryWP" DataSetName="qryWP"/> <item DataSet="qryWP" DataSetName="qryWP"/>
</Datasets> </Datasets>
...@@ -31,7 +31,16 @@ ...@@ -31,7 +31,16 @@
<item/> <item/>
</Formats> </Formats>
</TfrxMemoView> </TfrxMemoView>
<TfrxMemoView Name="Memo19" Left="170,07885" Top="120,94496" Width="536,69326" Height="22,67716535" Font.Charset="1" Font.Color="-16777208" Font.Height="-12" Font.Name="Arial" Font.Style="0" ParagraphGap="5" ParentFont="False" Text="[qryWP.&#34;kd_propinsi&#34;].[qryWP.&#34;kd_dati2&#34;].[qryWP.&#34;kd_kecamatan&#34;].[qryWP.&#34;kd_kelurahan&#34;].[qryWP.&#34;kd_blok&#34;].[qryWP.&#34;kd_jns_op&#34;]"/> <TfrxMemoView Name="Memo19" Left="170,07885" Top="120,94496" Width="536,69326" Height="22,67716535" Font.Charset="1" Font.Color="-16777208" Font.Height="-12" Font.Name="Arial" Font.Style="0" ParagraphGap="5" ParentFont="False" Text="[qryWP.&#34;kd_propinsi&#34;].[qryWP.&#34;kd_dati2&#34;].[qryWP.&#34;kd_kecamatan&#34;].[qryWP.&#34;kd_kelurahan&#34;].[qryWP.&#34;kd_blok&#34;].[qryWP.&#34;no_urut&#34;].[qryWP.&#34;kd_jns_op&#34;]">
<Formats>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
</Formats>
</TfrxMemoView>
<TfrxMemoView Name="Memo20" Left="170,07885" Top="188,9765" Width="536,69326" Height="22,67716535" Font.Charset="1" Font.Color="-16777208" Font.Height="-12" Font.Name="Arial" Font.Style="0" ParagraphGap="5" ParentFont="False" Text="[qryWP.&#34;nm_kecamatan&#34;]"> <TfrxMemoView Name="Memo20" Left="170,07885" Top="188,9765" Width="536,69326" Height="22,67716535" Font.Charset="1" Font.Color="-16777208" Font.Height="-12" Font.Name="Arial" Font.Style="0" ParagraphGap="5" ParentFont="False" Text="[qryWP.&#34;nm_kecamatan&#34;]">
<Formats> <Formats>
<item/> <item/>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment