Merge branch 'dev'

OpenSID · Oct 1, 2024 · 8a7e57c · 8a7e57c
2 parents ee1b1b2 + 2efc177
commit 8a7e57c
Show file tree

Hide file tree

Showing 15 changed files with 673 additions and 29 deletions.
diff --git a/assets/css/custom.css b/assets/css/custom.css
@@ -38,9 +38,10 @@
 	text-align: center;
 }
 .data-case-container table td.case {
-	width: 5px;
-	white-space: nowrap;
-	text-align: right;
+    width: auto; /* Allow the width to be flexible */
+    white-space: normal; /* Allow the text to wrap when needed */
+    text-align: right; /* Keep the text aligned to the right */
+    word-break: break-all; /* Break words at any character to prevent overflow */
 }
 .info-box {
 	display: block;

diff --git a/catatan_rilis.md b/catatan_rilis.md
@@ -1,6 +1,12 @@
-Catatan Rilis v2409.0.0 :
+Catatan Rilis v2410.0.0 :
+
+### FITUR : 
+1. Penambahan halaman stunting. (premium)
+2. Penambahan filter bantuan berdasarkan tahun. (premium)
+
+#### BUG : 
+1. Perbaikan tampilan halaman artikel.
+1. Perbaikan tampilan halaman peta.
 
 ### TEKNIS :
-1. Penyesuaian halaman statis.
-2. Penyesuaian halaman 404.
-3. Penyesuaian judul halaman statistik.
+1. Penyesuaian sebutan kepala dusun. (premium)
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', 'v2409.0.0') ?>
+<?php defined('THEME_VERSION') or define('THEME_VERSION', 'v2410.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']; ?>
 
@@ -123,17 +123,34 @@ function renderDate()
 	}
 
 	@keyframes progressiveReveal {
-    0% {
-        opacity: 0;
-        transform: scale(1.05)
-    }
+		0% {
+			opacity: 0;
+			transform: scale(1.05)
+		}
+
+		to {
+			opacity: 1;
+			transform: scale(1)
+		}
+	}
 
-    to {
-        opacity: 1;
-        transform: scale(1)
-    }
-}
-
+	embed-responsive {
+		position: relative;
+		display: block;
+		height: 0;
+		padding: 0;
+		overflow: hidden;
+		padding-bottom: 56.25%; /* For a 16:9 ratio */
+	}
+
+	embed-responsive iframe {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		border: 0;
+	}
 </style>
 
 <script>

diff --git a/layouts/full_content.tpl.php b/layouts/full_content.tpl.php
@@ -20,7 +20,7 @@
 				<div class="col-lg-12 col-md-12">
 					<?php
 						if ($tampil) {
-							theme_view("partials/{$halaman_peta}");
+							theme_view($halaman_peta);
 						} else {
 							theme_view("partials/not_found");
 						}

diff --git a/layouts/kesehatan.tpl.php b/layouts/kesehatan.tpl.php
@@ -0,0 +1,37 @@
+<?php defined('BASEPATH') || exit('No direct script access allowed'); ?>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:og="http://ogp.me/ns#" xmlns:fb="https://www.facebook.com/2008/fbml">
+<head>
+	<?php $this->load->view("$folder_themes/commons/meta"); ?>
+</head>
+<body onLoad="renderDate()">
+<a class="scrollToTop" href="#"><i class="fa fa-angle-up"></i></a>
+<div class="container" style="background-color: #f6f6f6;">
+	<header id="header">
+		<?php $this->load->view("$folder_themes/partials/header"); ?>
+	</header>
+	<div id="navarea">
+		<?php $this->load->view("$folder_themes/partials/menu_head"); ?>
+	</div>
+	<div class="row">
+		<section>
+			<div class="content_middle"></div>
+			<div class="content_bottom">
+      <?php
+        if ($tampil) {
+          $this->load->view($folder_themes . '/partials/kesehatan/index');
+        } else {
+          theme_view('partials/not_found');
+        } ?>
+			</div>
+		</section>
+	</div>
+</div>
+<footer id="footer">
+	<?php $this->load->view("$folder_themes/partials/footer_top"); ?>
+	<?php $this->load->view("$folder_themes/partials/footer_bottom"); ?>
+</footer>
+<?php $this->load->view("$folder_themes/commons/meta_footer"); ?>
+</body>
+</html>
diff --git a/partials/artikel.php b/partials/artikel.php
@@ -71,7 +71,7 @@
 						</a>
 					<?php endif ?>
 				</div>
-				<div class="teks"><?= $single_artikel["isi"] ?></div>
+				<div class="title_text"><?= $single_artikel["isi"] ?></div>
 				<?php if ($single_artikel['dokumen'] != '' and is_file(LOKASI_DOKUMEN . $single_artikel['dokumen'])) : ?>
 					<p>Unduh Lampiran:<br><a href='<?= site_url("first/unduh_dokumen_artikel/{$single_artikel['id']}") ?>' title=""><?= e($single_artikel['link_dokumen']) ?></a></p>
 				<?php endif ?>

diff --git a/partials/bottom_content_right.php b/partials/bottom_content_right.php
@@ -34,7 +34,9 @@
 			<div class="single_bottom_rightbar">
 				<h2><i class="fa fa-folder"></i>&ensp;<?= $judul_widget['judul_widget'] ?></h2>
 				<div class="box-body">
