Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
simas-blitar
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Deddy Vita Kurniawan
simas-blitar
Commits
a23b0d15
Commit
a23b0d15
authored
Jul 25, 2024
by
Deddy Vita Kurniawan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
redmine#15876
parent
4148a5e2
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
152 additions
and
28 deletions
+152
-28
anggaran_waktu.php
...ion/modules/anggaran_waktu/controllers/anggaran_waktu.php
+1
-0
anggaran_waktu_model.php
...on/modules/anggaran_waktu/models/anggaran_waktu_model.php
+81
-11
kartu_penugasan.php
...n/modules/kartu_penugasan/controllers/kartu_penugasan.php
+13
-1
kartu_penugasan_model.php
.../modules/kartu_penugasan/models/kartu_penugasan_model.php
+33
-8
kartu_penugasan_form.php
...on/modules/kartu_penugasan/views/kartu_penugasan_form.php
+12
-1
pilih_dasar_model.php
application/modules/pilih/models/pilih_dasar_model.php
+5
-0
program_kerja_audit_model.php
.../program_kerja_audit/models/program_kerja_audit_model.php
+5
-5
temuan_model.php
application/modules/temuan/models/temuan_model.php
+2
-2
No files found.
application/modules/anggaran_waktu/controllers/anggaran_waktu.php
View file @
a23b0d15
...
...
@@ -56,6 +56,7 @@ class Anggaran_waktu extends AktivitasBLUD_Controller
);
}
}
$response
->
sql
=
$this
->
db
->
queries
;
echo
json_encode
(
$response
);
}
...
...
application/modules/anggaran_waktu/models/anggaran_waktu_model.php
View file @
a23b0d15
...
...
@@ -174,7 +174,7 @@ class Anggaran_waktu_model extends Base_Model
$jml
=
count
(
$this
->
data_tim
);
for
(
$i
=
0
;
$i
<=
$jml
-
1
;
$i
++
)
{
$idr
=
$this
->
data_tim
[
$i
][
'id_rinci_anggaran_waktu'
];
$this
->
db
->
select
(
'
1
'
)
->
from
(
'anggaran_waktu_rinci'
)
->
where
(
'id_anggaran_waktu'
,
$this
->
id
)
->
where
(
'id_rinci_anggaran_waktu'
,
$idr
);
$this
->
db
->
select
(
'
id_rinci_anggaran_waktu
'
)
->
from
(
'anggaran_waktu_rinci'
)
->
where
(
'id_anggaran_waktu'
,
$this
->
id
)
->
where
(
'id_rinci_anggaran_waktu'
,
$idr
);
$rs
=
$this
->
db
->
get
()
->
row_array
();
if
(
$rs
){
...
...
@@ -257,13 +257,13 @@ class Anggaran_waktu_model extends Base_Model
function
check_dependency
(
$id
)
{
/*
$this->db->select("
(select count(b.id_surat) from
anggaran_waktu b where b.id_surat = a.id_surat) anggaran_waktu_PAKAI
,
$this
->
db
->
select
(
"
(select count(b.id_surat) from
program_kerja_audit b where b.id_surat = a.id_surat) program_kerja_audit_pakai
,
"
);
$this->db->where('a.id_
surat
', $id);
$result = $this->db->get('
surat_penugasan
a')->row_array();
$this
->
db
->
where
(
'a.id_
anggaran_waktu
'
,
$id
);
$result
=
$this
->
db
->
get
(
'
anggaran_waktu
a'
)
->
row_array
();
return !($result['
anggaran_waktu_PAKAI'] > 0); */
return
!
(
$result
[
'
program_kerja_audit_pakai'
]
>
0
);
return
true
;
}
...
...
@@ -279,7 +279,57 @@ class Anggaran_waktu_model extends Base_Model
{
$this
->
db
->
_protect_identifiers
=
false
;
$this
->
db
->
select
(
'
$result
=
$this
->
db
->
query
(
"
select
x.id_rinci_anggaran_waktu,
x.id_rinci_jenis_kegiatan,
x.nama,
x.struktural,
x.cons_struktural,
x.tim,
x.cons_tim,
x.jumlah,
x.lvl,
x.parent,
x.kode
from(
select
a.id_jenis_kegiatan id_rinci_anggaran_waktu,
a.id_jenis_kegiatan id_rinci_jenis_kegiatan,
a.uraian nama,
0 struktural,
0 cons_struktural,
0 tim,
0 cons_tim,
0 jumlah,
1 lvl,
0 parent,
a.id_jenis_kegiatan kode
from jenis_kegiatan a
union all
select
a.id_rinci_anggaran_waktu,
a.id_rinci_jenis_kegiatan,
b.nama_rinci nama,
a.struktural,
a.cons_struktural,
a.tim,
a.cons_tim,
a.jumlah,
2 lvl,
a.id_anggaran_waktu parent,
CONCAT( b.id_jenis_kegiatan, '.', if(char_length(b.id_rinci_jenis_kegiatan)=1, CONCAT('0',b.id_rinci_jenis_kegiatan), b.id_rinci_jenis_kegiatan)) kode
from anggaran_waktu_rinci a
join jenis_kegiatan_rinci b on b.id_rinci_jenis_kegiatan=a.id_rinci_jenis_kegiatan
where a.id_anggaran_waktu = "
.
$id
.
"
) x
order by x.kode
"
)
->
result_array
();
/* $this->db->select('
x.id_rinci_anggaran_waktu,
x.id_rinci_jenis_kegiatan,
x.nama,
...
...
@@ -321,15 +371,16 @@ class Anggaran_waktu_model extends Base_Model
a.jumlah,
2 lvl,
a.id_anggaran_waktu parent,
b.id_jenis_kegiatan || '.' || if(char_length(b.id_rinci_jenis_kegiatan)=1, '0' || b.id_rinci_jenis_kegiatan,b.id_rinci_jenis_kegiatan
) kode
CONCAT( b.id_jenis_kegiatan, '.', if(char_length(b.id_rinci_jenis_kegiatan)=1, CONCAT('0',b.id_rinci_jenis_kegiatan), b.id_rinci_jenis_kegiatan)
) kode
from anggaran_waktu_rinci a
join jenis_kegiatan_rinci b on b.id_rinci_jenis_kegiatan=a.id_rinci_jenis_kegiatan
where a.id_anggaran_waktu = ".$id."
) x
", false);
//$this->db->where('x.id_anggaran_waktu', $id);
$this->db->order_by('x.kode');//die(print_r($this->db->get_compiled_select()));
$result
=
$this
->
db
->
get
()
->
result_array
();
$result = $this->db->get()->result_array();
*/
return
$result
;
}
...
...
@@ -337,6 +388,25 @@ class Anggaran_waktu_model extends Base_Model
function
get_rincian_kegiatan
(
$id
=
0
)
{
$this
->
db
->
_protect_identifiers
=
false
;
$result
=
$this
->
db
->
query
(
"
select
x.idx,
x.nama,
x.lvl,
x.parent,
x.kode
from(
select a.id_jenis_kegiatan idx, a.uraian nama, 1 lvl, 0 parent, a.id_jenis_kegiatan kode
from jenis_kegiatan a
union all
select r.id_rinci_jenis_kegiatan idx, r.nama_rinci nama, 2 lvl, r.id_jenis_kegiatan parent, CONCAT(r.id_jenis_kegiatan ,'.' ,r.id_rinci_jenis_kegiatan) kode
from jenis_kegiatan_rinci r
) x
order by 5
"
)
->
result_array
();
/* $this->db->_protect_identifiers=false;
$this->db->select("
x.idx,
x.nama,
...
...
@@ -351,12 +421,12 @@ class Anggaran_waktu_model extends Base_Model
union all
select r.id_rinci_jenis_kegiatan idx, r.nama_rinci nama, 2 lvl, r.id_jenis_kegiatan parent,
r.id_jenis_kegiatan || '.' || r.id_rinci_jenis_kegiatan
kode
select r.id_rinci_jenis_kegiatan idx, r.nama_rinci nama, 2 lvl, r.id_jenis_kegiatan parent,
CONCAT(r.id_jenis_kegiatan ,'.' ,r.id_rinci_jenis_kegiatan)
kode
from jenis_kegiatan_rinci r
)
x");
$this->db->order_by('5');
$result
=
$this
->
db
->
get
()
->
result_array
();
$result = $this->db->get()->result_array();
*/
return
$result
;
}
...
...
application/modules/kartu_penugasan/controllers/kartu_penugasan.php
View file @
a23b0d15
...
...
@@ -76,8 +76,20 @@ class Kartu_penugasan extends AktivitasBLUD_Controller
$response
->
rows
[
$i
][
'cell'
][]
=
$result
[
$i
][
'urut'
];
}
}
//die(print_r($response));
$response
->
sql
=
$this
->
db
->
queries
;
echo
json_encode
(
$response
);
}
public
function
get_nomor_kartu_penugasan
()
{
$tanggal_surat
=
$this
->
input
->
post
(
'tanggal_surat'
)
?
$this
->
input
->
post
(
'tanggal_surat'
)
:
''
;
$result
=
$this
->
data_model
->
get_nomor_kartu
(
$tanggal_surat
);
$response
=
(
object
)
null
;
$response
=
array
(
'nomor_kartu'
=>
isset
(
$result
)
?
$result
:
'000x'
,
'sql'
=>
$this
->
db
->
queries
);
echo
json_encode
(
$response
);
}
}
application/modules/kartu_penugasan/models/kartu_penugasan_model.php
View file @
a23b0d15
...
...
@@ -122,7 +122,6 @@ class Kartu_penugasan_model extends Base_Model
$this
->
data_tim
[
$i
][
$value
]
=
$$key
;
}
}
//die(print_r($this->data_tim));
}
}
...
...
@@ -137,7 +136,6 @@ class Kartu_penugasan_model extends Base_Model
$this
->
id
=
$this
->
data_kartu_penugasan
[
'id_kartu_penugasan'
];
}
else
{
//$id = $this->get_id('g_id_kartu_penugasan');
$this
->
db
->
select_max
(
'id_kartu_penugasan'
)
->
from
(
'kartu_penugasan'
);
$res
=
$this
->
db
->
get
()
->
row_array
();
$id
=
$res
[
'id_kartu_penugasan'
]
+
1
;
...
...
@@ -154,7 +152,7 @@ class Kartu_penugasan_model extends Base_Model
$jml
=
count
(
$this
->
data_tim
);
for
(
$i
=
0
;
$i
<=
$jml
-
1
;
$i
++
)
{
$idr
=
$this
->
data_tim
[
$i
][
'id_kartu_penugasan_rinci'
];
$this
->
db
->
select
(
'
1
'
)
->
from
(
'kartu_penugasan_rinci'
)
->
where
(
'id_kartu_penugasan'
,
$this
->
id
)
->
where
(
'id_kartu_penugasan_rinci'
,
$idr
);
$this
->
db
->
select
(
'
id_kartu_penugasan
'
)
->
from
(
'kartu_penugasan_rinci'
)
->
where
(
'id_kartu_penugasan'
,
$this
->
id
)
->
where
(
'id_kartu_penugasan_rinci'
,
$idr
);
$rs
=
$this
->
db
->
get
()
->
row_array
();
if
(
$rs
){
...
...
@@ -218,13 +216,13 @@ class Kartu_penugasan_model extends Base_Model
function
check_dependency
(
$id
)
{
/*
$this->db->select("
(select count(b.id_surat) from
KARTU_PENUGASAN b where b.id_surat = a.id_surat) KARTU_PENUGASAN_PAKAI
,
$this
->
db
->
select
(
"
(select count(b.id_surat) from
anggaran_waktu b where b.id_surat = a.id_surat) anggaran_waktu_pakai
,
"
);
$this->db->where('a.id_
surat
', $id);
$result = $this->db->get('
surat
_penugasan a')->row_array();
$this
->
db
->
where
(
'a.id_
kartu_penugasan
'
,
$id
);
$result
=
$this
->
db
->
get
(
'
kartu
_penugasan a'
)
->
row_array
();
return !($result['
KARTU_PENUGASAN_PAKAI'] > 0); */
return
!
(
$result
[
'
anggaran_waktu_pakai'
]
>
0
);
return
true
;
}
...
...
@@ -292,4 +290,31 @@ class Kartu_penugasan_model extends Base_Model
return
$result
;
}
function
get_nomor_kartu_penugasan
(
$tanggal_surat
)
{
$this
->
db
->
select
(
"max(substring(a.nomor_kartu from 1 for 4)) maxno"
);
$this
->
db
->
from
(
'kartu_penugasan a'
);
$this
->
db
->
join
(
'surat_penugasan b'
,
'b.id_surat=a.id_surat'
);
$this
->
db
->
where
(
'b.tahun'
,
$this
->
session
->
userdata
[
'tahun'
]);
$res
=
$this
->
db
->
get
()
->
row_array
();
$maxno
=
$res
[
'maxno'
]
?
$res
[
'maxno'
]
+
1
:
1
;
$pjg_kar
=
strlen
(
$maxno
);
$rpt
=
4
-
$pjg_kar
;
$prev
=
''
;
if
(
$rpt
>
0
){
for
(
$u
=
0
;
$u
<
$rpt
;
$u
++
){
$prev
.=
"0"
;
}
$NoTrans
=
$prev
.
$maxno
;
}
else
{
$NoTrans
=
$maxno
;
}
list
(
$tanggal
,
$bulan
,
$tahun
)
=
explode
(
'/'
,
$tanggal_surat
);
return
$NoTrans
.
'/'
.
bulan_romawi
(
$bulan
)
.
'/'
.
$tahun
;
}
}
application/modules/kartu_penugasan/views/kartu_penugasan_form.php
View file @
a23b0d15
...
...
@@ -9,7 +9,7 @@
<div
class=
"control-group pull-left"
data-bind=
"validationElement: id_surat"
>
<label
class=
"control-label"
for=
"nomor_surat"
>
Nomor Surat Tugas
</label>
<div
class=
"controls span3 input-append"
>
<input
type=
"text"
class=
"span3"
id=
"nomor_surat"
data-bind=
"value: nomor_surat"
/>
<input
type=
"text"
class=
"span3"
id=
"nomor_surat"
data-bind=
"value: nomor_surat
, attr: {readonly: 'readonly'}
"
/>
<span
class=
"add-on"
data-bind=
"visible: !isEdit(), click: pilih_surat"
><i
class=
"icon-folder-open"
></i></span>
</div>
</div>
...
...
@@ -305,6 +305,17 @@
$
(
"#grd_tim"
).
jqGrid
(
'setGridParam'
,
{
'url'
:
'
<?php
echo
base_url
(
$modul
)
?>
/rincian_pejabat/'
+
rs
.
id_st
,
'datatype'
:
'json'
});
$
(
"#grd_tim"
).
trigger
(
'reloadGrid'
);
$
.
ajax
({
url
:
"
<?php
echo
base_url
()
.
$modul
;
?>
/get_nomor_kartu"
,
type
:
'POST'
,
dataType
:
'json'
,
data
:
{
tanggal_surat
:
rs
.
tanggal_surat
},
success
:
function
(
res
)
{
App
.
nomor_kartu
(
res
.
nomor_kartu
);
}
});
});
}
...
...
application/modules/pilih/models/pilih_dasar_model.php
View file @
a23b0d15
...
...
@@ -2093,6 +2093,11 @@ class Pilih_dasar_model extends Pilih_Model
'
,
FALSE
);
$this
->
db
->
from
(
'surat_penugasan a'
);
$this
->
db
->
join
(
'ref_satker b'
,
'b.id_satker = a.id_satker_auditee'
);
$this
->
db
->
where
(
'not exists(
select 1
from kartu_penugasan g
where g.id_surat = a.id_surat
)'
,
null
,
FALSE
);
}
else
if
(
$param
[
'mode'
]
==
'pengendalian_mutu'
)
{
...
...
application/modules/program_kerja_audit/models/program_kerja_audit_model.php
View file @
a23b0d15
...
...
@@ -214,13 +214,13 @@ class Program_kerja_audit_model extends Base_Model
function
check_dependency
(
$id
)
{
/*
$this->db->select("
(select count(b.id_surat) from
program_kerja_audit b where b.id_surat = a.id_surat) program_kerja_audit_PAKAI
,
$this
->
db
->
select
(
"
(select count(b.id_surat) from
kertas_kerja b where b.id_surat = a.id_surat) kertas_kerja_pakai
,
"
);
$this->db->where('a.id_
sura
t', $id);
$result = $this->db->get('
surat_penugasan
a')->row_array();
$this
->
db
->
where
(
'a.id_
program_kerja_audi
t'
,
$id
);
$result
=
$this
->
db
->
get
(
'
program_kerja_audit
a'
)
->
row_array
();
return !($result['
program_kerja_audit_PAKAI'] > 0); */
return
!
(
$result
[
'
kertas_kerja_pakai'
]
>
0
);
return
true
;
}
...
...
application/modules/temuan/models/temuan_model.php
View file @
a23b0d15
...
...
@@ -271,12 +271,12 @@ class Temuan_model extends Base_Model
function
check_dependency
(
$id
)
{
$this
->
db
->
select
(
"
(select count(b.id_surat) from
lhp b where b.id_surat = a.id_surat) lhp
_pakai,
(select count(b.id_surat) from
konsep_laporan b where b.id_surat = a.id_surat) konsep_laporan
_pakai,
"
);
$this
->
db
->
where
(
'a.id_temuan_jenis'
,
$id
);
$result
=
$this
->
db
->
get
(
'temuan_jenis a'
)
->
row_array
();
return
!
(
$result
[
'
lhp
_pakai'
]
>
0
);
return
!
(
$result
[
'
konsep_laporan
_pakai'
]
>
0
);
return
true
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment