[Koha-cvs] CVS: koha/bull subscription-add.pl,1.2,1.3 subscription-detail.pl,1.2,1.3

[Paul POULAIN]

Update of /cvsroot/koha/koha/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32276/bull

Modified Files:
        subscription-add.pl subscription-detail.pl 
Log Message:
changing DB structure to calculate next issue number.
Seems to work fine.

Still misses the date calculation & the test of end of subscription (maybe for 
monday ?)

Index: subscription-add.pl
===================================================================
RCS file: /cvsroot/koha/koha/bull/subscription-add.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** subscription-add.pl 5 Aug 2004 16:34:42 -0000       1.2
--- subscription-add.pl 6 Aug 2004 16:38:41 -0000       1.3
***************
*** 5,10 ****
--- 5,12 ----
  use C4::Koha;
  use C4::Auth;
+ use C4::Date;
  use C4::Output;
  use C4::Bull;
+ use C4::Acquisition;
  use C4::Interface::CGI::Output;
  use C4::Context;
***************
*** 17,26 ****
  my ($subscriptionid,$auser,$librarian,$cost,$aqbooksellerid, 
$aqbooksellername,$aqbudgetid, $bookfundid, $startdate, $periodicity,
        $dow, $numberlength, $weeklength, $monthlength,
!       $seqnum1,$startseqnum1,$seqtype1,$freq1,$step1,
!       $seqnum2,$startseqnum2,$seqtype2,$freq2,$step2,
!       $seqnum3,$startseqnum3,$seqtype3,$freq3,$step3,
        $numberingmethod, $arrivalplanified, $status, $biblionumber, 
        $bibliotitle, $notes);
  
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "bull/subscription-add.tmpl",
--- 19,29 ----
  my ($subscriptionid,$auser,$librarian,$cost,$aqbooksellerid, 
$aqbooksellername,$aqbudgetid, $bookfundid, $startdate, $periodicity,
        $dow, $numberlength, $weeklength, $monthlength,
!       $add1,$every1,$whenmorethan1,$setto1,$lastvalue1,
!       $add2,$every2,$whenmorethan2,$setto2,$lastvalue2,
!       $add3,$every3,$whenmorethan3,$setto3,$lastvalue3,
        $numberingmethod, $arrivalplanified, $status, $biblionumber, 
        $bibliotitle, $notes);
  
+       my @budgets;
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "bull/subscription-add.tmpl",
***************
*** 49,67 ****
        $weeklength = $subs->{'weeklength'};
        $monthlength = $subs->{'monthlength'};
!       $seqnum1 = $subs->{'seqnum1'};
!       $startseqnum1 = $subs->{'startseqnum1'};
!       $seqtype1 = $subs->{'seqtype1'};
!       $freq1 = $subs->{'freq1'};
!       $step1 = $subs->{'step1'};
!       $seqnum2 = $subs->{'seqnum2'};
!       $startseqnum2 = $subs->{'startseqnum2'};
!       $seqtype2 = $subs->{'seqtype2'};
!       $freq2 = $subs->{'freq2'};
!       $step2 = $subs->{'step2'};
!       $seqnum3 = $subs->{'seqnum3'};
!       $startseqnum3 = $subs->{'startseqnum3'};
!       $seqtype3 = $subs->{'seqtype3'};
!       $freq3 = $subs->{'freq3'};
!       $step3 = $subs->{'step3'};
        $numberingmethod = $subs->{'numberingmethod'};
        $arrivalplanified = $subs->{'arrivalplanified'};
--- 52,70 ----
        $weeklength = $subs->{'weeklength'};
        $monthlength = $subs->{'monthlength'};
!       $add1 = $subs->{'add1'};
!       $every1 = $subs->{'every1'};
!       $whenmorethan1 = $subs->{'whenmorethan1'};
!       $setto1 = $subs->{'setto1'};
!       $lastvalue1 = $subs->{'lastvalue1'};
!       $add2 = $subs->{'add2'};
!       $every2 = $subs->{'every2'};
!       $whenmorethan2 = $subs->{'whenmorethan2'};
!       $setto2 = $subs->{'setto2'};
!       $lastvalue2 = $subs->{'lastvalue2'};
!       $add3 = $subs->{'add3'};
!       $every3 = $subs->{'every3'};
!       $whenmorethan3 = $subs->{'whenmorethan3'};
!       $setto3 = $subs->{'setto3'};
!       $lastvalue3 = $subs->{'lastvalue3'};
        $numberingmethod = $subs->{'numberingmethod'};
        $arrivalplanified = $subs->{'arrivalplanified'};
