Skip to content

Commit

Permalink
2407.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
andifahruddinakas committed Jul 2, 2024
1 parent 7ab3428 commit 3cba2fc
Show file tree
Hide file tree
Showing 28 changed files with 654 additions and 59 deletions.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
11 changes: 6 additions & 5 deletions catatan_rilis.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
Catatan Rilis v2406.0.0 :
Catatan Rilis v2407.0.0 :

### FITUR :
1. Halaman inventaris
2.
1. Penambahan halaman peta
2. Penambahan halaman sotk


### TEKNIS :
1. Penyesuaian csrf token.
2. Penyesuaian keterangan pada pengaturan tema.
1. Penyesuaian folder asset dan gunakan helper theme_asset.
2. Penyesuaian sinergi program.
24 changes: 12 additions & 12 deletions commons/meta.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php defined('BASEPATH') || exit('No direct script access allowed'); ?>

<?php defined('THEME_VERSION') or define('THEME_VERSION', 'v2406.0.0') ?>
<?php defined('THEME_VERSION') or define('THEME_VERSION', 'v2407.0.0') ?>
<?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']; ?>

<meta http-equiv="encoding" content="utf-8">
Expand All @@ -24,19 +24,19 @@
</title>

<link rel="shortcut icon" href="<?= favico_desa() ?>"/>
<link rel="stylesheet" href="<?= base_url("$this->theme_folder/$this->theme/assets/css/bootstrap.min.css"); ?>">
<link rel="stylesheet" href="<?= base_url("$this->theme_folder/$this->theme/assets/css/font-awesome.min.css"); ?>">
<link rel="stylesheet" href="<?= base_url("$this->theme_folder/$this->theme/assets/css/animate.css"); ?>">
<link rel="stylesheet" href="<?= base_url("$this->theme_folder/$this->theme/assets/css/slick.css"); ?>">
<link rel="stylesheet" href="<?= base_url("$this->theme_folder/$this->theme/assets/css/theme.min.css"); ?>">
<link rel="stylesheet" href="<?= base_url("$this->theme_folder/$this->theme/assets/css/style.min.css"); ?>">
<link rel="stylesheet" href="<?= theme_asset("css/bootstrap.min.css"); ?>">
<link rel="stylesheet" href="<?= theme_asset("css/font-awesome.min.css"); ?>">
<link rel="stylesheet" href="<?= theme_asset("css/animate.css"); ?>">
<link rel="stylesheet" href="<?= theme_asset("css/slick.css"); ?>">
<link rel="stylesheet" href="<?= theme_asset("css/theme.min.css"); ?>">
<link rel="stylesheet" href="<?= theme_asset("css/style.min.css"); ?>">
<link rel='stylesheet' href="<?= asset('css/font-awesome.min.css'); ?>"/>
<link rel="stylesheet" href="<?= asset('css/leaflet.css'); ?>"/>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/fancyapps/[email protected]/dist/jquery.fancybox.min.css"/>
<link rel="stylesheet" href="<?= asset('css/mapbox-gl.css'); ?>"/>
<link rel="stylesheet" href="<?= asset('css/peta.css'); ?>">
<link rel="stylesheet" href="<?= asset('bootstrap/css/dataTables.bootstrap.min.css'); ?>">
<link rel="stylesheet" href="<?= base_url("$this->theme_folder/$this->theme/assets/css/custom.css"); ?>">
<link rel="stylesheet" href="<?= theme_asset("css/custom.css"); ?>">

<?php if(isset($single_artikel)): ?>
<meta property="og:title" content="<?= htmlspecialchars($single_artikel["judul"]); ?>"/>
Expand All @@ -52,7 +52,7 @@
<script language='javascript' src="<?= asset('front/js/jquery.min.js') ?>"></script>
<script language='javascript' src="<?= asset('front/js/jquery.cycle2.min.js') ?>"></script>
<script language='javascript' src="<?= asset('front/js/jquery.cycle2.carousel.js') ?>"></script>
<script src="<?= base_url("$this->theme_folder/$this->theme/assets/js/bootstrap.min.js") ?>"></script>
<script src="<?= theme_asset("js/bootstrap.min.js") ?>"></script>
<script src="<?= asset('js/leaflet.js') ?>"></script>
<script src="<?= asset('front/js/layout.js') ?>"></script>
<script src="<?= asset('front/js/jquery.colorbox.js') ?>"></script>
Expand Down Expand Up @@ -114,7 +114,7 @@ function renderDate()
<script async defer crossorigin="anonymous" src="https://connect.facebook.net/id_ID/sdk.js#xfbml=1&version=v3.2&appId=147912828718&autoLogAppEvents=1"></script>

