push

API/views.py

@@ -104,7 +104,7 @@ def jalan(request):
         print(kulon, lor, wetan, lor, wetan, kidul, kulon, kidul, kulon, lor, kulon, lor, wetan, lor, wetan, kidul, kulon, kidul, kulon, lor)
 
         with conn.cursor() as jalan:
-            jalan.execute("SELECT json_build_object ('type', 'Feature', 'properties', ( gj.ID, namrjl, st_length ( gj.geom :: geography ), gj.lebar_jalan, gj.remark, gj.gambar,(SELECT ARRAY_AGG ( '' || id || ',' || tgl_perbaikan || '' order by tgl_perbaikan DESC ) FROM tbl_perbaikan WHERE id_object = gj.ID ) ), 'geometry', ST_AsGeoJSON ( st_intersection(gj.geom, 'SRID=4326;POLYGON((%s %s, %s %s, %s %s, %s %s, %s %s))') :: geometry ) :: json ) FROM geo_jalan gj WHERE st_intersects(gj.geom,'SRID=4326;POLYGON((%s %s, %s %s, %s %s, %s %s, %s %s))') GROUP BY gj.id"% (kulon, lor, wetan, lor, wetan, kidul, kulon, kidul, kulon, lor, kulon, lor, wetan, lor, wetan, kidul, kulon, kidul, kulon, lor))
+            jalan.execute("SELECT json_build_object ('type', 'Feature', 'properties', ( gj.ID, gj.namrjl, st_length ( gj.geom :: geography ), gj.lebar_jalan, gj.remark, gj.gambar,(SELECT ARRAY_AGG ( '' || id || ',' || tgl_perbaikan || '' order by tgl_perbaikan DESC ) FROM tbl_perbaikan WHERE id_object = gj.ID and type_id = 2) ), 'geometry', ST_AsGeoJSON ( st_intersection(gj.geom, 'SRID=4326;POLYGON((%s %s, %s %s, %s %s, %s %s, %s %s))') :: geometry ) :: json ) FROM geo_jalan gj WHERE st_intersects(gj.geom,'SRID=4326;POLYGON((%s %s, %s %s, %s %s, %s %s, %s %s))') GROUP BY gj.id"% (kulon, lor, wetan, lor, wetan, kidul, kulon, kidul, kulon, lor, kulon, lor, wetan, lor, wetan, kidul, kulon, kidul, kulon, lor))
             prov_res = jalan.fetchall()
                                 
         data = {'gen':prov_res}

templates/includes/js-o.html

@@ -1467,6 +1467,32 @@
                             } else {
                                 var path_img = `"static/image/bangunan/` + feature.administrasi.f9 + `"`
                             }
+                            
+                            var list_history = feature.properties.f7
+
+                            var list_history_panel = ``
+                                for (var i = 0; i < list_history.length; i++) {
+                                    var dt_history = list_history[i].split(",");
+
+                                    var data_history = `<div class="form-group" style="margin-bottom:0px;">
+                                                            <div class="row">
+                                                                <label class="col-md-6">` + dt_history[1] + `</label>
+                                                                <a class="col-md-3" onclick="getjalanper(` + dt_history[0] + `)"><i>View Ruas</i></a>
+                                                                <a class="col-md-3" onclick="getdetailper(` + dt_history[0] + `)" data-toggle="modal" data-target="#modal_detail"><i>View Detail</i></a>
+                                                            </div>
+                                                        </div>`;
+                                    list_history_panel += data_history
+                                };
+
+                                history = `<p class="text-center">
+                                                History Perbaikan
+                                            </p>
+                                                <br>
+                                                ` + list_history_panel + `
+                                            <p class="text-center" style="margin-top: 10px;">
+                                                <a href="#" id='btn_perbaikan_jalan' class="btn btn-default"><i>Tambah History Perbaikan</i></a>
+                                            </p>`;
+
                             content_edit = `
                             <div class="modal-dialog" style="width: max-content;height: max-content;">
                                 <div class="modal-content">
@@ -1670,6 +1696,13 @@
                                             </th>
                                         </tr>
                                     </div>
+                                    <div class="container">
+                                        <tr style="height: 40px;">
+                                            <th id="history_panel">
+                                                ` + history + `
+                                            </th>
+                                        </tr>
+                                    </div>
                                 </tbody>
                             </table>`;
                             $("#isi_panel").html(content);