Commit 86c68770 authored by Muhamad's avatar Muhamad

create

parent 4958de4c
...@@ -85,10 +85,10 @@ DATABASES = { ...@@ -85,10 +85,10 @@ DATABASES = {
'NAME': 'oku_gis_new', 'NAME': 'oku_gis_new',
'USER': 'postgres', 'USER': 'postgres',
'PASSWORD' : 'khansia215758', 'PASSWORD' : 'khansia215758',
# 'HOST': '30.10.20.102', 'HOST': '30.10.20.102',
# 'PORT': '5432', 'PORT': '5432',
'HOST': '103.126.28.66', # 'HOST': '103.126.28.66',
'PORT': '8082', # 'PORT': '8082',
} }
} }
......
...@@ -199,6 +199,13 @@ body>div.page-container>div>div.sidebar.sidebar-main>div>img { ...@@ -199,6 +199,13 @@ body>div.page-container>div>div.sidebar.sidebar-main>div>img {
transform: rotate( 180deg); transform: rotate( 180deg);
} }
#map-create-all>div.leaflet-control-container>div.leaflet-top.leaflet-left>div:nth-child(2)>div>div>a.leaflet-draw-draw-marker {
margin-top: -20px;
margin-left: -10px;
width: 40px;
height: 20px;
}
@media (max-width: 1025px) { @media (max-width: 1025px) {
.dock { .dock {
position: absolute; position: absolute;
......
...@@ -309,7 +309,7 @@ ...@@ -309,7 +309,7 @@
for (var i = 0; i < data['result'].length; i++) { for (var i = 0; i < data['result'].length; i++) {
var data_k = data['result'][i][0]; var data_k = data['result'][i][0];
console.log(data_k) console.log(data_k)
var data_kab = `<option value="` + data_k +`">` + data_k + `</option>`; var data_kab = `<option value="` + data_k + `">` + data_k + `</option>`;
data_all_kab.push(data_kab) data_all_kab.push(data_kab)
}; };
$('#tipe_point_2_b').html(`<option value="null" selected disabled>-- Pilih Tipe Point --</option>` + data_all_kab); $('#tipe_point_2_b').html(`<option value="null" selected disabled>-- Pilih Tipe Point --</option>` + data_all_kab);
...@@ -334,7 +334,7 @@ ...@@ -334,7 +334,7 @@
for (var i = 0; i < data['result'].length; i++) { for (var i = 0; i < data['result'].length; i++) {
var data_id = data['result'][i][0]; var data_id = data['result'][i][0];
var data_po = data['result'][i][1]; var data_po = data['result'][i][1];
var data_kab = `<option value="` +data_id + `">` + data_po + `</option>`; var data_kab = `<option value="` + data_id + `">` + data_po + `</option>`;
data_all_kab.push(data_kab) data_all_kab.push(data_kab)
}; };
$('#tipe_point_3_b').html(`<option value="null" selected disabled>-- Pilih Point --</option>` + data_all_kab); $('#tipe_point_3_b').html(`<option value="null" selected disabled>-- Pilih Point --</option>` + data_all_kab);
......
This diff is collapsed.
This diff is collapsed.
...@@ -320,111 +320,6 @@ ...@@ -320,111 +320,6 @@
<div class="modal fade" id="modal_tampak"> <div class="modal fade" id="modal_tampak">
</div> </div>
<div id="modal_point" class="modal fade">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header bg-info" style="background-color: #40777c;">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h6 class="modal-title">Insert Point</h6>
</div>
<input type="text" name="poly_create_point" class="hidden" id="poly_create_point" value="">
<div class="modal-body" style="max-height: 450px;overflow-y: auto;">
<div class="row" style="margin-top: 15px;">
<div class="form-group">
<label class="col-lg-3 control-label" style="margin-top:10px">Image</label>
<div class="col-lg-9" style="margin-top:10px">
<input type="file" id="gambar_pitik" name="images[]" multiple accept="image/jpg,image/png,image/jpeg,image/gif">
</div>
</div>
</div>
<div class="row" style="margin-top: 15px;">
<div class="form-group">
<label class="col-lg-3 control-label lbl-top" style="margin-top: 15px;">Nama Point</label>
<div class="col-lg-9">
<input id="name_create_point" type="text" class="form-control" value="" required>
</div>
</div>
</div>
<div class="row" style="margin-top: 15px;">
<div class="form-group">
<label class="col-lg-3 control-label lbl-top" style="margin-top: 15px;">Jenis Point</label>
<div class="col-lg-9">
<select style="border-bottom: 1px solid rgb(83, 83, 83) !important;" id="tipe_point" data-placeholder="select point.." class="select-size-md">
<option value="null" selected disabled>-- Pilih Jenis Point --</option>
<option value="kantor_administrasi">Kantor Administrasi</option>
<option value="layanan_kesehatan">Layanan Kesehatan</option>
<option value="puskesmas">Puskesmas</option>
<option value="rumah_sakit">Rumah Sakit</option>
<option value="sarana_ibadah">Sarana Ibadah</option>
<option value="sarana_pendidikan">Sarana Pendidikan</option>
<option value="spbu">SPBU</option>
<option value="stasiun">Stasiun</option>
<option value="terminal_bus">Terminal Bus</option>
<option value="cagar_budaya">Cagar Budaya dan Tempat Wisata</option>
<option value="gardu_listrik">Gardu Listrik</option>
</select>
</div>
</div>
</div>
<div class="row" style="margin-top: 15px;">
<div class="form-group">
<label class="col-lg-3 control-label lbl-top" style="margin-top: 15px;">Tipe Point</label>
<div class="col-lg-9">
<select style="border-bottom: 1px solid rgb(83, 83, 83) !important;width: 220px;" id="tipe_point_2" data-placeholder="select point.." class="select-size-md">
<option value="null" selected disabled>-- Pilih Tipe Point --</option>
</select>
</div>
</div>
</div>
<div class="row" style="margin-top: 15px;">
<div class="form-group">
<label class="col-lg-3 control-label lbl-top" style="margin-top: 15px;">Alamat</label>
<div class="col-lg-9">
<input id="alamat_create_point" type="text" class="form-control" value="" placeholder="cth : Jl. Contoh Rt 005/01 No.01" required>
</div>
</div>
</div>
<div class="row" style="margin-top: 15px;">
<div class="form-group">
<label class="col-lg-3 control-label lbl-top" style="margin-top: 15px;">Luas Tanah</label>
<div class="col-lg-6">
<input id="luas_tanah_point" type="text" class="form-control" value="" required>
</div>
<div class="col-lg-3">
<select id="satuan_luas_tanah" style="margin-top: 15px;">
<option>m2</option>
</select>
</div>
</div>
</div>
<div class="row" style="margin-top: 15px;">
<div class="form-group">
<label class="col-lg-3 control-label lbl-top" style="margin-top: 15px;">Pimpinan</label>
<div class="col-lg-9">
<input id="pemilik_point" type="text" class="form-control" value="" placeholder="cth : Ali Budiman, S.Si." required>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-link" data-dismiss="modal">Close</button>
<button type="button" id="btnsavepoint" class="btn btn-info">Save</button>
</div>
</div>
</div>
</div>
<div class="modal fade" id="modalsearch3d" tabindex="-1" role="dialog"> <div class="modal fade" id="modalsearch3d" tabindex="-1" role="dialog">
<div class="modal-dialog modal-xs"> <div class="modal-dialog modal-xs">
<div class="modal-content"> <div class="modal-content">
...@@ -686,3 +581,91 @@ ...@@ -686,3 +581,91 @@
</div> </div>
</div> </div>
</div> </div>
<div class="modal fade" id="modal_option_create" tabindex="-1" role="dialog">
<div class="modal-dialog modal-xs" style="width: 350px;">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title">Pilih jenis create</h4>
</div>
<div class="modal-body">
<fieldset>
<div class="row">
<div class="col-md-4 text-center">
<a href="#" class="btn btn_create_jalan">
<div>
<img src="{% static 'img/icon-1/Vectorjalan.svg' %}" alt="" style="width: 35px;
height: 35px;">
</div>
<div style="margin-top: 10px;">
<span>
Jalan
</span>
</div>
</a>
</div>
<div class="col-md-4 text-center">
<a href="#" class="btn btn_create_bangunan">
<div>
<img src="{% static 'img/icon-1/Buildingsbangunan.svg' %}" alt="" style="width: 35px;
height: 35px;">
</div>
<div style="margin-top: 10px;">
<span>
Bangunan
</span>
</div>
</a>
</div>
<div class="col-md-4 text-center">
<a href="#" class="btn btn_create_point">
<div>
<img src="{% static 'img/icon-1/Vectorpoint.svg' %}" alt="" style="width: 35px;
height: 35px;">
</div>
<div style="margin-top: 10px;">
<span>Point</span>
</div>
</a>
</div>
</div>
</fieldset>
</div>
</div>
</div>
</div>
<div class="modal fade" id="modal__create" tabindex="-1" role="dialog">
<div class="modal-dialog modal-md">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h5 class="modal-title title-create">Create</h5>
</div>
<div class="modal-body" id="create_all">
<div class="tabbable" style="height:450px!important;width: 560px!important;">
<ul class="nav nav-tabs nav-tabs-bottom nav-justified">
<li onclick="changetabs(this)" class="active"><a href=".koordinatjalan" data-toggle="tab" class="tab_1">Koordinat</a></li>
<li onclick="changetabs(this)"><a href="#informasi_create" data-toggle="tab" class="tab_2">Informasi Jalan</a></li>
</ul>
<div class="tab-content">
<div class="tab-pane active koordinatjalan" id="koordinatjalan">
</div>
<div class="tab-pane" id="informasi_create">
</div>
</div>
</div>
<div class="tombol_save_create">
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
.modal-backdrop { .modal-backdrop {
z-index: -1!important; z-index: -1!important;
} }
.sidebar { .sidebar {
...@@ -116,8 +115,7 @@ ...@@ -116,8 +115,7 @@
height: 270px; height: 270px;
} }
#placelg{ #placelg {
object-fit: cover; object-fit: cover;
object-position: center center; object-position: center center;
width: 30px; width: 30px;
...@@ -132,7 +130,7 @@ ...@@ -132,7 +130,7 @@
border: 1px solid red; border: 1px solid red;
} }
.modal-lg{ .modal-lg {
max-width: 1000px !important; max-width: 1000px !important;
} }
...@@ -164,8 +162,6 @@ ...@@ -164,8 +162,6 @@
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
text-align: center; text-align: center;
} }
</style> </style>
</head> </head>
...@@ -212,6 +208,7 @@ ...@@ -212,6 +208,7 @@
<ul class="dropdown-menu dropdown-menu-right"> <ul class="dropdown-menu dropdown-menu-right">
{% if user.is_superuser or user.is_staff %} {% if user.is_superuser or user.is_staff %}
<li><a href="{% url 'usermanagement' %}?page=userprofile"><i class="icon-user-tie"></i>User Profile</a></li>
<li><a href="{% url 'usermanagement' %}"><i class="icon-user"></i>User Management</a></li> <li><a href="{% url 'usermanagement' %}"><i class="icon-user"></i>User Management</a></li>
<li><a href="{% url 'apps:perbaikan' %}"><i class="icon-list"></i>Repair & Renovation</a></li> <li><a href="{% url 'apps:perbaikan' %}"><i class="icon-list"></i>Repair & Renovation</a></li>
{% endif %} {% endif %}
...@@ -239,14 +236,12 @@ ...@@ -239,14 +236,12 @@
<div class="sidebar-user"> <div class="sidebar-user">
<div class="category-content"> <div class="category-content">
<div class="media"> <div class="media">
{% for us in thisUser %} {% for us in thisUser %} {% if us.filepath %}
{% if us.filepath %}
<a href="?page=userprofile" class="media-left"><img src="{% static 'img/' %}{{us.filepath}}" class="img-circle img-sm" alt=""></a> <a href="?page=userprofile" class="media-left"><img src="{% static 'img/' %}{{us.filepath}}" class="img-circle img-sm" alt=""></a>
{% else %} {% else %}
<a href="?page=userprofile" class="media-left"><img src="{% static '/img/placeholder.jpg' %}" class="img-circle img-sm" alt=""></a> <a href="?page=userprofile" class="media-left"><img src="{% static '/img/placeholder.jpg' %}" class="img-circle img-sm" alt=""></a>
{% endif %} {% endif %} {% endfor %}
{% endfor %}
<div class="media-body"> <div class="media-body">
<span class="media-heading text-semibold">{{user.username}}</span> <span class="media-heading text-semibold">{{user.username}}</span>
...@@ -502,7 +497,7 @@ ...@@ -502,7 +497,7 @@
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<label>Username </label> <label>Username </label>
<input type="text" id="username" class="form-control" value="{{us.username}}"readonly> <input type="text" id="username" class="form-control" value="{{us.username}}" readonly>
</div> </div>
</div> </div>
...@@ -532,7 +527,7 @@ ...@@ -532,7 +527,7 @@
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<label>Email </label> <label>Email </label>
<input type="text" id="useremail" class="form-control" value="{{us.email}}"readonly> <input type="text" id="useremail" class="form-control" value="{{us.email}}" readonly>
</div> </div>
</div> </div>
...@@ -753,7 +748,7 @@ ...@@ -753,7 +748,7 @@
<h6 class="modal-title"> Edit Password</h6> <h6 class="modal-title"> Edit Password</h6>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div > <div>
<div class="alert alert-danger" id="notifications" style="display: none"> <div class="alert alert-danger" id="notifications" style="display: none">
</div> </div>
...@@ -773,7 +768,7 @@ ...@@ -773,7 +768,7 @@
<div class="col-md-12"> <div class="col-md-12">
<label class="control-label"> Password saat ini :</label> <label class="control-label"> Password saat ini :</label>
<input type="password" id="currentPass" class="form-control" > <input type="password" id="currentPass" class="form-control">
</div> </div>
</div> </div>
...@@ -782,7 +777,7 @@ ...@@ -782,7 +777,7 @@
<div class="col-md-12"> <div class="col-md-12">
<label class="control-label"> Password baru :</label> <label class="control-label"> Password baru :</label>
<input type="password" id="newPass" class="form-control" > <input type="password" id="newPass" class="form-control">
</div> </div>
</div> </div>
...@@ -791,7 +786,7 @@ ...@@ -791,7 +786,7 @@
<div class="col-md-12"> <div class="col-md-12">
<label class="control-label"> Ulangi password baru :</label> <label class="control-label"> Ulangi password baru :</label>
<input type="password" id="renewPass" class="form-control" > <input type="password" id="renewPass" class="form-control">
</div> </div>
</div> </div>
...@@ -973,8 +968,7 @@ ...@@ -973,8 +968,7 @@
<!-- <script type="text/javascript" src="{% static 'js/plugins/ui/ripple.min.js' %}"></script> --> <!-- <script type="text/javascript" src="{% static 'js/plugins/ui/ripple.min.js' %}"></script> -->
<!-- /theme JS files --> <!-- /theme JS files -->
{% include 'includes/scripts.html' %} {% include 'includes/scripts.html' %} {% include 'layout/userprofile.html' %}
{% include 'layout/userprofile.html' %}
<script src="{% static 'js/leaflet-bing-layer.js' %}"></script> <script src="{% static 'js/leaflet-bing-layer.js' %}"></script>
<!-- <script src="https://unpkg.com/sweetalert/dists/sweetalert.min.js"></script> --> <!-- <script src="https://unpkg.com/sweetalert/dists/sweetalert.min.js"></script> -->
...@@ -1054,15 +1048,15 @@ ...@@ -1054,15 +1048,15 @@
const urlParams = new URLSearchParams(queryString); const urlParams = new URLSearchParams(queryString);
const page = urlParams.get('page') const page = urlParams.get('page')
if (page == "group" ) { if (page == "group") {
$("#usergroup").css("display", "block"); $("#usergroup").css("display", "block");
$("#info-maps").css("display", "none"); $("#info-maps").css("display", "none");
$("#userprofile").css("display", "none"); $("#userprofile").css("display", "none");
} else if(page == "user" || page == null){ } else if (page == "user" || page == null) {
$("#usergroup").css("display", "none"); $("#usergroup").css("display", "none");
$("#info-maps").css("display", "block"); $("#info-maps").css("display", "block");
$("#userprofile").css("display", "none") $("#userprofile").css("display", "none")
} else{ } else {
$("#usergroup").css("display", "none"); $("#usergroup").css("display", "none");
$("#info-maps").css("display", "none"); $("#info-maps").css("display", "none");
$("#userprofile").css("display", "block"); $("#userprofile").css("display", "block");
...@@ -1577,11 +1571,11 @@ ...@@ -1577,11 +1571,11 @@
//user profile js //user profile js
$("#save-edt-password").on("click", function(){ $("#save-edt-password").on("click", function() {
changepassword(); changepassword();
}) })
function changepassword(){ function changepassword() {
var isObject = {}; var isObject = {};
isObject.id = $("#iduseredt").val(); isObject.id = $("#iduseredt").val();
...@@ -1590,7 +1584,7 @@ ...@@ -1590,7 +1584,7 @@
isObject.renewPass = $("#renewPass").val(); isObject.renewPass = $("#renewPass").val();
isObject.username = $("#usernameedt").val(); isObject.username = $("#usernameedt").val();
if(isObject.currPass == "" || isObject.newPass == "" || isObject.renewPass == ""){ if (isObject.currPass == "" || isObject.newPass == "" || isObject.renewPass == "") {
$("#notifications").css("display", "block") $("#notifications").css("display", "block")
$("#notifications").html("Inputan tidak boleh kosong") $("#notifications").html("Inputan tidak boleh kosong")
...@@ -1627,11 +1621,11 @@ ...@@ -1627,11 +1621,11 @@
} }
$("#save-edit-profile").on("click", function(){ $("#save-edit-profile").on("click", function() {
editprofile(); editprofile();
}) })
function editprofile(){ function editprofile() {
var isObject = {} var isObject = {}
isObject.id = $("#iduseredt").val(); isObject.id = $("#iduseredt").val();
...@@ -1639,14 +1633,14 @@ ...@@ -1639,14 +1633,14 @@
isObject.last_name = $("#lastnameedt").val(); isObject.last_name = $("#lastnameedt").val();
isObject.email = $("#emailedts").val() isObject.email = $("#emailedts").val()
if(isObject.first_name == "" || isObject.last_name == "" || isObject.email == ""){ if (isObject.first_name == "" || isObject.last_name == "" || isObject.email == "") {
$("#notificationsprop").css("display", "block"); $("#notificationsprop").css("display", "block");
$("#notificationsprop").html("Inputan tidak boleh kosong") $("#notificationsprop").html("Inputan tidak boleh kosong")
return false return false
}else{ } else {
var mail_format = /^(("[\w-\s]+")|([\w-]+(?:\.[\w-]+)*)|("[\w-\s]+")([\w-]+(?:\.[\w-]+)*))(@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,6}(?:\.[a-z]{2})?)$)|(@\[?((25[0-5]\.|2[0-4][0-9]\.|1[0-9]{2}\.|[0-9]{1,2}\.))((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[0-9]{1,2})\.){2}(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[0-9]{1,2})\]?$)/; var mail_format = /^(("[\w-\s]+")|([\w-]+(?:\.[\w-]+)*)|("[\w-\s]+")([\w-]+(?:\.[\w-]+)*))(@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,6}(?:\.[a-z]{2})?)$)|(@\[?((25[0-5]\.|2[0-4][0-9]\.|1[0-9]{2}\.|[0-9]{1,2}\.))((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[0-9]{1,2})\.){2}(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[0-9]{1,2})\]?$)/;
if(!isObject.email.match(mail_format)){ if (!isObject.email.match(mail_format)) {
$("#notificationsprop").css("display", "block"); $("#notificationsprop").css("display", "block");
$("#notificationsprop").html("Format email tidak valid, silahkan coba kembali.") $("#notificationsprop").html("Format email tidak valid, silahkan coba kembali.")
return false return false
...@@ -1737,6 +1731,4 @@ ...@@ -1737,6 +1731,4 @@
} }
}) })
}); });
</script> </script>
\ No newline at end of file
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