Skip to content

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

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

parents 3ab7754e b7af101d
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 56 deletions
Application/views.py
View file @ 9e1c7e61
from django.http import response
from API.views import jalan
from django.contrib.auth.models import User, Group
from django.contrib.auth.models import User, Group, Permission
from django.shortcuts import render, redirect
# from django.views.generic import ListView, DetailView, DeleteView, UpdateView, CreateView
from django.views import View, generic
......
myauth/views.py
View file @ 9e1c7e61
......@@ -491,6 +491,8 @@ def loadGroupById(iduser):
# print(resGroup)
return resGroup
import json
from django.contrib.auth.models import Permission
@api_view(('POST',))
def addGroup(request):
......@@ -498,8 +500,9 @@ def addGroup(request):
name = request.POST.get('name')
idgroup = request.POST.get('id')
parent = request.POST.get('parent')
print(parent)
all_perm = request.POST.get('all_perm')
all_perm = json.loads(all_perm)
if parent != '':
for s in Group.objects.all():
if s.name == parent:
......@@ -560,6 +563,12 @@ def addGroup(request):
with conn.cursor() as cursor:
cursor.execute("INSERT INTO auth_group(name, have_parent) VALUES ('"+name+"', "+str(userGroup)+")")
result = cursor.rowcount
group = Group.objects.get(name=name)
for i in all_perm:
permiss = Permission.objects.get(codename=i)
group.permissions.add(permiss)
if result > 0:
data = {
......
static/js/action.js
View file @ 9e1c7e61
......@@ -241,7 +241,7 @@ function load_manage() {
number += 1;
var id = data['group'][i]['id'];
var name = data['group'][i]['name'];
var data_gab = `<tr>
<td>` + number + `</td>
<td>` + name + `</td>
......@@ -279,7 +279,7 @@ function load_manage() {
var switchery = new Switchery(primary_s[z], { color: '#5A9AFB', secondaryColor: '#3B3E47', jackColor: '#fff', jackSecondaryColor: '#fff' });
}
//endgroup
var data_point = []
var number2 = 0;
......@@ -826,7 +826,7 @@ function loadgroupbyid(id) {
$("#modal_edit_group").css('display', 'block');
$("#modal_edit_group").modal("show")
$(".modstit").html("Update Group")
// $("#ingroup").attr("disabled", true)
// $("#ingroup").attr("disabled", true)
let response = data;
......@@ -836,12 +836,12 @@ function loadgroupbyid(id) {
$("#ingroup").val(grup.name);
var gays = []
gays.push(grup.parent)
if (grup.parent == null){
if (grup.parent == null) {
loadparent()
} else {
loadparent(gays)
}
// if (user.is_staff) {
// $('input[name=isStaff][value=true]').attr('checked', true)
// } else {
......@@ -958,6 +958,7 @@ function gas_k_adm_perm() {
document.getElementById("delete_k_adm_perm").checked = false;
}
}
function gas_rs_perm() {
var checkBox = document.getElementById("rs_perm");
if (checkBox.checked == true) {
......@@ -971,6 +972,7 @@ function gas_rs_perm() {
document.getElementById("delete_rs_perm").checked = false;
}
}
function gas_puskes_perm() {
var checkBox = document.getElementById("puskes_perm");
if (checkBox.checked == true) {
......@@ -984,6 +986,7 @@ function gas_puskes_perm() {
document.getElementById("delete_puskes_perm").checked = false;
}
}
function gas_lakes_perm() {
var checkBox = document.getElementById("lakes_perm");
if (checkBox.checked == true) {
......@@ -997,6 +1000,7 @@ function gas_lakes_perm() {
document.getElementById("delete_lakes_perm").checked = false;
}
}
function gas_si_perm() {
var checkBox = document.getElementById("si_perm");
if (checkBox.checked == true) {
......@@ -1010,6 +1014,7 @@ function gas_si_perm() {
document.getElementById("delete_si_perm").checked = false;
}
}
function gas_skul_perm() {
var checkBox = document.getElementById("skul_perm");
if (checkBox.checked == true) {
......@@ -1023,6 +1028,7 @@ function gas_skul_perm() {
document.getElementById("delete_skul_perm").checked = false;
}
}
function gas_st_perm() {
var checkBox = document.getElementById("st_perm");
if (checkBox.checked == true) {
......@@ -1036,6 +1042,7 @@ function gas_st_perm() {
document.getElementById("delete_st_perm").checked = false;
}
}
function gas_term_perm() {
var checkBox = document.getElementById("term_perm");
if (checkBox.checked == true) {
......@@ -1049,6 +1056,7 @@ function gas_term_perm() {
document.getElementById("delete_term_perm").checked = false;
}
}
function gas_cb_perm() {
var checkBox = document.getElementById("cb_perm");
if (checkBox.checked == true) {
......@@ -1062,6 +1070,7 @@ function gas_cb_perm() {
document.getElementById("delete_cb_perm").checked = false;
}
}
function gas_gl_perm() {
var checkBox = document.getElementById("gl_perm");
if (checkBox.checked == true) {
......@@ -1132,6 +1141,7 @@ function gas_teritori_perm() {
document.getElementById("edit_kecamatan_perm").checked = false;
}
}
function gas_kelurahan_perm() {
var checkBox = document.getElementById("kelurahan_perm");
if (checkBox.checked == true) {
......@@ -1140,6 +1150,7 @@ function gas_kelurahan_perm() {
document.getElementById("edit_kelurahan_perm").checked = false;
}
}
function gas_kecamatan_perm() {
var checkBox = document.getElementById("kecamatan_perm");
if (checkBox.checked == true) {
......@@ -1207,7 +1218,7 @@ function gas_all_perm() {
document.getElementById("edit_jalan_perm").checked = true;
document.getElementById("delete_jalan_perm").checked = true;
document.getElementById("perbaikan_jalan_perm").checked = true;
document.getElementById("teritori_perm").checked = true;
document.getElementById("kelurahan_perm").checked = true;
document.getElementById("kecamatan_perm").checked = true;
......@@ -1216,7 +1227,7 @@ function gas_all_perm() {
document.getElementById("lahan_perm").checked = true;
document.getElementById("edit_lahan_perm").checked = true;
} else if (checkBox.checked == false) {
document.getElementById("point_perm").checked = false;
......@@ -1273,7 +1284,7 @@ function gas_all_perm() {
document.getElementById("edit_jalan_perm").checked = false;
document.getElementById("delete_jalan_perm").checked = false;
document.getElementById("perbaikan_jalan_perm").checked = false;
document.getElementById("teritori_perm").checked = false;
document.getElementById("kelurahan_perm").checked = false;
document.getElementById("kecamatan_perm").checked = false;
......@@ -1422,6 +1433,10 @@ $("#saveuser").on("click", function() {
})
$("#savegroup").on("click", function() {
var all_perm = []
$.each($("input[name='chekbox']:checked"), function() {
all_perm.push($(this).val())
});
var isObject = {};
var ars = ''
var idgroup = $("#idgroup").val();
......@@ -1433,6 +1448,7 @@ $("#savegroup").on("click", function() {
isObject['name'] = $("#ingroup").val();
isObject['parent'] = $("#select_parent").val();
isObject['all_perm'] = JSON.stringify(all_perm)
isObject.group = group
console.log(group)
......
templates/includes/modal.html
View file @ 9e1c7e61
......@@ -1703,8 +1703,8 @@
</div>
<div id="input_perbaikan" class="modal fade">
<!-- <div class="content-wrapper modal" id="input_perbaikan" style="display: none;padding: 60px;margin-left: 10%;border-radius:10px;top: -40px;"> -->
<!-- <div class="content-wrapper modal" id="input_perbaikan" style="display: none;padding: 60px;margin-left: 10%;border-radius:10px;top: -40px;"> -->
</div>
<table id="table_downloader" style="display: none;">
......@@ -1891,19 +1891,19 @@
<ul class="nasted active">
<div class="checkbox">
<label>
<input type="checkbox" id="add_k_adm_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="add_k_adm_perm" name="chekbox" onclick="" value="add_kantor_administrasi" style="margin-top:2px;">
Add Kantor Administrasi
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" id="edit_k_adm_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="edit_k_adm_perm" name="chekbox" onclick="" value="change_kantor_administrasi" style="margin-top:2px;">
Edit Kantor Administrasi
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" id="delete_k_adm_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="delete_k_adm_perm" name="chekbox" onclick="" value="delete_kantor_administrasi" style="margin-top:2px;">
Delete Kantor Administrasi
</label>
</div>
......@@ -1917,19 +1917,19 @@
<ul class="nasted active">
<div class="checkbox">
<label>
<input type="checkbox" id="add_rs_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="add_rs_perm" name="chekbox" value="add_rumah_sakit" onclick="" style="margin-top:2px;">
Add Rumah Sakit
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" id="edit_rs_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="edit_rs_perm" name="chekbox" value="change_rumah_sakit" onclick="" style="margin-top:2px;">
Edit Rumah Sakit
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" id="delete_rs_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="delete_rs_perm" name="chekbox" value="delete_rumah_sakit" onclick="" style="margin-top:2px;">
Delete Rumah Sakit
</label>
</div>
......@@ -1943,19 +1943,19 @@
<ul class="nasted active">
<div class="checkbox">
<label>
<input type="checkbox" id="add_puskes_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="add_puskes_perm" name="chekbox" value="add_puskesmas" onclick="" style="margin-top:2px;">
Add Puskesmas
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" id="edit_puskes_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="edit_puskes_perm" name="chekbox" value="change_puskesmas" onclick="" style="margin-top:2px;">
Edit Puskesmas
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" id="delete_puskes_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="delete_puskes_perm" name="chekbox" value="delete_puskesmas" onclick="" style="margin-top:2px;">
Delete Puskesmas
</label>
</div>
......@@ -1969,19 +1969,19 @@
<ul class="nasted active">
<div class="checkbox">
<label>
<input type="checkbox" id="add_lakes_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="add_lakes_perm" name="chekbox" value="add_layanan_kesehatan" onclick="" style="margin-top:2px;">
Add Layanan Kesehatan
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" id="edit_lakes_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="edit_lakes_perm" name="chekbox" value="change_layanan_kesehatan" onclick="" style="margin-top:2px;">
Edit Layanan Kesehatan
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" id="delete_lakes_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="delete_lakes_perm" name="chekbox" value="delete_layanan_kesehatan" onclick="" style="margin-top:2px;">
Delete Layanan Kesehatan
</label>
</div>
......@@ -1995,19 +1995,19 @@
<ul class="nasted active">
<div class="checkbox">
<label>
<input type="checkbox" id="add_si_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="add_si_perm" name="chekbox" value="add_sarana_ibadah" onclick="" style="margin-top:2px;">
Add Sarana Ibadah
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" id="edit_si_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="edit_si_perm" name="chekbox" value="change_sarana_ibadah" onclick="" style="margin-top:2px;">
Edit Sarana Ibadah
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" id="delete_si_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="delete_si_perm" name="chekbox" value="delete_sarana_ibadah" onclick="" style="margin-top:2px;">
Delete Sarana Ibadah
</label>
</div>
......@@ -2021,19 +2021,19 @@
<ul class="nasted active">
<div class="checkbox">
<label>
<input type="checkbox" id="add_skul_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="add_skul_perm" name="chekbox" value="add_sarana_pendidikan" onclick="" style="margin-top:2px;">
Add Sekolah
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" id="edit_skul_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="edit_skul_perm" name="chekbox" value="change_sarana_pendidikan" onclick="" style="margin-top:2px;">
Edit Sekolah
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" id="delete_skul_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="delete_skul_perm" name="chekbox" value="delete_sarana_pendidikan" onclick="" style="margin-top:2px;">
Delete Sekolah
</label>
</div>
......@@ -2047,19 +2047,19 @@
<ul class="nasted active">
<div class="checkbox">
<label>
<input type="checkbox" id="add_st_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="add_st_perm" name="chekbox" value="add_stasiun" onclick="" style="margin-top:2px;">
Add Stasiun
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" id="edit_st_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="edit_st_perm" name="chekbox" value="change_stasiun" onclick="" style="margin-top:2px;">
Edit Stasiun
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" id="delete_st_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="delete_st_perm" name="chekbox" value="delete_stasiun" onclick="" style="margin-top:2px;">
Delete Stasiun
</label>
</div>
......@@ -2073,19 +2073,19 @@
<ul class="nasted active">
<div class="checkbox">
<label>
<input type="checkbox" id="add_term_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="add_term_perm" name="chekbox" value="add_terminal_bus" onclick="" style="margin-top:2px;">
Add Terminal
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" id="edit_term_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="edit_term_perm" name="chekbox" value="change_terminal_bus" onclick="" style="margin-top:2px;">
Edit Terminal
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" id="delete_term_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="delete_term_perm" name="chekbox" value="delete_terminal_bus" onclick="" style="margin-top:2px;">
Delete Terminal
</label>
</div>
......@@ -2099,19 +2099,19 @@
<ul class="nasted active">
<div class="checkbox">
<label>
<input type="checkbox" id="add_cb_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="add_cb_perm" name="chekbox" value="add_cagar_budaya" onclick="" style="margin-top:2px;">
Add Cagar Budaya
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" id="edit_cb_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="edit_cb_perm" name="chekbox" value="change_cagar_budaya" onclick="" style="margin-top:2px;">
Edit Cagar Budaya
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" id="delete_cb_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="delete_cb_perm" name="chekbox" value="delete_cagar_budaya" onclick="" style="margin-top:2px;">
Delete Cagar Budaya
</label>
</div>
......@@ -2125,19 +2125,19 @@
<ul class="nasted active">
<div class="checkbox">
<label>
<input type="checkbox" id="add_gl_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="add_gl_perm" name="chekbox" value="add_gardu_listrik" onclick="" style="margin-top:2px;">
Add Gardu Listrik
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" id="edit_gl_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="edit_gl_perm" name="chekbox" value="change_gardu_listrik" onclick="" style="margin-top:2px;">
Edit Gardu Listrik
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" id="delete_gl_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="delete_gl_perm" name="chekbox" value="delete_gardu_listrik" onclick="" style="margin-top:2px;">
Delete Gardu Listrik
</label>
</div>
......@@ -2158,7 +2158,7 @@
<ul class="nasted active">
<div class="checkbox">
<label>
<input type="checkbox" id="add_bangunan_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="add_bangunan_perm" name="chekbox" value="add_bangunan" onclick="" style="margin-top:2px;">
<!-- class="active" checked="true" -->
Add Bangunan
</label>
......@@ -2166,28 +2166,28 @@
<div class="checkbox">
<label>
<input type="checkbox" id="edit_bangunan_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="edit_bangunan_perm" name="chekbox" value="change_bangunan" onclick="" style="margin-top:2px;">
Edit Bangunan
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" id="delete_bangunan_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="delete_bangunan_perm" name="chekbox" value="delete_bangunan" onclick="" style="margin-top:2px;">
Delete Bangunan
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" id="perbaikan_bangunan_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="perbaikan_bangunan_perm" name="chekbox" value="" onclick="" style="margin-top:2px;">
Perbaikan Bangunan
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" id="tampak_3d_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="tampak_3d_perm" name="chekbox" onclick="" style="margin-top:2px;">
Upload Tampak 3D
</label>
</div>
......@@ -2204,7 +2204,7 @@
<ul class="nasted active">
<div class="checkbox">
<label>
<input type="checkbox" id="add_jalan_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="add_jalan_perm" name="chekbox" value="add_jalan" onclick="" style="margin-top:2px;">
<!-- class="active" checked="true" -->
Add Jalan
</label>
......@@ -2212,21 +2212,21 @@
<div class="checkbox">
<label>
<input type="checkbox" id="edit_jalan_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="edit_jalan_perm" name="chekbox" value="change_jalan" onclick="" style="margin-top:2px;">
Edit Jalan
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" id="delete_jalan_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="delete_jalan_perm" name="chekbox" value="delete_jalan" onclick="" style="margin-top:2px;">
Delete Jalan
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" id="perbaikan_jalan_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="perbaikan_jalan_perm" name="chekbox" onclick="" style="margin-top:2px;">
Perbaikan Jalan
</label>
</div>
......@@ -2244,7 +2244,7 @@
<div class="checkbox">
<label>
<input type="checkbox" id="edit_lahan_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="edit_lahan_perm" name="chekbox" value="change_tuplah" onclick="" style="margin-top:2px;">
Edit Lahan
</label>
</div>
......@@ -2276,7 +2276,7 @@
<div class="checkbox">
<label>
<input type="checkbox" id="edit_kelurahan_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="edit_kelurahan_perm" name="chekbox" value="change_data_kelurahan" onclick="" style="margin-top:2px;">
Edit Kelurahan/Desa
</label>
</div>
......@@ -2291,14 +2291,14 @@
<div class="checkbox">
<label>
<input type="checkbox" id="edit_kecamatan_perm" onclick="" style="margin-top:2px;">
<input type="checkbox" id="edit_kecamatan_perm" name="chekbox" value="change_data_kecamatan" onclick="" style="margin-top:2px;">
Edit Kecamatan
</label>
</div>
</ul>
</ul>
</div>
</div>
</div>
<hr>
......
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