From 5e11243d4156c832bd9f765afe318cf252883ded Mon Sep 17 00:00:00 2001 From: Jonathan Rosenbaum Date: Sun, 25 Jan 2015 23:53:08 +0000 Subject: [PATCH] Provides fake deposits when none or only 1 exists. --- js/transaction.js | 8 ++++++-- json/transaction.php | 28 ++++++++++++++++++++++++++-- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/js/transaction.js b/js/transaction.js index 628c6be..756b813 100644 --- a/js/transaction.js +++ b/js/transaction.js @@ -148,10 +148,10 @@ $(function() { }); - // on reload + // transaction slider - on reload transaction_slider(); - // on date change + // transaction slider - on date change $("[name='gnucash_csv_year']").change(function() { transaction_slider(); }); var slider; @@ -166,6 +166,10 @@ $(function() { // currently go by a Jan - Dec year as fiscal year // max deposit from previous year needs to be included in range var year = $("[name='gnucash_csv_year']").val(); + if (!year) { + var d = new Date(); + year = d.getFullYear(); + } var last_year = year - 1; $.each(obj,function(k,v){ diff --git a/json/transaction.php b/json/transaction.php index d90ecf6..32541c3 100644 --- a/json/transaction.php +++ b/json/transaction.php @@ -94,8 +94,32 @@ $change_fund = CHANGE_FUND; $sql = mysql_query($query, $YBDB) or die(mysql_error()); while ( $result = mysql_fetch_assoc($sql) ) { $slider_range[] = $result; - } - echo json_encode($slider_range); + } + + // this is the first real deposit + if ($slider_range && !$slider_range[1]["transaction_id"]) { + $fake_trans_id = $slider_range[0]["transaction_id"] - 1; + $real_trans = $slider_range[0]; + $year = date("Y"); + $slider_range[0] = array("transaction_id" => "$fake_trans_id","deposited" => "yes","date" => "$year-01-01 22:22:22"); + $slider_range[1] = $real_trans; + echo json_encode($slider_range); + + // no real deposits exist + } elseif (!$slider_range) { + // send fake data + $year = date("Y"); + $slider_range = array + ( array("transaction_id" => "1","deposited" => "yes","date" => "$year-01-01 22:22:22"), + array("transaction_id" => "2","deposited" => "yes","date" => "$year-01-02 22:22:22"), + ); + echo json_encode($slider_range); + + // more than 1 deposit exists + } else { + echo json_encode($slider_range); + } + } // Deposit Calculator