Skip to content

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

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

Conflicts:
templates/includes/js-m.html

search done
parents 701e640b 3a79ac61
Expand all Show whitespace changes
Inline Side-by-side
Showing with 3174 additions and 1766 deletions
static/css/layout-style.css
View file @ f0d124c1
...@@ -195,10 +195,45 @@ body>div.page-container>div>div.sidebar.sidebar-main>div>img { ...@@ -195,10 +195,45 @@ body>div.page-container>div>div.sidebar.sidebar-main>div>img {
margin-bottom: 20px; margin-bottom: 20px;
} }
#modal_detail_perbaikan_dash>div>div>div>div.isi.text>div>div>div:nth-child(1)>span {
font-size: 12px;
line-height: 14px;
}
#modal_detail_perbaikan_dash>div>div>div>div.isi.text>div>div>div:nth-child(2)>span {
font-size: 16px;
line-height: 19px;
font-family: 'gilroysemibold';
}
#modal_detail_perbaikan_dash>div>div>div>div.isi.text>div>div {
margin-left: 40px;
margin-bottom: 20px;
}
.hid { .hid {
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;
}
.tab_personal_information {
margin: 10px;
}
#formmen>div>div>div>div {
margin-bottom: 10px;
}
#formmen>div>div>div>div>div>input {
font-family: 'gilroylight';
}
@media (max-width: 1025px) { @media (max-width: 1025px) {
.dock { .dock {
position: absolute; position: absolute;
......
static/img/icon-1/Vectorpoint.svg 0 → 100644
View file @ f0d124c1
<svg width="28" height="37" viewBox="0 0 28 37" fill="none" xmlns="http://www.w3.org/2000/svg">
<g filter="url(#filter0_d)">
<path d="M13.9966 6.99054e-10C11.8822 0.00183716 9.85438 0.874018 8.35608 2.42605C6.85779 3.97808 6.01076 6.08383 6 8.28339C6 11.5812 7.77853 14.3423 9.08188 16.3549L9.31947 16.7221C10.6162 18.6773 12.0073 20.5628 13.4875 22.3715L14.0034 23L14.5193 22.3715C15.9993 20.5626 17.3904 18.6771 18.6873 16.7221L18.9249 16.3479C20.2215 14.3353 22 11.5812 22 8.28339C21.9892 6.08261 21.1413 3.97579 19.6415 2.42356C18.1417 0.871329 16.1122 -2.84983e-05 13.9966 6.99054e-10ZM13.9966 12.0049C13.1159 12.0049 12.2549 11.7332 11.5226 11.2242C10.7903 10.7152 10.2195 9.99168 9.88246 9.1452C9.54541 8.29873 9.45723 7.36729 9.62905 6.46868C9.80088 5.57006 10.225 4.74463 10.8478 4.09677C11.4706 3.4489 12.264 3.0077 13.1278 2.82896C13.9917 2.65021 14.887 2.74195 15.7007 3.09257C16.5144 3.44319 17.2099 4.03695 17.6992 4.79876C18.1886 5.56057 18.4497 6.45621 18.4497 7.37243C18.4497 8.60104 17.9806 9.77933 17.1454 10.6481C16.3103 11.5168 15.1776 12.0049 13.9966 12.0049Z" fill="#5A9AFB"/>
</g>
<defs>
<filter id="filter0_d" x="0" y="0" width="28" height="37" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
<feOffset dy="8"/>
<feGaussianBlur stdDeviation="3"/>
<feComposite in2="hardAlpha" operator="out"/>
<feColorMatrix type="matrix" values="0 0 0 0 0.4875 0 0 0 0 0.6925 0 0 0 0 1 0 0 0 0.82 0"/>
<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/>
</filter>
</defs>
</svg>
static/img/icon-1/help.svg 0 → 100644
View file @ f0d124c1
<svg width="29" height="29" viewBox="0 0 29 29" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M14.0748 24.6313C19.9049 24.6313 24.6311 19.9051 24.6311 14.075C24.6311 8.24499 19.9049 3.5188 14.0748 3.5188C8.24475 3.5188 3.51855 8.24499 3.51855 14.075C3.51855 19.9051 8.24475 24.6313 14.0748 24.6313Z" stroke="#212232" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M14.0748 21.1125C15.0465 21.1125 15.8342 20.3248 15.8342 19.3531C15.8342 18.3814 15.0465 17.5938 14.0748 17.5938C13.1031 17.5938 12.3154 18.3814 12.3154 19.3531C12.3154 20.3248 13.1031 21.1125 14.0748 21.1125Z" fill="#212232"/>
<path d="M14.075 14.9552C14.684 14.9552 15.2792 14.7746 15.7855 14.4363C16.2919 14.098 16.6865 13.6171 16.9195 13.0545C17.1526 12.4919 17.2135 11.8729 17.0947 11.2756C16.9759 10.6784 16.6827 10.1297 16.2521 9.69916C15.8215 9.26856 15.2729 8.97533 14.6757 8.85652C14.0784 8.73772 13.4594 8.7987 12.8968 9.03173C12.3342 9.26477 11.8533 9.6594 11.515 10.1657C11.1767 10.672 10.9961 11.2673 10.9961 11.8763" stroke="#212232" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
</svg>
static/img/icon-1/infodatauser.svg 0 → 100644
View file @ f0d124c1
<svg width="29" height="29" viewBox="0 0 29 29" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M10.5566 7.25269H23.7522" stroke="#212232" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M10.5571 14.2903H23.752" stroke="#212232" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M10.5571 21.328H23.752" stroke="#212232" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M4.39844 7.25269H6.15785" stroke="#212232" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M4.39893 14.2903H6.15766" stroke="#212232" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M4.39893 21.328H6.15766" stroke="#212232" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
</svg>
static/img/icon-1/monitordatauser.svg 0 → 100644
View file @ f0d124c1
<svg width="29" height="29" viewBox="0 0 29 29" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M5.44582 21.1166L23.0399 21.1166C24.0116 21.1166 24.7993 20.3289 24.7993 19.3572V7.04131C24.7993 6.06961 24.0116 5.2819 23.0399 5.2819L5.44582 5.2819C4.47413 5.2819 3.68641 6.06961 3.68641 7.04131V19.3572C3.68641 20.3289 4.47413 21.1166 5.44582 21.1166Z" stroke="#212232" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M17.7618 25.0752H10.7241" stroke="#212232" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
</svg>
static/img/icon-1/personalinfo.svg 0 → 100644
View file @ f0d124c1
<svg width="29" height="29" viewBox="0 0 29 29" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M14.0755 25.1478C19.9057 25.1478 24.6319 20.4215 24.6319 14.5914C24.6319 8.7612 19.9057 4.03491 14.0755 4.03491C8.24533 4.03491 3.51904 8.7612 3.51904 14.5914C3.51904 20.4215 8.24533 25.1478 14.0755 25.1478Z" stroke="url(#paint0_linear)" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M14.0753 18.1103C16.5045 18.1103 18.4738 16.141 18.4738 13.7118C18.4738 11.2825 16.5045 9.31323 14.0753 9.31323C11.646 9.31323 9.67676 11.2825 9.67676 13.7118C9.67676 16.141 11.646 18.1103 14.0753 18.1103Z" stroke="url(#paint1_linear)" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M7.01562 22.4399C7.67827 21.1371 8.68852 20.043 9.93452 19.2789C11.1805 18.5147 12.6137 18.1102 14.0753 18.1102C15.537 18.1102 16.9702 18.5147 18.2162 19.2789C19.4622 20.043 20.4724 21.1371 21.1351 22.4399" stroke="url(#paint2_linear)" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
<defs>
<linearGradient id="paint0_linear" x1="14.0755" y1="-15.7584" x2="41.667" y2="28.3032" gradientUnits="userSpaceOnUse">
<stop stop-color="#4C97DC"/>
<stop offset="1" stop-color="#4969DA"/>
</linearGradient>
<linearGradient id="paint1_linear" x1="14.0753" y1="1.066" x2="25.5717" y2="19.425" gradientUnits="userSpaceOnUse">
<stop stop-color="#4C97DC"/>
<stop offset="1" stop-color="#4969DA"/>
</linearGradient>
<linearGradient id="paint2_linear" x1="14.0753" y1="14.0511" x2="16.4049" y2="26.1829" gradientUnits="userSpaceOnUse">
<stop stop-color="#4C97DC"/>
<stop offset="1" stop-color="#4969DA"/>
</linearGradient>
</defs>
</svg>
static/img/icon-1/saranaibadah.svg 0 → 100644
View file @ f0d124c1
<svg width="26" height="26" viewBox="0 0 26 26" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0)">
<path d="M24.4706 24.4612V6.10823C24.4706 3.93957 23.4876 1.76225 21.9052 0.42595L21.4118 0.00933838L20.9184 0.426001C19.3359 1.76225 18.3529 3.93957 18.3529 6.10823V11.6247C17.6896 10.5955 16.8272 9.68919 15.7973 8.96828L11.4706 5.93953L7.14383 8.96828C4.58589 10.7588 3.05882 13.6918 3.05882 16.8141V18.3435H1.52941V24.4612H0V25.9906H26V24.4612H24.4706ZM22.9412 7.63764H19.8824V6.10823H22.9412V7.63764ZM21.4118 2.07262C22.0362 2.76396 22.4976 3.6394 22.7425 4.57881H20.0811C20.3259 3.63945 20.7874 2.76396 21.4118 2.07262ZM8.02085 10.2212L11.4706 7.80638L14.9203 10.2212C16.6453 11.4287 17.8116 13.2547 18.2053 15.2847H4.73593C5.1296 13.2547 6.29593 11.4287 8.02085 10.2212ZM4.58824 16.8141H18.3529V18.3435H4.58824V16.8141ZM3.05882 19.8729H19.8824V21.4024H14.9774L11.9186 24.4612H3.05882V19.8729ZM14.0814 24.4612L15.6109 22.9318H19.8824V24.4612H14.0814ZM21.4118 24.4612V18.3435H19.8824C19.8824 17.9019 19.8824 9.56562 19.8824 9.16705H22.9412V24.4612H21.4118Z" fill="#7DC74F"/>
<path d="M4.58838 21.4024H6.11779V22.9318H4.58838V21.4024Z" fill="#7DC74F"/>
<path d="M7.64697 21.4024H9.17639V22.9318H7.64697V21.4024Z" fill="#7DC74F"/>
</g>
<defs>
<clipPath id="clip0">
<rect width="26" height="26" fill="white"/>
</clipPath>
</defs>
</svg>
templates/includes/insert.html
View file @ f0d124c1
...@@ -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);
......
templates/includes/js-m.html
View file @ f0d124c1
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 @ f0d124c1
This diff is collapsed.
templates/includes/m.html
View file @ f0d124c1
{% load static %} {% load static %}
<div class="legendapo" id="legendapo" style="bottom: 0px;display:none"> <!-- <div class="legendapo" id="legendapo" style="bottom: 0px;display:none">
<div> <div>
<a href="#" onclick="hidelegend()" class="btn btn-default" id="button_hide_point"><span class="caret" style="margin-left: -5px;"></span></a> <a href="#" onclick="hidelegend()" class="btn btn-default" id="button_hide_point"><span class="caret" style="margin-left: -5px;"></span></a>
</div> </div>
...@@ -303,4 +303,4 @@ ...@@ -303,4 +303,4 @@
</div> </div>
<div> <div>
<a href="#" onclick="showlegend()" class="btn btn-default" id="button_unhide_point" style="display: none;"><span class="caret" style="margin-left: -5px;transform: rotate(180deg)"></span></a> <a href="#" onclick="showlegend()" class="btn btn-default" id="button_unhide_point" style="display: none;"><span class="caret" style="margin-left: -5px;transform: rotate(180deg)"></span></a>
</div> </div> -->
\ No newline at end of file \ No newline at end of file
templates/includes/modal.html
View file @ f0d124c1
This diff is collapsed.
templates/includes/sidebar.html
View file @ f0d124c1
{% load static %} {% load humanize %} {% load static %} {% load humanize %}
<style> <style>
#list_perbaikan_filter>label>input[type=search] { #list_perbaikan_filter>label>input[type=search] {
border-color: #393E54; border-color: #393E54;
} }
...@@ -249,7 +248,7 @@ ...@@ -249,7 +248,7 @@
<div class="row-bod row" style="border-bottom: 0.5pt solid #313649;color:white"> <div class="row-bod row" style="border-bottom: 0.5pt solid #313649;color:white">
<div class="col-sm-1"></div> <div class="col-sm-1"></div>
<div class="col-sm-2"> <div class="col-sm-2">
<img src="{% static 'img/icon-1/GraduationCap.svg' %}" alt=""> <img src="{% static 'img/icon-1/saranaibadah.svg' %}" alt="">
</div> </div>
<div class="col-sm-7" style="margin-bottom: 2px;margin-top: -8px;"> <div class="col-sm-7" style="margin-bottom: 2px;margin-top: -8px;">
Jumlah Sarana Ibadah Jumlah Sarana Ibadah
...@@ -646,8 +645,10 @@ ...@@ -646,8 +645,10 @@
</div> </div>
<div id="previewImage" style="display: none;"></div> --> <div id="previewImage" style="display: none;"></div> -->
<div class="map_detail_p">
<div id="map_detail_perbaikan" style=" position: relative; height: 220px; width: 90%; border-radius: 5px; "> <div id="map_detail_perbaikan" style=" position: relative; height: 220px; width: 90%; border-radius: 5px; ">
</div>
</div> </div>
</div> </div>
...@@ -668,17 +669,6 @@ ...@@ -668,17 +669,6 @@
<script type="text/javascript " src="{% static 'js/plugins/forms/selects/select2.min.js' %} "></script> <script type="text/javascript " src="{% static 'js/plugins/forms/selects/select2.min.js' %} "></script>
<script> <script>
var map_detail_perbaikan = L.map('map_detail_perbaikan', {
editable: true,
zoomControl: false,
drawControl: true
}).setView([-4.125826277307029, 104.1881561279297], 10);
L.tileLayer('https://mt1.google.com/vt/lyrs=s&x={x}&y={y}&z={z}&s=Gal&apistyle=s.t:0|s.e:l|p.v:off', {
maxZoom: 21,
minZoom: 4,
}).addTo(map_detail_perbaikan);
$("#sel-kec ").change(function() { $("#sel-kec ").change(function() {
var id_kec = $(this).val() var id_kec = $(this).val()
...@@ -842,21 +832,36 @@ ...@@ -842,21 +832,36 @@
}); });
function loaddetailid(id) { function loaddetailid(id) {
$(".map_detail_p").html(``)
var isObject = {}; var isObject = {};
isObject.id = id; isObject.id = id;
$("#iduser ").val(id) $("#iduser ").val(id)
setTimeout(function() {
map_detail_perbaikan.invalidateSize();
}, 500);
$.ajax({ $.ajax({
url: "{% url 'apps:loadDetail' %} ", url: "{% url 'apps:loadDetail' %} ",
data: isObject, data: isObject,
dataType: 'json', dataType: 'json',
type: 'post', type: 'post',
success: function(data) { success: function(data) {
$(".map_detail_p").html(`<div id="map_detail_perbaikan" style=" position: relative; height: 220px; width: 90%; border-radius: 5px; ">`)
var map_detail_perbaikan = L.map('map_detail_perbaikan', {
editable: true,
zoomControl: false,
drawControl: true
}).setView([-4.125826277307029, 104.1881561279297], 10);
L.tileLayer('https://mt1.google.com/vt/lyrs=s&x={x}&y={y}&z={z}&s=Gal&apistyle=s.t:0|s.e:l|p.v:off', {
maxZoom: 21,
minZoom: 4,
}).addTo(map_detail_perbaikan);
setTimeout(function() {
map_detail_perbaikan.invalidateSize();
}, 500);
if (data.length === 0) { if (data.length === 0) {
$(".nama_detail").text("Null"); $(".nama_detail").text("Null");
......
templates/layout/layout.html
View file @ f0d124c1
...@@ -485,6 +485,22 @@ ...@@ -485,6 +485,22 @@
margin-top: -4.5px; margin-top: -4.5px;
border-radius: 50%; border-radius: 50%;
} }
.modal-header {
background-color: #1B1F2D !important;
border: #1B1F2D;
border-top-right-radius: 10px;
border-top-left-radius: 10px;
}
#modal_adm>.modal-content {
border-radius: 10px;
}
#modal_detail_non_kelurahan>div>div>div.modal-body>fieldset>div>div:nth-child(1)>div.gambar_keterangan>img {
border-bottom-left-radius: 0px!important;
border-bottom-right-radius: 10px;
}
</style> </style>
{% include 'includes/css-o.html' %} {% include 'includes/css-m.html' %} {% include 'includes/css-o.html' %} {% include 'includes/css-m.html' %}
...@@ -698,7 +714,7 @@ ...@@ -698,7 +714,7 @@
padding: 8px 16px; padding: 8px 16px;
text-align: center; text-align: center;
text-decoration: none; text-decoration: none;
text-overflow: ellipsis;">Kelola Akun</a> text-overflow: ellipsis;" data-toggle="modal" data-target="#user_profile" data-backdrop="static" data-keyboard="false">Kelola Akun</a>
</div> </div>
</div> </div>
......
templates/layout/user_layout.html
View file @ f0d124c1
...@@ -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