Skip to content

O
OKU-GIS
Commit f7c61c39 authored by Manggar Mahardhika's avatar Manggar Mahardhika
Browse files
Options

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

parents 6751c71a fe5ca450
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 343 additions and 218 deletions
Application/views.py
View file @ f7c61c39
......@@ -509,11 +509,15 @@ class Dashboard(generic.TemplateView):
'kecamatan':j[8],
}
res_all.append(data_all)
perm_group = []
if request.user.is_authenticated:
current_user = request.user
thisUser = current_user.id
for xx in request.user.get_group_permissions():
perm_group.append(xx.split(".")[1])
if thisUser == None:
user_data = {"filepath":'placeholder.jpg'}
else:
......@@ -582,7 +586,7 @@ class Dashboard(generic.TemplateView):
auth_group ag
WHERE
au.id = aug.user_id AND
ag.id = aug.group_id AND
ag.id = aug.group_id
ORDER BY
au.username ASC"""
userlist_.execute(sql)
......@@ -626,6 +630,7 @@ class Dashboard(generic.TemplateView):
'global':all[0],
'res_all':res_all,
'thisUser' : user_data,
'perm_group' : perm_group
# 'user_res':user_res
}
return render (request, self.template_name, context)
......
templates/includes/js-m.html
View file @ f7c61c39
This diff is collapsed.
templates/includes/js-o.html
View file @ f7c61c39
This diff is collapsed.
templates/includes/permission.html 0 → 100644
View file @ f7c61c39
<script>
var list_perm = []
</script>
{% for p in perm_group %}
<script>
var perm = "{{p}}"
list_perm.push(perm)
</script>
{% endfor %}
<script>
if (list_perm.indexOf('add_roads') >= 0 === false) {
$(".btn_create_jalan").remove();
}
if (list_perm.indexOf('add_bangunan') >= 0 === false) {
$(".btn_create_bangunan").remove();
}
if (list_perm.indexOf('add_kantor_administrasi') >= 0 === false || list_perm.indexOf('add_layanan_kesehatan') >= 0 === false || list_perm.indexOf('add_puskesmas') >= 0 === false || list_perm.indexOf('add_rumah_sakit') >= 0 === false || list_perm.indexOf('add_sarana_ibadah') >= 0 === false || list_perm.indexOf('add_sarana_pendidikan') >= 0 === false || list_perm.indexOf('add_stasiun') >= 0 === false || list_perm.indexOf('add_terminal_bus') >= 0 === false || list_perm.indexOf('add_cagar_budaya') >= 0 === false || list_perm.indexOf('add_gardu_listrik') >= 0 === false) {
$(".btn_create_point").remove();
}
if (list_perm.indexOf('add_roads') >= 0 === false && list_perm.indexOf('add_bangunan') >= 0 === false && list_perm.indexOf('add_kantor_administrasi') >= 0 === false || list_perm.indexOf('add_layanan_kesehatan') >= 0 === false || list_perm.indexOf('add_puskesmas') >= 0 === false || list_perm.indexOf('add_rumah_sakit') >= 0 === false || list_perm.indexOf('add_sarana_ibadah') >= 0 === false || list_perm.indexOf('add_sarana_pendidikan') >= 0 === false || list_perm.indexOf('add_stasiun') >= 0 === false || list_perm.indexOf('add_terminal_bus') >= 0 === false || list_perm.indexOf('add_cagar_budaya') >= 0 === false || list_perm.indexOf('add_gardu_listrik') >= 0 === false) {
$("#modal_option_create").remove();
}
</script>
\ No newline at end of file
templates/layout/layout.html
View file @ f7c61c39
......@@ -49,23 +49,20 @@
font-family: 'gilroyultralight';
src: url('/static/css/Gilroy-UltraLight.woff') format('woff');
}
/* start hide fitur modal */
.tab_kdb_klb {
display: none;
}
.btn_create_lahan{
.btn_create_lahan {
display: none;
}
.btn_cek_KDBKLB{
.btn_cek_KDBKLB {
display: none;
}
/* end hide fitur modal */
</style>
{% include 'includes/css-o.html' %} {% include 'includes/css-m.html' %}
......@@ -142,7 +139,7 @@
<div class="content">
<div id="map">
<div class="help_bangunan" style="position: absolute;z-index: 999;top: 0px;right: 60px;"></div>
<div class="row" style="margin-top: 20px;">
<div class="col-sm-4 head">
......@@ -187,8 +184,8 @@
</div>
</div>
<!-- </div> -->
<!-- </div> -->
<!-- <div class="row" id="searchbar" style="margin-top: 2%;">
<div class="col-sm-4 head">
......@@ -248,16 +245,16 @@
</button>
</span>
</div> -->
<!-- </div> -->
<!-- </div> -->
<!-- <div class="col-md-6 col-md-offset-3 modal-login input-group content-group foot centered" style="z-index: 999;">
<div class="row row-full-height" style="width: 100%;margin-left: 10px;"> -->
{% if user.is_authenticated %} {% else %}
<div class="col-md-6 col-md-offset-3 modal-login input-group content-group foot centered" style="height: fit-content;">
<div class="row row-full-height">
<div class="col-md-1 col-sm-12">
<img src="/static/img/logo-ok.png" alt="" class="img-centered" style="max-height: 28px;max-width: 21.999998092651367px;/* left: 27px; *//* top: 14px; */border-radius: 0px;">
......@@ -273,10 +270,10 @@
<a href="{% url 'login' %}" class="btn btn-primary vertical-centered" id="btn-signin">SIGN IN</a>
</div>
</div>
</div>
</div>
{% endif %}
</div>
<!-- <div class="col-md-6 col-md-offset-3 modal-login input-group content-group foot centered" style="z-index: 999;">
<!-- <div class="col-md-6 col-md-offset-3 modal-login input-group content-group foot centered" style="z-index: 999;">
<div class="row row-full-height" style="width: 100%;margin-left: 10px;">
<div class="col-md-1">
<img src="/static/img/logo-ok.png" alt="" class="img-centered" style="max-height: 28px;max-width: 21.999998092651367px;/* left: 27px; *//* top: 14px; */border-radius: 0px;">
......@@ -295,7 +292,7 @@
</div> -->
{% if user.is_authenticated %}
<div class="user-p-nav" style="height: 10%;width: 10%;position: absolute;top: 30px;right: 65px;z-index: 999;">
<!-- <a href="#">
......@@ -440,9 +437,9 @@
<!-- /page content -->
</div>
{% include 'includes/modal.html' %}
<div class="modal fade" id="modal-kelurahan" tabindex="-1" role="dialog">
......@@ -873,8 +870,7 @@
</body>
</html>
{% include 'includes/js-o.html' %} {% include 'includes/js-m.html' %}
{% include 'includes/permission.html' %} {% include 'includes/js-o.html' %} {% include 'includes/js-m.html' %}
<script type="text/javascript" src="{% static 'js/action.js' %}"></script>
<script>
// start disabled inspect
......@@ -903,7 +899,7 @@
// end disabled inspect
var dar = null;
$('#search_spes li a').on('click', function() {
......@@ -916,7 +912,7 @@
$("#pilihcari").html('<i class="icon-home4 text-muted text-size-base" style="color: #5A9AFB;"></i>')
} else if (dar == ' Jalan') {
$("#pilihcari").html('<i class="icon-git-branch text-muted text-size-base" style="color: #5A9AFB;"></i>')
}else if (dar == ' Reset') {
} else if (dar == ' Reset') {
$("#pilihcari").html('')
}
});
......
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