diff --git a/API/__pycache__/__init__.cpython-37.pyc b/API/__pycache__/__init__.cpython-37.pyc index 9186ff83ebfe5734d5e163009fce56db9dc44425..079776e71891b99c7717c65e820a023128401816 100644 Binary files a/API/__pycache__/__init__.cpython-37.pyc and b/API/__pycache__/__init__.cpython-37.pyc differ diff --git a/API/__pycache__/admin.cpython-37.pyc b/API/__pycache__/admin.cpython-37.pyc index 7035ca50ef7296f20222a77195ae4d4acd25ed72..d7733ff3aa4af215842218e8454fb7b72c28b3fc 100644 Binary files a/API/__pycache__/admin.cpython-37.pyc and b/API/__pycache__/admin.cpython-37.pyc differ diff --git a/API/__pycache__/apps.cpython-37.pyc b/API/__pycache__/apps.cpython-37.pyc index 3cd93f92a9e0a99bb9f440ff42e204d2db692a52..c4b1f380a63db25f70ce1a03bda551085dd1e879 100644 Binary files a/API/__pycache__/apps.cpython-37.pyc and b/API/__pycache__/apps.cpython-37.pyc differ diff --git a/API/__pycache__/models.cpython-37.pyc b/API/__pycache__/models.cpython-37.pyc index 6f490ca79b443da8dfe0464c67336aa7e05924ff..7b1dddc40794fbc46bc13b7e4324a93e559c72c4 100644 Binary files a/API/__pycache__/models.cpython-37.pyc and b/API/__pycache__/models.cpython-37.pyc differ diff --git a/API/__pycache__/urls.cpython-37.pyc b/API/__pycache__/urls.cpython-37.pyc index 1aa3cd7a292a48912abef1fe1bfed928dd21d0c1..0c1bb28022e9dece7c47c1e16a60419050049c70 100644 Binary files a/API/__pycache__/urls.cpython-37.pyc and b/API/__pycache__/urls.cpython-37.pyc differ diff --git a/API/__pycache__/views.cpython-37.pyc b/API/__pycache__/views.cpython-37.pyc index 082d70749c2f70e2871239472568421ac7f1c596..012a668cf53fabfd8eae845b5c86a84e4a55d3c5 100644 Binary files a/API/__pycache__/views.cpython-37.pyc and b/API/__pycache__/views.cpython-37.pyc differ diff --git a/API/migrations/__pycache__/__init__.cpython-37.pyc b/API/migrations/__pycache__/__init__.cpython-37.pyc index 145b941888a80bf78a4a732a16244d090cbe8d77..ed3e428ec67d23dfd6206869ad7bedf224c533c0 100644 Binary files a/API/migrations/__pycache__/__init__.cpython-37.pyc and b/API/migrations/__pycache__/__init__.cpython-37.pyc differ diff --git a/Application/__pycache__/__init__.cpython-37.pyc b/Application/__pycache__/__init__.cpython-37.pyc index 2aaf66853b2363ecccac12f8f27cf3855f681807..9f9182da8e8d6626fe98d195df8208b221f44ebd 100644 Binary files a/Application/__pycache__/__init__.cpython-37.pyc and b/Application/__pycache__/__init__.cpython-37.pyc differ diff --git a/Application/__pycache__/admin.cpython-37.pyc b/Application/__pycache__/admin.cpython-37.pyc index c23b38b591c5973788a87c6f21eeb2819eb1da5d..e6a2a1740ea7579df7aeca9b1557f6c715427c58 100644 Binary files a/Application/__pycache__/admin.cpython-37.pyc and b/Application/__pycache__/admin.cpython-37.pyc differ diff --git a/Application/__pycache__/apps.cpython-37.pyc b/Application/__pycache__/apps.cpython-37.pyc index 05c6b22638b73698fdd395a43f74b3e0b053a630..3cfaa2da630e8a3584d352d54f0476a23c6d8c8b 100644 Binary files a/Application/__pycache__/apps.cpython-37.pyc and b/Application/__pycache__/apps.cpython-37.pyc differ diff --git a/Application/__pycache__/edit.cpython-37.pyc b/Application/__pycache__/edit.cpython-37.pyc index ae01df0e319d0699820f291cb5d0359f136c193d..fec0a55e4d8030f5c3dbe3882aa6803b45b29fe4 100644 Binary files a/Application/__pycache__/edit.cpython-37.pyc and b/Application/__pycache__/edit.cpython-37.pyc differ diff --git a/Application/__pycache__/models.cpython-37.pyc b/Application/__pycache__/models.cpython-37.pyc index 2abcbafd75495876de38b34d3749760903bfe680..70003733ecb98b9e144bab053e6860f2706c531e 100644 Binary files a/Application/__pycache__/models.cpython-37.pyc and b/Application/__pycache__/models.cpython-37.pyc differ diff --git a/Application/__pycache__/urls.cpython-37.pyc b/Application/__pycache__/urls.cpython-37.pyc index 230d0914e18183f829334c782bf356eeb96f8073..51875bba0af8445100a47744aa6e83f16d127e80 100644 Binary files a/Application/__pycache__/urls.cpython-37.pyc and b/Application/__pycache__/urls.cpython-37.pyc differ diff --git a/Application/__pycache__/views.cpython-37.pyc b/Application/__pycache__/views.cpython-37.pyc index 12aaba6874d719132c25b3b75a151a11cae8d5e7..01c0853abc50f4aeb11c2531436c5d12d58dd483 100644 Binary files a/Application/__pycache__/views.cpython-37.pyc and b/Application/__pycache__/views.cpython-37.pyc differ diff --git a/Application/migrations/__pycache__/__init__.cpython-37.pyc b/Application/migrations/__pycache__/__init__.cpython-37.pyc index 19786633a66c55b326358c7d398abd064f74713b..9a6df95feccc9e2e3c635f925aa71c91e7a1f384 100644 Binary files a/Application/migrations/__pycache__/__init__.cpython-37.pyc and b/Application/migrations/__pycache__/__init__.cpython-37.pyc differ diff --git a/OKU/__pycache__/__init__.cpython-37.pyc b/OKU/__pycache__/__init__.cpython-37.pyc index 88d2c02c9e20ef75583125dd10d380dda3c4210c..b9d84411b2d32ff84fd05c4beafd7f1468177269 100644 Binary files a/OKU/__pycache__/__init__.cpython-37.pyc and b/OKU/__pycache__/__init__.cpython-37.pyc differ diff --git a/OKU/__pycache__/settings.cpython-37.pyc b/OKU/__pycache__/settings.cpython-37.pyc index a85f77a71142aedcdf354156da85cb2d8233bc0b..03f6f8ff57b40c1733e18349825313918274532f 100644 Binary files a/OKU/__pycache__/settings.cpython-37.pyc and b/OKU/__pycache__/settings.cpython-37.pyc differ diff --git a/OKU/__pycache__/urls.cpython-37.pyc b/OKU/__pycache__/urls.cpython-37.pyc index b8150125fb0537af4f9e6b94540284ab80642984..2fb05f429057a04642840821030a36c0a964ea0c 100644 Binary files a/OKU/__pycache__/urls.cpython-37.pyc and b/OKU/__pycache__/urls.cpython-37.pyc differ diff --git a/OKU/__pycache__/wsgi.cpython-37.pyc b/OKU/__pycache__/wsgi.cpython-37.pyc index faa1e0894e8452720db51135b69d120b6ebf6d6e..fd85a11ab133ee4742f2fcc1499bc6df2e98e58f 100644 Binary files a/OKU/__pycache__/wsgi.cpython-37.pyc and b/OKU/__pycache__/wsgi.cpython-37.pyc differ diff --git a/myauth/__pycache__/__init__.cpython-37.pyc b/myauth/__pycache__/__init__.cpython-37.pyc index 0d9f6fca7d084f35b71f24329203002fc1e6a403..2bf55a840c517412f06e09c4225cccf68a3d05db 100644 Binary files a/myauth/__pycache__/__init__.cpython-37.pyc and b/myauth/__pycache__/__init__.cpython-37.pyc differ diff --git a/myauth/__pycache__/admin.cpython-37.pyc b/myauth/__pycache__/admin.cpython-37.pyc index 1122c0cc6fb4de5734bdd485942fa8d380683850..f3b9c7e423741be9a74bae1edc3128e567a549ad 100644 Binary files a/myauth/__pycache__/admin.cpython-37.pyc and b/myauth/__pycache__/admin.cpython-37.pyc differ diff --git a/myauth/__pycache__/apps.cpython-37.pyc b/myauth/__pycache__/apps.cpython-37.pyc index 1f2830252a79c2f0af6697ac1b05c4c41bff4b06..a46f363714271a288b8c4afbe6d123e49f3517ba 100644 Binary files a/myauth/__pycache__/apps.cpython-37.pyc and b/myauth/__pycache__/apps.cpython-37.pyc differ diff --git a/myauth/__pycache__/models.cpython-37.pyc b/myauth/__pycache__/models.cpython-37.pyc index ad9cec08108fd0e7d5f6ed007a789a5559ba9aa7..fe706e18d4d55fc8ec93b0d3f926abe7c5bdeb54 100644 Binary files a/myauth/__pycache__/models.cpython-37.pyc and b/myauth/__pycache__/models.cpython-37.pyc differ diff --git a/myauth/__pycache__/views.cpython-37.pyc b/myauth/__pycache__/views.cpython-37.pyc index d924fb8f5289018efcd62d02a5a030942661c202..03600c35cbde3c08e7aa9c183cd4e241d2694f16 100644 Binary files a/myauth/__pycache__/views.cpython-37.pyc and b/myauth/__pycache__/views.cpython-37.pyc differ diff --git a/myauth/migrations/__pycache__/__init__.cpython-37.pyc b/myauth/migrations/__pycache__/__init__.cpython-37.pyc index 689b62d678eecac0970da0779f0b4145ab8d4cc9..7e0446113905bef63dcd974f1dde66c5826be102 100644 Binary files a/myauth/migrations/__pycache__/__init__.cpython-37.pyc and b/myauth/migrations/__pycache__/__init__.cpython-37.pyc differ diff --git a/static/js/action.js b/static/js/action.js index 40aeaca9d5f0e9141d809f1fbe43d04722f80234..92fd41b85ff49100bac0612ce15b2238a1edb7a5 100644 --- a/static/js/action.js +++ b/static/js/action.js @@ -1400,15 +1400,23 @@ function modal_detail_point_pengaturan(id, db) { var hasil = (JSON.stringify(poinin.toGeoJSON())) $("#coordinateZoneedit_p").val(hasil); }) - $("#edit_point_p").click(function() { - setTimeout(function() { - map_edit_p.invalidateSize(); - }, 1000); - }) } }); } + +$("#edit_point_p").click(function() { + $("#koordinat_cek_p").addClass("active") + $("#info_umum_p").removeClass("active") + $("#left-tab1-feas-upli").addClass("active") + $("#right-tab2-feas-upli").removeClass("active") + + setTimeout(function() { + map_edit_p.invalidateSize(); + }, 1000); +}) + + $("#saveuser").on("click", function() { var isObject = {}; var ars = '' diff --git a/static/js/scripts.js b/static/js/scripts.js index b0e187d252c46cf6903f5e7c06fa74cad9343df0..9b39e0cd43bbba0431a4e55d3bced5e9bfadb2e4 100644 --- a/static/js/scripts.js +++ b/static/js/scripts.js @@ -90,13 +90,38 @@ $("#button_hide_panel").click(function() { }) +var cek_layer_keterangan = 1 +var cek_layer_perbaikan = 0 + + $("#button_keterangan").click(function() { - $(".pace-done").toggleClass("sidebar-move") - $("#panel-samping").toggleClass("move"); - $(".mymodal").toggleClass("input_perbaikan") - $("#button_unhide_panel").toggleClass("move-btn"); + if (cek_layer_keterangan == 0){ + // $("#button_keterangan").removeClass("asctive"); + // $("#button_keterangan").removeAttr("class"); + $(".pace-done").toggleClass("sidebar-move") + + $("#panel-samping").toggleClass("move"); + $(".mymodal").toggleClass("input_perbaikan") + $("#button_unhide_panel").toggleClass("move-btn"); + $("#keterangan_button").css("background", "#353847") + $("#perbaikan_manage").css("background", "#1E2233") + cek_layer_keterangan = 1 + cek_layer_perbaikan = 0 + + }else{ + $("#button_keterangan").addClass("asctive"); + $("#keterangan_button").css("background", "#1E2233") + $("#manage_perbaikan").removeClass("active"); + $("#panel-sm").removeClass("active"); + $("#panel-sm2").removeClass("active"); + $("#panel-sm").css('display', 'none'); + cek_layer_keterangan = 0 + cek_layer_perbaikan = 0 + } }) +$("#button_keterangan").addClass("active"); + $("#button_unhide_panel").click(function() { @@ -108,13 +133,31 @@ $("#button_unhide_panel").click(function() { $("#manage_perbaikan").click(function() { - $(".pace-done").toggleClass("sidebar-move"); - $("#panel-samping").toggleClass("move"); - $(".mymodal").toggleClass("input_perbaikan"); - $("#button_unhide_panel").toggleClass("move-btn"); - - $("#perbaikan-dashboard").toggleClass("perbaikan-dashboard"); - + console.log('a') + if(cek_layer_perbaikan == 0){ + console.log('b') + cek_layer_perbaikan = 1 + cek_layer_keterangan = 0 + $(".pace-done").toggleClass("sidebar-move"); + $("#panel-samping").toggleClass("move"); + $(".mymodal").toggleClass("input_perbaikan"); + $("#button_unhide_panel").toggleClass("move-btn"); + $("#panel-sm2").addClass("active"); + $("#perbaikan_manage").css("background", "#353847") + $("#keterangan_button").css("background", "#1E2233") + + $("#perbaikan-dashboard").toggleClass("perbaikan-dashboard"); + }else{ + console.log('c') + cek_layer_perbaikan = 0 + cek_layer_keterangan = 0 + $("#perbaikan_manage").css("background", "#1E2233") + + $("#manage_perbaikan").addClass("active"); + $("#panel-sm").removeClass("active"); + $("#panel-sm2").removeClass("active"); + $("#panel-sm").css('display', 'none'); + } }) diff --git a/static/js/scripts_js_o.js b/static/js/scripts_js_o.js index a6aa501a7dde6003056a22c8bf6de51a5103a722..d4d12fab763ed770ff55154348a027e9bde4fa76 100644 --- a/static/js/scripts_js_o.js +++ b/static/js/scripts_js_o.js @@ -3757,6 +3757,13 @@ map.on('contextmenu', function(e) { $(".btn_create_jalan").click(function() { + + $("#tab_koor").addClass("active") + $("#tab_info").removeClass("active") + $("#koordinatjalan").addClass("active") + $("#informasi_create").removeClass("active") + + $("#create_all > div > ul").css("display", "block") $("#modal__create").modal("show"); $(".title-create").html("Create Jalan") @@ -3882,6 +3889,12 @@ map.on('contextmenu', function(e) { }) $(".btn_create_bangunan").click(function() { + $("#tab_koor").addClass("active") + $("#tab_info").removeClass("active") + $("#koordinatjalan").addClass("active") + $("#informasi_create").removeClass("active") + + $("#create_all > div > ul").css("display", "block") $("#modal__create").modal("show"); $(".title-create").html("Create Bangunan") @@ -4162,6 +4175,12 @@ map.on('contextmenu', function(e) { }); $(".btn_create_lahan").click(function() { + $("#tab_koor").addClass("active") + $("#tab_info").removeClass("active") + $("#koordinatjalan").addClass("active") + $("#informasi_create").removeClass("active") + + $("#create_all > div > ul").css("display", "block") $("#modal__create").modal("show"); $(".title-create").html("Create Lahan") @@ -4327,6 +4346,12 @@ map.on('contextmenu', function(e) { }); $(".btn_create_point").click(function() { + $("#tab_koor").addClass("active") + $("#tab_info").removeClass("active") + $("#koordinatjalan").addClass("active") + $("#informasi_create").removeClass("active") + + $("#modal__create").modal("show"); $(".title-create").html("Create Point") $(".tombol_action_create").html(``) diff --git a/templates/includes/modal.html b/templates/includes/modal.html index 8cc79c6c624f4536aaf37be7966e966e8d3fb402..6983ee9d75d384fee77c76808362e9652bfd96fc 100644 --- a/templates/includes/modal.html +++ b/templates/includes/modal.html @@ -2441,8 +2441,8 @@ <div class="tabbable"> <ul class="nav nav-tabs nav-tabs-bottom nav-justified"> - <li onclick="changetabs(this)" id="koordinat_cek" class="active"><a href="#left-tab1-feas-upli" data-toggle="tab">Koordinat</a></li> - <li onclick="changetabs(this)" id="info_umum"><a href="#right-tab2-feas-upli" data-toggle="tab">Informasi Umum</a></li> + <li onclick="changetabs(this)" id="koordinat_cek_p" class="active"><a href="#left-tab1-feas-upli" data-toggle="tab">Koordinat</a></li> + <li onclick="changetabs(this)" id="info_umum_p"><a href="#right-tab2-feas-upli" data-toggle="tab">Informasi Umum</a></li> </ul> <div class="tab-content">