Skip to content

O
OKU-GIS
Commit 19264452 authored by Muhamad's avatar Muhamad
Browse files
Options

Merge branch 'master' of http://git.khansia.co.id/Nahrowi/oku-gis 

# Conflicts:
#	API/__pycache__/views.cpython-37.pyc
#	API/urls.py
#	API/views.py
#	templates/includes/sidebar.html
#	templates/layout/layout.html
parents 192d9c39 f0d124c1
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2048 additions and 22 deletions
API/urls.py
View file @ 19264452
......@@ -63,11 +63,16 @@ urlpatterns = [
path('edit-jalan-valid', views.editjalanvalid, name='edit-jalan-valid'),
path('3d-maps', views.maps3d, name='3d-maps'),
path('deletejalan', views.deletejalan, name='hapus-jalan'),
path('filt_perbaikan_kecamatan', views.filt_perbaikan_kecamatan),
path('filt_perbaikan_desa', views.filt_perbaikan_desa),
path('user-data', views.user_data, name='user-data'),
path('deletejalan', views.deletejalan, name='hapus-jalan'),
path('search_spes', views.search_spes, name='search_spes'),
path('search_lanjut', views.search_lanjut, name='search_lanjut')
]
\ No newline at end of file
API/views.py
View file @ 19264452
This diff is collapsed.
templates/includes/js-m.html
View file @ 19264452
......@@ -628,7 +628,6 @@
}
}
$(document).on("click", "#btn_edit_adm", function() {
var map_edit = L.map('map-for-edit', {
editable: true,
......@@ -4426,13 +4425,10 @@
if ((checkBox1.checked == true) || (checkBox2.checked == true) || (checkBox3.checked == true) || (checkBox4.checked == true) || (checkBox5.checked == true) || (checkBox6.checked == true) || (checkBox7.checked == true) || (checkBox8.checked == true) || (checkBox9.checked == true) || (checkBox10.checked == true) || (checkBox11.checked == true) || (checkBox12.checked == true)) {
showlegend()
} else if ((checkBox1.checked == false) && (checkBox2.checked == false) && (checkBox3.checked == false) && (checkBox4.checked == false) && (checkBox5.checked == false) && (checkBox6.checked == false) && (checkBox7.checked == false) && (checkBox8.checked == false) && (checkBox9.checked == false) && (checkBox10.checked == false) && (checkBox11.checked == false) && (checkBox12.checked == false)) {
hidelegend()
}
}
......@@ -7165,11 +7161,11 @@
},
dataType: 'json',
success: function(data) {
console.log(data)
var data_all_kab = []
for (var i = 0; i < data['result'].length; i++) {
var data_id = data['result'][i][0];
var data_po = data['result'][i][1];
var data_kab = `<option value="` +data_id + `">` + data_po + `</option>`;
console.log(data_id)
console.log(data_po)
var data_kab = `<option value="` + data_id + `">` + data_po + `</option>`;
......
templates/includes/sidebar.html
View file @ 19264452
......@@ -48,6 +48,12 @@
</a>
</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>
</li>
</ul>
</div>
</div>
......
templates/layout/layout.html
View file @ 19264452
This source diff could not be displayed because it is too large. You can view the blob instead.
templates/user/login.html
View file @ 19264452
......@@ -56,7 +56,7 @@
</style>
</head>
<body style="background-image:url('../../static/img/bglog.PNG'); width: 100%; height: 100%; background-position: center; background-repeat: no-repeat; background-size: cover;">
<body style="background-image:url('../../static/img/bglog.PNG'); width: 100%; height: 100%; background-position: center; background-repeat: no-repeat; background-size: cover; overflow-x: hidden;">
<!-- <body style="background-color: gainsboro; width: 100%; height: 100%;"> -->
<!-- <body> -->
......@@ -152,7 +152,7 @@
</div>
<!-- <div class="background-image"></div> -->
<div>
<img src="../../static/img/indonesia-ter.PNG" alt="Image" style="margin-top: 4%; margin-bottom: 3%; margin-left: 36%; width:1028px; ">
<img src="../../static/img/indonesia-ter.PNG" alt="Image" style="margin-top: 4%; margin-bottom: 3%; margin-left: 38%; width:920px; ">
<span style="margin-top: 5%; margin-left: 45%; -webkit-filter: drop-shadow(5px 5px 5px #222); filter: drop-shadow(5px 5px 5px #222); width: 362px; color:#ffffff; font-family: 'Montserrat', light;">Fitur Teman-KU</span>
<img src="../../static/img/Group_68.png" alt="Image" style="margin-top: 2%; margin-left: 45%; -webkit-filter: drop-shadow(5px 5px 5px #222); filter: drop-shadow(5px 5px 5px #222);">
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment