Rilis v2411.0.0

OpenSID · Nov 4, 2024 · 2721af6 · 2721af6
1 parent 8a7e57c
commit 2721af6
Show file tree

Hide file tree

Showing 8 changed files with 144 additions and 67 deletions.
diff --git a/README.md b/README.md
diff --git a/catatan_rilis.md b/catatan_rilis.md
@@ -1,12 +1,10 @@
-Catatan Rilis v2410.0.0 :
+Catatan Rilis v2411.0.0 :
 
 ### FITUR : 
-1. Penambahan halaman stunting. (premium)
-2. Penambahan filter bantuan berdasarkan tahun. (premium)
+1. Penambahan fungsi cetak dan unduh pada halaman statistik dan bantuan.
+2. Penambahan fungsi cetak dan unduh pada halaman statistik kesehatan > stunting.
+3. Penambahan fungsi menu tipe embed.
 
-#### BUG : 
-1. Perbaikan tampilan halaman artikel.
-1. Perbaikan tampilan halaman peta.
-
-### TEKNIS :
-1. Penyesuaian sebutan kepala dusun. (premium)
+### BUG : 
+1. Perbaikan pengurutan data pada informasi publik.
+2. Perbaikan menu agar selalu posisi atas.
diff --git a/commons/meta.php b/commons/meta.php
@@ -1,6 +1,6 @@
 <?php defined('BASEPATH') || exit('No direct script access allowed'); ?>
 
-<?php defined('THEME_VERSION') or define('THEME_VERSION', 'v2410.0.0') ?>
+<?php defined('THEME_VERSION') or define('THEME_VERSION', 'v2411.0.0') ?>
 <?php defined('FOTO_TIDAK_TERSEDIA') or define('FOTO_TIDAK_TERSEDIA', theme_config('foto_tidak_tersedia') ? base_url(theme_config('foto_tidak_tersedia')) : asset('images/404-image-not-found.jpg')) ?>
 <?php $desa_title =  ucwords($this->setting->sebutan_desa) . ' '. $desa['nama_desa'] . ' '. ucwords($this->setting->sebutan_kecamatan) . ' '. $desa['nama_kecamatan'] . ' '. ucwords($this->setting->sebutan_kabupaten) . ' '. $desa['nama_kabupaten']; ?>
 

diff --git a/layouts/embed.tpl.php b/layouts/embed.tpl.php
@@ -0,0 +1,75 @@
+<?php $nama_desa = ucwords(setting('sebutan_desa') . ' ' . $desa['nama_desa']); ?>
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title><?= $menu->nama ?> - <?= $nama_desa ?></title>
+    <meta name="keywords" content="<?= $this->setting->website_title . ' '.  $desa_title; ?>"/>
+    <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/font/bootstrap-icons.css">
+    <style>
+        body, html {
+            margin: 0;
+            padding: 0;
+            height: 100%;
+            width: 100%;
+            overflow: hidden;
+        }
+        iframe {
+            border: none;
+            width: 100%;
+            height: calc(100% - 56px);
+            display: none;
+        }
+        .navbar-brand {
+            display: flex;
+            align-items: center;
+        }
+        .navbar-brand img {
+            height: 40px;
+            margin-right: 10px;
+        }
+        .spinner {
+            position: fixed;
+            top: 50%;
+            left: 50%;
+            transform: translate(-50%, -50%);
+            z-index: 1000;
+        }
+    </style>
+</head>
+<body>
+
+<div class="spinner">
+    <div class="spinner-border" role="status">
+        <span class="visually-hidden">Memuat...</span>
+    </div>
+</div>
+
+<nav class="navbar navbar-light bg-light">
+    <div class="container-fluid">
+        <a class="navbar-brand" href="#">
+            <img src="<?= gambar_desa($desa['logo']); ?>" alt="<?= $nama_desa ?>">
+            <span><?= $nama_desa ?></span>
+        </a>
+        <button class="btn btn-primary" onclick="window.location.href='<?= site_url() ?>'">
+            <i class="bi bi-arrow-left"></i> Kembali
+        </button>
+    </div>
+</nav>
+
+<iframe id="contentFrame" src="<?= $menu->link ?>" scrolling="yes"></iframe>
+
+<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"></script>
+<script>
+    const iframe = document.getElementById('contentFrame');
+    iframe.onload = function() {
+        document.querySelector('.spinner').style.display = 'none';
+        iframe.style.display = 'block';
+    };
+</script>
+
+</body>
+</html>
diff --git a/partials/informasi_publik/index.php b/partials/informasi_publik/index.php
@@ -46,7 +46,7 @@
       'processing': true,
       'serverSide': true,
       "pageLength": 10,
