From 666fd833584fe2e3618a397fe9d9a9bdf4c5b94b Mon Sep 17 00:00:00 2001 From: einhverfr Date: Thu, 26 Apr 2007 18:00:56 +0000 Subject: Doing a simple Perltidy commit so that I can evaluate differences between the branches and make sure patches are up to date git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@1103 4979c152-3d1c-0410-bac9-87ea11338e46 --- bin/hr.pl | 1520 +++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 862 insertions(+), 658 deletions(-) (limited to 'bin/hr.pl') diff --git a/bin/hr.pl b/bin/hr.pl index 160b4c87..78b098c0 100644 --- a/bin/hr.pl +++ b/bin/hr.pl @@ -8,9 +8,9 @@ # with permission. # # This file contains source code included with or based on SQL-Ledger which -# is Copyright Dieter Simader and DWS Systems Inc. 2000-2005 and licensed -# under the GNU General Public License version 2 or, at your option, any later -# version. For a full list including contact information of contributors, +# is Copyright Dieter Simader and DWS Systems Inc. 2000-2005 and licensed +# under the GNU General Public License version 2 or, at your option, any later +# version. For a full list including contact information of contributors, # maintainers, and copyright holders, see the CONTRIBUTORS file. # # Original Copyright Notice from SQL-Ledger 2.6.17 (before the fork): @@ -43,59 +43,88 @@ use LedgerSMB::HR; use LedgerSMB::User; 1; -# end of main - +# end of main sub add { - $label = "Add ".ucfirst $form->{db}; - $form->{title} = $locale->text($label); + $label = "Add " . ucfirst $form->{db}; + $form->{title} = $locale->text($label); - $form->{callback} = "$form->{script}?action=add&db=$form->{db}&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}" unless $form->{callback}; + $form->{callback} = +"$form->{script}?action=add&db=$form->{db}&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}" + unless $form->{callback}; - &{ "$form->{db}_links" }; - -} + &{"$form->{db}_links"}; +} -sub search { &{ "search_$form->{db}" } }; - +sub search { &{"search_$form->{db}"} } sub search_employee { - $form->{title} = $locale->text('Employees'); - - @a = (); - - push @a, qq| |.$locale->text('Pos'); - push @a, qq| |.$locale->text('ID'); - push @a, qq| |.$locale->text('Employee Number'); - push @a, qq| |.$locale->text('Employee Name'); - push @a, qq| |.$locale->text('Address'); - push @a, qq| |.$locale->text('City'); - push @a, qq| |.$locale->text('State/Province'); - push @a, qq| |.$locale->text('Zip/Postal Code'); - push @a, qq| |.$locale->text('Country'); - push @a, qq| |.$locale->text('Work Phone'); - push @a, qq| |.$locale->text('Home Phone'); - push @a, qq| |.$locale->text('Startdate'); - push @a, qq| |.$locale->text('Enddate'); - push @a, qq| |.$locale->text('Sales'); - push @a, qq| |.$locale->text('Manager'); - push @a, qq| |.$locale->text('Role'); - push @a, qq| |.$locale->text('Login'); - push @a, qq| |.$locale->text('E-mail'); - push @a, qq| |.$locale->text('SSN'); - push @a, qq| |.$locale->text('DOB'); - push @a, qq| |.$locale->text('IBAN'); - push @a, qq| |.$locale->text('BIC'); - push @a, qq| |.$locale->text('Notes'); - + $form->{title} = $locale->text('Employees'); + + @a = (); + + push @a, qq| | + . $locale->text('Pos'); + push @a, qq| | + . $locale->text('ID'); + push @a, +qq| | + . $locale->text('Employee Number'); + push @a, + qq| | + . $locale->text('Employee Name'); + push @a, qq| | + . $locale->text('Address'); + push @a, qq| | + . $locale->text('City'); + push @a, qq| | + . $locale->text('State/Province'); + push @a, qq| | + . $locale->text('Zip/Postal Code'); + push @a, qq| | + . $locale->text('Country'); + push @a, +qq| | + . $locale->text('Work Phone'); + push @a, +qq| | + . $locale->text('Home Phone'); + push @a, +qq| | + . $locale->text('Startdate'); + push @a, + qq| | + . $locale->text('Enddate'); + push @a, qq| | + . $locale->text('Sales'); + push @a, qq| | + . $locale->text('Manager'); + push @a, + qq| | + . $locale->text('Role'); + push @a, + qq| | + . $locale->text('Login'); + push @a, qq| | + . $locale->text('E-mail'); + push @a, qq| | + . $locale->text('SSN'); + push @a, qq| | + . $locale->text('DOB'); + push @a, qq| | + . $locale->text('IBAN'); + push @a, qq| | + . $locale->text('BIC'); + push @a, qq| | + . $locale->text('Notes'); + + $form->header; - $form->header; - - print qq| + print qq|
{script}> @@ -109,45 +138,54 @@ sub search_employee { - + - + - - + + - + - - + @@ -162,136 +200,208 @@ sub search_employee { |; - $form->hide_form(qw(db path login sessionid)); + $form->hide_form(qw(db path login sessionid)); - print qq| + print qq|
- + |; - if ($form->{lynx}) { - require "bin/menu.pl"; - &menubar; - } + if ( $form->{lynx} ) { + require "bin/menu.pl"; + &menubar; + } - print qq| + print qq| |; } - sub list_employees { - HR->employees(\%myconfig, \%$form); - - $href = "$form->{script}?action=list_employees&direction=$form->{direction}&oldsort=$form->{oldsort}&db=$form->{db}&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}&status=$form->{status}"; - - $form->sort_order(); + HR->employees( \%myconfig, \%$form ); + + $href = +"$form->{script}?action=list_employees&direction=$form->{direction}&oldsort=$form->{oldsort}&db=$form->{db}&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}&status=$form->{status}"; + + $form->sort_order(); + + $callback = +"$form->{script}?action=list_employees&direction=$form->{direction}&oldsort=$form->{oldsort}&db=$form->{db}&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}&status=$form->{status}"; - $callback = "$form->{script}?action=list_employees&direction=$form->{direction}&oldsort=$form->{oldsort}&db=$form->{db}&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}&status=$form->{status}"; - - @columns = $form->sort_columns(qw(id employeenumber name address city state zipcode country workphone homephone email startdate enddate ssn dob iban bic sales role manager login notes)); - unshift @columns, "ndx"; + @columns = + $form->sort_columns( + qw(id employeenumber name address city state zipcode country workphone homephone email startdate enddate ssn dob iban bic sales role manager login notes) + ); + unshift @columns, "ndx"; - foreach $item (@columns) { - if ($form->{"l_$item"} eq "Y") { - push @column_index, $item; + foreach $item (@columns) { + if ( $form->{"l_$item"} eq "Y" ) { + push @column_index, $item; - # add column to href and callback - $callback .= "&l_$item=Y"; - $href .= "&l_$item=Y"; + # add column to href and callback + $callback .= "&l_$item=Y"; + $href .= "&l_$item=Y"; + } + } + + %role = ( + user => $locale->text('User'), + supervisor => $locale->text('Supervisor'), + manager => $locale->text('Manager'), + admin => $locale->text('Administrator') + ); + + $option = $locale->text('All'); + + if ( $form->{status} eq 'sales' ) { + $option = $locale->text('Sales'); + } + if ( $form->{status} eq 'orphaned' ) { + $option = $locale->text('Orphaned'); } - } - - %role = ( user => $locale->text('User'), - supervisor => $locale->text('Supervisor'), - manager => $locale->text('Manager'), - admin => $locale->text('Administrator') - ); - - $option = $locale->text('All'); - - if ($form->{status} eq 'sales') { - $option = $locale->text('Sales'); - } - if ($form->{status} eq 'orphaned') { - $option = $locale->text('Orphaned'); - } - if ($form->{status} eq 'active') { - $option = $locale->text('Active'); - } - if ($form->{status} eq 'inactive') { - $option = $locale->text('Inactive'); - } - - if ($form->{employeenumber}) { - $callback .= "&employeenumber=".$form->escape($form->{employeenumber},1); - $href .= "&employeenumber=".$form->escape($form->{employeenumber}); - $option .= "\n
".$locale->text('Employee Number')." : $form->{employeenumber}"; - } - if ($form->{name}) { - $callback .= "&name=".$form->escape($form->{name},1); - $href .= "&name=".$form->escape($form->{name}); - $option .= "\n
".$locale->text('Employee Name')." : $form->{name}"; - } - if ($form->{startdatefrom}) { - $callback .= "&startdatefrom=$form->{startdatefrom}"; - $href .= "&startdatefrom=$form->{startdatefrom}"; - $fromdate = $locale->date(\%myconfig, $form->{startdatefrom}, 1); - } - if ($form->{startdateto}) { - $callback .= "&startdateto=$form->{startdateto}"; - $href .= "&startdateto=$form->{startdateto}"; - $todate = $locale->date(\%myconfig, $form->{startdateto}, 1); - } - if ($fromdate || $todate) { - $option .= "\n
".$locale->text('Startdate')." $fromdate - $todate"; - } - - if ($form->{notes}) { - $callback .= "¬es=".$form->escape($form->{notes},1); - $href .= "¬es=".$form->escape($form->{notes}); - $option .= "\n
" if $option; - $option .= $locale->text('Notes')." : $form->{notes}"; - } - - $form->{callback} = "$callback&sort=$form->{sort}"; - $callback = $form->escape($form->{callback}); - - $column_header{ndx} = qq||; - $column_header{id} = qq||; - $column_header{employeenumber} = qq||; - $column_header{name} = qq||; - $column_header{manager} = qq||; - $column_header{address} = qq||; - $column_header{city} = qq||; - $column_header{state} = qq||; - $column_header{zipcode} = qq||; - $column_header{country} = qq||; - $column_header{workphone} = qq||; - $column_header{homephone} = qq||; - - $column_header{startdate} = qq||; - $column_header{enddate} = qq||; - $column_header{notes} = qq||; - $column_header{role} = qq||; - $column_header{login} = qq||; - - $column_header{sales} = qq||; - $column_header{email} = qq||; - $column_header{ssn} = qq||; - $column_header{dob} = qq||; - $column_header{iban} = qq||; - $column_header{bic} = qq||; - - $form->{title} = $locale->text('Employees'); - - $form->header; - - print qq| + if ( $form->{status} eq 'active' ) { + $option = $locale->text('Active'); + } + if ( $form->{status} eq 'inactive' ) { + $option = $locale->text('Inactive'); + } + + if ( $form->{employeenumber} ) { + $callback .= + "&employeenumber=" . $form->escape( $form->{employeenumber}, 1 ); + $href .= "&employeenumber=" . $form->escape( $form->{employeenumber} ); + $option .= "\n
" + . $locale->text('Employee Number') + . " : $form->{employeenumber}"; + } + if ( $form->{name} ) { + $callback .= "&name=" . $form->escape( $form->{name}, 1 ); + $href .= "&name=" . $form->escape( $form->{name} ); + $option .= + "\n
" . $locale->text('Employee Name') . " : $form->{name}"; + } + if ( $form->{startdatefrom} ) { + $callback .= "&startdatefrom=$form->{startdatefrom}"; + $href .= "&startdatefrom=$form->{startdatefrom}"; + $fromdate = $locale->date( \%myconfig, $form->{startdatefrom}, 1 ); + } + if ( $form->{startdateto} ) { + $callback .= "&startdateto=$form->{startdateto}"; + $href .= "&startdateto=$form->{startdateto}"; + $todate = $locale->date( \%myconfig, $form->{startdateto}, 1 ); + } + if ( $fromdate || $todate ) { + $option .= + "\n
" . $locale->text('Startdate') . " $fromdate - $todate"; + } + + if ( $form->{notes} ) { + $callback .= "¬es=" . $form->escape( $form->{notes}, 1 ); + $href .= "¬es=" . $form->escape( $form->{notes} ); + $option .= "\n
" if $option; + $option .= $locale->text('Notes') . " : $form->{notes}"; + } + + $form->{callback} = "$callback&sort=$form->{sort}"; + $callback = $form->escape( $form->{callback} ); + + $column_header{ndx} = qq||; + $column_header{id} = + qq||; + $column_header{employeenumber} = + qq||; + $column_header{name} = + qq||; + $column_header{manager} = + qq||; + $column_header{address} = + qq||; + $column_header{city} = + qq||; + $column_header{state} = + qq||; + $column_header{zipcode} = + qq||; + $column_header{country} = + qq||; + $column_header{workphone} = + qq||; + $column_header{homephone} = + qq||; + + $column_header{startdate} = + qq||; + $column_header{enddate} = + qq||; + $column_header{notes} = + qq||; + $column_header{role} = + qq||; + $column_header{login} = + qq||; + + $column_header{sales} = + qq||; + $column_header{email} = + qq||; + $column_header{ssn} = + qq||; + $column_header{dob} = + qq||; + $column_header{iban} = + qq||; + $column_header{bic} = + qq||; + + $form->{title} = $locale->text('Employees'); + + $form->header; + + print qq|
|.$locale->text('Employee Number').qq|| . $locale->text('Employee Number') . qq|
|.$locale->text('Employee Name').qq|| . $locale->text('Employee Name') . qq|
|.$locale->text('Startdate').qq||.$locale->text('From').qq| |.$locale->text('To').qq| | . $locale->text('Startdate') . qq|| + . $locale->text('From') + . qq| | + . $locale->text('To') + . qq|
|.$locale->text('Notes').qq|| . $locale->text('Notes') . qq|
 |.$locale->text('All').qq| -  |.$locale->text('Active').qq| -  |.$locale->text('Inactive').qq| -  |.$locale->text('Orphaned').qq| -  |.$locale->text('Sales').qq| +  | + . $locale->text('All') . qq| +  | + . $locale->text('Active') . qq| +  | + . $locale->text('Inactive') . qq| +  | + . $locale->text('Orphaned') . qq| +  | + . $locale->text('Sales') . qq|
|.$locale->text('Include in Report').qq|| . $locale->text('Include in Report') . qq| |; - while (@a) { - print qq|\n|; - for (1 .. 5) { - print qq|\n|; + while (@a) { + print qq|\n|; + for ( 1 .. 5 ) { + print qq|\n|; + } + print qq|\n|; } - print qq|\n|; - } - print qq| + print qq|
|. shift @a; - print qq|
| . shift @a; + print qq|
 |.$locale->text('ID').qq||.$locale->text('Number').qq||.$locale->text('Name').qq||.$locale->text('Manager').qq||.$locale->text('Address').qq||.$locale->text('City').qq||.$locale->text('State/Province').qq||.$locale->text('Zip/Postal Code').qq||.$locale->text('Country').qq||.$locale->text('Work Phone').qq||.$locale->text('Home Phone').qq||.$locale->text('Startdate').qq||.$locale->text('Enddate').qq||.$locale->text('Notes').qq||.$locale->text('Role').qq||.$locale->text('Login').qq||.$locale->text('S').qq||.$locale->text('E-mail').qq||.$locale->text('SSN').qq||.$locale->text('DOB').qq||.$locale->text('IBAN').qq||.$locale->text('BIC').qq| | . $locale->text('ID') . qq|| + . $locale->text('Number') + . qq|| + . $locale->text('Name') + . qq|| + . $locale->text('Manager') + . qq|| . $locale->text('Address') . qq|| + . $locale->text('City') + . qq|| + . $locale->text('State/Province') + . qq|| + . $locale->text('Zip/Postal Code') + . qq|| + . $locale->text('Country') + . qq|| + . $locale->text('Work Phone') + . qq|| + . $locale->text('Home Phone') + . qq|| + . $locale->text('Startdate') + . qq|| + . $locale->text('Enddate') + . qq|| + . $locale->text('Notes') + . qq|| + . $locale->text('Role') + . qq|| + . $locale->text('Login') + . qq|| . $locale->text('S') . qq|| + . $locale->text('E-mail') + . qq|| + . $locale->text('SSN') + . qq|| + . $locale->text('DOB') + . qq|| + . $locale->text('IBAN') + . qq|| + . $locale->text('BIC') + . qq|
@@ -308,58 +418,65 @@ sub list_employees { |; - for (@column_index) { print "$column_header{$_}\n" } - - print qq| + for (@column_index) { print "$column_header{$_}\n" } + + print qq| |; - $i = 0; - foreach $ref (@{ $form->{all_employee} }) { + $i = 0; + foreach $ref ( @{ $form->{all_employee} } ) { - $i++; - - $ref->{notes} =~ s/\r?\n/
/g; - for (@column_index) { $column_data{$_} = "" } + $i++; - $column_data{ndx} = ""; - - $column_data{sales} = ($ref->{sales}) ? "" : ""; - $column_data{role} = qq||; - $column_date{address} = qq|$ref->{address1} $ref->{address2}|; + $ref->{notes} =~ s/\r?\n/
/g; + for (@column_index) { $column_data{$_} = "" } - $column_data{name} = ""; + $column_data{ndx} = ""; - if ($ref->{email}) { - $email = $ref->{email}; - $email =~ s//\>/; - - $column_data{email} = qq||; - } + $column_data{sales} = + ( $ref->{sales} ) ? "" : ""; + $column_data{role} = qq||; + $column_date{address} = qq|$ref->{address1} $ref->{address2}|; + + $column_data{name} = +""; + + if ( $ref->{email} ) { + $email = $ref->{email}; + $email =~ s//\>/; + + $column_data{email} = + qq||; + } - $j++; $j %= 2; - print " + $j++; + $j %= 2; + print " "; - for (@column_index) { print "$column_data{$_}\n" } + for (@column_index) { print "$column_data{$_}\n" } - print qq| + print qq| |; - - } - - $i = 1; - $button{'HR--Employees--Add Employee'}{code} = qq| |; - $button{'HR--Employees--Add Employee'}{order} = $i++; - - foreach $item (split /;/, $myconfig{acs}) { - delete $button{$item}; - } - - print qq| + + } + + $i = 1; + $button{'HR--Employees--Add Employee'}{code} = +qq| |; + $button{'HR--Employees--Add Employee'}{order} = $i++; + + foreach $item ( split /;/, $myconfig{acs} ) { + delete $button{$item}; + } + + print qq|
$ref->{$_} $ix $role{"$ref->{role}"} $ref->{$_} {script}?action=edit&db=employee&id=$ref->{id}&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}&status=$form->{status}&callback=$callback>$ref->{name} $i$emailx $role{"$ref->{role}"} {script}?action=edit&db=employee&id=$ref->{id}&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}&status=$form->{status}&callback=$callback>$ref->{name} $email
@@ -372,138 +489,148 @@ sub list_employees {
{script}> |; - $form->hide_form(qw(callback db path login sessionid)); - - foreach $item (sort { $a->{order} <=> $b->{order} } %button) { - print $item->{code}; - } + $form->hide_form(qw(callback db path login sessionid)); + + foreach $item ( sort { $a->{order} <=> $b->{order} } %button ) { + print $item->{code}; + } - if ($form->{lynx}) { - require "bin/menu.pl"; - &menubar; - } + if ( $form->{lynx} ) { + require "bin/menu.pl"; + &menubar; + } - print qq| + print qq|
|; - -} +} sub edit { -# $locale->text('Edit Employee') -# $locale->text('Edit Deduction') + # $locale->text('Edit Employee') + # $locale->text('Edit Deduction') - $label = ucfirst $form->{db}; - $form->{title} = "Edit $label"; + $label = ucfirst $form->{db}; + $form->{title} = "Edit $label"; - &{ "$form->{db}_links" }; - -} + &{"$form->{db}_links"}; +} sub employee_links { -#$form->{deductions} = 1; - HR->get_employee(\%myconfig, \%$form); + #$form->{deductions} = 1; + HR->get_employee( \%myconfig, \%$form ); - for (keys %$form) { $form->{$_} = $form->quote($form->{$_}) } + for ( keys %$form ) { $form->{$_} = $form->quote( $form->{$_} ) } - if (@{ $form->{all_deduction} }) { - $form->{selectdeduction} = "