Commit 62945eb4 62945eb47ee26c202f4d0f55884aa0cff20dde35 by Maulyanda

Update disposisi dan surat keluar

1 parent 20492124
......@@ -373,7 +373,7 @@ class controller{
$html3 .= '<tr>
<td class="center">
<label class="pos-rel">
<input type="checkbox" class="ace ace_pilih3" value="'.$datashow->nama_user.'" attrnama="'.$datashow->nama_user.' ('.$datashow->nip.')"/>
<input type="checkbox" class="ace ace_pilih3" value="'.$datashow->nip.'" attrnama="'.$datashow->nama_user.' ('.$datashow->nip.')"/>
<span class="lbl"></span>
</label>
</td>
......@@ -428,9 +428,9 @@ class controller{
$datap = "";
if($countPenandatangan > 0){
foreach($dataPenandatangan as $id_penandatangan){
$params = array(':nama_user' => $id_penandatangan);
$userp = $this->model->selectprepare("tag", $field=null, $params, "nama_user=:nama_user", $other=null)->fetch(PDO::FETCH_OBJ);
$datap .= '<p class="p_hapus_'.$userp->nama_user.'"><a href="javascript:" onclick="p_hapus(\''.$userp->nama_user.'\')" class="p_hapus_'.$userp->nama_user.'">X </a> '.$userp->nama_user.' ('.$userp->nip.')</p><input type="hidden" name="p_penandatangan[]" id="p_penandatangan[]" class="p_penandatangan p_penandatangan_'.$userp->nama_user.' p_hapus_'.$userp->nama_user.'" value="'.$userp->nama_user.'">';
$params = array(':nip' => $id_penandatangan);
$userp = $this->model->selectprepare("tag", $field=null, $params, "nip=:nip", $other=null)->fetch(PDO::FETCH_OBJ);
$datap .= '<p class="p_hapus_'.$userp->nip.'"><a href="javascript:" onclick="p_hapus(\''.$userp->nip.'\')" class="p_hapus_'.$userp->nip.'">X </a> '.$userp->nama_user.' ('.$userp->nip.')</p><input type="hidden" name="p_penandatangan[]" id="p_penandatangan[]" class="p_penandatangan p_penandatangan_'.$userp->nip.' p_hapus_'.$userp->nip.'" value="'.$userp->nip.'">';
}
}
......@@ -851,7 +851,7 @@ class controller{
$html3 .= '<tr>
<td class="center">
<label class="pos-rel">
<input type="checkbox" class="ace ace_pilih3" value="'.$datashow->nama_user.'" attrnama="'.$datashow->nama_user.' ('.$datashow->nip.')"/>
<input type="checkbox" class="ace ace_pilih3" value="'.$datashow->nip.'" attrnama="'.$datashow->nama_user.' ('.$datashow->nip.')"/>
<span class="lbl"></span>
</label>
</td>
......
......@@ -374,7 +374,7 @@ if($memo->rowCount() >= 1){
</div>
<div class="form-group">
<div class="col-sm-2">
<button onclick="return IsEmpty();" class="btn btn-white btn-info btn-bold">
<button class="btn btn-white btn-info btn-bold">
Submit <i class="ace-icon fa fa-arrow-right icon-on-right"></i>
</button>
</div>
......@@ -1034,7 +1034,7 @@ if($memo->rowCount() >= 1){
</div><!-- /.modal-dialog -->
</div>
<script>
<!-- <script>
function IsEmpty() {
if (document.forms['formku'].progres.value === "2" && document.forms['formku'].file_progres.value === "" ) {
alert("Harap upload File");
......@@ -1042,7 +1042,7 @@ if($memo->rowCount() >= 1){
}
return true;
}
</script>
</script> -->
<input type="hidden" value="<?php echo $statusid; ?>" id="memoidhelp"/>
<script src="assets/js/jquery-2.1.4.min.js"></script>
......
......@@ -380,7 +380,7 @@ if($memo->rowCount() >= 1){
</div>
<div class="form-group">
<div class="col-sm-2">
<button onclick="return IsEmpty();" class="btn btn-white btn-info btn-bold">
<button class="btn btn-white btn-info btn-bold">
Submit <i class="ace-icon fa fa-arrow-right icon-on-right"></i>
</button>
</div>
......@@ -972,7 +972,7 @@ if($memo->rowCount() >= 1){
</div><!-- /.modal-dialog -->
</div>
<script>
<!-- <script>
function IsEmpty() {
if (document.forms['formku'].progres.value === "2" && document.forms['formku'].file_progres.value === "" ) {
alert("Harap upload File");
......@@ -980,7 +980,7 @@ if($memo->rowCount() >= 1){
}
return true;
}
</script>
</script> -->
<input type="hidden" value="<?php echo $statusid; ?>" id="memoidhelp"/>
<script src="assets/js/jquery-2.1.4.min.js"></script>
......
......@@ -4,6 +4,7 @@ $sk = $this->model->selectprepare("surat_keluar a INNER JOIN user b on a.id_user
if($sk->rowCount() >= 1){
$data_sk= $sk->fetch(PDO::FETCH_OBJ);
$idsk= $data_sk->id_sk;
$penandatangan = json_decode($data_sk->penandatangan, true);
$tujuan = json_decode($data_sk->tujuan, true);
$tembusan = json_decode($data_sk->tembusan, true);
if(isset($_GET['act']) && $_GET['act'] == "del"){
......@@ -51,15 +52,14 @@ if($sk->rowCount() >= 1){
<p>
Penandatangan: <br/><b>
<?php
$field = array('nama_user, jabatan');
$userttd = $this->model->selectprepare("tag", $field, $params=null, $where=null, "WHERE nip='".$data_sk->penandatangan."' ");
if ($userttd->rowCount() > 0){
$userttd = $userttd->fetch(PDO::FETCH_OBJ);
echo $userttd->nama_user;
}else{
echo $data_sk->penandatangan;
if(is_array($penandatangan)){
foreach($penandatangan as $field => $value){
$field = array('nama_user', 'jabatan');
$GetUserDis = $this->model->selectprepare("tag", $field, $params=null, $where=null, "WHERE (nip='".$value."' OR nama_user='".$value."') ")->fetch(PDO::FETCH_OBJ);
echo '- '.$GetUserDis->nama_user.' ('.$GetUserDis->jabatan.') <br/>';
}
?></b>
}?>
</b>
</p>
<p>
Tujuan Surat: <br/><b><?php echo $data_sk->tujuan;?></b>
......
......@@ -5,6 +5,7 @@ if($sk->rowCount() >= 1){
$data_sk= $sk->fetch(PDO::FETCH_OBJ);
$idsk= $data_sk->id_sk;
$tujuan = json_decode($data_sk->tujuan, true);
$penandatangan = json_decode($data_sk->penandatangan, true);
if(isset($_GET['act']) && $_GET['act'] == "del"){
## Hanya Admin yang bisa menghapus ##
if($HakAkses->hapus_surat != "Y"){
......@@ -64,15 +65,14 @@ if($sk->rowCount() >= 1){
<p>
Penandatangan: <br/><b>
<?php
$field = array('nama_user, jabatan');
$userttd = $this->model->selectprepare("tag", $field, $params=null, $where=null, "WHERE nip='".$data_sk->penandatangan."' ");
if ($userttd->rowCount() > 0){
$userttd = $userttd->fetch(PDO::FETCH_OBJ);
echo $userttd->nama_user;
}else{
echo $data_sk->penandatangan;
if(is_array($penandatangan)){
foreach($penandatangan as $field => $value){
$field = array('nama_user', 'jabatan');
$GetUserDis = $this->model->selectprepare("tag", $field, $params=null, $where=null, "WHERE (nip='".$value."' OR nama_user='".$value."') ")->fetch(PDO::FETCH_OBJ);
echo '- '.$GetUserDis->nama_user.' ('.$GetUserDis->jabatan.') <br/>';
}
?></b>
}?>
</b>
</p>
<p>
Tujuan Surat: <br/><b>
......