-      'order': [],
+      'order': [4, 'desc'],
       "ajax": {
         "url": url,
         "type": "POST"

diff --git a/partials/kesehatan/scorecard.php b/partials/kesehatan/scorecard.php
@@ -1,6 +1,16 @@
+<div class="row">
+    <div class="col-lg-12">
+        <a href="cetak/cetak<?= '?kuartal=' . $kuartal . '&tahun=' . $_tahun . '&id=' . $id ?>" class="btn btn-info visible-xs-block visible-sm-inline-block visible-md-inline-block visible-lg-inline-block" style="margin: 10px;
+    float: right;" target="_blank"><i class="fa fa-print"></i>
+            Cetak</a>
+        <a href="cetak/unduh<?= '?kuartal=' . $kuartal . '&tahun=' . $_tahun . '&id=' . $id ?>" class="btn btn-primary visible-xs-block visible-sm-inline-block visible-md-inline-block visible-lg-inline-block" style="margin: 10px;
+    float: right;" target="_blank"><i class="fa fa-download"></i>
+            Unduh</a>
+    </div>
+</div>
 <div class="row">
     <div class="col-md-12 col-lg-12">
-        <div class="box box-success">            
+        <div class="box box-success">
             <!-- /.box-header -->
             <div class="box-body table-responsive">
                 <table id="table-datas" class="table table-bordered table-striped table-responsive">
@@ -316,27 +326,27 @@
                         </tr>
                         <?php
                         $JLD_IbuHamil = $ibu_hamil['tingkatKonvergensiDesa'] == null ? '0' :
-                        $ibu_hamil['tingkatKonvergensiDesa']['jumlah_diterima'];
+                            $ibu_hamil['tingkatKonvergensiDesa']['jumlah_diterima'];
                         $JLD_Anak = $bulanan_anak['tingkatKonvergensiDesa'] == null ? '0' :
-                        $bulanan_anak['tingkatKonvergensiDesa']['jumlah_diterima'];
+                            $bulanan_anak['tingkatKonvergensiDesa']['jumlah_diterima'];
 
                         $JYSD_IbuHamil = $ibu_hamil['tingkatKonvergensiDesa'] == null ? '0' :
-                        $ibu_hamil['tingkatKonvergensiDesa']['jumlah_seharusnya'];
+                            $ibu_hamil['tingkatKonvergensiDesa']['jumlah_seharusnya'];
                         $JYSD_Anak = $bulanan_anak['tingkatKonvergensiDesa'] == null ? '0' :
-                        $bulanan_anak['tingkatKonvergensiDesa']['jumlah_seharusnya'];
+                            $bulanan_anak['tingkatKonvergensiDesa']['jumlah_seharusnya'];
 
                         $PERSEN_IbuHamil = $ibu_hamil['tingkatKonvergensiDesa'] == null ? '0' :
-                        $ibu_hamil['tingkatKonvergensiDesa']['persen'];
+                            $ibu_hamil['tingkatKonvergensiDesa']['persen'];
                         $PERSEN_Anak = $bulanan_anak['tingkatKonvergensiDesa'] == null ? '0' :
-                        $bulanan_anak['tingkatKonvergensiDesa']['persen'];
+                            $bulanan_anak['tingkatKonvergensiDesa']['persen'];
 
                         $JLD_TOTAL = (int) $JLD_IbuHamil + (int) $JLD_Anak;
                         $JYSD_TOTAL = (int) $JYSD_IbuHamil + (int) $JYSD_Anak;
 
                         if ($JYSD_TOTAL != 0) {
-                        $KONV_TOTAL = number_format(($JLD_TOTAL / $JYSD_TOTAL) * 100, 2);
+                            $KONV_TOTAL = number_format(($JLD_TOTAL / $JYSD_TOTAL) * 100, 2);
                         } else {
-                        $KONV_TOTAL = number_format(0, 2);
+                            $KONV_TOTAL = number_format(0, 2);
                         }
 
                         ?>
@@ -409,4 +419,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>
diff --git a/partials/menu_head.php b/partials/menu_head.php
@@ -1,40 +1,43 @@
 <?php defined('BASEPATH') || exit('No direct script access allowed'); ?>
 
+
+<style>
+    .dropdown>.dropdown-menu>.dropdown>.dropdown-menu {
+        position: absolute;
+        left: 100%;
+        top: 10%;
+
+    }
+
+    .dropdown>.dropdown-menu>.dropdown>.dropdown-menu {
+        display: none;
+        background-color: #E64946;
+        color: #FFF
+    }
+</style>
+
 <nav class="navbar navbar-default" role="navigation">
     <div class="container-fluid">
         <div class="navbar-header">
             <div class="row visible-xs">
-            <div class="col-xs-6 visible-xs">
-                <img src="<?= gambar_desa($desa['logo']); ?>" class="cardz hidden-lg hidden-md" width="30" align="left" alt="<?= $desa['nama_desa']; ?>"/>
-            </div>
-            <div class="col-xs-6 visible-xs">
-                <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
-                    <span class="sr-only">Toggle navigation</span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                </button>
-            </div>
+                <div class="col-xs-6 visible-xs">
+                    <img src="<?= gambar_desa($desa['logo']); ?>" class="cardz hidden-lg hidden-md" width="30" align="left" alt="<?= $desa['nama_desa']; ?>" />
+                </div>
+                <div class="col-xs-6 visible-xs">
+                    <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
+                        <span class="sr-only">Toggle navigation</span>
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                    </button>
+                </div>
             </div>
         </div>
         <div id="navbar" class="navbar-collapse collapse">
             <ul class="nav navbar-nav custom_nav">
                 <li class="dropdown"><a href="<?= site_url(); ?>">Beranda</a></li>
-				<?php createDropdownMenu(menu_tema()) ?>               
+                <?php createDropdownMenu(menu_tema()) ?>
             </ul>
-		</div>
+        </div>
     </div>
-</nav>
-
-<style>
-    .dropdown>.dropdown-menu>.dropdown>.dropdown-menu{
-        position: absolute;
-        left: 100%;
-        top: 10%;
-
-    }
-    .dropdown>.dropdown-menu>.dropdown:hover>.dropdown-menu{
-        background-color: #E64946;
-        color: #FFF
-    }
-</style>
+</nav>
diff --git a/partials/statistik.php b/partials/statistik.php
@@ -182,6 +182,16 @@ function switchType(obj){
         <div class="btn-group-xs">
             <a class="btn <?= (($default_chart_type ?? 'pie')=='pie') ? 'btn-primary' : 'btn-default' ?> btn-xs" onclick="switchType(this);">Bar Graph</a>
             <a class="btn <?= (($default_chart_type ?? 'pie')=='column') ? 'btn-primary' : 'btn-default' ?> btn-xs" onclick="switchType(this);">Pie Cart</a>
+            <a href="<?= site_url("data-statistik/{$slug_aktif}/cetak/cetak") ?>?tahun=<?= $selected_tahun ?>"
+                class="btn btn-primary btn-sm visible-xs-block visible-sm-inline-block visible-md-inline-block visible-lg-inline-block"
+                title="Cetak Laporan" target="_blank">
+                <i class="fa fa-print "></i> Cetak
+            </a>
+            <a href="<?= site_url("data-statistik/{$slug_aktif}/cetak/unduh") ?>?tahun=<?= $selected_tahun ?>"
+                class="btn btn-success btn-sm visible-xs-block visible-sm-inline-block visible-md-inline-block visible-lg-inline-block"
+                title="Unduh Laporan" target="_blank">
+                <i class="fa fa-print "></i> Unduh
+            </a>
         </div>
     </div>
 </div>