bug fix

minus
- delete jalan
- history bangunan

templates/includes/js-m.html

@@ -3863,8 +3863,8 @@
         if (checkBox.checked == true) {
             geo_po_cagar_budaya.addTo(map)
         } else {
-            valket()
             geo_po_cagar_budaya.remove()
+            valket()
         }
     }
 
@@ -4200,11 +4200,10 @@
     function gl100() {
         var checkBox = document.getElementById("gardu");
         if (checkBox.checked == true) {
-            valket()
             geo_po_gardu_listrik.addTo(map)
         } else {
-            valket()
             geo_po_gardu_listrik.remove()
+            valket()
         }
     }
 
@@ -6698,7 +6697,6 @@
                                     </div>
 
                                     <div class="modal-footer ">
-                                        <button type="button " class="btn btn-link " data-dismiss="modal ">Close</button>
                                         <button type="button " id="btnsavebangunan" class="btn btn-info ">Save changes</button>
                                     </div>
                                 </div>
@@ -7153,6 +7151,9 @@
                 }, 1000);
                 loaderPage(false);
 
+                $("#modal_bangunan_edit").modal("show")
+                $(".modal_detail_non_kelurahan").modal("hide")
+
                 map_edit.setView([data['geometry']['coordinates'][0][0][0][1], data['geometry']['coordinates'][0][0][0][0]], 19);
 
                 let lop_poly_edit = data['geometry']['coordinates'][0][0];
@@ -7226,7 +7227,9 @@
                         icon: "success",
                         confirmButtonColor: "#00BCD4"
                     }, function() {
-                        $("#modal_bangunan_edit").css('display', 'none');
+                        // $("#modal_bangunan_edit").css('display', 'none');
+                        $("#modal_bangunan_edit").modal("hide")
+                        // $(".modal_detail_non_kelurahan").modal("hide")
                     })
                 } else {
                     swal({
@@ -7265,7 +7268,8 @@
             },
             dataType: 'json',
             success: function(data) {
-
+                $("#modal_bangunan_delete").modal("show")
+                $(".modal_detail_non_kelurahan").modal("hide")
                 setTimeout(function() {
                     map_delete.invalidateSize();
                 }, 1000);
@@ -7312,7 +7316,7 @@
                         icon: "success",
                         confirmButtonColor: "#00BCD4"
                     }, function() {
-                        $("#modal_bangunan_delete").css('display', 'none');
+                        $("#modal_bangunan_delete").modal("hide")
                     })
                 } else {
                     swal({

templates/includes/js-o.html

@@ -2080,6 +2080,16 @@
                             </div>`
 
                         }
+                        $(".nama_keterangan").html(`
+                                            <div>
+                                                <span style="font-size: large;">
+                                                    ` + feature.properties.f2 + `
+                                                </span>
+                                            </div>
+                                            <div>
+                                                <span></span>
+                                            </div>
+                                            `)
 
                         $(".isi_keterangan").html(`
                                     <input type="text" name="idjalan" id="idjalan" class="hidden" value="">
@@ -2171,7 +2181,6 @@
                         $('#lebarjalan').val(feature.properties.f4);
                         $('#tipejalan').val(feature.properties.f5);
 
-
                         $("#coordinatejalan").val(feature.geometry);
                     }
                 });

templates/includes/sidebar.html

@@ -45,8 +45,8 @@
                 </li>
                 <hr>
                 <li>
-                    <a href="#" id="btn-hide-all" class="side-bar-but" style="position: absolute;margin-top: 1px;">
-                        <i class="icon-arrow-right13"></i>
+                    <a href="#" id="btn-hide-all" class="side-bar-but" style="position: absolute;margin-top: 1px; display: none;">
+                        <i class="icon-arrow-left12"></i>
                     </a>
                 </li>
                 
@@ -995,20 +995,22 @@
     });
 
     $("#btn-hide-all").click(function() {
-
         $("#button_keterangan").removeClass("active");
         $("#manage_perbaikan").removeClass("active");
         $("#panel-sm").removeClass("active");
         $("#panel-sm2").removeClass("active");
+        $(this).css('display', 'none');
         $(this).removeClass("hid");
     });
 
     $("#keterangan_button").click(function() {
-        $("#btn-hide-all").toggleClass("hid")
+        $("#btn-hide-all").css('display', 'block');
+        // $("#btn-hide-all").toggleClass("hid");
     });
 
     $("#perbaikan_manage").click(function() {
-        $("#btn-hide-all").toggleClass("hid")
+        $("#btn-hide-all").css('display', 'block');
+        // $("#btn-hide-all").toggleClass("hid");
     });
 
     function gas_all() {