***************
*** 79,83 ****
                aqbudgetid => $aqbudgetid,
                bookfundid => $bookfundid,
!               startdate => $startdate,
                periodicity => $periodicity,
                dow => $dow,
--- 82,86 ----
                aqbudgetid => $aqbudgetid,
                bookfundid => $bookfundid,
!               startdate => format_date($startdate),
                periodicity => $periodicity,
                dow => $dow,
***************
*** 85,126 ****
                weeklength => $weeklength,
                monthlength => $monthlength,
!               seqnum1 =>$seqnum1,
!               startseqnum =>$startseqnum1,
!               seqtype1 =>$seqtype1,
!               freq1 =>$freq1,
!               step1 =>$step1,
!               seqnum2 => $seqnum2,
!               startseqnum2 => $startseqnum2,
!               seqtype2 => $seqtype2,
!               freq2 => $freq2,
!               step2 => $step2,
!               seqnum3 => $seqnum3,
!               startseqnum3 => $startseqnum3,
!               seqtype3 => $seqtype3,
!               freq3 => $freq3,
!               step3 => $step3,
                numberingmethod => $numberingmethod,
!               arrivalplanified => $arrivalplanified,
                status => $status,
                biblionumber => $biblionumber,
                bibliotitle => $bibliotitle,
                notes => $notes,
!               subscriptionid => $subscriptionid
                );
        $template->param(
                                "periodicity$periodicity" => 1,
-                               "seqtype1$seqtype1" => 1,
-                               "seqtype2$seqtype2" => 1,
-                               "seqtype3$seqtype3" => 1,
                                "dow$dow" => 1,
                                );
- } else {
- # fill seqtype with 0 to avoid a javascript error
-       $template->param(
-                               "seqtype1" => 0,
-                               "seqtype2" => 0,
-                               "seqtype3" => 0,
-               );
  }
  if ($op eq 'addsubscription') {
        my $auser = $query->param('user');
--- 88,128 ----
                weeklength => $weeklength,
                monthlength => $monthlength,
!               add1 => $add1,
!               every1 => $every1,
!               whenmorethan1 => $whenmorethan1,
!               setto1 => $setto1,
!               lastvalue1 => $lastvalue1,
!               add2 => $add2,
!               every2 => $every2,
!               whenmorethan2 => $whenmorethan2,
!               setto2 => $setto2,
!               lastvalue2 => $lastvalue2,
!               add3 => $add3,
!               every3 => $every3,
!               whenmorethan3 => $whenmorethan3,
!               setto3 => $setto3,
!               lastvalue3 => $lastvalue3,
                numberingmethod => $numberingmethod,
!               arrivalplanified => format_date($arrivalplanified),
                status => $status,
                biblionumber => $biblionumber,
                bibliotitle => $bibliotitle,
                notes => $notes,
!               subscriptionid => $subscriptionid,
                );
        $template->param(
                                "periodicity$periodicity" => 1,
                                "dow$dow" => 1,
                                );
  }
+ (my $temp,@budgets) = bookfunds();
+ # find default value & set it for the template
+ for (my $i=0;$i<=$#budgets;$i++) {
+       if ($budgets[$i]->{'aqbudgetid'} eq $aqbudgetid) {
+               $budgets[$i]->{'selected'}=1;
+       }
+ }
+ $template->param(budgets => address@hidden);
+ 
  if ($op eq 'addsubscription') {
        my $auser = $query->param('user');
***************
*** 134,149 ****
        my $weeklength = $query->param('weeklength');
        my $monthlength = $query->param('monthlength');
!       my $seqnum1 = $query->param('seqnum1');
!       my $seqtype1 = $query->param('seqtype1');
!       my $freq1 = $query->param('freq1');
!       my $step1 = $query->param('step1');
!       my $seqnum2 = $query->param('seqnum2');
!       my $seqtype2 = $query->param('seqtype2');
!       my $freq2 = $query->param('freq2');
!       my $step2 = $query->param('step2');
!       my $seqnum3 = $query->param('seqnum3');
!       my $seqtype3 = $query->param('seqtype3');
!       my $freq3 = $query->param('freq3');
!       my $step3 = $query->param('step3');
        my $numberingmethod = $query->param('numberingmethod');
        my $arrivalplanified = $query->param('arrivalplanified');
--- 136,154 ----
        my $weeklength = $query->param('weeklength');
        my $monthlength = $query->param('monthlength');
!       my $add1 = $query->param('add1');
!       my $every1 = $query->param('every1');
!       my $whenmorethan1 = $query->param('whenmorethan1');
!       my $setto1 = $query->param('setto1');
!       my $lastvalue1 = $query->param('lastvalue1');
!       my $add2 = $query->param('add2');
!       my $every2 = $query->param('every2');
!       my $whenmorethan2 = $query->param('whenmorethan2');
!       my $setto2 = $query->param('setto2');
!       my $lastvalue2 = $query->param('lastvalue2');
!       my $add3 = $query->param('add3');
!       my $every3 = $query->param('every3');
!       my $whenmorethan3 = $query->param('whenmorethan3');
!       my $setto3 = $query->param('setto3');
!       my $lastvalue3 = $query->param('lastvalue3');
        my $numberingmethod = $query->param('numberingmethod');
        my $arrivalplanified = $query->param('arrivalplanified');
***************
*** 151,157 ****
        my $biblionumber = $query->param('biblionumber');
        my $notes = $query->param('notes');
! 
!       my $sth=$dbh->prepare("insert into subscription (librarian, 
aqbooksellerid,cost,aqbudgetid,biblionumber,startdate, 
periodicity,dow,numberlength,weeklength,monthlength,seqnum1,startseqnum1,seqtype1,freq1,step1,seqnum2,startseqnum2,seqtype2,freq2,
 step2, seqnum3,startseqnum3,seqtype3, freq3, step3,numberingmethod, 
arrivalplanified, status, notes, pos1, pos2, pos3) values 
(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?, 0, 0, 0)");
!       
newsubscription($auser,$aqbooksellerid,$cost,$aqbudgetid,$biblionumber,$startdate,$periodicity,$dow,$numberlength,$weeklength,$monthlength,$seqnum1,$seqnum1,$seqtype1,$freq1,
 $step1,$seqnum2,$seqnum2,$seqtype2,$freq2, 
$step2,$seqnum3,$seqnum3,$seqtype3,$freq3, $step3, $numberingmethod, 
$arrivalplanified, $status, $notes);
        
  }
--- 156,166 ----
        my $biblionumber = $query->param('biblionumber');
        my $notes = $query->param('notes');
!       newsubscription($auser,$aqbooksellerid,$cost,$aqbudgetid,$biblionumber,
!                                       
$startdate,$periodicity,$dow,$numberlength,$weeklength,$monthlength,
!                                       
$add1,$every1,$whenmorethan1,$setto1,$lastvalue1,
!                                       
$add2,$every2,$whenmorethan2,$setto2,$lastvalue2,
!                                       
$add3,$every3,$whenmorethan3,$setto3,$lastvalue3,
!                                       $numberingmethod, $arrivalplanified, 
$status, $notes
!                               );
        
  }

Index: subscription-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/bull/subscription-detail.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** subscription-detail.pl      5 Aug 2004 16:34:42 -0000       1.2
--- subscription-detail.pl      6 Aug 2004 16:38:41 -0000       1.3
***************
*** 5,8 ****
--- 5,9 ----
  use C4::Auth;
  use C4::Koha;
+ use C4::Date;
  use C4::Bull;
  use C4::Output;
***************
*** 19,25 ****
  my ($subscriptionid,$auser,$librarian,$cost,$aqbooksellerid, 
$aqbooksellername,$aqbudgetid, $bookfundid, $startdate, $periodicity,
        $dow, $numberlength, $weeklength, $monthlength,
!       $seqnum1,$startseqnum1,$seqtype1,$freq1,$step1,
!       $seqnum2,$startseqnum2,$seqtype2,$freq2,$step2,
!       $seqnum3,$startseqnum3,$seqtype3,$freq3,$step3,
        $numberingmethod, $arrivalplanified, $status, $biblionumber, 
$bibliotitle, $notes);
  
--- 20,26 ----
  my ($subscriptionid,$auser,$librarian,$cost,$aqbooksellerid, 
$aqbooksellername,$aqbudgetid, $bookfundid, $startdate, $periodicity,
        $dow, $numberlength, $weeklength, $monthlength,
!       $add1,$every1,$whenmorethan1,$setto1,$lastvalue1,
!       $add2,$every2,$whenmorethan2,$setto2,$lastvalue2,
!       $add3,$every3,$whenmorethan3,$setto3,$lastvalue3,
        $numberingmethod, $arrivalplanified, $status, $biblionumber, 
$bibliotitle, $notes);
  
***************
*** 39,57 ****
        $weeklength = $query->param('weeklength');
        $monthlength = $query->param('monthlength');
!       $seqnum1 = $query->param('seqnum1');
!       $startseqnum1 = $query->param('startseqnum1');
!       $seqtype1 = $query->param('seqtype1');
!       $freq1 = $query->param('freq1');
!       $step1 = $query->param('step1');
!       $seqnum2 = $query->param('seqnum2');
!       $startseqnum2 = $query->param('startseqnum2');
!       $seqtype2 = $query->param('seqtype2');
!       $freq2 = $query->param('freq2');
!       $step2 = $query->param('step2');
!       $seqnum3 = $query->param('seqnum3');
!       $startseqnum3 = $query->param('startseqnum3');
!       $seqtype3 = $query->param('seqtype3');
!       $freq3 = $query->param('freq3');
!       $step3 = $query->param('step3');
        $numberingmethod = $query->param('numberingmethod');
        $arrivalplanified = $query->param('arrivalplanified');
--- 40,58 ----
        $weeklength = $query->param('weeklength');
        $monthlength = $query->param('monthlength');
!       $add1 = $query->param('add1');
!       $every1 = $query->param('every1');
!       $whenmorethan1 = $query->param('whenmorethan1');
!       $setto1 = $query->param('setto1');
!       $lastvalue1 = $query->param('lastvalue1');
!       $add2 = $query->param('add2');
!       $every2 = $query->param('every2');
!       $whenmorethan2 = $query->param('whenmorethan2');
!       $setto2 = $query->param('setto2');
!       $lastvalue2 = $query->param('lastvalue2');
!       $add3 = $query->param('add3');
!       $every3 = $query->param('every3');
!       $whenmorethan3 = $query->param('whenmorethan3');
!       $setto3 = $query->param('setto3');
!       $lastvalue3 = $query->param('lastvalue3');
        $numberingmethod = $query->param('numberingmethod');
        $arrivalplanified = $query->param('arrivalplanified');
***************
*** 61,107 ****
        &modsubscription($auser,$aqbooksellerid,$cost,$aqbudgetid,$startdate,
                                        
$periodicity,$dow,$numberlength,$weeklength,$monthlength,
!                                       
$seqnum1,$startseqnum1,$seqtype1,$freq1,$step1,
!                                       
$seqnum2,$startseqnum2,$seqtype2,$freq2,$step2,
!                                       
$seqnum3,$startseqnum3,$seqtype3,$freq3,$step3,
                                        $numberingmethod, $arrivalplanified, 
$status, $biblionumber, $notes, $subscriptionid);
-       
-  } else {
-               my $subs = &getsubscription($subscriptionid);
-               $auser = $subs->{'user'};
-               $librarian => $subs->{'librarian'},
-               $cost = $subs->{'cost'};
-               $aqbooksellerid = $subs->{'aqbooksellerid'};
-               $aqbooksellername = $subs->{'aqbooksellername'};
-               $bookfundid = $subs->{'bookfundid'};
-               $aqbudgetid = $subs->{'aqbudgetid'};
-               $startdate = $subs->{'startdate'};
-               $periodicity = $subs->{'periodicity'};
-               $dow = $subs->{'dow'};
-               $numberlength = $subs->{'numberlength'};
-               $weeklength = $subs->{'weeklength'};
-               $monthlength = $subs->{'monthlength'};
-               $seqnum1 = $subs->{'seqnum1'};
-               $startseqnum1 = $subs->{'startseqnum1'};
-               $seqtype1 = $subs->{'seqtype1'};
-               $freq1 = $subs->{'freq1'};
-               $step1 = $subs->{'step1'};
-               $seqnum2 = $subs->{'seqnum2'};
-               $startseqnum2 = $subs->{'startseqnum2'};
-               $seqtype2 = $subs->{'seqtype2'};
-               $freq2 = $subs->{'freq2'};
-               $step2 = $subs->{'step2'};
-               $seqnum3 = $subs->{'seqnum3'};
-               $startseqnum3 = $subs->{'startseqnum3'};
-               $seqtype3 = $subs->{'seqtype3'};
-               $freq3 = $subs->{'freq3'};
-               $step3 = $subs->{'step3'};
-               $numberingmethod = $subs->{'numberingmethod'};
-               $arrivalplanified = $subs->{'arrivalplanified'};
-               $status = $subs->{status};
-               $biblionumber = $subs->{'biblionumber'};
-               $bibliotitle = $subs->{'bibliotitle'},
-               $notes = $subs->{'notes'};
-       
  }
  
  ($template, $loggedinuser, $cookie)
--- 62,105 ----
        &modsubscription($auser,$aqbooksellerid,$cost,$aqbudgetid,$startdate,
                                        
$periodicity,$dow,$numberlength,$weeklength,$monthlength,
!                                       
$add1,$every1,$whenmorethan1,$setto1,$lastvalue1,
!                                       
$add2,$every2,$whenmorethan2,$setto2,$lastvalue2,
!                                       
$add3,$every3,$whenmorethan3,$setto3,$lastvalue3,
                                        $numberingmethod, $arrivalplanified, 
$status, $biblionumber, $notes, $subscriptionid);
  }
