Commit 60c8ed0c authored by Muhamad's avatar Muhamad

perbaikan, user

parent 9c526a4a
......@@ -63,6 +63,9 @@ urlpatterns = [
path('edit-jalan-valid', views.editjalanvalid, name='edit-jalan-valid'),
path('3d-maps', views.maps3d, name='3d-maps'),
path('deletejalan', views.deletejalan, name='hapus-jalan')
path('deletejalan', views.deletejalan, name='hapus-jalan'),
path('filt_perbaikan_kecamatan', views.filt_perbaikan_kecamatan, name='filt_perbaikan_kecamatan'),
path('filt_perbaikan_desa', views.filt_perbaikan_desa)
]
\ No newline at end of file
from django.http import response
from django.http.response import Http404
from django.shortcuts import redirect, render
from rest_framework import status
......@@ -15,13 +16,12 @@ from django.db import connection as conn
# Create your views here.
from rest_framework.renderers import JSONRenderer, TemplateHTMLRenderer
from django.utils import six
#import six
# from django.utils import six
import six
from django.core.exceptions import PermissionDenied
from django.contrib.auth.decorators import user_passes_test
from django.http import HttpResponse, HttpResponseNotFound
def group_required(group, login_url=None, raise_exception=False):
def check_perms(user):
......@@ -2621,3 +2621,97 @@ def createpoint(request):
respon={'data':data, 'info': info, 'status':status}
return Response(respon)
@api_view(('GET',))
def filt_perbaikan_kecamatan(request):
id_kec = request.GET.get('id_kec')
with conn.cursor() as data_per:
data_per.execute("""
SELECT
gl.NAME,
tp.id_object,
tp.NAME,
tp.TYPE,
tp.tgl_perbaikan,
tp.anggaran,
tp.tgl_selesai
FROM
( SELECT tbl_perbaikan.*, ROW_NUMBER ( ) OVER ( PARTITION BY id_object ORDER BY tgl_selesai DESC ) AS rn FROM tbl_perbaikan ) tp
JOIN geo_label gl ON gl.ID = tp.type_id
JOIN geo_data_kecamatan gdk ON st_intersects(st_setsrid(tp.geom, 4326), st_setsrid(gdk.geom, 4326))
WHERE
rn = 1 and gdk.id = %s
"""% id_kec)
res_perbaikan = data_per.fetchall()
res_all = []
for j in res_perbaikan:
data_all = {
'name_perbaikan':j[0],
'id_object':j[1],
'name':j[2],
'type':j[3],
'tgl_perbaikan':j[4],
'anggaran':j[5],
'tgl_selesai':j[6],
}
res_all.append(data_all)
with conn.cursor() as data_desa:
data_desa.execute("""
SELECT
gdk.ID,
gdk.desa
FROM
geo_data_kelurahan gdk
WHERE
kecamatan = (SELECT kecamatan FROM geo_data_kecamatan WHERE id = %s)
"""% id_kec)
res_kelurahan = data_desa.fetchall()
respon = {'res_perbaikan':res_all, 'res_kel':res_kelurahan}
return Response(respon)
@api_view(('GET',))
def filt_perbaikan_desa(request):
id_desa = request.GET.get('id_desa')
with conn.cursor() as data_per:
data_per.execute("""
SELECT
gl.NAME,
tp.id_object,
tp.NAME,
tp.TYPE,
tp.tgl_perbaikan,
tp.anggaran,
tp.tgl_selesai
FROM
( SELECT tbl_perbaikan.*, ROW_NUMBER ( ) OVER ( PARTITION BY id_object ORDER BY tgl_selesai DESC ) AS rn FROM tbl_perbaikan ) tp
JOIN geo_label gl ON gl.ID = tp.type_id
JOIN geo_data_kelurahan gdk ON st_intersects(st_setsrid(tp.geom, 4326), st_setsrid(gdk.geom, 4326))
WHERE
rn = 1 and gdk.id = %s
"""% id_desa)
res_perbaikan = data_per.fetchall()
res_all = []
for j in res_perbaikan:
data_all = {
'name_perbaikan':j[0],
'id_object':j[1],
'name':j[2],
'type':j[3],
'tgl_perbaikan':j[4],
'anggaran':j[5],
'tgl_selesai':j[6],
}
res_all.append(data_all)
respon = {'res_perbaikan':res_all}
return Response(respon)
\ No newline at end of file
......@@ -23,7 +23,7 @@ class Dashboard(generic.TemplateView):
kel_res_ = kel.fetchall()
with conn.cursor() as kec:
kec.execute("SELECT kecamatan, json_build_object('type', 'Feature', 'administrasi', (id, kecamatan),'geometry', ST_AsGeoJSON(geom :: geometry) :: json) from geo_data_kecamatan")
kec.execute("SELECT kecamatan, json_build_object('type', 'Feature', 'administrasi', (id, kecamatan),'geometry', ST_AsGeoJSON(geom :: geometry) :: json) from geo_data_kecamatan order by kecamatan ASC")
kec_res_ = kec.fetchall()
# with conn.cursor() as knt:
......@@ -463,6 +463,64 @@ class Dashboard(generic.TemplateView):
for i in gardu_listrik_res:
gardu_listrik_result.append(i[0])
with conn.cursor() as data_per:
data_per.execute("""
SELECT
gl.NAME,
tp.id_object,
tp.NAME,
tp.TYPE,
tp.tgl_perbaikan,
tp.anggaran,
tp.tgl_selesai
FROM
( SELECT tbl_perbaikan.*, ROW_NUMBER ( ) OVER ( PARTITION BY id_object ORDER BY tgl_selesai DESC ) AS rn FROM tbl_perbaikan ) tp
JOIN geo_label gl ON gl.ID = tp.type_id
WHERE
rn = 1
""")
res_perbaikan = data_per.fetchall()
res_all = []
for j in res_perbaikan:
data_all = {
'name_perbaikan':j[0],
'id_object':j[1],
'name':j[2],
'type':j[3],
'tgl_perbaikan':j[4],
'anggaran':j[5],
'tgl_selesai':j[6],
}
res_all.append(data_all)
current_user = request.user
thisUser = current_user.id
if thisUser == None:
user_data = {"filepath":'placeholder.jpg'}
else:
# print()
sql = "select * from auth_user where id = "+str(thisUser)
with conn.cursor() as userprop:
userprop.execute(sql)
us = userprop.fetchall()
user_data = []
for row in us:
datas = {
"id": row[0],
"username": row[4],
"firstname": row[5],
"lastname": row[6],
"email" : row[7],
"filepath": row[11],
# "password": row[1]
}
user_data.append(datas)
context = {
'title':'Dashboard',
'kelurahan':kel_res,
......@@ -479,7 +537,9 @@ class Dashboard(generic.TemplateView):
'cagar_budaya':cagar_budaya_result,
'gardu_listrik':gardu_listrik_result,
'global':all[0],
# 'kntl':kntl
'res_all':res_all,
'thisUser' : user_data
}
return render (request, self.template_name, context)
......
......@@ -79,14 +79,25 @@ WSGI_APPLICATION = 'OKU.wsgi.application'
# Database
# https://docs.djangoproject.com/en/3.2/ref/settings/#databases
# DATABASES = {
# 'default': {
# 'ENGINE': 'django.db.backends.postgresql_psycopg2',
# 'NAME': 'oku_gis_new',
# 'USER': 'postgres',
# 'PASSWORD' : 'khansia215758',
# 'HOST': '30.10.20.102',
# 'PORT': '5432',
# }
# }
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql_psycopg2',
'NAME': 'oku_gis_new',
'USER': 'postgres',
'PASSWORD' : 'khansia215758',
'HOST': '30.10.20.102',
'PORT': '5432',
'HOST': '103.126.28.66',
'PORT': '8082',
}
}
......
......@@ -49,6 +49,32 @@
opacity: 1;
}
.sidebar-2.active {
display: block!important;
}
.navigation>li.active>a,
.navigation>li.active>a:hover,
.navigation>li.active>a:focus {
background-color: #353847;
color: #fff;
border-radius: 15px;
}
/* #btn-hide-all {
transform: rotate(180deg)
}
.active>#btn-hide-all {
transform: rotate(0deg)
} */
.navigation>li.active>#btn-hide-all {
color: #fff;
border-radius: 15px;
}
.tooltiptext-side {
visibility: hidden;
position: absolute;
......@@ -146,6 +172,33 @@ body>div.page-container>div>div.sidebar.sidebar-main>div>img {
padding-left: 0;
}
.dataTables_filter {
position: relative;
display: block;
float: left;
margin: 0 0 20px 30px;
}
#modal_detail_perbaikan>div>div>div>div.isi.text>div>div>div:nth-child(1)>span {
font-size: 12px;
line-height: 14px;
}
#modal_detail_perbaikan>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>div>div>div>div.isi.text>div>div {
margin-left: 40px;
margin-bottom: 20px;
}
.hid {
transform: rotate( 180deg);
}
@media (max-width: 1025px) {
.dock {
position: absolute;
......
<svg width="18" height="19" viewBox="0 0 18 19" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M16.875 14.7199H16.3121V7.40741C16.3117 7.10915 16.1931 6.8232 15.9822 6.61229C15.7713 6.40139 15.4854 6.28275 15.1871 6.28241H10.6871V2.90741C10.6867 2.60915 10.5681 2.3232 10.3572 2.11229C10.1463 1.90139 9.86035 1.78275 9.56209 1.78241H2.81209C2.51382 1.78275 2.22787 1.90139 2.01697 2.11229C1.80606 2.3232 1.68743 2.60915 1.68709 2.90741V14.7199H1.125C0.975816 14.7199 0.832742 14.7792 0.727252 14.8847C0.621763 14.9902 0.5625 15.1332 0.5625 15.2824C0.5625 15.4316 0.621763 15.5747 0.727252 15.6802C0.832742 15.7856 0.975816 15.8449 1.125 15.8449H16.875C17.0242 15.8449 17.1673 15.7856 17.2727 15.6802C17.3782 15.5747 17.4375 15.4316 17.4375 15.2824C17.4375 15.1332 17.3782 14.9902 17.2727 14.8847C17.1673 14.7792 17.0242 14.7199 16.875 14.7199ZM8.43709 9.65741C8.43709 9.80659 8.37782 9.94967 8.27233 10.0552C8.16684 10.1606 8.02377 10.2199 7.87459 10.2199H5.62459C5.4754 10.2199 5.33233 10.1606 5.22684 10.0552C5.12135 9.94967 5.06209 9.80659 5.06209 9.65741C5.06209 9.50822 5.12135 9.36515 5.22684 9.25966C5.33233 9.15417 5.4754 9.09491 5.62459 9.09491H7.87459C8.02377 9.09491 8.16684 9.15417 8.27233 9.25966C8.37782 9.36515 8.43709 9.50823 8.43709 9.65741ZM4.49959 4.59491H6.74959C6.89877 4.59491 7.04185 4.65417 7.14734 4.75966C7.25282 4.86515 7.31209 5.00823 7.31209 5.15741C7.31209 5.30659 7.25282 5.44967 7.14734 5.55516C7.04185 5.66065 6.89877 5.71991 6.74959 5.71991H4.49959C4.3504 5.71991 4.20733 5.66065 4.10184 5.55516C3.99635 5.44967 3.93709 5.30659 3.93709 5.15741C3.93709 5.00823 3.99635 4.86515 4.10184 4.75966C4.20733 4.65417 4.3504 4.59491 4.49959 4.59491ZM4.49959 11.9074H6.74959C6.89877 11.9074 7.04185 11.9667 7.14734 12.0722C7.25282 12.1777 7.31209 12.3207 7.31209 12.4699C7.31209 12.6191 7.25282 12.7622 7.14734 12.8677C7.04185 12.9731 6.89877 13.0324 6.74959 13.0324H4.49959C4.3504 13.0324 4.20733 12.9731 4.10184 12.8677C3.99635 12.7622 3.93709 12.6191 3.93709 12.4699C3.93709 12.3207 3.99635 12.1777 4.10184 12.0722C4.20733 11.9667 4.3504 11.9074 4.49959 11.9074ZM10.6871 7.40741H15.1871V14.7199H10.6871V7.40741Z" fill="url(#paint0_linear)"/>
<path d="M13.4995 11.9074H12.3745C12.2253 11.9074 12.0823 11.9667 11.9768 12.0722C11.8713 12.1777 11.812 12.3207 11.812 12.4699C11.812 12.6191 11.8713 12.7622 11.9768 12.8677C12.0823 12.9731 12.2253 13.0324 12.3745 13.0324H13.4995C13.6487 13.0324 13.7918 12.9731 13.8973 12.8677C14.0027 12.7622 14.062 12.6191 14.062 12.4699C14.062 12.3207 14.0027 12.1777 13.8973 12.0722C13.7918 11.9667 13.6487 11.9074 13.4995 11.9074Z" fill="url(#paint1_linear)"/>
<path d="M12.3745 10.2199H13.4995C13.6487 10.2199 13.7918 10.1606 13.8973 10.0552C14.0027 9.94967 14.062 9.80659 14.062 9.65741C14.062 9.50822 14.0027 9.36515 13.8973 9.25966C13.7918 9.15417 13.6487 9.09491 13.4995 9.09491H12.3745C12.2253 9.09491 12.0823 9.15417 11.9768 9.25966C11.8713 9.36515 11.812 9.50822 11.812 9.65741C11.812 9.80659 11.8713 9.94967 11.9768 10.0552C12.0823 10.1606 12.2253 10.2199 12.3745 10.2199Z" fill="url(#paint2_linear)"/>
<defs>
<linearGradient id="paint0_linear" x1="9" y1="1.78241" x2="9" y2="15.8449" gradientUnits="userSpaceOnUse">
<stop stop-color="#738ADE"/>
<stop offset="1" stop-color="#4940AF"/>
</linearGradient>
<linearGradient id="paint1_linear" x1="12.937" y1="11.9074" x2="12.937" y2="13.0324" gradientUnits="userSpaceOnUse">
<stop stop-color="#738ADE"/>
<stop offset="1" stop-color="#4940AF"/>
</linearGradient>
<linearGradient id="paint2_linear" x1="12.937" y1="9.09491" x2="12.937" y2="10.2199" gradientUnits="userSpaceOnUse">
<stop stop-color="#738ADE"/>
<stop offset="1" stop-color="#4940AF"/>
</linearGradient>
</defs>
</svg>
<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M14.3438 2.53125H3.65625C3.35799 2.53159 3.07204 2.65023 2.86113 2.86113C2.65023 3.07204 2.53159 3.35799 2.53125 3.65625V14.3438C2.53159 14.642 2.65023 14.928 2.86113 15.1389C3.07204 15.3498 3.35799 15.4684 3.65625 15.4688H14.3438C14.642 15.4684 14.928 15.3498 15.1389 15.1389C15.3498 14.928 15.4684 14.642 15.4688 14.3438V3.65625C15.4684 3.35799 15.3498 3.07204 15.1389 2.86113C14.928 2.65023 14.642 2.53159 14.3438 2.53125ZM3.65625 3.65625H9V14.3438H3.65625V3.65625Z" fill="url(#paint0_linear)"/>
<defs>
<linearGradient id="paint0_linear" x1="9" y1="2.53125" x2="9" y2="15.4688" gradientUnits="userSpaceOnUse">
<stop stop-color="#FFC46B"/>
<stop offset="1" stop-color="#D5B64A"/>
</linearGradient>
</defs>
</svg>
<svg width="16" height="13" viewBox="0 0 16 13" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M13.0625 8.45013C12.5638 8.45078 12.0794 8.61677 11.6852 8.92213C11.2909 9.22749 11.0091 9.65496 10.8837 10.1376H4.0625C3.46576 10.1376 2.89347 9.90058 2.47151 9.47862C2.04955 9.05667 1.8125 8.48437 1.8125 7.88763C1.8125 7.2909 2.04955 6.7186 2.47151 6.29664C2.89347 5.87469 3.46576 5.63763 4.0625 5.63763H10.8125C11.5584 5.63763 12.2738 5.34132 12.8012 4.81387C13.3287 4.28643 13.625 3.57106 13.625 2.82513C13.625 2.07921 13.3287 1.36384 12.8012 0.836396C12.2738 0.30895 11.5584 0.0126343 10.8125 0.0126343H4.0625C3.91332 0.0126343 3.77024 0.0718976 3.66475 0.177387C3.55926 0.282876 3.5 0.42595 3.5 0.575134C3.5 0.724319 3.55926 0.867393 3.66475 0.972882C3.77024 1.07837 3.91332 1.13763 4.0625 1.13763H10.8125C11.2601 1.13763 11.6893 1.31542 12.0057 1.63189C12.3222 1.94836 12.5 2.37758 12.5 2.82513C12.5 3.27269 12.3222 3.70191 12.0057 4.01838C11.6893 4.33484 11.2601 4.51263 10.8125 4.51263H4.0625C3.16739 4.51263 2.30895 4.86821 1.67601 5.50115C1.04308 6.13408 0.6875 6.99253 0.6875 7.88763C0.6875 8.78274 1.04308 9.64118 1.67601 10.2741C2.30895 10.9071 3.16739 11.2626 4.0625 11.2626H10.8837C10.9889 11.6701 11.2063 12.0399 11.5111 12.3301C11.8159 12.6202 12.196 12.8191 12.6082 12.904C13.0204 12.989 13.4481 12.9566 13.8429 12.8107C14.2376 12.6647 14.5835 12.4109 14.8412 12.0782C15.0989 11.7455 15.2582 11.3472 15.3009 10.9286C15.3436 10.5099 15.268 10.0876 15.0828 9.70975C14.8975 9.33187 14.61 9.01352 14.2529 8.79086C13.8958 8.5682 13.4833 8.45015 13.0625 8.45013Z" fill="#8E8E8E"/>
</svg>
<svg width="14" height="15" viewBox="0 0 14 15" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M13.4391 1.41406C13.3457 1.3673 13.2411 1.3475 13.137 1.35687C13.033 1.36625 12.9336 1.40443 12.85 1.46713C10.8602 2.95956 9.17392 2.23686 7.22158 1.40012C5.23567 0.54902 2.98491 -0.415305 0.475015 1.46713C0.471684 1.46962 0.468801 1.47246 0.465573 1.475C0.45778 1.48111 0.450261 1.48742 0.442811 1.49393C0.435841 1.50002 0.42894 1.50617 0.42235 1.51254C0.416205 1.51846 0.4103 1.52459 0.404429 1.53079C0.39739 1.5382 0.390456 1.54565 0.383897 1.55338C0.378919 1.55925 0.374215 1.56531 0.369478 1.57137C0.362955 1.57971 0.3565 1.58809 0.350527 1.59674C0.346063 1.60312 0.341978 1.60972 0.337789 1.61629C0.332365 1.62489 0.32694 1.63347 0.321996 1.64233C0.317773 1.64985 0.313928 1.65759 0.310049 1.66533C0.305963 1.67354 0.301809 1.68171 0.298135 1.69007C0.294222 1.69893 0.290752 1.70801 0.287287 1.71709C0.284368 1.72476 0.281416 1.73242 0.278841 1.7402C0.275648 1.74983 0.272934 1.75964 0.270258 1.76952C0.268129 1.77731 0.266 1.78507 0.264215 1.79295C0.262087 1.80246 0.260335 1.81212 0.258688 1.82182C0.257177 1.83063 0.255735 1.83942 0.254636 1.84829C0.253572 1.85703 0.252817 1.86582 0.25213 1.87468C0.251375 1.88492 0.250826 1.89517 0.250584 1.90545C0.250513 1.9094 0.25 1.91321 0.25 1.91716V13.7297C0.25 13.8788 0.309263 14.0219 0.414753 14.1274C0.520242 14.2329 0.663316 14.2922 0.8125 14.2922C0.961684 14.2922 1.10476 14.2329 1.21025 14.1274C1.31574 14.0219 1.375 13.8788 1.375 13.7297V10.6454C3.26805 9.3683 4.9002 10.0667 6.77842 10.8717C7.92196 11.3618 9.15325 11.8895 10.4714 11.8895C11.4423 11.8895 12.4603 11.6031 13.525 10.8047C13.5948 10.7523 13.6516 10.6843 13.6906 10.6062C13.7297 10.5281 13.75 10.442 13.75 10.3547V1.91716C13.75 1.8127 13.7209 1.71031 13.666 1.62145C13.6111 1.53259 13.5325 1.46078 13.4391 1.41406Z" fill="url(#paint0_linear)"/>
<defs>
<linearGradient id="paint0_linear" x1="7" y1="0.382385" x2="7" y2="14.2922" gradientUnits="userSpaceOnUse">
<stop stop-color="#51B9DA"/>
<stop offset="1" stop-color="#4E8394"/>
</linearGradient>
</defs>
</svg>
<svg width="52" height="53" viewBox="0 0 52 53" fill="none" xmlns="http://www.w3.org/2000/svg">
<g filter="url(#filter0_d)">
<path d="M36 10.1416H16C15.4697 10.142 14.9612 10.3528 14.5862 10.7278C14.2112 11.1028 14.0004 11.6113 14 12.1416V32.1416C14.0004 32.6719 14.2112 33.1804 14.5862 33.5554C14.9612 33.9304 15.4697 34.1412 16 34.1416H29.5859C29.8486 34.1421 30.1088 34.0906 30.3515 33.99C30.5942 33.8894 30.8146 33.7418 31 33.5557L37.4141 27.1416C37.6002 26.9562 37.7478 26.7358 37.8484 26.4931C37.949 26.2505 38.0005 25.9902 38 25.7275V12.1416C37.9996 11.6113 37.7888 11.1028 37.4138 10.7278C37.0388 10.3528 36.5303 10.142 36 10.1416ZM22 17.1416H30C30.2652 17.1416 30.5196 17.247 30.7071 17.4345C30.8946 17.622 31 17.8764 31 18.1416C31 18.4068 30.8946 18.6612 30.7071 18.8487C30.5196 19.0362 30.2652 19.1416 30 19.1416H22C21.7348 19.1416 21.4804 19.0362 21.2929 18.8487C21.1054 18.6612 21 18.4068 21 18.1416C21 17.8764 21.1054 17.622 21.2929 17.4345C21.4804 17.247 21.7348 17.1416 22 17.1416ZM26 27.1416H22C21.7348 27.1416 21.4804 27.0362 21.2929 26.8487C21.1054 26.6612 21 26.4068 21 26.1416C21 25.8764 21.1054 25.622 21.2929 25.4345C21.4804 25.247 21.7348 25.1416 22 25.1416H26C26.2652 25.1416 26.5196 25.247 26.7071 25.4345C26.8946 25.622 27 25.8764 27 26.1416C27 26.4068 26.8946 26.6612 26.7071 26.8487C26.5196 27.0362 26.2652 27.1416 26 27.1416ZM22 23.1416C21.7348 23.1416 21.4804 23.0362 21.2929 22.8487C21.1054 22.6612 21 22.4068 21 22.1416C21 21.8764 21.1054 21.622 21.2929 21.4345C21.4804 21.247 21.7348 21.1416 22 21.1416H30C30.2652 21.1416 30.5196 21.247 30.7071 21.4345C30.8946 21.622 31 21.8764 31 22.1416C31 22.4068 30.8946 22.6612 30.7071 22.8487C30.5196 23.0362 30.2652 23.1416 30 23.1416H22ZM30 31.7275V26.1396H35.5879L30 31.7275Z" fill="url(#paint0_linear)"/>
</g>
<defs>
<filter id="filter0_d" x="0" y="0.141602" width="52" height="52" 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="4"/>
<feGaussianBlur stdDeviation="7"/>
<feComposite in2="hardAlpha" operator="out"/>
<feColorMatrix type="matrix" values="0 0 0 0 0.745833 0 0 0 0 0.58788 0 0 0 0 0.32941 0 0 0 0.36 0"/>
<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/>
</filter>
<linearGradient id="paint0_linear" x1="28" y1="27.5" x2="38" y2="-3" gradientUnits="userSpaceOnUse">
<stop stop-color="#FFDF6D"/>
<stop offset="1" stop-color="#AA7C38"/>
</linearGradient>
</defs>
</svg>
<svg width="76" height="80" viewBox="0 0 76 80" fill="none" xmlns="http://www.w3.org/2000/svg">
<g filter="url(#filter0_d)">
<path d="M48.6987 26.2844L41.7072 19.2928C41.6971 19.2828 41.6863 19.274 41.6759 19.2645C41.6624 19.2521 41.6493 19.2393 41.6351 19.2277C41.6257 19.22 41.6157 19.2133 41.606 19.2059C41.5897 19.1934 41.5735 19.1807 41.5564 19.1691C41.5486 19.1639 41.5404 19.1596 41.5326 19.1547C41.5128 19.1422 41.4929 19.1297 41.4722 19.1185C41.4665 19.1155 41.4607 19.1132 41.4551 19.1104C41.4316 19.0983 41.4079 19.0867 41.3835 19.0765C41.3797 19.0749 41.3757 19.0737 41.3718 19.0722C41.3455 19.0616 41.3188 19.0518 41.2915 19.0435C41.2875 19.0422 41.2834 19.0415 41.2795 19.0403C41.2524 19.0325 41.225 19.0252 41.1969 19.0196C41.188 19.0178 41.1788 19.017 41.1698 19.0155C41.1466 19.0115 41.1235 19.0074 41.0999 19.0051C41.0667 19.0017 41.0334 19 41 19H28.999C28.4688 19.0006 27.9604 19.2115 27.5855 19.5865C27.2105 19.9614 26.9996 20.4698 26.999 21V43C26.9996 43.5302 27.2105 44.0386 27.5855 44.4135C27.9604 44.7885 28.4688 44.9994 28.999 45H47C47.5302 44.9994 48.0386 44.7885 48.4135 44.4135C48.7885 44.0386 48.9994 43.5302 49 43V27.0193C49.0001 27.0128 49.001 27.0065 49.001 27C49.0011 26.8665 48.9744 26.7344 48.9224 26.6115C48.8705 26.4886 48.7944 26.3773 48.6987 26.2844ZM42.6812 39.682C42.4937 39.8695 42.2393 39.9749 41.9741 39.9749C41.7089 39.9749 41.4546 39.8695 41.267 39.682L39.8939 38.3089C38.9581 38.896 37.8389 39.118 36.7498 38.9322C35.6608 38.7465 34.6784 38.1661 33.9901 37.302C33.3019 36.4379 32.956 35.3505 33.0187 34.2475C33.0813 33.1446 33.548 32.1033 34.3296 31.3226C35.1113 30.542 36.1531 30.0765 37.2561 30.0153C38.3592 29.954 39.4461 30.3012 40.3094 30.9905C41.1727 31.6798 41.7518 32.663 41.9362 33.7522C42.1206 34.8415 41.8973 35.9604 41.309 36.8955L42.6812 38.2677C42.7741 38.3606 42.8477 38.4708 42.898 38.5921C42.9483 38.7135 42.9741 38.8435 42.9741 38.9749C42.9741 39.1062 42.9483 39.2362 42.898 39.3576C42.8477 39.4789 42.7741 39.5891 42.6812 39.682ZM41 27V21.4142L46.5857 27H41Z" fill="url(#paint0_linear)"/>
</g>
<path d="M37.499 32.0012C36.9211 32.0017 36.3613 32.2025 35.9148 32.5694C35.4684 32.9363 35.163 33.4467 35.0506 34.0136C34.9382 34.5804 35.0259 35.1687 35.2986 35.6782C35.5713 36.1877 36.0123 36.5868 36.5463 36.8077C37.0803 37.0285 37.6744 37.0574 38.2273 36.8894C38.7802 36.7214 39.2578 36.3668 39.5786 35.8862C39.8995 35.4055 40.0438 34.8285 39.9869 34.2535C39.93 33.6784 39.6755 33.1408 39.2668 32.7323C39.0348 32.5 38.7592 32.3158 38.4558 32.1904C38.1525 32.0649 37.8273 32.0006 37.499 32.0012Z" fill="url(#paint1_linear)"/>
<defs>
<filter id="filter0_d" x="-0.000976562" y="0" width="76.002" height="80" 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="13.5"/>
<feComposite in2="hardAlpha" operator="out"/>
<feColorMatrix type="matrix" values="0 0 0 0 0.34902 0 0 0 0 0.882353 0 0 0 0 0.803922 0 0 0 0.36 0"/>
<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/>
</filter>
<linearGradient id="paint0_linear" x1="38" y1="19" x2="38" y2="45" gradientUnits="userSpaceOnUse">
<stop stop-color="#ADF0FF"/>
<stop offset="1" stop-color="#48DDC2"/>
</linearGradient>
<linearGradient id="paint1_linear" x1="37.501" y1="32.0012" x2="37.501" y2="36.9973" gradientUnits="userSpaceOnUse">
<stop stop-color="#ADF0FF"/>
<stop offset="1" stop-color="#48DDC2"/>
</linearGradient>
</defs>
</svg>
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -20,11 +20,8 @@ function loaderPage(stat) {
};
$("#sidebar").hide()
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', {
maxZoom: 22,
minZoom: 4,
}).addTo(map);
//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://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", {
......@@ -35,7 +32,7 @@ OpenStreetMap.onclick = function() {
WorldImagery.onclick = function() {
// https://{s}.tiles.wmflabs.org/osm-no-labels/{z}/{x}/{y}.png
maps = L.tileLayer("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,
}).addTo(map);
......
This diff is collapsed.
......@@ -28,8 +28,7 @@
height: 450px!important;
width: 500px!important;
}
.legendapo {
/*.legendapo {
background: #ffffffa6;
position: fixed;
left: 20px;
......@@ -37,7 +36,7 @@
bottom: 0;
height: 170px;
z-index: 999;
}
}*/
.marker-cluster-adm {
margin-left: -20px;
......
This diff is collapsed.
This diff is collapsed.
{% load static %}
<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>
</div>
<div class="row">
......@@ -302,5 +302,5 @@
</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>
\ No newline at end of file
......@@ -92,29 +92,6 @@
</div>
</div>
<div id="modal_detail" class="modal fade mymodal" style="padding-top: 0px;padding-bottom: 0px;right: -11px;width: 100%!important;">
<div class="modal-dialog modal-lg" style="width: 100%;height: 100%;margin: 0;bottom: 0;">
<div class="modal-content" style="height: 100%;">
<div class="modal-header bg-info" style="background-color:#28343a">
<button type="button" class="close" data-dismiss="modal"> <i class='fa fa-times'></i> </button>
<h6 class="modal-title">Info Detail</h6>
</div>
<div class="modal-body" style="max-height: 100%;overflow-y: auto;">
<div class="panel-body" id="isi_modal_detail">
<table class="table table-responsive datatable-show-all table-sm" id="isi_detail" style="word-wrap:break-word;">
</table>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-link" onclick="cetakExcel()">Cetak</button>
</div>
</div>
</div>
</div>
<!-- modal jalan -->
<div id="modal-jalan" class="modal fade">
<div class="modal-dialog">
......@@ -688,6 +665,7 @@
</div>
</div>
<div class="modal fade" id="modalsearch3d" tabindex="-1" role="dialog">
<div class="modal-dialog modal-xs">
<div class="modal-content">
......@@ -709,32 +687,158 @@
</div>
</div>
</div>
<!--
<script>
$("#tipe_point").change(function() {
var tipe = $(this).val();
$.ajax({
url: "{% url 'api:change-tipe' %}",
data: {
'tipe': tipe
},
dataType: 'json',
success: function(data) {
console.log(data)
var data_all_kab = []
for (var i = 0; i < data['result'].length; i++) {
var data_k = data['result'][i][0];
console.log(data_k)
var data_kab = `<option value="` +
data_k +
`">` +
data_k +
`</option>`;
data_all_kab.push(data_kab)
};
$('#tipe_point_2').html(`<option value="null" selected disabled>-- Pilih Tipe Point --</option>` + data_all_kab);
<style>
#modal_detail_kelurahan>div>div>div>fieldset>div>div:nth-child(1)>div:nth-child(2)>div.row>div>div>div:nth-child(1) {
margin-bottom: 5px;
}
#modal_detail_kelurahan>div>div>div>fieldset>div>div:nth-child(1)>div:nth-child(2)>div.row>div>div>div:nth-child(2) {
margin-bottom: 10px;
font-family: 'gilroysemibold';
}
li.active>a:after {
border-bottom: 2pt solid #60B2FD;
}
.apexcharts-menu-icon {
width: 150px;
color: white;
left: -16px;
}
.apexcharts-toolbar {
right: -50px!important;
top: 104%!important;
background-color: #5A9AFB;
border-top-left-radius: 10px;
width: 150px;
height: 45px;
border-bottom-right-radius: 10px;
}
.apexcharts-menu {
top: -98px!important;
right: 0px!important;
}
});
});
</script> -->
</style>
<div class="modal fade" id="modal_detail_kelurahan" tabindex="-1" role="dialog">
<div class="modal-dialog modal-md" style="width: 820px;max-height: 500px;min-height: 500px;">
<div class="modal-content" style="border-radius:10px;max-height: 500px;min-height: 500px;">
<div class="modal-body" style="padding: 0px;">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true" style="padding: 5px 10px 0px 0px;">×</button>
<fieldset>
<div class="row">
<div class="col-md-6">
<div class="gambar_kelurahan">
<img src="/static/img/imm.png" alt="" style="width:360px;height:290px;border-top-left-radius: 10px;">
</div>
<div style="margin: 10px;">
<div style="font-family: 'gilroybold';margin-bottom: 10px;" class="nama_kelurahan">
NAMADESA
</div>
<div class="row">
<div class="col-md-6">
<div>
<div>
<span>Kode Desa</span>
</div>
<div>
<span class="kode_kelurahan">1234</span>
</div>
</div>
<div>
<div>
<span>Jumlah Penduduk</span>
</div>
<div>
<span class="jumlah_penduduk_kelurahan">34567</span>
</div>
</div>
</div>
<div class="col-md-6">
<div>
<div>
<span>Luas Wilayah</span>
</div>
<div>
<span class="luas_wilayah_kelurahan">1234</span>
</div>
</div>
<div>
<div>
<span>Jumlah KK</span>
</div>
<div>
<span class="jumlah_kk_kelurahan">34567</span>
</div>
</div>
</div>
</div>
</div>
<div class="tombol-edit text-center" style="background-color: #5A9AFB;
position: absolute;
margin-top: 3px;
border-bottom-left-radius: 8px;
border-top-right-radius: 8px;
width: 80px;
height:45px;">
<a href="" class="btn">Edit</a>
</div>
</div>
<div class="col-md-6" style="margin-left: -30px;margin-top: 10px;">
<div>
<span>
Informasi Data Wilayah
</span>
</div>
<div class="tabbable">
<ul class="nav nav-tabs nav-tabs-bottom nav-justified" style="border-top: 1px solid #F9F9F9;
border-bottom: 1px solid #F9F9F9;">
<li class="active"><a href="#bordered-justified-tab1" data-toggle="tab">Penduduk</a></li>
<li><a href="#bordered-justified-tab5" data-toggle="tab">Agama</a></li>
<li><a href="#bordered-justified-tab2" data-toggle="tab">Pendidikan</a></li>
<li><a href="#bordered-justified-tab3" data-toggle="tab">Umur</a></li>
<li><a href="#bordered-justified-tab4" data-toggle="tab">Pekerjaan</a></li>
</ul>
<div class="tab-content">
<div class="tab-pane active" id="bordered-justified-tab1">
<div id="info_penduduk">
</div>
</div>
<div class="tab-pane" id="bordered-justified-tab5">
<div id="info_agama">
</div>
</div>
<div class="tab-pane" id="bordered-justified-tab2">
<div id="info_pendidik">
</div>
</div>
<div class="tab-pane" id="bordered-justified-tab3">
<div id="info_umur">
</div>
</div>
<div class="tab-pane" id="bordered-justified-tab4">
<div id="info_pekerjaan">
</div>
</div>
</div>
</div>
</div>
</div>
</fieldset>
</div>
</div>
</div>
</div>
\ No newline at end of file
......@@ -14,11 +14,13 @@
</div>
</a>
</div>
<span class="tooltiptext tooltip-left">3D</span>
<span class="tooltiptext tooltip-left" style="font-family: 'gilroysemibold';
color: #085E8C;">3D</span>
</li>
<li class="fixed-plugin no3d" style="top: 110px;">
<span class="tooltiptext tooltip-left">Basemaps</span>
<span class="tooltiptext tooltip-left" style="color:
#2D7159;font-family:'gilroysemibold';">Basemaps</span>
<div class="dropdown show-dropdown" style="top: 1px;">
<a href="#" data-toggle="dropdown">
<img src="{% static 'img/icon-1/Vectorbasemaps.svg' %}" alt="" style="height: 50px;
......@@ -75,7 +77,7 @@
</div>
</li>
<li class="fixed-plugin no3d" style="top: 170px;">
<span class="tooltiptext tooltip-left">Overlay</span>
<span class="tooltiptext tooltip-left" style="font-family: 'gilroysemibold';color: #6D3FDE;">OVERLAY</span>
<div class="dropdown show-dropdown ">
<a href="#" data-toggle="dropdown">
<img src="{% static 'img/icon-1/Vectoroverlay.svg' %}" alt="" style="height: 50px;
......@@ -83,25 +85,34 @@
margin-top: -1px;
margin-left: -4px;">
</a>
<ul class="dropdown-menu" style="top: -5px;">
<ul class="dropdown-menu" style="top: 12px;
width: 300px;
margin-left: -270px!important;">
<li class="header-title text-center">Sidebar Filters</li>
<!-- <div id="sidebar" onmouseleave="overll()">
<div class="sidebar-wrapper">
<div class="panel panel-default" id="features">
<div class="panel-body"> -->
<div class="row" style="margin: 0;padding: 0;">
<div class="col-md-6">
<div class="col-md-12">
<div class="checkbox">
<label>
<input type="checkbox" id="geo_tuplah" onclick="geotuplah()" style="margin-top:2px;">
<img src="/static/img/icon-1/SquareHalflahan.svg" alt="" style="margin-top: -5px;">
<span>
Lahan
</span>
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" id="geo_building" style="margin-top:2px;">
<img src="/static/img/icon-1/Buildingsbangunan.svg" alt="" style="margin-top: -5px;">
<span>
Bangunan
</span>
</label>
</div>
<!-- <ul class="nasted active">
......@@ -121,7 +132,10 @@
<div class="checkbox">
<label>
<input type="checkbox" id="geo_jalan" onclick="geojalan()" style="margin-top:2px;">
<img src="/static/img/icon-1/Vectorjalan.svg" alt="" style="margin-top: -5px;">
<span>
Jalan
</span>
</label>
</div>
......@@ -134,7 +148,10 @@
<div class="checkbox">
<label>
<input type="checkbox" id="batas_all" onclick="batasall()" style="margin-top:2px;" >
<img src="/static/img/icon-1/Vectorteritory.svg" alt="" style="margin-top: -5px;">
<span>
Batas Teritori
</span>
</label>
</div>
<ul class="nasted active">
......@@ -160,16 +177,16 @@
</div>
</ul>
</div>
<div class="col-md-6">
<div class="checkbox">
<!-- <div class="col-md-6"> -->
<!-- <div class="checkbox">
<label>
<input type="checkbox" id="po_all" onclick="gas_all()" value="BLACK" class="checkboxOccInfo" name="checkOccInfo" style="margin-top:2px;">
Point
</label>
</div>
</div> -->
<ul class="nasted active">
<div class="checkbox">
<!-- <ul class="nasted active"> -->
<!-- <div class="checkbox">
<label>
<input type="checkbox" id="knt_adm" onclick="k_adm()" value="BLACK" class="checkboxOccInfo" name="checkOccInfo" style="margin-top:2px;">
Kantor Administrasi
......@@ -194,26 +211,26 @@
<input type="checkbox" id="rusak" onclick="rs()" value="YELLOW" class="checkboxOccInfo" name="checkOccInfo" style="margin-top:2px;">
Rumah Sakit
</label>
</div>
<div class="checkbox">
</div> -->
<!-- <div class="checkbox">
<label>
<input type="checkbox" id="ibdh" onclick="fiksi()" value="YELLOW" class="checkboxOccInfo" name="checkOccInfo" style="margin-top:2px;">
Sarana Ibadah
</label>
</div>
<div class="checkbox">
</div> -->
<!-- <div class="checkbox">
<label>
<input type="checkbox" id="dididik" onclick="didik()" value="YELLOW" class="checkboxOccInfo" name="checkOccInfo" style="margin-top:2px;">
Sarana Pendidikan
</label>
</div>
<div class="checkbox">
</div> -->
<!-- <div class="checkbox">
<label>
<input type="checkbox" id="pom_bengsin" onclick="pom_mini()" value="YELLOW" class="checkboxOccInfo" name="checkOccInfo" style="margin-top:2px;">
SPBU
</label>
</div>
<div class="checkbox">
</div> -->
<!-- <div class="checkbox">
<label>
<input type="checkbox" id="tasiun" onclick="sthall()" value="YELLOW" class="checkboxOccInfo" name="checkOccInfo" style="margin-top:2px;">
Stasiun
......@@ -236,9 +253,9 @@
<input type="checkbox" id="gardu" onclick="gl100()" value="YELLOW" class="checkboxOccInfo" name="checkOccInfo" style="margin-top:2px;">
Gardu Listrik
</label>
</div>
</ul>
</div>
</div> -->
<!-- </ul>
</div> -->
</div>
</ul>
</div>
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -38,7 +38,6 @@
.modal-backdrop {
z-index: -1!important;
}
.sidebar {
......@@ -116,8 +115,7 @@
height: 270px;
}
#placelg{
#placelg {
object-fit: cover;
object-position: center center;
width: 30px;
......@@ -132,7 +130,7 @@
border: 1px solid red;
}
.modal-lg{
.modal-lg {
max-width: 1000px !important;
}
......@@ -164,8 +162,6 @@
transform: translate(-50%, -50%);
text-align: center;
}
</style>
</head>
......@@ -241,15 +237,11 @@
<div class="sidebar-user">
<div class="category-content">
<div class="media">
{% for us in thisUser %}
{% if us.filepath %}
{% for us in thisUser %} {% if us.filepath %}
<a href="#" class="media-left"><img src="{% static 'img/' %}{{us.filepath}}" class="img-circle img-sm" alt=""></a>
{% else %}
<a href="#" class="media-left"><img src="{% static '/img/placeholder.jpg' %}" class="img-circle img-sm" alt=""></a>
{% endif %}
{% endfor %}
{% endif %} {% endfor %}
<div class="media-body">
......@@ -507,7 +499,7 @@
<div class="row">
<div class="col-md-6">
<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>
......@@ -537,7 +529,7 @@
<div class="row">
<div class="col-md-6">
<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>
......@@ -969,7 +961,7 @@
<h6 class="modal-title"> Edit Password</h6>
</div>
<div class="modal-body">
<div >
<div>
<div class="alert alert-danger" id="notifications" style="display: none">
</div>
......@@ -989,7 +981,7 @@
<div class="col-md-12">
<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>
......@@ -998,7 +990,7 @@
<div class="col-md-12">
<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>
......@@ -1007,7 +999,7 @@
<div class="col-md-12">
<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>
......@@ -1268,8 +1260,7 @@
<!-- <script type="text/javascript" src="{% static 'js/plugins/ui/ripple.min.js' %}"></script> -->
<!-- /theme JS files -->
{% include 'includes/scripts.html' %}
{% include 'layout/userprofile.html' %}
{% include 'includes/scripts.html' %} {% include 'layout/userprofile.html' %}
<script src="{% static 'js/leaflet-bing-layer.js' %}"></script>
<!-- <script src="https://unpkg.com/sweetalert/dists/sweetalert.min.js"></script> -->
......@@ -1349,15 +1340,15 @@
const urlParams = new URLSearchParams(queryString);
const page = urlParams.get('page')
if (page == "group" ) {
if (page == "group") {
$("#usergroup").css("display", "block");
$("#info-maps").css("display", "none");
$("#userprofile").css("display", "none");
} else if(page == "user" || page == null){
} else if (page == "user" || page == null) {
$("#usergroup").css("display", "none");
$("#info-maps").css("display", "block");
$("#userprofile").css("display", "none")
} else{
} else {
$("#usergroup").css("display", "none");
$("#info-maps").css("display", "none");
$("#userprofile").css("display", "block");
......@@ -1872,11 +1863,11 @@
//user profile js
$("#save-edt-password").on("click", function(){
$("#save-edt-password").on("click", function() {
changepassword();
})
function changepassword(){
function changepassword() {
var isObject = {};
isObject.id = $("#iduseredt").val();
......@@ -1885,7 +1876,7 @@
isObject.renewPass = $("#renewPass").val();
isObject.username = $("#usernameedt").val();
if(isObject.currPass == "" || isObject.newPass == "" || isObject.renewPass == ""){
if (isObject.currPass == "" || isObject.newPass == "" || isObject.renewPass == "") {
$("#notifications").css("display", "block")
$("#notifications").html("Inputan tidak boleh kosong")
......@@ -1922,11 +1913,11 @@
}
$("#save-edit-profile").on("click", function(){
$("#save-edit-profile").on("click", function() {
editprofile();
})
function editprofile(){
function editprofile() {
var isObject = {}
isObject.id = $("#iduseredt").val();
......@@ -1934,14 +1925,14 @@
isObject.last_name = $("#lastnameedt").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").html("Inputan tidak boleh kosong")
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})\]?$)/;
if(!isObject.email.match(mail_format)){
if (!isObject.email.match(mail_format)) {
$("#notificationsprop").css("display", "block");
$("#notificationsprop").html("Format email tidak valid, silahkan coba kembali.")
return false
......@@ -2032,6 +2023,4 @@
}
})
});
</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