-					<?= htmlspecialchars_decode(html_entity_decode($widget['isi']), ENT_QUOTES) ?>
+					<div class="embed-responsive embed-responsive-16by9">
+						<?= htmlspecialchars_decode(html_entity_decode($widget['isi']), ENT_QUOTES) ?>
+					</div>
 				</div>
 			</div>
 		<?php endif ?>

diff --git a/partials/kesehatan/chart_stunting_posyandu.php b/partials/kesehatan/chart_stunting_posyandu.php
@@ -0,0 +1,27 @@
+<div class="grid grid-cols-1 container px-3 lg:px-5">     
+    <div id="chart_posyandu"></div>    
+</div>
+<script>
+    $(document).ready(function(){        
+        const posy=    Highcharts.chart('chart_posyandu', {
+            chart: {
+                type: 'column'
+            },
+            title: {
+                text: 'Grafik Kasus Stunting per-Posyandu'
+            },
+            xAxis: {
+                categories: <?= json_encode($chartStuntingPosyanduData['categories']) ?>
+            },
+            yAxis: {
+                min: 0,
+                title: {
+                    text: 'Angka Kasus Stunting'
+                }
+            },            
+            colors: ['#028EFA', '#5EE497', '#FDB13B'],
+            series: <?= json_encode($chartStuntingPosyanduData['data']) ?>
+
+        })                
+    })
+</script>
diff --git a/partials/kesehatan/chart_stunting_umur.php b/partials/kesehatan/chart_stunting_umur.php
@@ -0,0 +1,48 @@
+<div class="row mt-4">     
+    <div class="col-md-4 col-sm-12" id="chart_0_5"></div>
+    <div class="col-md-4 col-sm-12" id="chart_6_11"></div>
+    <div class="col-md-4 col-sm-12" id="chart_12_23"></div>
+</div>
+
+<script>
+    $(document).ready(function(){
+        <?php foreach($chartStuntingUmurData as $item): ?>
+            Highcharts.chart('<?= $item['id'] ?>', {
+            chart: {
+                type: 'pie'
+            },
+            title: {
+                text: '<?= $item['title'] ?>'
+            },
+            tooltip: {
+                valueSuffix: '%'
+            },    
+            plotOptions: {
+                series: {
+                    allowPointSelect: true,
+                    cursor: 'pointer',
+                    colors: ['blue', 'red'],
+                    showInLegend: true,                    
+                },
+                pie: {
+                    dataLabels: {
+                    enabled: true,
+                    distance: -50,
+                    format: '{point.y:,.1f} %'
+                    }
+                }
+            },
+            series: [
+                {
+                    type: 'pie',
+                    name: 'percentage',
+                    colorByPoint: true,
+                    data: <?= json_encode($item['data']) ?>
+                }
+            ]
+
+        })
+
+        <?php endforeach; ?>
+    })
+</script>
diff --git a/partials/kesehatan/index.php b/partials/kesehatan/index.php
@@ -0,0 +1,51 @@
+<?php defined('BASEPATH') OR exit('No direct script access allowed'); ?>
+
+<div class="box-header">    
+    <div class="container">
+        <h1 class="text-h3"><?= $title; ?></h1>
+        <form class="form form-inline" action="" method="get">                           
+                <div class="form-group">
+                    <select name="kuartal" id="kuartal" required class="form-control input-sm" title="Pilih salah satu">
+                        <?php foreach (kuartal2() as $item): ?>
+                        <option value="<?= $item['ke'] ?>" <?= $item['ke'] == $kuartal ? 'selected' : '' ?>>
+                            Kuartal ke <?= $item['ke'] ?>
+                            (<?= $item['bulan'] ?>)
+                        </option>
+                        <?php endforeach ?>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    <select name="tahun" id="tahun" class="form-control input-sm" title="Pilih salah satu">
+                        <?php foreach ($dataTahun as $item): ?>
+                        <option value="<?= $item->tahun ?>"><?= $item->tahun ?></option>
+                        <?php endforeach ?>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    <select name="id_posyandu" class="form-control input-sm" title="Pilih salah satu">
+                        <option value="">Semua</option>
+                        <?php foreach ($posyandu as $item): ?>
+                        <option value="<?= $item->id ?>" <?= $item->id == $idPosyandu ? 'selected' : '' ?>>
+                            <?= $item->nama ?></option>
+                        <?php endforeach ?>
+                    </select>
+                </div>
+
+            <div class="form-group">
+                <button type="submit" class="btn btn-social btn-info btn-sm" id="cari">
+                    <i class="fa fa-search"></i> Cari
+                </button>
+            </div>
+
+        </form>
+    </div>
+    <div class="box-body text-sm py-2 space-y-4">
+    <?php $this->load->view($folder_themes . '/partials/kesehatan/widget'); ?>
+    <?php $this->load->view($folder_themes . '/partials/kesehatan/chart_stunting_umur'); ?>
+    <?php $this->load->view($folder_themes . '/partials/kesehatan/chart_stunting_posyandu'); ?>
+    <?php $this->load->view($folder_themes . '/partials/kesehatan/scorecard', $scorecard); ?>
+    </div>
+</div>
+