Skip to content

O
OKU-GIS
Commit 2be5a845 authored by Fachri's avatar Fachri
Browse files
Options

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

# Conflicts:
#	static/css/layout-style.css
#	templates/layout/layout.html
parents 4cb87c94 8ecf5493
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4475 additions and 1789 deletions
API/urls.py
View file @ 2be5a845
......@@ -21,6 +21,9 @@ urlpatterns = [
path('editkependudukan/', views.editkependudukan, name='kependudukan'),
path('valideditkependudukan', views.valideditkependudukan, name='valideditkependudukan'),
path('editspo', views.editpointsearch, name='editspo'),
path('editkantor', views.editpointka, name='editkantor'),
path('editlakes', views.editpointlk, name='editlakes'),
path('editpks', views.editpointpks, name='editpks'),
......@@ -33,6 +36,7 @@ urlpatterns = [
path('edittr', views.editpointtr, name='edittr'),
path('editcb', views.editpointcb, name='editcb'),
path('saveeditspo', views.editsearchpoint, name='saveeditspo'),
path('rumahsakit', views.editrumahsakit, name='rumahsakit'),
path('cagarbudaya', views.editcagarbudaya, name='cagarbudaya'),
path('kantor', views.editkantoradmin, name='kantor'),
......@@ -55,6 +59,7 @@ urlpatterns = [
path('c_bangunan', views.createbang, name='c_bangunan'),
path('create-jalan', views.createjalan, name='create-jalan'),
path('create-point', views.createpoint, name='create-point'),
path('c_lahan', views.createlahan, name='c_lahan'),
path('edit-tuplah', login_required(views.edittuplah), name='edit-tuplah'),
path('edit-tuplah-valid', views.edittuplahvalid, name='edit-tuplah-valid'),
......@@ -75,6 +80,7 @@ urlpatterns = [
path('search_lanjut', views.search_lanjut, name='search_lanjut'),
path('load_point_id', views.load_point_id),
path('edit_detail_poin', views.edit_detail_poin),
path('dpoint', views.dpoint, name='dpoint'),
path('download_perbaikan_data', views.download_perbaikan_data)
]
\ No newline at end of file
API/views.py
View file @ 2be5a845
This diff is collapsed.
Application/views.py
View file @ 2be5a845
......@@ -619,8 +619,8 @@ class Dashboard(generic.TemplateView):
'gardu_listrik':gardu_listrik_result,
'global':all[0],
'res_all':res_all,
'thisUser' : user_data
# ,'user_res':user_res
'thisUser' : user_data,
# 'user_res':user_res
}
return render (request, self.template_name, context)
......
myauth/views.py
View file @ 2be5a845
......@@ -49,7 +49,7 @@ class HomeView(View):
class CustomLogoutView(LogoutView):
template_name = 'user/login.html'
next_page = 'login'
next_page = '/'
class Userprofile(generic.TemplateView):
template_name = 'user/user_profile.html'
......@@ -234,6 +234,7 @@ def addUser(request):
password = request.POST.get('username')
iduser = request.POST.get('id')
isStaff = request.POST.get('isStaff')
phone = request.POST.get('phone')
# arrGroup = group.split("~")
......@@ -245,10 +246,11 @@ def addUser(request):
try:
if iduser:
with conn.cursor() as cursor:
cursor.execute("UPDATE auth_user SET first_name = '"+first_name+"', last_name = '"+last_name+"', email = '"+email+"' WHERE id="+iduser)
cursor.execute("UPDATE auth_user SET first_name = '"+first_name+"', last_name = '"+last_name+"', email = '"+email+"', phone = '"+phone+"' WHERE id="+iduser)
with conn.cursor() as curGroup:
curGroup.execute("DELETE FROM auth_user_groups WHERE user_id="+iduser)
if group != 'none':
with conn.cursor() as curGroup:
curGroup.execute("DELETE FROM auth_user_groups WHERE user_id="+iduser)
users = User.objects.get(username=usernames)
......@@ -282,13 +284,19 @@ def addUser(request):
user.password = make_password(password)
user.save()
# add user to group
userinsert = User.objects.get(username=usernames)
insertgroups = Group.objects.get(name=group)
insertgroups.user_set.add(userinsert)
# add phone
with conn.cursor() as cursor:
cursor.execute("UPDATE auth_user SET phone = '%s' WHERE username = '%s' and first_name = '%s' and last_name = '%s'"%(phone, usernames, first_name, last_name))
print(user)
data = {
"code" : 0,
......@@ -364,7 +372,7 @@ def deactivateUser(request):
# # print(type(status)+status)
# # print(type(True))
# print(status == 'True')
if status == 'True':
if status == 'true':
sql = "f"
else:
sql = "t"
......@@ -424,7 +432,8 @@ def loadUserbyId(request):
"last" : rows[2],
"group" : group_res,
"is_staff" : rows[9],
"filepath" : rows[11]
"filepath" : rows[11],
"phone" : rows[12]
}
user_res.append(datas)
......
static/css/layout-style.css
View file @ 2be5a845
......@@ -853,6 +853,43 @@ li.active>a:after {
}
input#change_stat {
display: block!important;
}
#help>div:nth-child(3)>div>div.panel.panel-flat.panel-collapsed>div.panel-body>table>tbody>tr {
border-top: 20px solid white;
}
#create,
#create-jal {
border: transparent;
border-radius: 5px;
margin: 10px;
}
#map-create-all>div.leaflet-control-container>div.leaflet-top.leaflet-left>div:nth-child(1)>div>div>a.leaflet-draw-draw-marker {
width: 100%!important;
padding: 0px!important;
}
#informasi_create>div {
margin: 10px;
}
.navbar .navbar-inverse {
display: none
}
.page-content {
display: table;
}
body>ul>li.fixed-plugin.no3d.overlay-cek>div.dropdown.show-dropdown.open>ul {
width: 300px;
margin-left: -270px!important;
}
@media (max-width: 1025px) {
.dock {
position: absolute;
......@@ -905,4 +942,135 @@ li.active>a:after {
margin-left: auto !important;
margin-right: auto !important;
}
}
@media (max-width: 720px) {
/* html {
transform: rotate(-90deg);
transform-origin: left top;
width: 100vh;
height: 100vw;
overflow-x: hidden;
position: absolute;
top: 100%;
left: 0;
} */
.dock {
position: absolute;
top: -4px;
left: 95%;
}
#map>div.leaflet-control-container>div.leaflet-bottom.leaflet-right {
right: 5px;
}
#map .head {
top: 1%!important;
}
.dock {
left: 93%;
}
.navbar .navbar-inverse {
display: block
}
#map>div.row>div.col-sm-4.input-group.content-group.head {
width: 80%;
margin-top: -15px;
margin-left: 60px;
}
.user-p-nav {
display: none
}
li.fixed-plugin .dropdown-menu {
transform: scale(0.769230);
float: right;
position: absolute;
right: -550px;
width: 190px;
margin-left: -175px !important;
margin-top: -137px !important;
top: 20px;
margin-right: -550px;
}
li.overlay-cek .dropdown-menu {
transform: scale(0.769230);
float: right;
position: absolute;
right: -550px;
width: 190px;
margin-left: -175px !important;
margin-top: -127px !important;
top: 13px;
margin-right: -550px;
}
.menu-heading {
color: black;
}
.menu-list>a>img {
min-width: 120px!important;
min-height: 20px!important;
max-height: 90px!important;
}
#bottom-tab2>div>div:nth-child(2) {
display: none;
}
#panel-sm {
width: 100%!important;
top: 0px;
}
#panel-sm>div {
margin-left: 0px
}
body>div.page-container>div>div.sidebar.sidebar-main {
/* transform: rotate( 270deg);
height: 100%;
float: right;
margin-left: 282px;
top: -290px; */
display: block;
}
#bottom-tab1>div {
margin-left: 10px;
}
#bottom-tab1>div>div.col-sm-2 {
display: none;
}
#bottom-tab2>div>div:nth-child(4) {
margin-left: 18px;
}
#bottom-tab2>div>div {
margin-left: 10px;
}
#panel-sm>div>div.bod>div>ul {
background: #1B1F2D;
}
#panel-sm>div>div.bod>div>ul>li.active>a {
background: #353847;
}
#panel-sm>div>div.bod>div>ul {
border-top: none;
border-left: none;
}
#panel-sm>div>div.bod>div>div {
margin-left: 10px;
}
body>ul>li.fixed-plugin.no3d.overlay-cek>div.dropdown.show-dropdown.open>ul {
width: 270px!important;
margin-left: -245px!important;
}
body>div.page-container>div>div.sidebar.sidebar-main>div.sidebar-category.sidebar-category-visible>div>ul:nth-child(1) {
margin-bottom: 47vh!important;
}
body>div.page-container>div>div.sidebar.sidebar-main>div.sidebar-category.sidebar-category-visible>div>ul:nth-child(2)>li:nth-child(1)>a {
display: none
}
.modal-dialog {
margin-top: 0px;
top: 7%!important;
}
.modal-content {
margin-left: 20px!important;
}
#modal_detail_non_kelurahan>div>div>div.modal-body>fieldset>div>div:nth-child(2)>div>div {
margin-left: 5px
}
}
\ No newline at end of file
static/css/st.css 0 → 100644
View file @ 2be5a845
#map-jalan>div.leaflet-control-container>div.leaflet-top.leaflet-left>div>div {
display: none;
}
#tbody_user_list>tr>td.text-center>div>div.col-md-6.text-right>a>i {
font-size: 16px!important;
top: -3px;
}
.switch_custom {
position: relative;
display: inline-block;
width: 36px;
height: 20px;
}
.switch_custom input {
opacity: 0;
width: 0;
height: 0;
}
.slider {
position: absolute;
cursor: pointer;
top: 0;
left: 0;
right: 0;
bottom: 0;
background-color: rgb(59, 62, 71);
-webkit-transition: .4s;
transition: .4s;
}
.slider:before {
position: absolute;
content: "";
height: 18px;
width: 18px;
left: 1px;
bottom: 1px;
background-color: white;
-webkit-transition: .4s;
transition: .4s;
}
input:checked+.slider {
background-color: #2196F3;
}
input:focus+.slider {
box-shadow: 0 0 1px #2196F3;
}
input:checked+.slider:before {
-webkit-transform: translateX(16px);
-ms-transform: translateX(16px);
transform: translateX(16px);
}
/* Rounded sliders */
.slider.round {
border-radius: 34px;
}
.slider.round:before {
border-radius: 50%;
}
#user_profile>.table-sm>thead>tr>th,
.table-sm>tbody>tr>th,
.table-sm>tfoot>tr>th,
.table-sm>thead>tr>td,
.table-sm>tbody>tr>td,
.table-sm>tfoot>tr>td {
padding: 13px 20px;
}
\ No newline at end of file
static/img/icon-1/MapTrifold.svg
View file @ 2be5a845
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M12 23L4 25V7L12 5" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M20 27L12 23V5L20 9V27Z" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M20 9L28 7V25L20 27" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
<svg width="26" height="26" viewBox="0 0 26 26" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M9.75 18.6875L3.25 20.3125V5.6875L9.75 4.0625" stroke="#E86250" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M16.25 21.9375L9.75 18.6875V4.0625L16.25 7.3125V21.9375Z" stroke="#E86250" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M16.25 7.3125L22.75 5.6875V20.3125L16.25 21.9375" stroke="#E86250" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
</svg>
static/img/icon-1/Vector2d.svg 0 → 100644
View file @ 2be5a845
<svg width="24" height="19" viewBox="0 0 24 19" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M3.07985 17.7188L20.6739 17.7188C21.6456 17.7188 22.4333 16.931 22.4333 15.9593V3.64348C22.4333 2.67179 21.6456 1.88407 20.6739 1.88407L3.07985 1.88407C2.10816 1.88407 1.32045 2.67179 1.32045 3.64348V15.9593C1.32045 16.931 2.10816 17.7188 3.07985 17.7188Z" stroke="#212232" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
</svg>
static/js/action.js
View file @ 2be5a845
This diff is collapsed.
static/js/maps.js
View file @ 2be5a845
......@@ -24,14 +24,18 @@ $("#sidebar").hide()
maps = L.tileLayer('https://api.mapbox.com/styles/v1/{id}/tiles/{z}/{x}/{y}?access_token=pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4NXVycTA2emYycXBndHRqcmZ3N3gifQ.rJcFIG214AriISLbB6B5aw', { id: 'mapbox/light-v9', tileSize: 512, zoomOffset: -1 }).addTo(map);
OpenStreetMap.onclick = function() {
maps = L.tileLayer("https://mt1.google.com/vt/lyrs=m&x={x}&y={y}&z={z}&s=Gal&apistyle=s.t:0|s.e:l|p.v:off", {
map.removeLayer(maps)
//maps = L.tileLayer("https://mt1.google.com/vt/lyrs=m&x={x}&y={y}&z={z}&s=Gal&apistyle=s.t:0|s.e:l|p.v:off", {
maps = L.tileLayer("https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", {
maxZoom: 22,
minZoom: 3,
}).addTo(map);
};
WorldImagery.onclick = function() {
// https://{s}.tiles.wmflabs.org/osm-no-labels/{z}/{x}/{y}.png
map.removeLayer(maps)
// https://{s}.tiles.wmflabs.org/osm-no-labels/{z}/{x}/{y}.png
maps = L.tileLayer("https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}", {
maxZoom: 22,
minZoom: 3,
......@@ -39,12 +43,17 @@ WorldImagery.onclick = function() {
};
BingSatellite.onclick = function() {
map.removeLayer(maps)
maps = L.tileLayer.bing({ bingMapsKey: BING_KEY, maxNativeZoom: 22 }).addTo(map);
setTimeout(function() {
$('.leaflet-bottom.leaflet-right>.leaflet-control-attribution.leaflet-control').html(`Powered by <a href="https://khansia.co.id" target="_blank">Khansia</a> with <a href="https://leafletjs.com" target="_blank">Leaflet</a>`)
}, 100);
};
GoogleSatellite.onclick = function() {
map.removeLayer(maps)
maps = L.tileLayer('http://mt0.google.com/vt/lyrs=y&hl=en&x={x}&y={y}&z={z}&s=Gal&apistyle=s.t:0|s.e:l|p.v:off', {
maxZoom: 22,
minZoom: 4,
......
static/js/pages/form_checkboxes_radios.js
View file @ 2be5a845
/* ------------------------------------------------------------------------------
*
* # Styled checkboxes, radios and file input
*
* Specific JS code additions for form_checkboxes_radios.html page
*
* Version: 1.0
* Latest update: Aug 1, 2015
*
* ---------------------------------------------------------------------------- */
*
* # Styled checkboxes, radios and file input
*
* Specific JS code additions for form_checkboxes_radios.html page
*
* Version: 1.0
* Latest update: Aug 1, 2015
*
* ---------------------------------------------------------------------------- */
$(function() {
......@@ -21,7 +21,8 @@ $(function() {
elems.forEach(function(html) {
var switchery = new Switchery(html);
});
} else {
}
else {
var elems = document.querySelectorAll('.switchery');
for (var i = 0; i < elems.length; i++) {
var switchery = new Switchery(elems[i]);
......@@ -29,28 +30,8 @@ $(function() {
}
// Colored switches
/* ini ngaruh sama element yang punya class "switchery-" */
var primary = document.querySelectorAll("[class^=switchery-");
/* ------------------- */
console.log(primary);
var switcheryCustom = document.querySelector('.switchery-custom');
var switchery = new Switchery(switcheryCustom, { color: '#5A9AFB', secondaryColor: '#3B3E47', jackColor: '#fff', jackSecondaryColor: '#fff' });
// var switchery = new Switchery(primary[0], { color: '#2196F3' });
/* inisialisasi switchery buat class "switchery-" */
for (var z = 0; z < primary.length; z++) {
var switchery = new Switchery(primary[z], { color: '#5A9AFB', secondaryColor: '#3B3E47', jackColor: '#fff', jackSecondaryColor: '#fff' });
}
/* ------------------ */
var switcheryCustom1 = document.querySelector('.switchery-custom1');
var switchery = new Switchery(switcheryCustom1, { color: '#5A9AEB', secondaryColor: '#3B3E47', jackColor: '#fff', jackSecondaryColor: '#fff' });
// var switchery = new Switchery(primary, { color: '#2196F3' });
var primary = document.querySelector('.switchery-primary');
var switchery = new Switchery(primary, { color: '#2196F3' });
var danger = document.querySelector('.switchery-danger');
var switchery = new Switchery(danger, { color: '#EF5350' });
......@@ -59,7 +40,7 @@ $(function() {
var switchery = new Switchery(warning, { color: '#FF7043' });
var info = document.querySelector('.switchery-info');
var switchery = new Switchery(info, { color: '#00BCD4' });
var switchery = new Switchery(info, { color: '#00BCD4'});
......@@ -124,5 +105,5 @@ $(function() {
// ------------------------------
$(".switch").bootstrapSwitch();
});
\ No newline at end of file
});
templates/includes/css-o.html
View file @ 2be5a845
......@@ -67,7 +67,6 @@
.active {
display: block;
}
/* #button_hide {
line-height: 15px;
width: 40px;
......@@ -139,10 +138,134 @@
display: none!important;
}
</style>
{% if user.is_authenticated %}
<style>
#btn_perbaikan_jalan {
display: block;
}
.btn_action {
display: block;
}
#btn_edit_bangunan {
display: block;
}
#btn_delete_bangunan {
display: block;
}
#btn_edit_kelurahan {
display: block;
top: 5px;
}
#btn_edit_kelurahan :hover {
border-color: #DADCE0;
background-color: #F1F3F4;
}
#btn_edit_tuplah {
display: block;
}
#btn_jalan {
display: block;
}
#btn_edit_gl {
display: block;
}
#btn_edit_lk {
display: block;
}
#btn_edit_puskes {
display: block;
}
#btn_edit_adm {
display: block;
}
#btn_delete_adm {
display: block;
}
#btn_edit_rs {
display: block;
}
#btn_edit_si {
display: block;
}
#btn_edit_sp {
display: block;
}
#btn_edit_spbu {
display: block;
}
#btn_edit_st {
display: block;
}
#btn_edit_tr {
display: block;
}
#btn_edit_cb {
display: block;
}
#btn_detail_per_bang {
display: block;
}
#btn_perbaikan_bangunan {
display: block;
}
#btn_upload_tampak {
display: block;
}
#map>div.leaflet-control-container>div.leaflet-bottom.leaflet-right {
right: 65px;
}
#map>div.leaflet-control-container>div.leaflet-bottom.leaflet-right>div.leaflet-control-attribution.leaflet-control {
right: 0px;
}
</style>
{% else %}
<style>
.tombol_save_create {
display: none;
}
.tombol-edit {
display: none;
}
#btn_perbaikan_jalan {
display: none;
}
.btn_action {
display: none;
}
#btn_edit_bangunan {
display: none;
}
#btn_delete_bangunan {
display: none;
}
......@@ -151,8 +274,8 @@
display: none;
top: 5px;
}
#btn_edit_kelurahan :hover{
#btn_edit_kelurahan :hover {
border-color: #DADCE0;
background-color: #F1F3F4;
}
......@@ -184,6 +307,7 @@
#btn_edit_adm {
display: none;
}
#btn_delete_adm {
display: none;
}
......@@ -215,20 +339,22 @@
#btn_edit_cb {
display: none;
}
#btn_detail_per_bang {
display: none;
}
#btn_perbaikan_bangunan {
display: none;
}
#btn_upload_tampak {
display: none;
}
.leaflet-popup{
.leaflet-popup {
display: none;
}
</style>
\ No newline at end of file
</style>
{% endif %}
\ No newline at end of file
templates/includes/js-m.html
View file @ 2be5a845
This source diff could not be displayed because it is too large. You can view the blob instead.
templates/includes/js-o.html
View file @ 2be5a845
This source diff could not be displayed because it is too large. You can view the blob instead.
templates/includes/modal.html
View file @ 2be5a845
This diff is collapsed.
templates/includes/plugin.html
View file @ 2be5a845
......@@ -4,15 +4,14 @@
<div class="dropdown show-dropdown">
<a href="#" type="checkbox">
<input type="checkbox" name="checkbox" onclick="mapsganti()" id="mapschange" style="position: absolute;opacity: 0;width: 40px;height: 40px;margin-top: -5px;">
<input type="checkbox" name="checkbox" onclick="mapsganti()" id="mapschange" style="position: absolute;opacity: 0;width: 50px;height: 50px;margin-top: 0px;z-index:2;cursor: pointer;">
<div id="labelchange">
<img src="{% static 'img/icon-1/Vector3d.svg' %}" alt="" style="height: 50px;
width: 50px;">
</div>
</a>
</div>
<span class="tooltiptext tooltip-left" style="font-family: 'gilroysemibold';
<span class="tooltiptext tooltip-left tooltip-3d" style="font-family: 'gilroysemibold';
color: #085E8C;">3D</span>
</li>
......@@ -72,16 +71,17 @@
</ul>
</div>
</li>
<li class="fixed-plugin no3d" style="top: 170px;">
<li class="fixed-plugin no3d overlay-cek" style="top: 170px;">
<span class="tooltiptext tooltip-left" style="font-family: 'gilroysemibold';color: #6D3FDE;">Overlay</span>
<div class="jumlah-ceklis">
</div>
<div class="dropdown show-dropdown ">
<a href="#" data-toggle="dropdown">
<img src="{% static 'img/icon-1/Vectoroverlay.svg' %}" alt="" style="height: 50px;
width: 50px;">
</a>
<ul class="dropdown-menu" style="top: 12px;
width: 300px;
margin-left: -270px!important;">
<ul class="dropdown-menu">
<li class="header-title text-center">Sidebar Filters</li>
<!-- <div id="sidebar" onmouseleave="overll()">
<div class="sidebar-wrapper">
......@@ -101,7 +101,7 @@
<div class="checkbox">
<label>
<input type="checkbox" id="geo_building" style="margin-top:2px;">
<input type="checkbox" id="geo_building" onclick="georumah()" style="margin-top:2px;">
<img src="/static/img/icon-1/Buildingsbangunan.svg" alt="" style="margin-top: -5px;">
<span>
Bangunan
......
templates/includes/sidebar.html
View file @ 2be5a845
......@@ -9,13 +9,24 @@
border-bottom: 0.5pt solid #313649;
}
</style>
<!-- <div class="navbar navbar-inverse" style="z-index: 1;
top: 45px;
position: absolute;
background: none;border-color: transparent;">
<div class="navbar-header" style="min-width: 0px;">
<ul class="nav navbar-nav visible-xs-block">
<li><a class="sidebar-mobile-main-toggle" style="border-radius: 5px;"><i class="icon-paragraph-justify3"></i></a></li>
</ul>
</div>
</div> -->
<div class="sidebar sidebar-main">
<div class="sidebar-content">
<img src="{% static 'img/logo-ok.png' %}" alt="" style="width: 25px;height:32px;">
</div>
<div class="sidebar-category sidebar-category-visible">
<div class="category-content no-padding">
<ul class="navigation navigation-main navigation-accordion" style="margin-bottom: 45vh;">
<ul class="navigation navigation-main navigation-accordion" style="margin-bottom: 40vh;">
<!-- Main -->
<li id="button_keterangan">
......@@ -29,19 +40,19 @@
</a>
</li>
<li style="margin-top: 60vh;position: absolute;">
<a href="#" id="btn-hide-all" class="side-bar-but" style="position: absolute;margin-top: 20px; display: block!important;">
<i class="icon-arrow-right13"></i>
<a href="#" id="btn-hide-all" class="side-bar-but" style="position: absolute; margin-top: 0px; display: none;">
<i class="icon-arrow-left12"></i>
</a>
</li>
</ul>
<ul class="navigation navigation-main navigation-accordion">
<!-- <li>
<a href="#" class="side-bar-but">
<ul class="navigation navigation-main navigation-accordion" style="height: 100px;">
<li>
<a href="#" class="side-bar-but" data-toggle="modal" data-target="#modal_help" data-backdrop="static" data-keyboard="false">
<img src="{% static 'img/icon-1/Vectoriconwarning.svg' %}" alt="" style="height: 17.875003814697266px;width: 17.875003814697266px;margin-left: -8px;">
</a>
</li> -->
</li>
<li>
<a href="{% url 'logout' %}" class="side-bar-but">
<img src="{% static 'img/icon-1/Vectoriconlogout.svg' %}" alt="" style="height: 17.875003814697266px;width: 17.875003814697266px;margin-left: -8px;">
......@@ -352,8 +363,8 @@
<div class="col-sm-2">
<div class="checkbox checkbox-switchery">
<label>
<input type="checkbox" class="switchery-custom" id="cabud" onclick="cb100()">
</label>
<input type="checkbox" class="switchery-custom" id="cabud" onclick="cb100()">
</label>
</div>
</div>
......@@ -413,7 +424,7 @@
<div class="form-group" style="margin-top: 15px;width: 98%;">
<select name="select" id="sel-kec" class="form-control input-sm" style="background-color: #393E54;border-radius: 8px;border-color: #393E54;color: white;">
<option>Pilih Kecamatan</option>
<option value="all_kecamatan">Pilih Kecamatan</option>
{% for nama_kecamatan in kecamatan %}
<option value="{{nama_kecamatan.administrasi.f1}}">{{nama_kecamatan.administrasi.f2}}</option>
{% endfor %}
......@@ -686,18 +697,23 @@
},
dataType: 'json',
success: function(data) {
if (data['res_kel'] == 'all_kecamatan') {
$('#sel-desa').html(`<option>Pilih Desa</option>`);
} else {
var data_all_desa = []
for (var i = 0; i < data['res_kel'].length; i++) {
var id_k = data['res_kel'][i][0];
var data_k = data['res_kel'][i][1];
var data_kel = `<option value="` + id_k + ` ">` +
data_k +
`</option>`;
data_all_desa.push(data_kel)
};
$('#sel-desa').html(`<option>Pilih Desa</option>` + data_all_desa);
}
var data_all_desa = []
for (var i = 0; i < data['res_kel'].length; i++) {
var id_k = data['res_kel'][i][0];
var data_k = data['res_kel'][i][1];
var data_kel = `<option value="` + id_k + ` ">` +
data_k +
`</option>`;
data_all_desa.push(data_kel)
};
$('#sel-desa').html(`<option>Pilih Desa</option>` + data_all_desa);
var data_perbaikan = []
var number = 0;
......@@ -1170,7 +1186,7 @@
$("#manage_perbaikan").removeClass("active");
$("#panel-sm").removeClass("active");
$("#panel-sm2").removeClass("active");
$(this).css('display', 'none');
$(this).removeClass("hid");
});
......@@ -1179,7 +1195,7 @@
$("#manage_perbaikan").removeClass("active");
$("#panel-sm").removeClass("active");
$("#panel-sm2").removeClass("active");
$(this).css('display', 'none');
$(this).removeClass("hid");
};
......
templates/layout/layout.html
View file @ 2be5a845
This source diff could not be displayed because it is too large. You can view the blob instead.
templates/layout/user_layout.html
View file @ 2be5a845
......@@ -632,7 +632,8 @@
<label class="col-lg-3 control-label lbl-top">Groups</label>
<div class="col-lg-9">
<select style="border-bottom: 1px solid rgb(83, 83, 83) !important;" id="select_group" data-placeholder="select group.." class="select-size-xs">
<option></option>
<option value="Select Group"></option>
</select>
</div>
</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