From 8fa3869c7dc869ba998cef893273d6201711ce4e Mon Sep 17 00:00:00 2001 From: Metabox Date: Sun, 4 Aug 2019 04:21:35 +1000 Subject: [PATCH] dev. and fixes. rtf button on log entries. --- htdocs/cgi-bin/main.cgi | 88 ++++++++++++++++++------------------ htdocs/cgi-bin/wsrc/main.css | 4 ++ htdocs/cgi-bin/wsrc/main.js | 70 +++++++++++++++++++--------- 3 files changed, 95 insertions(+), 67 deletions(-) diff --git a/htdocs/cgi-bin/main.cgi b/htdocs/cgi-bin/main.cgi index e27ac2b..e6a5e17 100755 --- a/htdocs/cgi-bin/main.cgi +++ b/htdocs/cgi-bin/main.cgi @@ -81,16 +81,27 @@ my $rs_page = $cgi->param('rs_page'); my $stmS = "SELECT rowid, ID_CAT, DATE, LOG, AMMOUNT from LOG WHERE"; my $stmE = " ORDER BY DATE DESC;"; my $stmD = ""; -if ( !$rs_dat_to ) { - $rs_dat_to = 'now'; +my $sm_reset_all; + + +my $lang = Date::Language->new($LANGUAGE); +my $today = DateTime->now; +$today->set_time_zone($TIME_ZONE); + + + +if ( !$rs_dat_to && $rs_dat_from ) { + my $dur = $today; + $dur->add(months => 1); + $rs_dat_to = DateTime::Format::SQLite->parse_datetime( $dur ); } if ( $rs_dat_from && $rs_dat_to ) { $stmD =qq( DATE BETWEEN date('$rs_dat_from') AND date('$rs_dat_to') ); } - +#Toggle if search deployed. my $toggle = ""; -if ( $rs_keys || $rs_cat_idx || $stmD ) { $toggle = 1; } +if ( $rs_keys || $rs_cat_idx || $stmD || $prm_vc > 0) { $toggle = 1; } $session->expire($SESSN_EXPR); @@ -163,10 +174,6 @@ print $cgi->start_html( my $rv; my $st; -my $lang = Date::Language->new($LANGUAGE); -my $today = DateTime->now; -$today->set_time_zone($TIME_ZONE); - my $stmtCat = "SELECT * FROM CAT;"; my $stmt = "SELECT rowid, ID_CAT, DATE, LOG, AMMOUNT, RTF FROM LOG ORDER BY DATE DESC, rowid DESC;"; @@ -188,42 +195,22 @@ $cats_v =~ s/\"ec\"/\"vc\"/g; while ( my @row = $st->fetchrow_array() ) { if ( $row[0] == $c_sel ) { - $cats = - $cats - . '\n'; + $cats .= '\n'; } else { - $cats = - $cats - . '\n'; + $cats .= '\n'; } if ( $row[0] == $prm_vc ) { - $cats_v = - $cats_v - . '\n'; + $cats_v .= '\n'; } else { - $cats_v = - $cats_v - . '\n'; + $cats_v .= '\n'; } $hshCats{ $row[0] } = $row[1]; $desc{ $row[0] } = $row[2]; } -$cats = $cats . ''; +$cats .= ''; my $cat_descriptions = ""; for my $key ( keys %desc ) { @@ -245,10 +232,10 @@ qq(
); if (defined $prm_vc) { #view category form selection - $rs_cat_idx = $prm_vc; + $rs_cat_idx = $prm_vc; } -if ($rs_keys) { +if ($rs_keys && $rs_keys ne '*') { my @keywords = split / /, $rs_keys; if ($rs_cat_idx) { @@ -331,6 +318,7 @@ while ( my @row = $st->fetchrow_array() ) { my $log = $row[3]; my $am = &cam($row[4]); my $rtf = $row[5]; + if($ct eq 'Expense'){ $exp += $row[4]; }else{ @@ -519,6 +507,9 @@ while ( my @row = $st->fetchrow_array() ) { $dtf = $lang->time2str( "%d %b %Y", $dt->epoch, $TIME_ZONE); } + if($rtf > 0){ + $log .= qq(
); + } $tbl .= qq( $dtf @@ -600,7 +591,7 @@ if ( $tbl_rc == 0 ) { } $tbl .= -qq([Show All -> ] +qq([Show Again The Hidden By -> ] ↟ @@ -617,10 +608,10 @@ qq([Show All -> ); -my $COLLAPSED_LOG = 's'; + my ($sp1,$sp2); $sp1 = ''; -$sp2 = qq(); +$sp2 = qq(); my $frm = qq(
@@ -654,7 +645,7 @@ my $frm = qq(
  -
+ @@ -688,8 +679,8 @@ qq(View by Category: View by Date: - From:  - To:  + From:  + To:  Keywords: @@ -697,16 +688,20 @@ qq(View by Category: ); -if ( $rs_keys || $rs_cat_idx || $stmD ) { + +if ( ($rs_keys && $rs_keys ne '*') || $rs_cat_idx || $stmD ) { + $sm_reset_all = 'Reset View
'; $srh .= ' - '; + '; } $srh .= ''; my $quill = &quill($cgi->param('submit_is_edit')); + # #Page printout from here! # + print qq(