Skip to content
GitLab
Commit 2846ae05 authored by Nigel Kukard's avatar Nigel Kukard
Browse files

Added end dates for client statements

parent 2918ef2c
Hide whitespace changes
Inline Side-by-side
wiaflos/client/cmdline/Statements.pm
View file @ 2846ae05
# Statement functions # Statement functions
# Copyright (C) 2009-2014, AllWorldIT # Copyright (C) 2009-2020, AllWorldIT
# Copyright (C) 2008, LinuxRulz # Copyright (C) 2008, LinuxRulz
# Copyright (C) 2007 Nigel Kukard <nkukard@lbsd.net> # Copyright (C) 2007 Nigel Kukard <nkukard@lbsd.net>
# #
...@@ -51,14 +51,14 @@ our $pluginInfo = { ...@@ -51,14 +51,14 @@ our $pluginInfo = {
MenuItem => "Show", MenuItem => "Show",
Regex => "show", Regex => "show",
Desc => "Display statement", Desc => "Display statement",
Help => 'show client="<client code>" [start="<start date>"]', Help => 'show client="<client code>" [start="<start date>"] [end="yyyy-mm-dd"]',
Function => \&show, Function => \&show,
}, },
{ {
MenuItem => "Send", MenuItem => "Send",
Regex => "send", Regex => "send",
Desc => "Send statement", Desc => "Send statement",
Help => 'send client="<client code>" start="<yyyy-mm-dd>" [subject="<subject>"] sendto="<email[:addy1,addy2...] or file:filename>"', Help => 'send client="<client code>" [start="<yyyy-mm-dd>"] [end="yyyy-mm-dd"] [subject="<subject>"] sendto="<email[:addy1,addy2...] or file:filename>"',
Function => \&send, Function => \&send,
}, },
], ],
...@@ -86,6 +86,7 @@ sub show ...@@ -86,6 +86,7 @@ sub show
my $detail; my $detail;
$detail->{'ClientCode'} = $parms->{'client'}; $detail->{'ClientCode'} = $parms->{'client'};
$detail->{'StartDate'} = $parms->{'start'}; $detail->{'StartDate'} = $parms->{'start'};
$detail->{'EndDate'} = $parms->{'end'};
my $res = soapCall($OUT,"wiaflos/server/api/Statements","getStatement",$detail); my $res = soapCall($OUT,"wiaflos/server/api/Statements","getStatement",$detail);
if ($res->{'Result'} == RES_OK) { if ($res->{'Result'} == RES_OK) {
...@@ -136,6 +137,7 @@ sub send ...@@ -136,6 +137,7 @@ sub send
my $detail; my $detail;
$detail->{'ClientCode'} = $parms->{'client'}; $detail->{'ClientCode'} = $parms->{'client'};
$detail->{'StartDate'} = $parms->{'start'}; $detail->{'StartDate'} = $parms->{'start'};
$detail->{'EndDate'} = $parms->{'end'};
$detail->{'SendTo'} = $parms->{'sendto'}; $detail->{'SendTo'} = $parms->{'sendto'};
$detail->{'Subject'} = $parms->{'subject'}; $detail->{'Subject'} = $parms->{'subject'};
my $res = soapCall($OUT,"wiaflos/server/api/Statements","sendStatement",$detail); my $res = soapCall($OUT,"wiaflos/server/api/Statements","sendStatement",$detail);
......
wiaflos/server/api/Statements.pm
View file @ 2846ae05
# SOAP interface to Statements module # SOAP interface to Statements module
# Copyright (C) 2009-2014, AllWorldIT # Copyright (C) 2009-2020, AllWorldIT
# Copyright (C) 2008, LinuxRulz # Copyright (C) 2008, LinuxRulz
# Copyright (C) 2007 Nigel Kukard <nkukard@lbsd.net> # Copyright (C) 2007 Nigel Kukard <nkukard@lbsd.net>
# #
...@@ -53,6 +53,7 @@ sub init { ...@@ -53,6 +53,7 @@ sub init {
# Parameters: # Parameters:
# ClientCode - Client code # ClientCode - Client code
# StartDate - Start date # StartDate - Start date
# EndDate - End date
sub getStatement { sub getStatement {
my (undef,$data) = @_; my (undef,$data) = @_;
...@@ -67,6 +68,7 @@ sub getStatement { ...@@ -67,6 +68,7 @@ sub getStatement {
my $detail; my $detail;
$detail->{'ClientCode'} = $data->{'ClientCode'}; $detail->{'ClientCode'} = $data->{'ClientCode'};
$detail->{'StartDate'} = $data->{'StartDate'}; $detail->{'StartDate'} = $data->{'StartDate'};
$detail->{'EndDate'} = $data->{'EndDate'};
my $rawData = wiaflos::server::core::Statements::getStatement($detail); my $rawData = wiaflos::server::core::Statements::getStatement($detail);
if (ref $rawData ne "ARRAY") { if (ref $rawData ne "ARRAY") {
return SOAPResponse(RES_ERROR,$rawData,wiaflos::server::core::Statements::Error()); return SOAPResponse(RES_ERROR,$rawData,wiaflos::server::core::Statements::Error());
...@@ -97,6 +99,7 @@ sub getStatement { ...@@ -97,6 +99,7 @@ sub getStatement {
# SendTo - Send statement to here # SendTo - Send statement to here
# Optional: # Optional:
# StartDate - Start date # StartDate - Start date
# EndDate - End date
# Subject - Statement subject # Subject - Statement subject
sub sendStatement { sub sendStatement {
my (undef,$data) = @_; my (undef,$data) = @_;
...@@ -118,6 +121,7 @@ sub sendStatement { ...@@ -118,6 +121,7 @@ sub sendStatement {
$detail->{'ClientCode'} = $data->{'ClientCode'}; $detail->{'ClientCode'} = $data->{'ClientCode'};
$detail->{'SendTo'} = $data->{'SendTo'}; $detail->{'SendTo'} = $data->{'SendTo'};
$detail->{'StartDate'} = $data->{'StartDate'}; $detail->{'StartDate'} = $data->{'StartDate'};
$detail->{'EndDate'} = $data->{'EndDate'};
$detail->{'Subject'} = $data->{'Subject'}; $detail->{'Subject'} = $data->{'Subject'};
my $res = wiaflos::server::core::Statements::sendStatement($detail); my $res = wiaflos::server::core::Statements::sendStatement($detail);
......
wiaflos/server/core/Statements.pm
View file @ 2846ae05
# Statement functions # Statement functions
# Copyright (C) 2009-2014, AllWorldIT # Copyright (C) 2009-2020, AllWorldIT
# Copyright (C) 2008, LinuxRulz # Copyright (C) 2008, LinuxRulz
# Copyright (C) 2007 Nigel Kukard <nkukard@lbsd.net> # Copyright (C) 2007 Nigel Kukard <nkukard@lbsd.net>
# #
...@@ -138,6 +138,7 @@ sub getStatement ...@@ -138,6 +138,7 @@ sub getStatement
# Parameters: # Parameters:
# ClientCode - Client code # ClientCode - Client code
# StartDate - Start date # StartDate - Start date
# EndDate - End date
# SendTo - Send to, email: , file: , return # SendTo - Send to, email: , file: , return
# Optional: # Optional:
# Subject - Subject of the statement # Subject - Subject of the statement
...@@ -156,6 +157,7 @@ sub sendStatement ...@@ -156,6 +157,7 @@ sub sendStatement
my $data; my $data;
$data->{'ClientCode'} = $detail->{'ClientCode'}; $data->{'ClientCode'} = $detail->{'ClientCode'};
$data->{'StartDate'} = $detail->{'StartDate'}; $data->{'StartDate'} = $detail->{'StartDate'};
$data->{'EndDate'} = $detail->{'EndDate'};
my $entries = getStatement($data); my $entries = getStatement($data);
if (ref $entries ne "ARRAY") { if (ref $entries ne "ARRAY") {
setError(Error()); setError(Error());
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment