fix 18/11/2021

Application/views.py

@@ -491,9 +491,7 @@ class Dashboard(generic.TemplateView):
                                 ( 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 gdl on st_intersects(st_setsrid(gdl.geom, 4326), st_setsrid(tp.geom, 4326))
-                                JOIN geo_data_kecamatan gdc ON st_intersects ( st_setsrid ( gdc.geom, 4326 ), st_setsrid ( tp.geom, 4326 ) ) 
-                            WHERE
-                                rn = 1
+                                JOIN geo_data_kecamatan gdc ON st_intersects ( st_setsrid ( gdc.geom, 4326 ), st_setsrid ( tp.geom, 4326 ) )
                             """)
             res_perbaikan = data_per.fetchall()
         
@@ -646,6 +644,10 @@ def has_group(user, group_name):
     group = Group.objects.get(name=group_name)
     return True if group in user.groups.all() else False
 
+def saver():
+    # feses = '/var/www/django/oku.khansia.co.id/static/media/'
+    feses = 'static/media/'
+    return feses
 
 def perbaikanrenovasi(request):
     with conn.cursor() as data_per:
@@ -686,9 +688,7 @@ def perbaikanrenovasi(request):
                             ( 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 gdl on st_intersects(st_setsrid(gdl.geom, 4326), st_setsrid(tp.geom, 4326))
-                            JOIN geo_data_kecamatan gdc ON st_intersects ( st_setsrid ( gdc.geom, 4326 ), st_setsrid ( tp.geom, 4326 ) ) 
-                        WHERE
-                            rn = 1
+                            JOIN geo_data_kecamatan gdc ON st_intersects ( st_setsrid ( gdc.geom, 4326 ), st_setsrid ( tp.geom, 4326 ))
                          """)
         res_perbaikan = data_per.fetchall()
     
@@ -848,10 +848,9 @@ def saveperbaikan(request):
     bukti_selesai   = request.FILES.get("bukti_selesai")
     print(coor, proposal)
     
-    
-    
-    fss_p = FileSystemStorage(location='/var/www/django/oku.khansia.co.id/media/proposal/')
-    fss_b = FileSystemStorage(location='/var/www/django/oku.khansia.co.id/media/bukti_penyelesaian/')
+    save = saver()
+    fss_p = FileSystemStorage(location=str(str(save)+'proposal/'))
+    fss_b = FileSystemStorage(location=str(str(save)+'bukti_penyelesaian/'))
     
     # coord = json.loads(str(coor))
     
@@ -1034,8 +1033,9 @@ def saveperbaikanbangunan(request):
     print((proposal.name).split("."))
     print((bukti_selesai.name).split("."))
     
-    fss_p = FileSystemStorage(location='/var/www/django/oku.khansia.co.id/media/proposal/')
-    fss_b = FileSystemStorage(location='/var/www/django/oku.khansia.co.id/media/bukti_penyelesaian/')
+    save = saver()
+    fss_p = FileSystemStorage(location=str(str(save)+'proposal/'))
+    fss_b = FileSystemStorage(location=str(str(save)+'bukti_penyelesaian/'))
 
     try:
         format1 = (proposal.name).split(".")

static/js/action.js

@@ -64,7 +64,6 @@ function getdetailper(id) {
                 minZoom: 4,
             }).addTo(map_detail_perbaikan);
 
-
             setTimeout(function() {
                 map_detail_perbaikan.invalidateSize();
             }, 500);
@@ -104,13 +103,13 @@ function getdetailper(id) {
                 $(".panjang_jalan_detail_dash").html(data[0]['panjang'])
                 $(".lebar_jalan_detail_dash").html(data[0]['lbr_jln_reno'])
                 $(".proposal_detail_dash").html(`
-                        <a href="media/proposal/` + data[0]['proposal'] + ` target="_blank" "id="downloadproposal">
+                        <a href="static/media/proposal/` + data[0]['proposal'] + `" target="_blank" "id="downloadproposal">
                             <img src="static/img/icon-1/proposal.svg" alt=" " style="height: 65px;width: 65px; ">
                         </a>`);
 
 
                 $(".bukti_detail_perbaikan_dash").html(`
-                        <a href="media/bukti_penyelesaian/` + data[0].bukti_selesai + ` target="_blank" id="view-bukti">
+                        <a href="static/media/bukti_penyelesaian/` + data[0].bukti_selesai + `" target="_blank" id="view-bukti">
                             <img src="static/img/icon-1/bukti.svg" alt=" " style="height: 70px;
                             width: 50px;">
                         </a>`);