+       my $subs = &getsubscription($subscriptionid);
+       $auser = $subs->{'user'};
+       $librarian => $subs->{'librarian'},
+       $cost = $subs->{'cost'};
+       $aqbooksellerid = $subs->{'aqbooksellerid'};
+       $aqbooksellername = $subs->{'aqbooksellername'};
+       $bookfundid = $subs->{'bookfundid'};
+       $aqbudgetid = $subs->{'aqbudgetid'};
+       $startdate = $subs->{'startdate'};
+       $periodicity = $subs->{'periodicity'};
+       $dow = $subs->{'dow'};
+       $numberlength = $subs->{'numberlength'};
+       $weeklength = $subs->{'weeklength'};
+       $monthlength = $subs->{'monthlength'};
+       $add1 = $subs->{'add1'};
+       $every1 = $subs->{'every1'};
+       $whenmorethan1 = $subs->{'whenmorethan1'};
+       $setto1 = $subs->{'setto1'};
+       $lastvalue1 = $subs->{'lastvalue1'};
+       $add2 = $subs->{'add2'};
+       $every2 = $subs->{'every2'};
+       $whenmorethan2 = $subs->{'whenmorethan2'};
+       $setto2 = $subs->{'setto2'};
+       $lastvalue2 = $subs->{'lastvalue2'};
+       $add3 = $subs->{'add3'};
+       $every3 = $subs->{'every3'};
+       $whenmorethan3 = $subs->{'whenmorethan3'};
+       $setto3 = $subs->{'setto3'};
+       $lastvalue3 = $subs->{'lastvalue3'};
+       $numberingmethod = $subs->{'numberingmethod'};
+       $arrivalplanified = $subs->{'arrivalplanified'};
+       $status = $subs->{status};
+       $biblionumber = $subs->{'biblionumber'};
+       $bibliotitle = $subs->{'bibliotitle'},
+       $notes = $subs->{'notes'};
  
  ($template, $loggedinuser, $cookie)
***************
*** 125,129 ****
        aqbudgetid => $aqbudgetid,
        bookfundid => $bookfundid,
!       startdate => $startdate,
        periodicity => $periodicity,
        dow => $dow,
--- 123,127 ----
        aqbudgetid => $aqbudgetid,
        bookfundid => $bookfundid,
!       startdate => format_date($startdate),
        periodicity => $periodicity,
        dow => $dow,
***************
*** 131,149 ****
        weeklength => $weeklength,
        monthlength => $monthlength,
!       seqnum1 =>$seqnum1,
!       startseqnum1 =>$startseqnum1,
!       seqtype1 =>$seqtype1,
!       freq1 =>$freq1,
!       step1 =>$step1,
!       seqnum2 => $seqnum2,
!       startseqnum2 => $startseqnum2,
!       seqtype2 => $seqtype2,
!       freq2 => $freq2,
!       step2 => $step2,
!       seqnum3 => $seqnum3,
!       startseqnum3 => $startseqnum3,
!       seqtype3 => $seqtype3,
!       freq3 => $freq3,
!       step3 => $step3,
        numberingmethod => $numberingmethod,
        arrivalplanified => $arrivalplanified,
--- 129,147 ----
        weeklength => $weeklength,
        monthlength => $monthlength,
!       add1 => $add1,
!       every1 => $every1,
!       whenmorethan1 => $whenmorethan1,
!       setto1 => $setto1,
!       lastvalue1 => $lastvalue1,
!       add2 => $add2,
!       every2 => $every2,
!       whenmorethan2 => $whenmorethan2,
!       setto2 => $setto2,
!       lastvalue2 => $lastvalue2,
!       add3 => $add3,
!       every3 => $every3,
!       whenmorethan3 => $whenmorethan3,
!       setto3 => $setto3,
!       lastvalue3 => $lastvalue3,
        numberingmethod => $numberingmethod,
        arrivalplanified => $arrivalplanified,
***************
*** 156,165 ****
  $template->param(
                        "periodicity$periodicity" => 1,
-                       "seqtype1$seqtype1" => 1,
-                       "seqtype2$seqtype2" => 1,
-                       "seqtype3$seqtype3" => 1,
                        "arrival$dow" => 1,
                        );
  
- 
  output_html_with_http_headers $query, $cookie, $template->output;
--- 154,159 ----