diff --git a/app/Models/Mpemby.php b/app/Models/Mpemby.php
index 477e666a..e581b466 100644
--- a/app/Models/Mpemby.php
+++ b/app/Models/Mpemby.php
@@ -76,7 +76,8 @@ class Mpemby extends Model
WHERE THNBYR = '" . $tahun . "') A,
(SELECT TO_NUMBER(BLNBYR) JMLBULAN,JUMLAHWP FROM PAYCOMPNAS
WHERE THNBYR = '" . $tahunl . "') B
- WHERE A.JMLBULAN =B.JMLBULAN");
+ WHERE A.JMLBULAN =B.JMLBULAN
+ ORDER BY A.JMLBULAN ASC");
return $query;
}
diff --git a/app/Views/inc/head.php b/app/Views/inc/head.php
index 5b52e9d1..74656985 100644
--- a/app/Views/inc/head.php
+++ b/app/Views/inc/head.php
@@ -14,12 +14,10 @@
<link href="https://fonts.googleapis.com/css?family=Nunito+Sans:300,400,600,700,800" rel="stylesheet">
<link rel="stylesheet" href="<?= base_url('public/theme/plugins/bootstrap/dist/css/bootstrap.min.css') ?>">
- <link rel="stylesheet" href="<?= base_url('public/theme/plugins/fontawesome-free/css/all.min.css') ?>">
<link rel="stylesheet" href="<?= base_url('public/theme/plugins/icon-kit/dist/css/iconkit.min.css') ?>">
- <link rel="stylesheet" href="<?= base_url('public/theme/plugins/ionicons/dist/css/ionicons.min.css') ?>">
<link rel="stylesheet" href="<?= base_url('public/theme/plugins/perfect-scrollbar/css/perfect-scrollbar.css') ?>">
<link rel="stylesheet" href="<?= base_url('public/theme/plugins/datatables.net-bs4/css/dataTables.bootstrap4.min.css') ?>">
- <link rel="stylesheet" href="<?= base_url('public/theme/plugins/jvectormap/jquery-jvectormap.css') ?>">
+ <!-- <link rel="stylesheet" href="<?= base_url('public/theme/plugins/jvectormap/jquery-jvectormap.css') ?>"> -->
<link rel="stylesheet" href="<?= base_url('public/theme/plugins/tempusdominus-bootstrap-4/build/css/tempusdominus-bootstrap-4.min.css') ?>">
<link rel="stylesheet" href="<?= base_url('public/theme/plugins/weather-icons/css/weather-icons.min.css') ?>">
<link rel="stylesheet" href="<?= base_url('public/theme/plugins/c3/c3.min.css') ?>">
diff --git a/app/Views/inc/js.php b/app/Views/inc/js.php
index 65409ebd..eeb179f7 100644
--- a/app/Views/inc/js.php
+++ b/app/Views/inc/js.php
@@ -7,8 +7,8 @@
<script src="<?= base_url('public/theme/plugins/datatables.net-bs4/js/dataTables.bootstrap4.min.js') ?>"></script>
<script src="<?= base_url('public/theme/plugins/datatables.net-responsive/js/dataTables.responsive.min.js') ?>"></script>
<script src="<?= base_url('public/theme/plugins/datatables.net-responsive-bs4/js/responsive.bootstrap4.min.js') ?>"></script>
-<script src="<?= base_url('public/theme/plugins/jvectormap/jquery-jvectormap.min.js') ?>"></script>
-<script src="<?= base_url('public/theme/plugins/jvectormap/tests/assets/jquery-jvectormap-world-mill-en.js') ?>"></script>
+<!-- <script src="<?= base_url('public/theme/plugins/jvectormap/jquery-jvectormap.min.js') ?>"></script>
+<script src="<?= base_url('public/theme/plugins/jvectormap/tests/assets/jquery-jvectormap-world-mill-en.js') ?>"></script> -->
<script src="<?= base_url('public/theme/plugins/moment/moment.js') ?>"></script>
<script src="<?= base_url('public/theme/plugins/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js') ?>"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/highcharts/11.3.0/highcharts.js"></script>
@@ -17,8 +17,11 @@
<script src="https://code.highcharts.com/modules/export-data.js"></script>
<script src="https://code.highcharts.com/modules/accessibility.js"></script>
<script src="<?= base_url('public/theme/js/tables.js') ?>"></script>
-<script src="<?= base_url('public/theme/js/widgets.js') ?>"></script>
+<!-- <script src="<?= base_url('public/theme/js/widgets.js') ?>"></script> -->
<script src="<?= base_url('public/theme/dist/js/theme.min.js') ?>"></script>
+<script type="module" src="https://unpkg.com/ionicons@7.1.0/dist/ionicons/ionicons.esm.js"></script>
+<script nomodule src="https://unpkg.com/ionicons@7.1.0/dist/ionicons/ionicons.js"></script>
+
</body>
diff --git a/app/Views/inc/navbar.php b/app/Views/inc/navbar.php
index f00318f0..2c8e3363 100644
--- a/app/Views/inc/navbar.php
+++ b/app/Views/inc/navbar.php
@@ -4,19 +4,16 @@
<div class="top-menu d-flex align-items-center">
<button type="button" class="btn-icon mobile-nav-toggle d-lg-none"><span></span></button>
<div class="header-search">
- <div class="input-group">
- <span class="input-group-addon search-close"><i class="ik ik-x"></i></span>
- <input type="text" class="form-control">
- <span class="input-group-addon search-btn"><i class="ik ik-search"></i></span>
- </div>
</div>
<button type="button" id="navbar-fullscreen" class="nav-link"><i class="ik ik-maximize"></i></button>
</div>
- <div class="top-menu d-flex align-items-center">
+ <div class="top-menu d-flex align-items-left">
<div class="dropdown">
- <a class="dropdown-toggle" href="#" id="userDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><img class="avatar" src="https://account.kemenkeu.go.id/manage/Uploads/Thumbnails/<?= session('nipp') ?>.jpg" alt=""></a>
+ <a class="dropdown-toggle" href="#" id="userDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><img class="avatar" src="https://account.kemenkeu.go.id/manage/Uploads/Thumbnails/<?= session('nipp') ?>.jpg" alt="">
+ <?php echo session('kppadm') ?> - <?php echo session('nama') ?>
+ </a>
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="userDropdown">
<a class="dropdown-item" href="profile.html"><i class="ik ik-user dropdown-icon"></i> Profile</a>
<a class="dropdown-item" href="<?php echo base_url() ?>Auth/logout"><i class="ik ik-power dropdown-icon"></i> Logout</a>
diff --git a/app/Views/pages/test.php b/app/Views/pages/test.php
deleted file mode 100644
index 4d931dbb..00000000
--- a/app/Views/pages/test.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<div class="main-content">
- <div class="container-fluid">
- <div class="row">
- <div class="col-md-12">
- <div class="card">
- <div class="card-body">
- <table class="table">
- <tbody>
- <?php foreach ($users as $user) : ?>
-
- <tr>
- <td><?= $user['name'] ?></td>
- <td><?= $user['username'] ?></td>
- <td><?= $user['noTelp'] ?></td>
- <td><?= $user['created_at'] ?></td>
- </tr>
-
- <?php endforeach; ?>
- </tbody>
- </table>
- </div>
- </div>
- </div>
- </div>
- </div>
-</div>
diff --git a/app/Views/ppm/dashboard.php b/app/Views/ppm/dashboard.php
index dad2ee2d..d8055fbe 100644
--- a/app/Views/ppm/dashboard.php
+++ b/app/Views/ppm/dashboard.php
@@ -100,8 +100,24 @@ $datapaycomp = $datapaycomp . "]";
<div class="main-content">
<div class="container-fluid">
- <h4>Dashboard Penerimaan Nasional</h4>
+ <div class="row">
+ <div class="col-sm-12">
+
+ <form class="form-inline" action="<?php base_url('Home/index') ?>" method="post">
+ <label class="my-1 mr-2">Tahun :</label>
+ <select class="custom-select my-1 mr-sm-2" id="tahun" name="tahun">
+ <option selected>Pilih</option>
+ <option value="2024">2024</option>
+ <option value="2023">2023</option>
+ </select>
+
+ <button type="submit" class="btn btn-primary my-1">Proses</button>
+ </form>
+
+ </div>
+ </div>
<div class="row clearfix">
+
<div class="col-lg-3 col-md-6 col-sm-12">
<div class="widget">
<div class="widget-body">
@@ -190,7 +206,7 @@ $datapaycomp = $datapaycomp . "]";
</div>
<div class="col-lg-6 col-md-12">
<div class="col text-center">
- <h5>Strategis</h5>
+ <h5><ion-icon name="people"></ion-icon>Strategis</h5>
</div>
<div class="row mb-15">
<div class="col-9">Penerimaan</div>
@@ -253,7 +269,7 @@ $datapaycomp = $datapaycomp . "]";
</div>
<div class=" col-lg-6 col-md-12">
<div class="col text-center">
- <h5>Kewilayahan</h5>
+ <h5><ion-icon name="aperture"></ion-icon>Kewilayahan</h5>
</div>
<div class="row mb-15">
<div class="col-9">Penerimaan</div>
@@ -383,11 +399,11 @@ $datapaycomp = $datapaycomp . "]";
<div class="card-body">
<table class="table table-sm">
<thead>
- <th class="text-center">SOF</th>
- <th class="text-center">WP</th>
- <th class="text-center">WP %</th>
- <th class="text-center">Jumlah</th>
- <th class="text-center">Jumlah %</th>
+ <th class="text-center"><ion-icon name="pulse"></ion-icon> SOF</th>
+ <th class="text-center"><ion-icon name="person"></ion-icon> WP</th>
+ <th class="text-center"><ion-icon name="warning"></ion-icon> WP (%)</th>
+ <th class="text-center"><ion-icon name="cash"></ion-icon> Jumlah</th>
+ <th class="text-center"><ion-icon name="warning"></ion-icon> Jumlah (%)</th>
</thead>
<?php
@@ -401,23 +417,27 @@ $datapaycomp = $datapaycomp . "]";
if ($pctwp < 20) {
$mpctwp = "text-danger";
+ $markmpctwp = "<ion-icon name='arrow-down-outline'></ion-icon>";
} else {
$mpctwp = "text-success";
+ $markmpctwp = "<ion-icon name='arrow-up-outline'></ion-icon>";
}
if ($pctpen < 20) {
$mpctpen = "text-danger";
+ $markmpctpen = "<ion-icon name='arrow-down-outline'></ion-icon>";
} else {
$mpctpen = "text-success";
+ $markmpctpen = "<ion-icon name='arrow-up-outline'></ion-icon>";
}
?>
<tbody>
<td><?= $row->LAPISAN; ?></td>
<td class="text-right"><?= number_format($row->WPBYR, 0, ',', '.') ?></td>
- <td class="text-right <?= $mpctwp ?>"><?= number_format($pctwp, 2) ?></td>
+ <td class="text-right <?= $mpctwp ?>"><?= number_format($pctwp, 2) ?> <?= $markmpctwp ?></td>
<td class="text-right"><?= number_format($row->TOTAL, 0, ',', '.') ?></td>
- <td class="text-right <?= $mpctpen ?>"><?= number_format($pctpen, 2) ?></td>
+ <td class="text-right <?= $mpctpen ?>"><?= number_format($pctpen, 2) ?> <?= $markmpctpen ?></td>
</tbody>
<?php } ?>
</table>
@@ -429,121 +449,7 @@ $datapaycomp = $datapaycomp . "]";
</div>
- <!-- <div class="card">
- <div class="card-header row">
- <div class="col col-sm-3">
- <div class="dropdown d-inline-block">
- <a class="btn-icon checkbox-dropdown dropdown-toggle" href="#" id="moreDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></a>
- <div class="dropdown-menu" aria-labelledby="moreDropdown">
- <a class="dropdown-item" id="checkbox_select_all" href="javascript:void(0);">Select All</a>
- <a class="dropdown-item" id="checkbox_deselect_all" href="javascript:void(0);">Deselect All</a>
- </div>
- </div>
- <div class="card-options d-inline-block">
- <a href="#"><i class="ik ik-inbox"></i></a>
- <a href="#"><i class="ik ik-plus"></i></a>
- <a href="#"><i class="ik ik-rotate-cw"></i></a>
- <div class="dropdown d-inline-block">
- <a class="nav-link dropdown-toggle" href="#" id="moreDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="ik ik-more-horizontal"></i></a>
- <div class="dropdown-menu dropdown-menu-right" aria-labelledby="moreDropdown">
- <a class="dropdown-item" href="#">Action</a>
- <a class="dropdown-item" href="#">More Action</a>
- </div>
- </div>
- </div>
- </div>
- <div class="col col-sm-6">
- <div class="card-search with-adv-search dropdown">
- <form action="">
- <input type="text" class="form-control" placeholder="Search.." required>
- <button type="submit" class="btn btn-icon"><i class="ik ik-search"></i></button>
- <button type="button" id="adv_wrap_toggler" class="adv-btn ik ik-chevron-down dropdown-toggle" data-toggle="dropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></button>
- <div class="adv-search-wrap dropdown-menu dropdown-menu-right" aria-labelledby="adv_wrap_toggler">
- <div class="form-group">
- <input type="text" class="form-control" placeholder="Full Name">
- </div>
- <div class="form-group">
- <input type="email" class="form-control" placeholder="Email">
- </div>
- <button class="btn btn-theme">Search</button>
- </div>
- </form>
- </div>
- </div>
- <div class="col col-sm-3">
- <div class="card-options text-right">
- <span class="mr-5">1 - 50 of 2,500</span>
- <a href="#"><i class="ik ik-chevron-left"></i></a>
- <a href="#"><i class="ik ik-chevron-right"></i></a>
- </div>
- </div>
- </div>
- <div class="card-body p-0">
- <div class="list-item-wrap">
- <div class="list-item">
- <div class="item-inner">
- <label class="custom-control custom-checkbox">
- <input type="checkbox" class="custom-control-input" id="item_checkbox" name="item_checkbox" value="option1">
- <span class="custom-control-label"> </span>
- </label>
- <div class="list-title"><a href="javascript:void(0)">Lorem Ipsum is simply dumm dummy text of the printing and typesetting industry.</a></div>
- <div class="list-actions">
- <a href="#"><i class="ik ik-eye"></i></a>
- <a href="#"><i class="ik ik-inbox"></i></a>
- <a href="#"><i class="ik ik-edit-2"></i></a>
- <a href="#"><i class="ik ik-trash-2"></i></a>
- </div>
- </div>
- <div class="qickview-wrap">
- <div class="desc">
- <p>Fusce suscipit turpis a dolor posuere ornare at a ante. Quisque nec libero facilisis, egestas tortor eget, mattis dui. Curabitur viverra laoreet ligula at hendrerit. Nullam sollicitudin maximus leo, vel pulvinar orci semper id. Donec vehicula tempus enim a facilisis. Proin dignissim porttitor sem, sed pulvinar tortor gravida vitae.</p>
- </div>
- </div>
- </div>
- <div class="list-item">
- <div class="item-inner">
- <label class="custom-control custom-checkbox">
- <input type="checkbox" class="custom-control-input" id="item_checkbox" name="item_checkbox" value="option2">
- <span class="custom-control-label"> </span>
- </label>
- <div class="list-title"><a href="javascript:void(0)">Aenean eu pharetra arcu, vitae elementum sem. Sed non ligula molestie, finibus lacus at, suscipit mi. Nunc luctus lacus vel felis blandit, eu finibus augue tincidunt.</a></div>
- <div class="list-actions">
- <a href="#"><i class="ik ik-eye"></i></a>
- <a href="#"><i class="ik ik-inbox"></i></a>
- <a href="#"><i class="ik ik-edit-2"></i></a>
- <a href="#"><i class="ik ik-trash-2"></i></a>
- </div>
- </div>
- <div class="qickview-wrap">
- <div class="desc">
- <p>Fusce suscipit turpis a dolor posuere ornare at a ante. Quisque nec libero facilisis, egestas tortor eget, mattis dui. Curabitur viverra laoreet ligula at hendrerit. Nullam sollicitudin maximus leo, vel pulvinar orci semper id. Donec vehicula tempus enim a facilisis. Proin dignissim porttitor sem, sed pulvinar tortor gravida vitae.</p>
- </div>
- </div>
- </div>
- <div class="list-item">
- <div class="item-inner">
- <label class="custom-control custom-checkbox">
- <input type="checkbox" class="custom-control-input" id="item_checkbox" name="item_checkbox" value="option3">
- <span class="custom-control-label"> </span>
- </label>
- <div class="list-title"><a href="javascript:void(0)">Donec lectus augue, suscipit in sodales sit amet, semper sit amet enim. Duis pretium, nisi id pretium ornare, tortor nibh sodales tellus.</a></div>
- <div class="list-actions">
- <a href="#"><i class="ik ik-eye"></i></a>
- <a href="#"><i class="ik ik-inbox"></i></a>
- <a href="#"><i class="ik ik-edit-2"></i></a>
- <a href="#"><i class="ik ik-trash-2"></i></a>
- </div>
- </div>
- <div class="qickview-wrap">
- <div class="desc">
- <p>Fusce suscipit turpis a dolor posuere ornare at a ante. Quisque nec libero facilisis, egestas tortor eget, mattis dui. Curabitur viverra laoreet ligula at hendrerit. Nullam sollicitudin maximus leo, vel pulvinar orci semper id. Donec vehicula tempus enim a facilisis. Proin dignissim porttitor sem, sed pulvinar tortor gravida vitae.</p>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div> -->
<div class="card">
<div class="card-body">
@@ -567,14 +473,18 @@ $datapaycomp = $datapaycomp . "]";
if ($gwwp < 0) {
$markgww = "text-danger";
+ $markgwwic = "<ion-icon name='arrow-down-outline'></ion-icon>";
} else {
$markgww = "text-success";
+ $markgwwic = "<ion-icon name='arrow-up-outline'></ion-icon>";
}
if ($gwkat < 0) {
$markgwk = "text-danger";
+ $markgwkic = "<ion-icon name='arrow-down-outline'></ion-icon>";
} else {
$markgwk = "text-success";
+ $markgwkic = "<ion-icon name='arrow-up-outline'></ion-icon>";
}
?>
<tbody>
@@ -582,10 +492,10 @@ $datapaycomp = $datapaycomp . "]";
<td><?= $row->NMKAT ?></td>
<td class="text-right"><?= number_format($row->WPBYRN, 0, ',', '.') ?></td>
<td class="text-right"><?= number_format($row->WPBYRP, 0, ',', '.') ?></td>
- <td class="text-center <?= $markgww ?>"><?= number_format($gwwp, 2) ?></td>
+ <td class="text-center <?= $markgww ?>"><?= number_format($gwwp, 2) ?> <?php echo $markgwwic ?></td>
<td class="text-right"><?= number_format($row->KPENN, 0, ',', '.') ?></td>
<td class="text-right"><?= number_format($row->KPENP, 0, ',', '.') ?></td>
- <td class="text-center <?= $markgwk ?>"><?= number_format($gwkat, 2) ?></td>
+ <td class="text-center <?= $markgwk ?>"><?= number_format($gwkat, 2) ?> <?php echo $markgwkic ?></td>
</tbody>
<?php } ?>
</table>