Skip to content

S
simas-blitar
Commit d741e1fe authored by Deddy Vita Kurniawan's avatar Deddy Vita Kurniawan
Browse files
Options

* revisi form surat tugas, tim audit ambil dari tim pengawas

parent f7c6616e
Show whitespace changes
Inline Side-by-side
Showing with 210 additions and 28 deletions
application/modules/pilih/controllers/pilih.php
View file @ d741e1fe
...@@ -2984,4 +2984,63 @@ class Pilih extends Pilih_Controller ...@@ -2984,4 +2984,63 @@ class Pilih extends Pilih_Controller
$response->sql = $this->db->queries; $response->sql = $this->db->queries;
echo json_encode($response); echo json_encode($response);
} }
/*
Pilih tim_pengawasan
Keterangan : mengembalikan daftar tim_pengawasan
Dipakai di modul surat_tugas
Digunakan untuk komponen dialog
*/
var $opt_tim_pengawasan = array(
'multi' => array('default' => 0),
'tree' => array('default' => 0),
'lvl' => array('default' => 0)
);
function gettimpengawasan()
{
$param = $this->getParam($this->opt_tim_pengawasan);
$result = $this->pilih_model->getTimPengawasan($param);
$response = (object) NULL;
if ($result) {
for ($i = 0; $i < count($result); $i++) {
$response->rows[$i]['id'] = $result[$i]['id_tim_pengawasan_rinci'];
$response->rows[$i]['cell'] = array(
$result[$i]['id_tim_pengawasan_rinci'],
$result[$i]['nama_tim'],
$result[$i]['pejabat']
);
}
}
$response->sql = $this->db->queries;
echo json_encode($response);
}
function timpengawasan()
{
$data['dialogname'] = 'timpengawasan';
$data['colnames'] = array('', 'Nama Tim Pengawasan', 'Pejabat');
$data['colmodel'] = array(
array('name' => 'id', 'hidden' => true),
array('name' => 'nama_tim', 'width' => 240, 'sortable' => true, 'search' => true, 'datatype' => 'string'),
array('name' => 'pejabat', 'width' => 400, 'sortable' => true, 'search' => true, 'datatype' => 'string'),
);
$data['orderby'] = 'nama_tim';
$data['param'] = $this->getParam($this->opt_tim_pengawasan);
$response = (object) NULL;
$response->html = $this->load->view('v_pilih', $data, true);
$response->grid = array(
'url' => base_url() . 'pilih/get' . $data['dialogname'],
'pager' => '#pgrDialog' . $data['dialogname'],
'sortname' => $data['orderby'],
'multiselect' => $data['param']['multi'],
'colNames' => $data['colnames'],
'colModel' => $data['colmodel'],
'postData' => $data['param'],
);
echo json_encode($response);
}
} }
application/modules/pilih/models/pilih_dasar_model.php
View file @ d741e1fe
...@@ -2675,7 +2675,7 @@ class Pilih_dasar_model extends Pilih_Model ...@@ -2675,7 +2675,7 @@ class Pilih_dasar_model extends Pilih_Model
{ {
$this->db->select(' $this->db->select('
t.id_tim_pengawasan_rinci, t.id_tim_pengawasan_rinci,
t.nama_tim, concat(c.nama_inspektur,'-',t.nama_tim) nama_tim,
( (
select group_concat(b.NAMA) select group_concat(b.NAMA)
from tim_pengawasan_pejabat a from tim_pengawasan_pejabat a
...@@ -2684,6 +2684,7 @@ class Pilih_dasar_model extends Pilih_Model ...@@ -2684,6 +2684,7 @@ class Pilih_dasar_model extends Pilih_Model
) pejabat ) pejabat
'); ');
$this->db->from('tim_pengawasan_rinci t'); $this->db->from('tim_pengawasan_rinci t');
$this->db->join('tim_pengawasan c','c.id_tim_pengawasan=t.id_tim_pengawasan');
$this->db->where('t.aktif','Y'); $this->db->where('t.aktif','Y');
if ($param['q'] != '') if ($param['q'] != '')
$this->db->like('Upper(t.nama_tim)', strtoupper($param['q'])); $this->db->like('Upper(t.nama_tim)', strtoupper($param['q']));
...@@ -2691,4 +2692,34 @@ class Pilih_dasar_model extends Pilih_Model ...@@ -2691,4 +2692,34 @@ class Pilih_dasar_model extends Pilih_Model
$result = $this->db->get()->result_array(); $result = $this->db->get()->result_array();
return $result; return $result;
} }
function getTimPengawasan($param)
{
$this->db->_protect_identifiers=false;
$fieldmap = array(
'nama_tim' => 't.nama_tim',
'pejabat' => 't.pejabat',
);
$swhere = $this->checkSearch($param['q'], $fieldmap);
if ($swhere) {
$swhere = build_or_where($swhere);
$this->db->where($swhere);
}
$this->db->select("
t.id_tim_pengawasan_rinci,
concat(c.nama_inspektur,'-',t.nama_tim) nama_tim,
(
select group_concat(b.NAMA)
from tim_pengawasan_pejabat a
join ref_pejabat_spi b on b.ID_PEJABAT_SPI = a.id_pejabat_spi
where a.id_tim_pengawasan_rinci = t.id_tim_pengawasan_rinci
) pejabat
");
$this->db->from('tim_pengawasan_rinci t');
$this->db->join('tim_pengawasan c','c.id_tim_pengawasan=t.id_tim_pengawasan');
$this->db->where('t.aktif','Y');
$result = $this->db->get()->result_array();
return $result;
}
} }
application/modules/surat_tugas/controllers/surat_tugas.php
View file @ d741e1fe
...@@ -134,9 +134,12 @@ class Surat_tugas extends AktivitasBLUD_Controller ...@@ -134,9 +134,12 @@ class Surat_tugas extends AktivitasBLUD_Controller
function rincian_pejabat($id = 0) function rincian_pejabat($id = 0)
{ {
$response = (object) NULL; $response = (object) NULL;
$result = $this->data_model->get_rincian_pejabat($id); $result = $this->data_model->get_rincian_penanggungjawab();
if ($result){ $result2 = $this->data_model->get_rincian_tim($id);
if ($result)
{
for($i=0; $i<count($result); $i++) for($i=0; $i<count($result); $i++)
{ {
$response->rows[$i]['id'] = -$result[$i]['id_pejabat_spi']; $response->rows[$i]['id'] = -$result[$i]['id_pejabat_spi'];
...@@ -146,31 +149,49 @@ class Surat_tugas extends AktivitasBLUD_Controller ...@@ -146,31 +149,49 @@ class Surat_tugas extends AktivitasBLUD_Controller
$response->rows[$i]['cell'][] = $result[$i]['nama']; $response->rows[$i]['cell'][] = $result[$i]['nama'];
$response->rows[$i]['cell'][] = $result[$i]['nip']; $response->rows[$i]['cell'][] = $result[$i]['nip'];
$response->rows[$i]['cell'][] = $result[$i]['jabatan']; $response->rows[$i]['cell'][] = $result[$i]['jabatan'];
$response->rows[$i]['cell'][] = $result[$i]['jabatan'] == 'inspektur'?'penanggung jawab':'wakil penanggung jawab'; $response->rows[$i]['cell'][] = $result[$i]['jabatan'] == 'inspektur'?'Penanggung Jawab':'Wakil Penanggung Jawab';
$response->rows[$i]['cell'][] = ''; $response->rows[$i]['cell'][] = '';
$response->rows[$i]['cell'][] = ''; $response->rows[$i]['cell'][] = '';
$response->rows[$i]['cell'][] = ''; $response->rows[$i]['cell'][] = '';
$response->rows[$i]['cell'][] = $i+1; $response->rows[$i]['cell'][] = $i+1;
} }
$x = count($result);
$idx = mt_rand(10,1000);
$response->rows[$x]['id'] = -$idx;
$response->rows[$x]['cell'][] = -$idx;
$response->rows[$x]['cell'][] = $idx;
$response->rows[$x]['cell'][] = 3;
$response->rows[$x]['cell'][] = '';
$response->rows[$x]['cell'][] = '';
$response->rows[$x]['cell'][] = '';
$response->rows[$x]['cell'][] = 'Pengendali Teknis';
$response->rows[$x]['cell'][] = '';
$response->rows[$x]['cell'][] = '';
$response->rows[$x]['cell'][] = '';
$response->rows[$x]['cell'][] = $x;
for($i=2; $i<5; $i++) $y = count($result)+1;
for($i2=0; $i2<count($result2); $i2++)
{ {
$idx = mt_rand(10,1000); $x+=1;
$response->rows[$i]['id'] = -$idx; $response->rows[$y]['id'] = -$result2[$i2]['id_pejabat_spi'];
$response->rows[$i]['cell'][] = -$idx; $response->rows[$y]['cell'][] = -$result2[$i2]['id_pejabat_spi'];
$response->rows[$i]['cell'][] = ''; $response->rows[$y]['cell'][] = $result2[$i2]['id_pejabat_spi'];
$response->rows[$i]['cell'][] = $i == 2?3:($i == 3?4:5); $response->rows[$y]['cell'][] = $result2[$i2]['uraian'] == 'Ketua Tim'?4:5;
$response->rows[$i]['cell'][] = ''; $response->rows[$y]['cell'][] = $result2[$i2]['nama'];
$response->rows[$i]['cell'][] = ''; $response->rows[$y]['cell'][] = $result2[$i2]['nip'];
$response->rows[$i]['cell'][] = ''; $response->rows[$y]['cell'][] = $result2[$i2]['jabatan'];
$response->rows[$i]['cell'][] = $i == 2?'Pengendali Teknis':($i == 3?'Ketua Tim':'Anggota Tim'); $response->rows[$y]['cell'][] = $result2[$i2]['uraian'];
$response->rows[$i]['cell'][] = ''; $response->rows[$y]['cell'][] = '';
$response->rows[$i]['cell'][] = ''; $response->rows[$y]['cell'][] = '';
$response->rows[$i]['cell'][] = ''; $response->rows[$y]['cell'][] = '';
$response->rows[$i]['cell'][] = $i+1; $response->rows[$y]['cell'][] = $x;
$y+=1;
} }
} }
//die(print_r($response));
$response->sql = $this->db->queries; $response->sql = $this->db->queries;
echo json_encode($response); echo json_encode($response);
} }
......
application/modules/surat_tugas/models/surat_tugas_model.php
View file @ d741e1fe
...@@ -536,7 +536,7 @@ class Surat_tugas_model extends Base_Model ...@@ -536,7 +536,7 @@ class Surat_tugas_model extends Base_Model
return $result; return $result;
} }
function get_rincian_pejabat() function get_rincian_penanggungjawab()
{ {
$this->db->select("a.id_pejabat_spi, a.nama, a.nip, a.kode_jab, a.jabatan"); $this->db->select("a.id_pejabat_spi, a.nama, a.nip, a.kode_jab, a.jabatan");
$this->db->from("ref_pejabat_spi a"); $this->db->from("ref_pejabat_spi a");
...@@ -545,6 +545,20 @@ class Surat_tugas_model extends Base_Model ...@@ -545,6 +545,20 @@ class Surat_tugas_model extends Base_Model
return $result->result_array(); return $result->result_array();
} }
function get_rincian_tim($id)
{
$this->db->select("a.id_tim_pengawasan_pejabat, a.id_tim_pengawasan_rinci, c.id_jab_tim_audit, c.uraian, c.no_urut, b.id_pejabat_spi, b.nama, b.nip, b.jabatan");
$this->db->from("tim_pengawasan_pejabat a");
$this->db->join("ref_pejabat_spi b","b.id_pejabat_spi = a.id_pejabat_spi");
$this->db->join("ref_jab_tim_audit c","c.id_jab_tim_audit = a.id_jab_tim_audit");
$this->db->join("tim_pengawasan_rinci d","d.id_tim_pengawasan_rinci = a.id_tim_pengawasan_rinci");
$this->db->where("d.id_tim_pengawasan_rinci", $id);
$this->db->order_by('a.no_urut');
$result = $this->db->get();
return $result->result_array();
}
function get_checked_token($id,$token) function get_checked_token($id,$token)
{ {
......
application/modules/surat_tugas/views/surat_tugas_form.php
View file @ d741e1fe
...@@ -421,7 +421,9 @@ ...@@ -421,7 +421,9 @@
add: true, add: true,
addtext: 'Tambah', addtext: 'Tambah',
addfunc: add_row, addfunc: add_row,
edit: false, edit: true,
edittext: 'Sisip',
editfunc: insert_row,
del: false, del: false,
refresh: true, refresh: true,
refreshtext: 'Refresh', refreshtext: 'Refresh',
...@@ -538,7 +540,7 @@ ...@@ -538,7 +540,7 @@
function add_row() { function add_row() {
if (!App.canEdit()) return; if (!App.canEdit()) return;
if (App.id() > 0) { /* if (App.id() > 0) {
var totalData2 = $('#grd_audit').jqGrid("getDataIDs"); var totalData2 = $('#grd_audit').jqGrid("getDataIDs");
for (i=0; i<totalData2.length; i++) for (i=0; i<totalData2.length; i++)
{ {
...@@ -579,21 +581,66 @@ ...@@ -579,21 +581,66 @@
} }
} }
$(this).jqGrid('addRow', addparam); $(this).jqGrid('addRow', addparam);
App.onChangeDate(); App.onChangeDate(); */
/* var $grd_audit = $(this), var $grd_audit = $(this),
option = {multi: 0, tree: 1, mode: 'anggaran_pendapatan'}, option = {multi: 0, tree: 1, mode: 'anggaran_pendapatan'},
i = 0, i = 0,
rs = [], rs = [],
newid = --idp; newid = --idp;
Dialog.pilihAuditor(option, function(obj, select) { Dialog.pilihTimPengawasan(option, function(obj, select) {
var rs = $(obj).jqGrid('getRowData', select[0].id); var rs = $(obj).jqGrid('getRowData', select[0].id);
$("#grd_audit").jqGrid('setGridParam', {'url': '<?php echo base_url($modul) ?>/rincian_pejabat/', 'datatype': 'json'}); $("#grd_audit").jqGrid('setGridParam', {'url': '<?php echo base_url($modul) ?>/rincian_pejabat/'+rs.id, 'datatype': 'json'});
$("#grd_audit").trigger('reloadGrid'); $("#grd_audit").trigger('reloadGrid');
}); */ });
}; };
function insert_row(id){
var row = [], newdata = [], newid = 0;
if (!App.canEdit()) return;
var no_urut = $(this).jqGrid('getCell', id, 'no_urut');
if (no_urut < 5) {
show_warning('Hanya bisa sisip Anggota Tim', 'Perhatian');
return false;
}
var jmlData = $(this).jqGrid("getDataIDs");
$(this).jqGrid('resetSelection');
row = $(this).jqGrid('getRowData', id);
newid = --idp;
addparam = {
rowID: newid,
initdata: {
idaudit: newid,
jab_tim: 'Anggota Tim',
id_jab_tim_audit: 5,
no_urut: (jmlData.length + 1)
},
position: "last",
addRowParams: {
keys: true,
url: 'clientArray',
aftersavefunc: after_save,
beforeSaveRow: before_save,
oneditfunc: onEditaudit,
afterrestorefunc: after_restore,
restoreAfterError: false,
}
}
$(this).jqGrid('addRow', addparam);
App.onChangeDate();
last = newid;
/* opt.grd.jqGrid('editRow', newid, editparam);
$('#'+newid+'_uraian').focus();
opt.grd.closest(".ui-jqgrid-bdiv").scrollLeft(0);
$('#hitung_grd_rinci').addClass('ui-state-disabled');
last = newid;
return newid; */
}
function dblClickaudit(id, irow, icol, e) { function dblClickaudit(id, irow, icol, e) {
e.stopPropagation(); e.stopPropagation();
edit_row.call(this, id); edit_row.call(this, id);
...@@ -1234,7 +1281,7 @@ ...@@ -1234,7 +1281,7 @@
grd_tanggal.jqGrid('setGridParam', {'url': '<?php echo base_url() . $modul; ?>/data_tanggal_aktif/' + App.id(), 'datatype': 'json'}); grd_tanggal.jqGrid('setGridParam', {'url': '<?php echo base_url() . $modul; ?>/data_tanggal_aktif/' + App.id(), 'datatype': 'json'});
grd_tanggal.trigger('reloadGrid'); grd_tanggal.trigger('reloadGrid');
} }
else /* else
{ {
grd_rinci.jqGrid('setGridParam', {'url': '<?php echo base_url($modul) ?>/rincian_pejabat/', 'datatype': 'json'}); grd_rinci.jqGrid('setGridParam', {'url': '<?php echo base_url($modul) ?>/rincian_pejabat/', 'datatype': 'json'});
grd_rinci.trigger('reloadGrid'); grd_rinci.trigger('reloadGrid');
...@@ -1243,7 +1290,7 @@ ...@@ -1243,7 +1290,7 @@
//grd_rinci.jqGrid('setGridParam', {'url': '', 'datatype': 'local'}); //grd_rinci.jqGrid('setGridParam', {'url': '', 'datatype': 'local'});
grd_tanggal.jqGrid('setGridParam', {'url': '', 'datatype': 'local'}); grd_tanggal.jqGrid('setGridParam', {'url': '', 'datatype': 'local'});
App.onChangeDate(); App.onChangeDate();
} } */
} }
App.pilih_sdskpd = function(mode) { App.pilih_sdskpd = function(mode) {
......
assets/js/app.js
View file @ d741e1fe
...@@ -1038,6 +1038,15 @@ var Dialog = (function () { ...@@ -1038,6 +1038,15 @@ var Dialog = (function () {
} }
initDialog(opt, callback, param); initDialog(opt, callback, param);
} }
function pilihTimPengawasan(opt, callback){
// opt : multi [0, 1]
var param = {
name: 'timpengawasan',
title: 'Pilih Tim Pengawasan',
}
initDialog(opt, callback, param);
}
function pilihST(opt, callback){ function pilihST(opt, callback){
// opt : multi [0, 1] // opt : multi [0, 1]
var param = { var param = {
...@@ -1167,6 +1176,7 @@ var Dialog = (function () { ...@@ -1167,6 +1176,7 @@ var Dialog = (function () {
pilihProgramKerjaAudit:pilihProgramKerjaAudit, pilihProgramKerjaAudit:pilihProgramKerjaAudit,
pilihpkpt:pilihpkpt, pilihpkpt:pilihpkpt,
pilihKKP:pilihKKP, pilihKKP:pilihKKP,
pilihTimPengawasan:pilihTimPengawasan,
} }
}()); }());
......
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