From f410645402471f70e01867a7d7c76a36b8366277 Mon Sep 17 00:00:00 2001
From: Adhidarma Hadiwinoto <me@adhisimon.org>
Date: Mon, 3 Sep 2018 11:32:56 +0700
Subject: [PATCH] tanggal pada ussd dan sms index
---
lib/modem-dashboard/router-ussd.js | 9 +++++++--
lib/modem-dashboard/views/date-selector.html | 2 +-
lib/modem-dashboard/views/ussd.index.html | 4 +++-
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/lib/modem-dashboard/router-ussd.js b/lib/modem-dashboard/router-ussd.js
index 6cd346f..da9b6aa 100644
--- a/lib/modem-dashboard/router-ussd.js
+++ b/lib/modem-dashboard/router-ussd.js
@@ -9,10 +9,15 @@ const router = express.Router();
module.exports = router;
function pageIndex(req, res, next) {
+ if (!req.query.input_date) {
+ req.query.input_date = moment().format('YYYY-MM-DD');
+ }
+
res.render(
'ussd.index.html',
{
- page_title: 'Histori USSD'
+ page_title: 'Histori USSD',
+ input_date: req.query.input_date
}
)
}
@@ -20,7 +25,7 @@ function pageIndex(req, res, next) {
function pageDataTables(req, res, next) {
const db = localDb.getConnection();
- const created_date = moment().format('YYYY-MM-DD');
+ const created_date = req.query.input_date || moment().format('YYYY-MM-DD');
const query = "SELECT rowid, * FROM ussd WHERE created_date = ? ORDER BY created DESC, rowid DESC";
db.all(query, created_date, function (err, rows) {
if (err) {
diff --git a/lib/modem-dashboard/views/date-selector.html b/lib/modem-dashboard/views/date-selector.html
index 6a3797f..950795a 100644
--- a/lib/modem-dashboard/views/date-selector.html
+++ b/lib/modem-dashboard/views/date-selector.html
@@ -4,7 +4,7 @@
<div class="form-group">
<label for="inputDate" class="col-sm-2 control-label">Tanggal:</label>
<div class="col-sm-3">
- <input type="date" class="form-control" id="inputDate" placeholder="Tanggal" name="inputDate" value="{{ input_date }}">
+ <input type="date" class="form-control" id="inputDate" placeholder="Tanggal" name="input_date" value="{{ input_date }}">
</div>
</div>
diff --git a/lib/modem-dashboard/views/ussd.index.html b/lib/modem-dashboard/views/ussd.index.html
index e84613b..6ed0299 100644
--- a/lib/modem-dashboard/views/ussd.index.html
+++ b/lib/modem-dashboard/views/ussd.index.html
@@ -8,6 +8,8 @@
{% block content %}
+{% include "date-selector.html" %}
+
<table id="smsHistory" class="display table table-hover table-striped">
<thead>
<tr>
@@ -32,7 +34,7 @@
<script>
$(document).ready(function() {
$('#smsHistory').DataTable( {
- "ajax": "/ussd/datatables",
+ "ajax": "/ussd/datatables?input_date={{ input_date}}",
"language": { "url": "//cdn.datatables.net/plug-ins/9dcbecd42ad/i18n/Indonesian.json" },
"columns": [
{ "data": "rowid" },
--
1.9.0