<!-- lazy load images -->
<script src="<?= base_url("$this->theme_folder/$this->theme/assets/js/yall/yall.min.js") ?>"></script>
<script src="<?= theme_asset("js/yall/yall.min.js") ?>"></script>

<style>
img.yall_loaded {
Expand Down Expand Up @@ -148,7 +148,7 @@ function renderDate()


<!--[if lt IE 9]>
<script src="<?= base_url("$this->theme_folder/$this->theme/assets/js/html5shiv.min.js") ?>"></script>
<script src="<?= base_url("$this->theme_folder/$this->theme/assets/js/respond.min.js") ?>"></script>
<script src="<?= theme_asset("js/html5shiv.min.js") ?>"></script>
<script src="<?= theme_asset("js/respond.min.js") ?>"></script>
<![endif]-->
<?= view('admin.layouts.components.token') ?>
6 changes: 3 additions & 3 deletions commons/meta_footer.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php defined('BASEPATH') || exit('No direct script access allowed'); ?>

<script src="<?= base_url("{$this->theme_folder}/{$this->theme}/assets/js/wow.min.js") ?>"></script>
<script src="<?= base_url("{$this->theme_folder}/{$this->theme}/assets/js/slick.min.js") ?>"></script>
<script src="<?= base_url("{$this->theme_folder}/{$this->theme}/assets/js/custom.js") ?>"></script>
<script src="<?= theme_asset("js/wow.min.js") ?>"></script>
<script src="<?= theme_asset("js/slick.min.js") ?>"></script>
<script src="<?= theme_asset("js/custom.js") ?>"></script>
<script>
$.extend($.fn.dataTable.defaults, {
lengthMenu: [
Expand Down
7 changes: 6 additions & 1 deletion commons/style.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,17 @@

<style type="text/css">
#jam {
display: flex;
flex-direction: column;
justify-content: flex-start;
text-align: center;
margin: 5px 0 5px 0;
margin: 5px 0;
background: <?=$warna_dasar?>;
border: 3px double #ffffff;
padding: 3px;
width: auto;
box-sizing: border-box;
height: auto;
}

/* color white */
Expand Down
14 changes: 7 additions & 7 deletions layouts/peta_statis.tpl.php → layouts/full_content.tpl.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,31 @@
<!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"); ?>
<?php theme_view("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"); ?>
<?php theme_view("partials/header"); ?>
</header>
<div id="navarea">
<?php $this->load->view("$folder_themes/partials/menu_head"); ?>
<?php theme_view("partials/menu_head"); ?>
</div>
<div class="row">
<section>
<div class="content_bottom">
<div class="col-lg-12 col-md-12">
<?php $this->load->view($halaman_peta); ?>
<?php theme_view($halaman_peta); ?>
</div>
</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"); ?>
<?php theme_view("partials/footer_top"); ?>
<?php theme_view("partials/footer_bottom"); ?>
</footer>
<?php $this->load->view("$folder_themes/commons/meta_footer"); ?>
<?php theme_view("commons/meta_footer"); ?>
</body>
</html>
8 changes: 4 additions & 4 deletions partials/bottom_content_left.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
<img data-src="<?= AmbilFotoArtikel($headline['gambar'], 'sedang') ?>" src="<?= asset('images/img-loader.gif') ?>" width="300" class="yall_lazy img-fluid img-thumbnail hidden-sm hidden-xs" style="float:left; margin:0 8px 4px 0;" />
<img data-src="<?= AmbilFotoArtikel($headline['gambar'], 'sedang') ?>" src="<?= asset('images/img-loader.gif') ?>" width="100%" class="yall_lazy img-fluid img-thumbnail hidden-lg hidden-md" style="float:left; margin:0 8px 4px 0;" />
<?php else : ?>
<img src="<?= base_url("$this->theme_folder/$this->theme/images/noimage.png") ?>" width="300px" class="img-fluid img-thumbnail hidden-sm hidden-xs" style="float:left; margin:0 8px 4px 0;" />
<img src="<?= base_url("$this->theme_folder/$this->theme/images/noimage.png") ?>" width="100%" class="img-fluid img-thumbnail hidden-lg hidden-md" style="float:left; margin:0 8px 4px 0;" />
<img src="<?= theme_asset("images/noimage.png") ?>" width="300px" class="img-fluid img-thumbnail hidden-sm hidden-xs" style="float:left; margin:0 8px 4px 0;" />
<img src="<?= theme_asset("images/noimage.png") ?>" width="100%" class="img-fluid img-thumbnail hidden-lg hidden-md" style="float:left; margin:0 8px 4px 0;" />
<?php endif; ?>
<?php endif; ?>
</a>
Expand Down Expand Up @@ -82,8 +82,8 @@
<img data-src="<?= AmbilFotoArtikel($data['gambar'], 'sedang') ?>" src="<?= asset('images/img-loader.gif') ?>" width="300" class="yall_lazy img-fluid img-thumbnail hidden-sm hidden-xs" style="float:left; margin:0 8px 4px 0;" alt="<?= $data["judul"] ?>" />
<img data-src="<?= AmbilFotoArtikel($data['gambar'], 'sedang') ?>" src="<?= asset('images/img-loader.gif') ?>" width="100%" class="yall_lazy img-fluid img-thumbnail hidden-lg hidden-md" style="float:left; margin:0 8px 4px 0;" alt="<?= $data["judul"] ?>" />
<?php else: ?>
<img src="<?= base_url("$this->theme_folder/$this->theme/images/noimage.png") ?>" width="300px" class="img-fluid img-thumbnail hidden-sm hidden-xs" style="float:left; margin:0 8px 4px 0;" alt="<?= $data["judul"] ?>" />
<img src="<?= base_url("$this->theme_folder/$this->theme/images/noimage.png") ?>" width="100%" class="img-fluid img-thumbnail hidden-lg hidden-md" style="float:left; margin:0 8px 4px 0;" alt="<?= $data["judul"] ?>" />
<img src="<?= theme_asset("images/noimage.png") ?>" width="300px" class="img-fluid img-thumbnail hidden-sm hidden-xs" style="float:left; margin:0 8px 4px 0;" alt="<?= $data["judul"] ?>" />
<img src="<?= theme_asset("images/noimage.png") ?>" width="100%" class="img-fluid img-thumbnail hidden-lg hidden-md" style="float:left; margin:0 8px 4px 0;" alt="<?= $data["judul"] ?>" />
<?php endif;?>
</a>
<div style="text-align: justify;" class="hidden-sm hidden-xs">
Expand Down
12 changes: 6 additions & 6 deletions partials/footer_top.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
<div class="col-md-12" align="center">
<h2>Statistik <?php ucwords(setting('sebutan_desa')) ?></h2><hr>
<div class="col-md-6">
<a href="<?= site_url(); ?>data-wilayah"><img alt="Statistik Wilayah" width="30%" src="<?= base_url("$this->theme_folder/$this->theme/images/statistik_wil.png") ?>" /></a>
<a href="<?= site_url(); ?>first/statistik/0"><img alt="Statistik Pendidikan" width="30%" src="<?= base_url("$this->theme_folder/$this->theme/images/statistik_pend.png") ?>" /></a>
<a href="<?= site_url(); ?>first/statistik/1"><img alt="Statistik Pekerjaan" width="30%" src="<?= base_url("$this->theme_folder/$this->theme/images/statistik_pekerjaan.png") ?>" /></a>
<a href="<?= site_url(); ?>data-wilayah"><img alt="Statistik Wilayah" width="30%" src="<?= theme_asset("images/statistik_wil.png") ?>" /></a>
<a href="<?= site_url(); ?>first/statistik/0"><img alt="Statistik Pendidikan" width="30%" src="<?= theme_asset("images/statistik_pend.png") ?>" /></a>
<a href="<?= site_url(); ?>first/statistik/1"><img alt="Statistik Pekerjaan" width="30%" src="<?= theme_asset("images/statistik_pekerjaan.png") ?>" /></a>
<hr></div>
<div class="col-md-6">
<a href="<?= site_url(); ?>first/statistik/3"><img alt="Statistik Agama" width="30%" src="<?= base_url("$this->theme_folder/$this->theme/images/statistik_agama.png") ?>" /></a>
<a href="<?= site_url(); ?>first/statistik/4"><img alt="Statistik Jenis Kelamin" width="30%" src="<?= base_url("$this->theme_folder/$this->theme/images/statistik_kelamin.png") ?>" /></a>
<a href="<?= site_url(); ?>first/statistik/13"><img alt="Statistik Umur" width="30%" src="<?= base_url("$this->theme_folder/$this->theme/images/statistik_umur.png") ?>" /></a>
<a href="<?= site_url(); ?>first/statistik/3"><img alt="Statistik Agama" width="30%" src="<?= theme_asset("images/statistik_agama.png") ?>" /></a>
<a href="<?= site_url(); ?>first/statistik/4"><img alt="Statistik Jenis Kelamin" width="30%" src="<?= theme_asset("images/statistik_kelamin.png") ?>" /></a>
<a href="<?= site_url(); ?>first/statistik/13"><img alt="Statistik Umur" width="30%" src="<?= theme_asset("images/statistik_umur.png") ?>" /></a>
<hr></div>
</div>
<?php endif; ?>
Expand Down
4 changes: 2 additions & 2 deletions partials/header2.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@
</ol>
<div class="carousel-inner">
<div class="item active">
<img class="tlClogo" src="<?= base_url("$this->theme_folder/$this->theme/images/bg_header.jpg") ?>">
<img class="tlClogo" src="<?= theme_asset("images/bg_header.jpg") ?>">
</div>
<div class="item">
<img class="tlClogo" src="<?= base_url("$this->theme_folder/$this->theme/images/bg_header.jpg") ?>">
<img class="tlClogo" src="<?= theme_asset("images/bg_header.jpg") ?>">
</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion partials/idm/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<link rel="stylesheet" href="<?= base_url("{$this->theme_folder}/{$this->theme}/css/first.css") ?>" />
<?php endif; ?>
<?php if (is_file($this->theme_folder . '/' . $this->theme . '/assets/css/desa-web.css')): ?>
<link type='text/css' href="<?= base_url("{$this->theme_folder}/{$this->theme}/assets/css/desa-web.css") ?>" rel='stylesheet' />
<link type='text/css' href="<?= theme_asset("css/desa-web.css") ?>" rel='stylesheet' />
<?php endif; ?>
<?php if (is_file('desa/css/' . $this->theme . '/desa-web.css')): ?>
<link type='text/css' href="<?= base_url("desa/css/{$this->theme}/desa-web.css") ?>" rel='Stylesheet' />
Expand Down
56 changes: 56 additions & 0 deletions partials/peta/components/aparatur_desa.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<link type='text/css' href="<?= asset('front/css/slider.css') ?>" rel='Stylesheet' />
<script src="<?= asset('front/js/jquery.cycle2.caption2.min.js') ?>"></script>
<script>
$('.cycle-slideshow').cycle();
</script>

<!-- TODO: Pindahkan ke external css -->
<style type="text/css">
#aparatur_desa .cycle-pager span
{
height: 10px;
width: 10px;
}
.cycle-slideshow
{
max-height: none;
margin-bottom: 0px;
border: 0px;
}
.cycle-next, .cycle-prev
{
mix-blend-mode: difference;
}
</style>
<!-- widget Aparatur Desa -->
<div class="modal-body">
<div class="box box-info box-solid">
<div class="box-body">
<div id="aparatur_desa" class="cycle-slideshow"
data-cycle-pause-on-hover=true
data-cycle-fx=scrollHorz
data-cycle-timeout=2000
data-cycle-caption-plugin=caption2
data-cycle-overlay-fx-out="slideUp"
data-cycle-overlay-fx-in="slideDown"
data-cycle-auto-height=4:6
>

<?php if ($this->web_widget_model->get_setting('aparatur_desa', 'overlay') == true): ?>
<span class="cycle-prev"><img src="<?= asset('images/back_button.png')?>" alt="Back"></span>
<span class="cycle-next"><img src="<?= asset('images/next_button.png')?>" alt="Next"></span>
<div class="cycle-caption"></div>
<div class="cycle-overlay"></div>
<?php else: ?>
<span class="cycle-pager"></span> <!-- Untuk membuat tanda bulat atau link pada slider -->
<?php endif; ?>

<?php foreach ($aparatur_desa['daftar_perangkat'] as $data) : ?>
<img src="<?= $data['foto'] ?>"
data-cycle-title="<span class='cycle-overlay-title'><?= $data['nama'] ?></span>"
data-cycle-desc="<?= $data['jabatan'] ?>">
<?php endforeach; ?>
</div>
</div>
</div>
</div>
35 changes: 35 additions & 0 deletions partials/peta/components/apbdes.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<style type="text/css">
.progress-bar span
{
position: absolute;
right: 20px;
color: #000000;
font-weight: bold;
}
</style>
<div class="modal-body">
<div class="container" id="transparansi-footer" style="width: 100%; padding-top: 20px; background: #fff; color: #222">
<div class="box box-info">
<?php foreach ($transparansi['data_widget'] as $subdatas): ?>
<div class="col-md-4">
<div align="center" style="height: 0.5em;"><h4><?= ($subdatas['laporan'])?></h4></div><hr/>
<div align="center" style="height: 0.5em;"><h5>Realisasi | Anggaran</h5></div><hr/>
<?php foreach ($subdatas as $key => $subdata): ?>
<?php if ($subdata['judul'] != null && $key != 'laporan'): ?>
<div class="progress-group">
<?= $subdata['judul']; ?><br>
<b>Rp. <?= number_format($subdata['realisasi']); ?> | Rp. <?= number_format($subdata['anggaran']); ?></b>
<div class="progress progress-bar-striped" align="right" style="background-color: #27b2c8">
<small></small>
<div class="progress-bar progress-bar-success progress-bar-striped" role="progressbar" style="width: <?= $subdata['persen'] ?>%" aria-valuenow="<?= $subdata['persen'] ?>" aria-valuemin="0" aria-valuemax="100">
<span><?= $subdata['persen'] ?> %</span>
</div>
</div>
</div>
<?php endif; ?>
<?php endforeach; ?>
</div>
<?php endforeach; ?>
</div>
</div>
</div>
39 changes: 39 additions & 0 deletions partials/peta/components/content_desa.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<?php $pengaturan = json_decode(setting('tampilkan_tombol_peta'), true) ?>
<div id="isi_popup" style="visibility: hidden;">
<div id="content">
<h5 id="firstHeading" class="firstHeading">Wilayah <?= set_ucwords($wilayah); ?></h5>
<div id="bodyContent">
<?php $link = underscore($desa['nama_desa']) ?>
<?php $data_title = "{$wilayah}" ?>

<!-- statistik penduduk -->
<?php if (in_array('Statistik Penduduk', $pengaturan)): ?>
<p><a href="#collapseStatPenduduk" class="btn btn-social bg-navy btn-sm btn-block visible-sm-inline-block visible-md-inline-block visible-lg-inline-block" title="Statistik Penduduk" data-toggle="collapse" data-target="#collapseStatPenduduk" aria-expanded="false" aria-controls="collapseStatPenduduk"><i class="fa fa-bar-chart"></i>&nbsp;&nbsp;Statistik Penduduk&nbsp;&nbsp;</a></p>
<div class="collapse box-body no-padding" id="collapseStatPenduduk">
<div class="card card-body">
<?php foreach ($list_ref as $key => $value): ?>
<li <?= jecho($lap, $key, 'class="active"'); ?>><a href="<?= site_url("statistik_web/chart_gis_desa/{$key}/{$link}") ?>" data-remote="false" data-toggle="modal" data-target="#modalSedang" data-title="Statistik Penduduk <?= set_ucwords($wilayah) ?>"><?= $value ?></a></li>
<?php endforeach; ?>
</div>
</div>
<?php endif ?>

<!-- statistik bantuan -->
<?php if (in_array('Statistik Bantuan', $pengaturan)): ?>
<p><a href="#collapseStatBantuan" class="btn btn-social bg-navy btn-sm btn-block visible-sm-inline-block visible-md-inline-block visible-lg-inline-block" title="Statistik Bantuan" data-toggle="collapse" data-target="#collapseStatBantuan" aria-expanded="false" aria-controls="collapseStatBantuan"><i class="fa fa-heart"></i>&nbsp;&nbsp;Statistik Bantuan&nbsp;&nbsp;</a></p>
<div class="collapse box-body no-padding" id="collapseStatBantuan">
<div class="card card-body">
<?php foreach ($list_bantuan as $key => $value): ?>
<li <?= jecho($lap, $key, 'class="active"'); ?>><a href="<?= site_url("statistik_web/chart_gis_desa/{$key}/{$link}") ?>" data-remote="false" data-toggle="modal" data-target="#modalSedang" data-title="Statistik Bantuan <?= $data_title; ?>"><?= $value; ?></a></li>
<?php endforeach; ?>
</div>
</div>
<?php endif ?>

<!-- statistik aparatur -->
<?php if (in_array('Aparatur Desa', $pengaturan)): ?>
<p><a href="<?= site_url('load_aparatur_desa'); ?>" class="btn btn-social bg-navy btn-sm btn-block visible-sm-inline-block visible-md-inline-block visible-lg-inline-block" data-title="<?= ucwords(setting('sebutan_pemerintah_desa')) ?>" data-remote="false" data-toggle="modal" data-target="#modalKecil"><i class="fa fa-user"></i>&nbsp;&nbsp;<?= ucwords(setting('sebutan_pemerintah_desa')) ?>&nbsp;&nbsp;</a></p>
<?php endif ?>
</div>
</div>
</div>
Loading

0 comments on commit 3cba2fc

Please sign in to comment.