Skip to content

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

redmine#15625

* tambah kolom keterangan di modul Pengendalian_mutu * revisi report FormPengendalianMutu.fr3, tambah keterangan
parent b81f8442
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 16 deletions
application/modules/pengendalian_mutu/controllers/pengendalian_mutu.php
View file @ e0ba928e
......@@ -42,6 +42,7 @@ class Pengendalian_mutu extends AktivitasBLUD_Controller
{
$response->rows[$i]['id'] = $result[$i]['id_kendali_mutu'];
$response->rows[$i]['cell'][] = $result[$i]['id_kendali_mutu'];
$response->rows[$i]['cell'][] = $result[$i]['id_kendali_mutu'];
$response->rows[$i]['cell'][] = $result[$i]['uraian'];
}
}
......@@ -52,15 +53,16 @@ class Pengendalian_mutu extends AktivitasBLUD_Controller
function rinci($id)
{
$response = (object) NULL;
$result = $this->data_model->get_rinci_by_id($id);//die(print_r($result));
$result = $this->data_model->get_rinci_by_id($id);
for($i=0; $i<count($result); $i++)
{
$response->rows[$i]['id'] = $result[$i]['id_data_pengendalian_rinci'];
$response->rows[$i]['cell'][] = $result[$i]['id_data_pengendalian_rinci'];
$response->rows[$i]['cell'][] = $result[$i]['id_kendali_mutu'];
$response->rows[$i]['cell'][] = $result[$i]['uraian'];
$response->rows[$i]['cell'][] = $result[$i]['ceklis_kendali']=='Y'?1:0;
$response->rows[$i]['cell'][] = $result[$i]['keterangan'];
}
echo json_encode($response);
}
}
application/modules/pengendalian_mutu/models/pengendalian_mutu_model.php
View file @ e0ba928e
......@@ -35,10 +35,11 @@ class Pengendalian_mutu_model extends Base_Model
);
$this->fieldmap_rincian = array(
'idpr' => 'id_data_pengendalian_rinci',
'id_data_pengendalian_rinci' => 'id_data_pengendalian_rinci',
'id_data_pengendalian' => 'id_data_pengendalian',
'id_kendali_mutu' => 'id_kendali_mutu',
'ketua' => 'ceklis_kendali',
'keterangan' => 'keterangan',
);
$this->fieldmap_daftar_aggregate = array(
......@@ -99,6 +100,7 @@ class Pengendalian_mutu_model extends Base_Model
}
}
}
//die(print_r($this->data_rincian));
}
/* Simpan data_pengendalian */
......@@ -129,9 +131,9 @@ class Pengendalian_mutu_model extends Base_Model
for ($i = 0; $i < count($this->data_rincian); $i++) {
$this->data_rincian[$i]['ceklis_kendali'] = $this->data_rincian[$i]['ceklis_kendali'] == 1?'Y':'T';
$idr = isset($this->data_rincian[$i]['id_data_pengendalian_rinci']) ? str_replace('new_', 0, $this->data_rincian[$i]['id_data_pengendalian_rinci']) : null;
$idr = isset($this->data_rincian[$i]['id_data_pengendalian_rinci']) ? str_replace('new_', 0, $this->data_rincian[$i]['id_data_pengendalian_rinci']) : null;
$this->db->select('id_data_pengendalian')->from('data_pengendalian_rinci')->where('id_data_pengendalian', $this->id)->where('id_data_pengendalian_rinci', $idr);
$this->db->select('id_data_pengendalian')->from('data_pengendalian_rinci')->where('id_data_pengendalian', $this->id)->where('id_kendali_mutu', $this->data_rincian[$i]['id_kendali_mutu']);
$rs = $this->db->get()->row_array();
if ($rs){
......@@ -222,6 +224,7 @@ class Pengendalian_mutu_model extends Base_Model
a.id_data_pengendalian_rinci,
a.id_data_pengendalian,
a.ceklis_kendali,
a.keterangan,
b.id_kendali_mutu,
b.uraian
');
......
application/modules/pengendalian_mutu/views/pengendalian_mutu_form.php
View file @ e0ba928e
......@@ -57,20 +57,23 @@
url: '',
datatype: 'local',
mtype: 'POST',
colNames: ['', 'Uraian', 'Ceklis <input type="checkbox" class="head_ketua" id="id_head_ketua" >',''],
colNames: ['', '', 'Uraian', 'Ceklis <input type="checkbox" class="head_ketua" id="id_head_ketua" >','Keterangan'],
colModel: [
{
name: 'id_kendali_mutu',
hidden: true,
editable: true,
},
{name: 'id_data_pengendalian_rinci', hidden: true, key:true},
{name: 'id_kendali_mutu', hidden: true, editable: true},
{
name: 'uraian',
width: 600,
sortable: false
},
{name:'ketua', width:100, editable: true, edittype:'checkbox', formatter:'checkbox', editoptions:{value:'1:0'}, formatoptions:{disabled:false}, align:'center', sortable:false, class:'check-row ketua'},
{name:'ketua_cek', editable:true, hidden:true},
//{name:'ketua_cek', editable:true, hidden:true},
{
name: 'keterangan',
width: 600,
sortable: false,
editable: true,
}
],
pager: '#pgr_tim',
rowNum: 1000,
......@@ -86,12 +89,12 @@
loadComplete: function() {
},
ondblClickRow:dblClickPejabat,
ondblClickRow:edit_row,
gridComplete: function(){
var IDs = $("#grd_tim").jqGrid('getDataIDs');
for (var i=0; i<IDs.length; i++){
var data = $("#grd_tim").jqGrid('getRowData', IDs[i]);
if (data.ketua_cek == 'T') $("#grd_tim").jqGrid('setCell', IDs[i], 'ketua', '' ,'ui-state-disabled ui-jqgrid-disablePointerEvents', '');
//if (data.ketua_cek == 'T') $("#grd_tim").jqGrid('setCell', IDs[i], 'ketua', '' ,'ui-state-disabled ui-jqgrid-disablePointerEvents', '');
}
},
onSelectRow: function(id) {
......@@ -103,13 +106,46 @@
});
$("#grd_tim").jqGrid('navGrid', '#pgr_tim', {
add: false,
edit: false,
edit: App.canEdit(),
edittext: 'Ubah',
editfunc:edit_row,
del: false,
refresh: false,
refreshtext: 'Refresh',
search: false,
}, {}, {}, {}, {});
function edit_row(id) {
if (!App.canEdit()) return;
var row = $(this).jqGrid('getRowData', id);
editparam = {
keys: true,
url: 'clientArray',
aftersavefunc: after_save,
oneditfunc: onEditaudit,
afterrestorefunc: after_restore,
restoreAfterError: false,
}
$(this).jqGrid('saveRow', last, null, 'clientArray', null, after_save);
$(this).jqGrid('editRow', id, editparam);
last = id;
};
function after_save() {
$("#grd_tim").focus();
}
function after_restore() {
$("#grd_tim").focus();
}
function onEditaudit(id) {
if (!App.canEdit()) return;
$('#' + id + '_keterangan').focus();
}
$("#id_head_ketua").click(function(e) {
var isSelectAllTrue = $('#id_head_ketua').is(":checked");
......@@ -218,7 +254,7 @@
self.canEditWakil = ko.observable(false);
self.canEdit = ko.computed(function() {
return self.akses_level() >= 3 && (self.canEditKetua() || self.canEditPengendali() || self.canEditWakil());
return self.akses_level() >= 3;
});
self.canPrint = ko.computed(function() {
return self.akses_level() >= 2 && self.mode() === 'edit';
......
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