#! /usr/bin/perl
# infocon - Admin-Tool for InfoCon
-# Copyright (c) 1998-2003,2005 Martin Schulze <joey@infodrom.org>
+# Copyright (c) 1998-2003,2005-8 Martin Schulze <joey@infodrom.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# $Id$
+use strict;
+use warnings;
+
use DBI;
use Term::ReadLine;
-$table = "sales";
-$engine = "dbi:Pg:dbname=infocon";
-$dbh = DBI->connect($engine);
+my $table = "sales";
+my $engine = "dbi:Pg:dbname=infocon";
+my $dbh = DBI->connect($engine);
if (!$dbh) {
print "Access to database denied!\n";
return 1;
}
-@categories = ();
+my @categories = ();
+my $term = undef;
+my $opt_all = 0;
+my $opt_verbose = 0;
+my $opt_year = 0;
+my $opt_direction = undef;
sub sdate
{
#
sub date_to_string
{
+ my ($day,$mon,$year);
+
return "" if (!$_[0]);
- ($date_sec,$date_min,$date_hour,$date_mday,$date_mon,$date_year,$date_wday,$date_isdst)
- = localtime();
+ my ($date_sec,$date_min,$date_hour,$date_mday,$date_mon,$date_year,$date_wday,$date_isdst)
+ = localtime;
if ($_[0] eq "heute" || $_[0] eq "sofort" || $_[0] eq "pronto" || $_[0] eq "today" || $_[0] eq "now") {
$day = $date_mday;
my $sth;
my $d;
- if ($where !~ /visible/ && (!$opt_all || $opt_all == 0)) {
+ if ($where && $where !~ /visible/ && (!$opt_all || $opt_all == 0)) {
if ($where) {
$where .= " AND visible = 1";
} else {
$query .= " WHERE $where" if ($where);
$query .= " ORDER by date,nr";
$sth = $dbh->prepare($query);
- if ($sth && ($rc = $sth->execute) > 0) {
+ if ($sth && (my $rc = $sth->execute) > 0) {
print " Nr. Datum Bezeichnung Betrag\n";
print "------------------------------------------------------------------\n";
while (@row = $sth->fetchrow_array) {
$descr = substr($row[2],0,40);
- printf "%4d %8s %-40s %9.2f\n", $row[0], &sdate($row[1]), $descr, $row[3];
+ printf "%4d %8s %-40s %9.2f\n", $row[0], sdate($row[1]), $descr, $row[3];
if ($row[3] < 0.0) {
$sum_neg -= $row[3];
} else {
}
}
+sub get_descriptions
+{
+ my $query;
+ my @row;
+ my $sth;
+ my @arr = ();
+ my ($date_sec,$date_min,$date_hour,$date_mday,$date_mon,$date_year,$date_wday,$date_isdst)
+ = localtime;
+
+ $query = sprintf("SELECT DISTINCT description FROM %s WHERE date LIKE '%d%%' ORDER by description",
+ $table, $date_year+1900);
+ $sth = $dbh->prepare($query);
+ if ($sth && (my $rc = $sth->execute) > 0) {
+ while (@row = $sth->fetchrow_array) {
+ push(@arr, $row[0]) if ($row[0]);
+ }
+ }
+ return @arr;
+}
+
sub get_categories
{
my $query;
$query = "SELECT DISTINCT category FROM $table ORDER by category";
$sth = $dbh->prepare($query);
- if ($sth && ($rc = $sth->execute) > 0) {
+ if ($sth && (my $rc = $sth->execute) > 0) {
while (@row = $sth->fetchrow_array) {
push(@arr, $row[0]) if ($row[0]);
}
sub list_categories
{
- @categories = &get_categories() if ($#categories);
+ @categories = get_categories unless @categories;
printf "%s\n", join (", ",@categories);
}
} elsif ($ans eq ".") {
$ans = '';
}
+ $ans =~ s/ *$//;
return $ans;
}
my @input = ();
my $weiter = 'y';
my $i;
+ my $ans;
my $query;
my ($date_sec,$date_min,$date_hour,$date_mday,$date_mon,$date_year,$date_wday,$date_isdst)
- = localtime();
+ = localtime;
+
+ @categories = get_categories unless @categories;
+ my @descriptions = get_descriptions;
+
+ $term = new Term::ReadLine '' unless $term;
+
+ $term->addhistory($_) foreach (@categories);
+ $term->addhistory($_) foreach (@descriptions);
+
+ my $attribs = $term->Attribs;
+
+ my $sth = $dbh->prepare ("INSERT INTO $table VALUES (?,?,?,?,?,?,?,?,?)");
print "Buchungseingabe\n\n";
- while ($weiter =~ /[JjYy]/) {
+ while ($weiter =~ /[JjYy1]/) {
$i=0;while ($i <= $#fieldname) {
- $ans = &read_input($fieldname[$i],$input[$i]);
+ if ($fieldname[$i] eq "Category") {
+ $attribs->{completion_entry_function} = $attribs->{list_completion_function};
+ $attribs->{completion_word} = \@categories;
+ } elsif ($fieldname[$i] eq "Description") {
+ $attribs->{completion_entry_function} = $attribs->{list_completion_function};
+ $attribs->{completion_word} = \@descriptions;
+ } elsif ($fieldname[$i] eq "Tax assigned") {
+ if ($input[$i-1] == 0) {
+ $input[$i++] = 0;
+ next;
+ }
+ } else {
+ $attribs->{completion_word} = undef;
+ }
+ $ans = read_input($fieldname[$i],$input[$i]);
if ($fieldname[$i] eq "Category" && $ans eq "?") {
- @categories = &get_categories() if ($#categories);
printf " %s\n", join (", ",@categories);
} elsif ($fieldname[$i] eq "Datum") {
if ($ans =~ /^\d+\.\d+.\d+$/) {
$input[$i] = $ans;
$i++;
}
+ } elsif ($fieldname[$i] eq "Paid") {
+ if ($ans =~ /[1jJyY]/) {
+ $input[$i] = 1;
+ } else {
+ $input[$i] = 0;
+ }
+ $i++;
} else {
$input[$i] = $ans;
$i++;
$input[6] *= -1 if ($input[6] > 0);
}
- $query = sprintf ("INSERT INTO $table VALUES (%d,'%s','%s','%s',%8.2f,%8.2f,%8.2f,%d,%d)",
- &get_next_nr(), &date_to_string($input[0]), $input[1], $input[2], $input[4],
+ $sth->execute (get_next_nr(), date_to_string($input[0]), $input[1], $input[2], $input[4],
$input[5], $input[6], 1, $input[7]);
- $sth = $dbh->do($query);
- $weiter = &read_input("Weiter",'j');
+ $weiter = read_input("Weiter",'j');
$input[5] = 0.0;
}
}
exit 0;
}
-$term = new Term::ReadLine '';
-$i = 0;
-$opt_all = 0;
-$opt_verbose = 0;
-$opt_year = 0;
-&usage() if ($#ARGV == -1);
+my $i = 0;
+usage unless @ARGV;
while ($i <= $#ARGV) {
# Some aliases
if ($ARGV[$i] eq "-bc") {
$ARGV[$i] = "--buchung-input";
} elsif ($ARGV[$i] eq "-bh") {
$ARGV[$i] = "--buchung-hidden";
+ } elsif ($ARGV[$i] eq "-bu") {
+ $ARGV[$i] = "--buchung-unpaid";
} elsif ($ARGV[$i] eq "-lc") {
$ARGV[$i] = "--list-categories";
}
if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "--help") {
- &usage();
+ usage;
} elsif ($ARGV[$i] =~ /^--list-/) {
$ARGV[$i] =~ s/^--list-//;
if ($ARGV[$i] eq "categories") {
- &list_categories();
+ list_categories;
} else {
- &usage();
+ usage;
}
} elsif ($ARGV[$i] =~ /^--buchung-/) {
$ARGV[$i] =~ s/^--buchung-//;
if ($ARGV[$i] eq "category") {
if ($i+1 <= $#ARGV && ($ARGV[$i+1] !~ /^-/)) {
$i++;
- &sales_list("category = '$ARGV[$i]'");
+ sales_list("category = '$ARGV[$i]'");
} else {
- &sales_list();
+ sales_list;
}
} elsif ($ARGV[$i] eq "hidden") {
- $saved_table = $table;
+ my $saved_table = $table;
$table = "sales_dm";
- &sales_list("visible = 0");
+ sales_list("visible = 0");
$table = "sales";
- &sales_list("visible = 0");
- $table = $table_saved;
+ sales_list("visible = 0");
+ $table = $saved_table;
} elsif ($ARGV[$i] eq "input") {
- &buchung_input();
+ buchung_input;
} elsif ($ARGV[$i] eq "unpaid") {
- $saved_table = $table;
+ my $saved_table = $table;
$table = "sales_dm";
- &sales_list("paid = 0");
+ sales_list("paid = 0");
$table = "sales";
- &sales_list("paid = 0");
- $table = $table_saved;
+ sales_list("paid = 0");
+ $table = $saved_table;
} else {
- &usage();
+ usage;
}
} elsif ($ARGV[$i] eq "--pay") {
if ($i+1 <= $#ARGV && ($ARGV[$i+1] !~ /^-/)
&& ($ARGV[$i+1] =~ /^\d+$/)) {
$i++;
- &pay_invoice ($ARGV[$i], 1);
+ pay_invoice ($ARGV[$i], 1);
}
} elsif ($ARGV[$i] eq "--unpay") {
if ($i+1 <= $#ARGV && ($ARGV[$i+1] !~ /^-/)
&& ($ARGV[$i+1] =~ /^\d+$/)) {
$i++;
- &pay_invoice ($ARGV[$i], 0);
+ pay_invoice ($ARGV[$i], 0);
}
} elsif ($ARGV[$i] eq "--hide") {
if ($i+1 <= $#ARGV && ($ARGV[$i+1] !~ /^-/)
&& ($ARGV[$i+1] =~ /^\d+$/)) {
$i++;
- &hide_invoice ($ARGV[$i], 1);
+ hide_invoice ($ARGV[$i], 1);
}
} elsif ($ARGV[$i] eq "--unhide") {
if ($i+1 <= $#ARGV && ($ARGV[$i+1] !~ /^-/)
&& ($ARGV[$i+1] =~ /^\d+$/)) {
$i++;
- &hide_invoice ($ARGV[$i], 0);
+ hide_invoice ($ARGV[$i], 0);
}
} elsif ($ARGV[$i] eq "--year" || $ARGV[$i] eq "-y") {
if ($i+1 <= $#ARGV && ($ARGV[$i+1] =~ /^(\d+)$/)) {
projects / infodrom.org / service.infodrom.org / blobdiff