Skip to content

Agung Nugraha Putra / SIAS_2020

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 62945eb4 62945eb47ee26c202f4d0f55884aa0cff20dde35 by Maulyanda
Options

Update disposisi dan surat keluar

1 parent 20492124
Inline Side-by-side
Showing 5 changed files with 27 additions and 27 deletions
...@@ -373,7 +373,7 @@ class controller{ ...@@ -373,7 +373,7 @@ class controller{
373 $html3 .= '<tr> 373 $html3 .= '<tr>
374 <td class="center"> 374 <td class="center">
375 <label class="pos-rel"> 375 <label class="pos-rel">
376 <input type="checkbox" class="ace ace_pilih3" value="'.$datashow->nama_user.'" attrnama="'.$datashow->nama_user.' ('.$datashow->nip.')"/> 376 <input type="checkbox" class="ace ace_pilih3" value="'.$datashow->nip.'" attrnama="'.$datashow->nama_user.' ('.$datashow->nip.')"/>
377 <span class="lbl"></span> 377 <span class="lbl"></span>
378 </label> 378 </label>
379 </td> 379 </td>
...@@ -428,9 +428,9 @@ class controller{ ...@@ -428,9 +428,9 @@ class controller{
428 $datap = ""; 428 $datap = "";
429 if($countPenandatangan > 0){ 429 if($countPenandatangan > 0){
430 foreach($dataPenandatangan as $id_penandatangan){ 430 foreach($dataPenandatangan as $id_penandatangan){
431 $params = array(':nama_user' => $id_penandatangan); 431 $params = array(':nip' => $id_penandatangan);
432 $userp = $this->model->selectprepare("tag", $field=null, $params, "nama_user=:nama_user", $other=null)->fetch(PDO::FETCH_OBJ); 432 $userp = $this->model->selectprepare("tag", $field=null, $params, "nip=:nip", $other=null)->fetch(PDO::FETCH_OBJ);
433 $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.'">'; 433 $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.'">';
434 } 434 }
435 } 435 }
436 436
...@@ -851,7 +851,7 @@ class controller{ ...@@ -851,7 +851,7 @@ class controller{
851 $html3 .= '<tr> 851 $html3 .= '<tr>
852 <td class="center"> 852 <td class="center">
853 <label class="pos-rel"> 853 <label class="pos-rel">
854 <input type="checkbox" class="ace ace_pilih3" value="'.$datashow->nama_user.'" attrnama="'.$datashow->nama_user.' ('.$datashow->nip.')"/> 854 <input type="checkbox" class="ace ace_pilih3" value="'.$datashow->nip.'" attrnama="'.$datashow->nama_user.' ('.$datashow->nip.')"/>
855 <span class="lbl"></span> 855 <span class="lbl"></span>
856 </label> 856 </label>
857 </td> 857 </td>
......
...@@ -374,7 +374,7 @@ if($memo->rowCount() >= 1){ ...@@ -374,7 +374,7 @@ if($memo->rowCount() >= 1){
374 </div> 374 </div>
375 <div class="form-group"> 375 <div class="form-group">
376 <div class="col-sm-2"> 376 <div class="col-sm-2">
377 <button onclick="return IsEmpty();" class="btn btn-white btn-info btn-bold"> 377 <button class="btn btn-white btn-info btn-bold">
378 Submit <i class="ace-icon fa fa-arrow-right icon-on-right"></i> 378 Submit <i class="ace-icon fa fa-arrow-right icon-on-right"></i>
379 </button> 379 </button>
380 </div> 380 </div>
...@@ -1034,7 +1034,7 @@ if($memo->rowCount() >= 1){ ...@@ -1034,7 +1034,7 @@ if($memo->rowCount() >= 1){
1034 </div><!-- /.modal-dialog --> 1034 </div><!-- /.modal-dialog -->
1035 </div> 1035 </div>
1036 1036
1037 <script> 1037 <!-- <script>
1038 function IsEmpty() { 1038 function IsEmpty() {
1039 if (document.forms['formku'].progres.value === "2" && document.forms['formku'].file_progres.value === "" ) { 1039 if (document.forms['formku'].progres.value === "2" && document.forms['formku'].file_progres.value === "" ) {
1040 alert("Harap upload File"); 1040 alert("Harap upload File");
...@@ -1042,7 +1042,7 @@ if($memo->rowCount() >= 1){ ...@@ -1042,7 +1042,7 @@ if($memo->rowCount() >= 1){
1042 } 1042 }
1043 return true; 1043 return true;
1044 } 1044 }
1045 </script> 1045 </script> -->
1046 1046
1047 <input type="hidden" value="<?php echo $statusid; ?>" id="memoidhelp"/> 1047 <input type="hidden" value="<?php echo $statusid; ?>" id="memoidhelp"/>
1048 <script src="assets/js/jquery-2.1.4.min.js"></script> 1048 <script src="assets/js/jquery-2.1.4.min.js"></script>
......
...@@ -380,7 +380,7 @@ if($memo->rowCount() >= 1){ ...@@ -380,7 +380,7 @@ if($memo->rowCount() >= 1){
380 </div> 380 </div>
381 <div class="form-group"> 381 <div class="form-group">
382 <div class="col-sm-2"> 382 <div class="col-sm-2">
383 <button onclick="return IsEmpty();" class="btn btn-white btn-info btn-bold"> 383 <button class="btn btn-white btn-info btn-bold">
384 Submit <i class="ace-icon fa fa-arrow-right icon-on-right"></i> 384 Submit <i class="ace-icon fa fa-arrow-right icon-on-right"></i>
385 </button> 385 </button>
386 </div> 386 </div>
...@@ -972,7 +972,7 @@ if($memo->rowCount() >= 1){ ...@@ -972,7 +972,7 @@ if($memo->rowCount() >= 1){
972 </div><!-- /.modal-dialog --> 972 </div><!-- /.modal-dialog -->
973 </div> 973 </div>
974 974
975 <script> 975 <!-- <script>
976 function IsEmpty() { 976 function IsEmpty() {
977 if (document.forms['formku'].progres.value === "2" && document.forms['formku'].file_progres.value === "" ) { 977 if (document.forms['formku'].progres.value === "2" && document.forms['formku'].file_progres.value === "" ) {
978 alert("Harap upload File"); 978 alert("Harap upload File");
...@@ -980,7 +980,7 @@ if($memo->rowCount() >= 1){ ...@@ -980,7 +980,7 @@ if($memo->rowCount() >= 1){
980 } 980 }
981 return true; 981 return true;
982 } 982 }
983 </script> 983 </script> -->
984 984
985 <input type="hidden" value="<?php echo $statusid; ?>" id="memoidhelp"/> 985 <input type="hidden" value="<?php echo $statusid; ?>" id="memoidhelp"/>
986 <script src="assets/js/jquery-2.1.4.min.js"></script> 986 <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 ...@@ -4,6 +4,7 @@ $sk = $this->model->selectprepare("surat_keluar a INNER JOIN user b on a.id_user
4 if($sk->rowCount() >= 1){ 4 if($sk->rowCount() >= 1){
5 $data_sk= $sk->fetch(PDO::FETCH_OBJ); 5 $data_sk= $sk->fetch(PDO::FETCH_OBJ);
6 $idsk= $data_sk->id_sk; 6 $idsk= $data_sk->id_sk;
7 $penandatangan = json_decode($data_sk->penandatangan, true);
7 $tujuan = json_decode($data_sk->tujuan, true); 8 $tujuan = json_decode($data_sk->tujuan, true);
8 $tembusan = json_decode($data_sk->tembusan, true); 9 $tembusan = json_decode($data_sk->tembusan, true);
9 if(isset($_GET['act']) && $_GET['act'] == "del"){ 10 if(isset($_GET['act']) && $_GET['act'] == "del"){
...@@ -51,15 +52,14 @@ if($sk->rowCount() >= 1){ ...@@ -51,15 +52,14 @@ if($sk->rowCount() >= 1){
51 <p> 52 <p>
52 Penandatangan: <br/><b> 53 Penandatangan: <br/><b>
53 <?php 54 <?php
54 $field = array('nama_user, jabatan'); 55 if(is_array($penandatangan)){
55 $userttd = $this->model->selectprepare("tag", $field, $params=null, $where=null, "WHERE nip='".$data_sk->penandatangan."' "); 56 foreach($penandatangan as $field => $value){
56 if ($userttd->rowCount() > 0){ 57 $field = array('nama_user', 'jabatan');
57 $userttd = $userttd->fetch(PDO::FETCH_OBJ); 58 $GetUserDis = $this->model->selectprepare("tag", $field, $params=null, $where=null, "WHERE (nip='".$value."' OR nama_user='".$value."') ")->fetch(PDO::FETCH_OBJ);
58 echo $userttd->nama_user; 59 echo '- '.$GetUserDis->nama_user.' ('.$GetUserDis->jabatan.') <br/>';
59 }else{
60 echo $data_sk->penandatangan;
61 } 60 }
62 ?></b> 61 }?>
62 </b>
63 </p> 63 </p>
64 <p> 64 <p>
65 Tujuan Surat: <br/><b><?php echo $data_sk->tujuan;?></b> 65 Tujuan Surat: <br/><b><?php echo $data_sk->tujuan;?></b>
......
...@@ -5,6 +5,7 @@ if($sk->rowCount() >= 1){ ...@@ -5,6 +5,7 @@ if($sk->rowCount() >= 1){
5 $data_sk= $sk->fetch(PDO::FETCH_OBJ); 5 $data_sk= $sk->fetch(PDO::FETCH_OBJ);
6 $idsk= $data_sk->id_sk; 6 $idsk= $data_sk->id_sk;
7 $tujuan = json_decode($data_sk->tujuan, true); 7 $tujuan = json_decode($data_sk->tujuan, true);
8 $penandatangan = json_decode($data_sk->penandatangan, true);
8 if(isset($_GET['act']) && $_GET['act'] == "del"){ 9 if(isset($_GET['act']) && $_GET['act'] == "del"){
9 ## Hanya Admin yang bisa menghapus ## 10 ## Hanya Admin yang bisa menghapus ##
10 if($HakAkses->hapus_surat != "Y"){ 11 if($HakAkses->hapus_surat != "Y"){
...@@ -64,15 +65,14 @@ if($sk->rowCount() >= 1){ ...@@ -64,15 +65,14 @@ if($sk->rowCount() >= 1){
64 <p> 65 <p>
65 Penandatangan: <br/><b> 66 Penandatangan: <br/><b>
66 <?php 67 <?php
67 $field = array('nama_user, jabatan'); 68 if(is_array($penandatangan)){
68 $userttd = $this->model->selectprepare("tag", $field, $params=null, $where=null, "WHERE nip='".$data_sk->penandatangan."' "); 69 foreach($penandatangan as $field => $value){
69 if ($userttd->rowCount() > 0){ 70 $field = array('nama_user', 'jabatan');
70 $userttd = $userttd->fetch(PDO::FETCH_OBJ); 71 $GetUserDis = $this->model->selectprepare("tag", $field, $params=null, $where=null, "WHERE (nip='".$value."' OR nama_user='".$value."') ")->fetch(PDO::FETCH_OBJ);
71 echo $userttd->nama_user; 72 echo '- '.$GetUserDis->nama_user.' ('.$GetUserDis->jabatan.') <br/>';
72 }else{
73 echo $data_sk->penandatangan;
74 } 73 }
75 ?></b> 74 }?>
75 </b>
76 </p> 76 </p>
77 <p> 77 <p>
78 Tujuan Surat: <br/><b> 78 Tujuan Surat: <br/><b>
......