Update jadwal salur

app/Http/Controllers/JadwalSalurdanaController.php

@@ -31,7 +31,9 @@ class JadwalSalurdanaController extends Controller
         $ta = $post["ta"];
 
         $dataFilter=0;
-        $data = Sps_pendapatan::selectRaw("kode_rekening,nama_rekening,spsbulan1,spsbulan2,spsbulan3,spsbulan4,spsbulan5,spsbulan6,spsbulan7,spsbulan8,spsbulan9,spsbulan10,spsbulan11,spsbulan12,SUBSTR(KODE_REKENING,1,12) AS kodegrup,SUBSTR(KODE_REKENING,1,9) AS groupall")
+        $data = Sps_pendapatan::selectRaw("kode_rekening,nama_rekening,spsbulan1,spsbulan2,spsbulan3,spsbulan4,
+                                spsbulan5,spsbulan6,spsbulan7,spsbulan8,spsbulan9,spsbulan10,spsbulan11,spsbulan12,
+                                SUBSTR(KODE_REKENING,1,12) AS kodegrup,SUBSTR(KODE_REKENING,1,9) AS groupall")
                 ->where("SKPD_ID",980)
                 ->where("TAHUN",$ta)
                 ->whereRaw("SUBSTR(KODE_REKENING,1,3)='4.2'");

resources/views/jadwal_salurdana/index.blade.php

@@ -50,21 +50,49 @@
     <table id="dtTableJadwalPendapatan" class="table table-striped jambo_table tblClickRow" style="width:150%">
         <thead>
             <tr class="headings">
-                <th>No</th>
+                <th rowspan=2>No</th>
-                <th>Rekening</th>
+                <th rowspan=2>Nama Rekening</th>
-                <th>Jan</th>
+                <th colspan=2 class="text-right">Jan</th>
-                <th>Feb</th>
+                <th colspan=2 class="text-right">Feb</th>
-                <th>Mar</th>
+                <th colspan=2 class="text-right">Mar</th>
-                <th>Apr</th>
+                <th colspan=2 class="text-right">Apr</th>
-                <th>Mei</th>
+                <th colspan=2 class="text-right">Mei</th>
-                <th>Juni</th>
+                <th colspan=2 class="text-right">Juni</th>
-                <th>Juli</th>
+                <th colspan=2 class="text-right">Juli</th>
-                <th>Agu</th>
+                <th colspan=2 class="text-right">Agu</th>
-                <th>Sep</th>
+                <th colspan=2 class="text-right">Sep</th>
-                <th>Okt</th>
+                <th colspan=2 class="text-right">Okt</th>
-                <th>Nov</th>
+                <th colspan=2 class="text-right">Nov</th>
-                <th>Des</th>
+                <th colspan=2 class="text-right">Des</th>
-                <th>Jumlah</th>
+                <th colspan=2 class="text-right">Jumlah</th>
+            </tr>
+            <tr>
+            	<td>Jadwal</td>
+                <td>Realisasi</td>
+                <td>Jadwal</td>
+                <td>Realisasi</td>
+				<td>Jadwal</td>
+                <td>Realisasi</td>
+                <td>Jadwal</td>
+                <td>Realisasi</td>
+                <td>Jadwal</td>
+                <td>Realisasi</td>
+				<td>Jadwal</td>
+                <td>Realisasi</td>
+                <td>Jadwal</td>
+                <td>Realisasi</td>
+                <td>Jadwal</td>
+                <td>Realisasi</td>
+				<td>Jadwal</td>
+                <td>Realisasi</td>
+                <td>Jadwal</td>
+                <td>Realisasi</td>
+				<td>Jadwal</td>
+                <td>Realisasi</td>
+                <td>Jadwal</td>
+                <td>Realisasi</td>
+                <td>Jadwal</td>
+                <td>Realisasi</td>
             </tr>
         </thead>
         <tbody></tbody>
@@ -131,18 +159,31 @@
                     { "data": null},
                     { "data": "kode_rekening", "width": "400px" },
                     { "data": "spsbulan1", "className":"text-right" },                    
+                    { "data": null, "className":"text-right" }, 
                     { "data": "spsbulan2", "className":"text-right" },  
+                    { "data": null, "className":"text-right" }, 
                     { "data": "spsbulan3", "className":"text-right" },
+                    { "data": null, "className":"text-right" },   
                     { "data": "spsbulan4", "className":"text-right" },
+                    { "data": null, "className":"text-right" },   
                     { "data": "spsbulan5", "className":"text-right" },
+                    { "data": null, "className":"text-right" },   
                     { "data": "spsbulan6", "className":"text-right" },
+                    { "data": null, "className":"text-right" },   
                     { "data": "spsbulan7", "className":"text-right" },
+                    { "data": null, "className":"text-right" },   
                     { "data": "spsbulan8", "className":"text-right" },
+                    { "data": null, "className":"text-right" },   
                     { "data": "spsbulan9", "className":"text-right" },
+                    { "data": null, "className":"text-right" },   
                     { "data": "spsbulan10", "className":"text-right" },
+                    { "data": null, "className":"text-right" },   
                     { "data": "spsbulan11", "className":"text-right" },
+                    { "data": null, "className":"text-right" }, 
                     { "data": "spsbulan12", "className":"text-right" },
-                    { "data": "kode_rekening", "className":"text-right" },    
+                    { "data": null, "className":"text-right" },  
+                    { "data": null, "className":"text-right" },
+                    { "data": null, "className":"text-right" },     
                     //{ "data": null },
                 ],
                 "rowCallback": function(nRow, aData, iDisplayIndex, iDisplayIndexFull, oSettings) {
@@ -155,8 +196,11 @@
                     let total = 0;
                     $("td:eq(0)", nRow).html(index);
                     $("td:eq(1)", nRow).html(aData["kode_rekening"] + " | " + aData["nama_rekening"]);
+                    let Jadwalcol=0;
                     $.each(sps, function(i,x){
-                        $("td:eq("+(i+2)+")", nRow).html(separateNumberIndo(sps[i]));
+                        Jadwalcol+=2;
+                        $("td:eq("+Jadwalcol+")", nRow).html(separateNumberIndo(sps[i]));
+                        $("td:eq("+(Jadwalcol+1)+")", nRow).html(0);
                         total+=parseFloat(sps[i]);
                     })
                     $("td:eq(14)", nRow).html(separateNumberIndo(total));
@@ -195,18 +239,31 @@
                         return $("<tr/>")    
                             .append( "<td colspan=2 class=\'text-left " + textmuted +"\'><strong>"+labelGroup+"</strong></td>")
                             .append( "<td class=\'text-right " + textmuted +"\'><strong>"+ separateNumberIndo(sum[0]) +"</strong></td>" )
+                            .append( "<td class=\'text-right " + textmuted +"\'><strong>0</strong></td>" )
                             .append( "<td class=\'text-right " + textmuted +"\'><strong>"+ separateNumberIndo(sum[1]) +"</strong></td>" )
+                            .append( "<td class=\'text-right " + textmuted +"\'><strong>0</strong></td>" )
                             .append( "<td class=\'text-right " + textmuted +"\'><strong>"+ separateNumberIndo(sum[2]) +"</strong></td>" )
+                            .append( "<td class=\'text-right " + textmuted +"\'><strong>0</strong></td>" )
                             .append( "<td class=\'text-right " + textmuted +"\'><strong>"+ separateNumberIndo(sum[3]) +"</strong></td>" )
+                            .append( "<td class=\'text-right " + textmuted +"\'><strong>0</strong></td>" )
                             .append( "<td class=\'text-right " + textmuted +"\'><strong>"+ separateNumberIndo(sum[4]) +"</strong></td>" )
+                            .append( "<td class=\'text-right " + textmuted +"\'><strong>0</strong></td>" )
                             .append( "<td class=\'text-right " + textmuted +"\'><strong>"+ separateNumberIndo(sum[5]) +"</strong></td>" )
+                            .append( "<td class=\'text-right " + textmuted +"\'><strong>0</strong></td>" )
                             .append( "<td class=\'text-right " + textmuted +"\'><strong>"+ separateNumberIndo(sum[6]) +"</strong></td>" )
+                            .append( "<td class=\'text-right " + textmuted +"\'><strong>0</strong></td>" )
                             .append( "<td class=\'text-right " + textmuted +"\'><strong>"+ separateNumberIndo(sum[7]) +"</strong></td>" )
+                            .append( "<td class=\'text-right " + textmuted +"\'><strong>0</strong></td>" )
                             .append( "<td class=\'text-right " + textmuted +"\'><strong>"+ separateNumberIndo(sum[8]) +"</strong></td>" )
+                            .append( "<td class=\'text-right " + textmuted +"\'><strong>0</strong></td>" )
                             .append( "<td class=\'text-right " + textmuted +"\'><strong>"+ separateNumberIndo(sum[9]) +"</strong></td>" )
+                            .append( "<td class=\'text-right " + textmuted +"\'><strong>0</strong></td>" )
                             .append( "<td class=\'text-right " + textmuted +"\'><strong>"+ separateNumberIndo(sum[10]) +"</strong></td>" )
+                            .append( "<td class=\'text-right " + textmuted +"\'><strong>0</strong></td>" )
                             .append( "<td class=\'text-right " + textmuted +"\'><strong>"+ separateNumberIndo(sum[11]) +"</strong></td>" )
-                            .append( "<td class=\'text-right " + textmuted +"\'><strong>"+ separateNumberIndo(total) +"</strong></td>" );
+                            .append( "<td class=\'text-right " + textmuted +"\'><strong>0</strong></td>" )
+                            .append( "<td class=\'text-right " + textmuted +"\'><strong>"+ separateNumberIndo(total) +"</strong></td>" )
+                            .append( "<td class=\'text-right " + textmuted +"\'><strong>0</strong></td>" );
                     },
                     startRender: function ( rows, group, index ) {
                         // let group1 = rows.data().pluck("GROUP1");

resources/views/login.blade.php

@@ -34,14 +34,19 @@
         @endif
         <form action="{{ route('login') }}" method="post">
             @csrf
+            <div class="form-group">
+              <label class="col-form-label" for="nrk">Username</label>
               <div class="input-group mb-3">
-            <input type="text" name="nrk" class="form-control" placeholder="NRK">
+                <input type="text" name="nrk" class="form-control" placeholder="Username">
                 <div class="input-group-append">
                   <div class="input-group-text">
                     <span class="fas fa-envelope"></span>
                   </div>
                 </div>
               </div>
+            </div>
+            <div class="form-group">
+              <label class="col-form-label" for="password">Password</label>
               <div class="input-group mb-3">
                 <input type="password" name="password" class="form-control" placeholder="Password">
                 <div class="input-group-append">
@@ -50,6 +55,7 @@
                   </div>
                 </div>
               </div>
+            </div>
             <div class="row">
               <div class="col-8">
                 <div class="icheck-primary">