Commit b81f8442 authored by Deddy Vita Kurniawan's avatar Deddy Vita Kurniawan

redmine#15593

* tambah kolom PENDIDIKAN
parent 5fbd3aad
...@@ -108,6 +108,7 @@ class Pejabat_spi extends Userpage_Controller { ...@@ -108,6 +108,7 @@ class Pejabat_spi extends Userpage_Controller {
$result[$i]['nama_jabatan'], $result[$i]['nama_jabatan'],
$result[$i]['nomor_hp'], $result[$i]['nomor_hp'],
$result[$i]['email'], $result[$i]['email'],
$result[$i]['pendidikan'],
$result[$i]['aktif'] $result[$i]['aktif']
); );
} }
......
...@@ -20,6 +20,7 @@ class Pejabat_spi_model extends Base_Model ...@@ -20,6 +20,7 @@ class Pejabat_spi_model extends Base_Model
'nama_jabatan', 'nama_jabatan',
'nomor_hp', 'nomor_hp',
'email', 'email',
'pendidikan',
'aktif', 'aktif',
); );
...@@ -32,6 +33,7 @@ class Pejabat_spi_model extends Base_Model ...@@ -32,6 +33,7 @@ class Pejabat_spi_model extends Base_Model
'nama_jabatan' => 'b.nama_jabatan', 'nama_jabatan' => 'b.nama_jabatan',
'nomor_hp' => 'a.nomor_hp', 'nomor_hp' => 'a.nomor_hp',
'email' => 'a.email', 'email' => 'a.email',
'pendidikan' => 'a.pendidikan',
'aktif' => 'a.aktif', 'aktif' => 'a.aktif',
); );
...@@ -44,6 +46,7 @@ class Pejabat_spi_model extends Base_Model ...@@ -44,6 +46,7 @@ class Pejabat_spi_model extends Base_Model
'id_ref_golongan' => 'id_ref_golongan', 'id_ref_golongan' => 'id_ref_golongan',
'nomor_hp' => 'nomor_hp', 'nomor_hp' => 'nomor_hp',
'email' => 'email', 'email' => 'email',
'pendidikan' => 'pendidikan',
'aktif' => 'aktif', 'aktif' => 'aktif',
'token' => 'token', 'token' => 'token',
); );
...@@ -72,7 +75,10 @@ class Pejabat_spi_model extends Base_Model ...@@ -72,7 +75,10 @@ class Pejabat_spi_model extends Base_Model
'pangkat' => array('name' => 'Pangkat', 'kategori'=>'string'), 'pangkat' => array('name' => 'Pangkat', 'kategori'=>'string'),
'golongan' => array('name' => 'Golongan', 'kategori'=>'string'), 'golongan' => array('name' => 'Golongan', 'kategori'=>'string'),
'nama_jabatan' => array('name' => 'Nama Jabatan', 'kategori'=>'string'), 'nama_jabatan' => array('name' => 'Nama Jabatan', 'kategori'=>'string'),
'aktif' => array('name' => 'Aktif', 'kategori' => 'predefined', 'options' => array('0' => 'Tidak Aktif', '1' => 'Aktif')), 'nomor_hp' => array('name' => 'Nomor HP', 'kategori'=>'string'),
'email' => array('name' => 'Email', 'kategori'=>'string'),
'pendidikan' => array('name' => 'Pendidikan', 'kategori'=>'string'),
'aktif' => array('name' => 'Keterangan', 'kategori' => 'predefined', 'options' => array('0' => 'Tidak Aktif', '1' => 'Aktif')),
); );
return $fields; return $fields;
...@@ -151,6 +157,7 @@ class Pejabat_spi_model extends Base_Model ...@@ -151,6 +157,7 @@ class Pejabat_spi_model extends Base_Model
a.nip, a.nip,
a.nomor_hp, a.nomor_hp,
a.email, a.email,
a.pendidikan,
a.aktif, a.aktif,
a.token, a.token,
a.id_ref_jabatan, a.id_ref_jabatan,
...@@ -175,6 +182,7 @@ class Pejabat_spi_model extends Base_Model ...@@ -175,6 +182,7 @@ class Pejabat_spi_model extends Base_Model
a.nik, a.nik,
a.nip, a.nip,
a.email, a.email,
a.pendidikan,
a.nomor_hp, a.nomor_hp,
a.aktif, a.aktif,
a.id_ref_jabatan, a.id_ref_jabatan,
......
...@@ -48,6 +48,12 @@ ...@@ -48,6 +48,12 @@
<input type="text" class="span4" id="email" data-bind="value: email" /> <input type="text" class="span4" id="email" data-bind="value: email" />
</div> </div>
</div> </div>
<div class="control-group" data-bind="validationElement: pendidikan" >
<label class="control-label" for="email">Pendidikan</label>
<div class="controls">
<textarea rows="1" class="span4" id="pendidikan" data-bind="value: pendidikan" required></textarea>
</div>
</div>
<div class="control-group" data-bind="validationElement: token" > <div class="control-group" data-bind="validationElement: token" >
<label class="control-label" for="token">Token</label> <label class="control-label" for="token">Token</label>
<div class="controls"> <div class="controls">
...@@ -108,6 +114,7 @@ ...@@ -108,6 +114,7 @@
self.id_ref_golongan = ko.observable('<?php echo isset($data['id_ref_golongan']) ? $data['id_ref_golongan'] : '' ?>'); self.id_ref_golongan = ko.observable('<?php echo isset($data['id_ref_golongan']) ? $data['id_ref_golongan'] : '' ?>');
self.pangkat = ko.observable('<?php echo isset($data['pangkat']) ? $data['pangkat'] : '' ?>'); self.pangkat = ko.observable('<?php echo isset($data['pangkat']) ? $data['pangkat'] : '' ?>');
self.email = ko.observable('<?php echo isset($data['email']) ? $data['email'] : '' ?>'); self.email = ko.observable('<?php echo isset($data['email']) ? $data['email'] : '' ?>');
self.pendidikan = ko.observable('<?php echo isset($data['pendidikan']) ? $data['pendidikan'] : '' ?>');
self.nomor_hp = ko.observable(<?php echo isset($data['nomor_hp']) ? json_encode($data['nomor_hp']) : "''" ?>) self.nomor_hp = ko.observable(<?php echo isset($data['nomor_hp']) ? json_encode($data['nomor_hp']) : "''" ?>)
.extend({ .extend({
required: {params: true, message: 'Nomor Handphone belum diisi'}, required: {params: true, message: 'Nomor Handphone belum diisi'},
......
...@@ -45,7 +45,7 @@ $(document).ready(function() { ...@@ -45,7 +45,7 @@ $(document).ready(function() {
url:root+modul+'/get_daftar', url:root+modul+'/get_daftar',
datatype:'json', datatype:'json',
mtype:'POST', mtype:'POST',
colNames:['Nama', 'NIK', 'NIP', 'Pangkat', 'Golongan', 'Jabatan', 'Nomor HP', 'Email', 'Aktif'], colNames:['Nama', 'NIK', 'NIP', 'Pangkat', 'Golongan', 'Jabatan', 'Nomor HP', 'Email', 'Pendidikan', 'Keterangan'],
colModel:[ colModel:[
{name:'nama', width:300, sortable: true}, {name:'nama', width:300, sortable: true},
{name:'nik', width:150, sortable: false}, {name:'nik', width:150, sortable: false},
...@@ -55,6 +55,7 @@ $(document).ready(function() { ...@@ -55,6 +55,7 @@ $(document).ready(function() {
{name:'nama_jabatan', width:150, sortable: false}, {name:'nama_jabatan', width:150, sortable: false},
{name:'nomor_hp', width:150, sortable: false}, {name:'nomor_hp', width:150, sortable: false},
{name:'email', width:150, sortable: false}, {name:'email', width:150, sortable: false},
{name:'pendidikan', width:150, sortable: false},
{name: 'aktif', width: 150, formatter:'select',edittype:'select', editoptions:{value:{0:'Tidak Aktif',1:'Aktif'},class:'span2'}}, {name: 'aktif', width: 150, formatter:'select',edittype:'select', editoptions:{value:{0:'Tidak Aktif',1:'Aktif'},class:'span2'}},
], ],
pager:'#pager', pager:'#pager',
......
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