X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=serials%2Fsubscription-add.pl;h=c8f049b3b06764fe2d0a86d60f2976fa96e8d9c9;hb=d208a5593a749771c9761c0bc08ab6b20a34f5f2;hp=47430cd96f5f0ee10d8817278880cdd14377f102;hpb=ee5c60cc2dced3ef40ae68555a382437e7ba98dc;p=koha_gimpoz

diff --git a/serials/subscription-add.pl b/serials/subscription-add.pl
index 47430cd96f..c8f049b3b0 100755
--- a/serials/subscription-add.pl
+++ b/serials/subscription-add.pl
@@ -16,9 +16,12 @@
 # Suite 330, Boston, MA  02111-1307 USA
 
 use strict;
+use warnings;
+
 use CGI;
 use Date::Calc qw(Today Day_of_Year Week_of_Year Add_Delta_Days);
 use C4::Koha;
+use C4::Biblio;
 use C4::Auth;
 use C4::Dates qw/format_date format_date_in_iso/;
 use C4::Acquisition;
@@ -31,15 +34,15 @@ use C4::Letters;
 #use Smart::Comments;
 
 my $query = new CGI;
-my $op = $query->param('op');
+my $op = $query->param('op') || '';
 my $dbh = C4::Context->dbh;
 my ($subscriptionid,$auser,$branchcode,$librarian,$cost,$aqbooksellerid, $aqbooksellername,$aqbudgetid, $bookfundid, $startdate, $periodicity,
 	$firstacquidate, $dow, $irregularity, $numberpattern, $numberlength, $weeklength, $monthlength, $sublength,
 	$add1,$every1,$whenmorethan1,$setto1,$lastvalue1,$innerloop1,
 	$add2,$every2,$whenmorethan2,$setto2,$lastvalue2,$innerloop2,
 	$add3,$every3,$whenmorethan3,$setto3,$lastvalue3,$innerloop3,
-	$numberingmethod, $status, $biblionumber, 
-	$bibliotitle, $callnumber, $notes, $hemisphere, $letter, $manualhistory);
+	$numberingmethod, $status, $biblionumber,
+	$bibliotitle, $callnumber, $notes, $hemisphere, $letter, $manualhistory,$serialsadditems, $location);
 
 	my @budgets;
 my ($template, $loggedinuser, $cookie)
@@ -52,53 +55,76 @@ my ($template, $loggedinuser, $cookie)
 				});
 
 
-my $weekarrayjs='';
-my $count = 0;
-my ($year, $month, $day) = Today;
-my $firstday   =  Day_of_Year($year,$month,$day);
-my ($wkno,$yr) = Week_of_Year($year,$month,$day); # week starting monday
-my $weekno = $wkno;
-for(my $i=$firstday;$i<($firstday+365);$i=$i+7){
-        $count = $i;
-        if($wkno > 52){$year++; $wkno=1;}
-        if($count>365){$count=$i-365;}    
-        my ($y,$m,$d) = Add_Delta_Days(1,1,1,$i - 1);
-
-        #BUGFIX padding add_delta_days() date
-        my $output  = sprintf("%04d-%02d-%02d",$y , $m, $d );
-
-        $weekarrayjs .= "'Wk $wkno: ".format_date($output)."',";
-        $wkno++;    
-}
-chop($weekarrayjs);
-# warn $weekarrayjs;
 
 my $sub_on;
 my @subscription_types = (
             'issues', 'weeks', 'months'
-        ); 
+        );
 my @sub_type_data;
 
-my $letters = GetLetters('serial');
-my @letterloop;
-foreach my $thisletter (keys %$letters) {
-    my $selected = 1 if $thisletter eq $letter;
-    my %row =(value => $thisletter,
-                selected => $selected,
-                lettername => $letters->{$thisletter},
-            );
-    push @letterloop, \%row;
+my $subs;
+my $firstissuedate;
+my $nextexpected;
+
+if ($op eq 'mod' || $op eq 'dup' || $op eq 'modsubscription') {
+
+    $subscriptionid = $query->param('subscriptionid');
+    $subs = &GetSubscription($subscriptionid);
+## FIXME : Check rights to edit if mod. Could/Should display an error message.
+    if ($subs->{'cannotedit'} && $op eq 'mod'){
+      warn "Attempt to modify subscription $subscriptionid by ".C4::Context->userenv->{'id'}." not allowed";
+      print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
+    }
+    $firstissuedate = $subs->{firstacquidate};  # in iso format.
+    for (qw(startdate firstacquidate histstartdate enddate histenddate)) {
+        next unless defined $subs->{$_};
+	# TODO : Handle date formats properly.
+         if ($subs->{$_} eq '0000-00-00') {
+            $subs->{$_} = ''
+    	} else {
+            $subs->{$_} = format_date($subs->{$_});
+        }
+	  }
+    $subs->{'letter'}='' unless($subs->{'letter'});
+    letter_loop($subs->{'letter'}, $template);
+    $irregularity   = $subs->{'irregularity'};
+    $numberpattern  = $subs->{'numberpattern'};
+    $nextexpected = GetNextExpected($subscriptionid);
+    $nextexpected->{'isfirstissue'} = $nextexpected->{planneddate}->output('iso') eq $firstissuedate ;
+    $subs->{nextacquidate} = $nextexpected->{planneddate}->output()  if($op eq 'mod');
+    unless($op eq 'modsubscription') {
+		foreach my $length_unit qw(numberlength weeklength monthlength){
+			if ($subs->{$length_unit}){
+				$sublength=$subs->{$length_unit};
+				$sub_on=$length_unit;
+				last;
+			}
+		}
+
+        $template->param($subs);
+        $template->param("dow".$subs->{'dow'} => 1) if defined $subs->{'dow'};
+        $template->param(
+                    $op => 1,
+                    "subtype_$sub_on" => 1,
+                    sublength =>$sublength,
+                    history => ($op eq 'mod' && $subs->{manualhistory} == 1 ),
+                    "periodicity".$subs->{'periodicity'} => 1,
+                    "numberpattern".$subs->{'numberpattern'} => 1,
+                    firstacquiyear => substr($firstissuedate,0,4),
+                    );
+    }
 }
-$template->param(letterloop => \@letterloop);
 
-my $onlymine=C4::Context->preference('IndependantBranches') && 
-             C4::Context->userenv && 
-             C4::Context->userenv->{flags}!=1 && 
+my $onlymine=C4::Context->preference('IndependantBranches') &&
+             C4::Context->userenv &&
+             C4::Context->userenv->{flags} % 2 !=1 &&
              C4::Context->userenv->{branch};
 my $branches = GetBranches($onlymine);
 my @branchloop;
-foreach my $thisbranch (keys %$branches) {
-    my $selected = 1 if $thisbranch eq C4::Context->userenv->{'branch'};
+for my $thisbranch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) {
+    my $selected = 0;
+    $selected = 1 if ($thisbranch eq C4::Context->userenv->{'branch'});
+    $selected = 1 if (defined($subs) && $thisbranch eq $subs->{'branchcode'});
     my %row =(value => $thisbranch,
                 selected => $selected,
                 branchname => $branches->{$thisbranch}->{'branchname'},
@@ -108,78 +134,30 @@ foreach my $thisbranch (keys %$branches) {
 $template->param(branchloop => \@branchloop,
     DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
 );
-
-if ($op eq 'mod'||$op eq 'dup') {
-
-    my $subscriptionid = $query->param('subscriptionid');
-#     warn "irregularity :$irregularity numberpattern : $numberpattern, callnumber :$callnumber, firstacquidate :$firstacquidate";
-    my $subs = &GetSubscription($subscriptionid);
-## FIXME : Check rights to edit if mod. Could/Should display an error message.
-    if ($subs->{'cannotedit'} && $op eq 'mod'){
-      warn "Attempt to modify subscription $subscriptionid by ".C4::Context->userenv->{'id'}." not allowed";
-      print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
-    }  
-	for (qw(startdate firstacquidate histstartdate enddate)) {
-    	$subs->{$_} = format_date($subs->{$_});
-	}
-    $subs->{'letter'}='' unless($subs->{'letter'});
-    $irregularity   = $subs->{'irregularity'};
-    $numberpattern  = $subs->{'numberpattern'};
-
-
-    if($subs->{numberlength} > 0){
-        $sublength = $subs->{numberlength};
-        $sub_on = $subscription_types[0];
-    } elsif ($subs->{weeklength}>0){
-        $sublength = $subs->{weeklength};
-        $sub_on = $subscription_types[1];
-    } else {
-        $sublength = $subs->{monthlength};
-        $sub_on = $subscription_types[2];
-    }
-    while (@subscription_types) {
-        my $sub_type = shift @subscription_types;
-        my %row = ( 'name' => $sub_type );
-        if ( $sub_on eq $sub_type ) {
-            $row{'selected'} = ' selected';
-        } else {
-            $row{'selected'} = '';
-        }
-        push( @sub_type_data, \%row );
-    }
-
-    $template->param($subs);
-    $template->param(
-            $op => 1,
-            subtype => \@sub_type_data,
-            sublength =>$sublength,
-            history => ($op eq 'mod' && ($subs->{recievedlist}||$subs->{missinglist}||$subs->{opacnote}||$subs->{librariannote}))
-            );
-    $template->param(
-                "periodicity".$subs->{'periodicity'} => 1,
-                "dow".$subs->{'dow'} => 1,
-                "numberpattern".$subs->{'numberpattern'} => 1,
+my $count = 0;
+# prepare template variables common to all $op conditions:
+$template->param(  'dateformat_' . C4::Context->preference('dateformat') => 1 ,
                 );
-}
 
 if ($op eq 'addsubscription') {
+    my $auser           = $query->param('user');
+    my $branchcode      = $query->param('branchcode');
+    my $aqbooksellerid  = $query->param('aqbooksellerid');
+    my $cost            = $query->param('cost');
+    my $aqbudgetid      = $query->param('aqbudgetid');
+    my $startdate       = $query->param('startdate');
+    my $firstacquidate  = $query->param('firstacquidate');
+    my $periodicity     = $query->param('periodicity');
+    my $dow             = $query->param('dow');
+    my @irregularity    = $query->param('irregularity_select');
+    my $numberlength    = 0;
+    my $weeklength      = 0;
+    my $monthlength     = 0;
+    my $numberpattern   = $query->param('numbering_pattern');
+    my $sublength       = $query->param('sublength');
+    my $subtype         = $query->param('subtype');
+    my $graceperiod     = $query->param('graceperiod') || 0;
 
-    my $auser = $query->param('user');
-    my $branchcode = $query->param('branchcode');
-    my $aqbooksellerid = $query->param('aqbooksellerid');
-    my $cost = $query->param('cost');
-    my $aqbudgetid = $query->param('aqbudgetid'); 
-    my $startdate = $query->param('startdate');
-    my $firstacquidate = $query->param('firstacquidate');    
-    my $periodicity = $query->param('periodicity');
-    my $dow = $query->param('dow');
-    my @irregularity = $query->param('irregular');
-    my $numberlength = 0;
-    my $weeklength = 0;
-    my $monthlength = 0;
-    my $numberpattern = $query->param('numbering_pattern');
-    my $sublength = $query->param('sublength');
-    my $subtype = $query->param('subtype');
     if ($subtype eq 'months'){
         $monthlength = $sublength;
     } elsif ($subtype eq 'weeks'){
@@ -213,28 +191,28 @@ if ($op eq 'addsubscription') {
     my $internalnotes = $query->param('internalnotes');
     my $hemisphere = $query->param('hemisphere') || 1;
 	my $letter = $query->param('letter');
-    # ## BugFIX : hdl doesnot know what innerloops or letter stand for but it seems necessary. So he adds them.
     my $manualhistory = $query->param('manualhist');
+    my $serialsadditems = $query->param('serialsadditems');
+	my $staffdisplaycount = $query->param('staffdisplaycount');
+	my $opacdisplaycount = $query->param('opacdisplaycount');
+    my $location = $query->param('location');
+    my $startdate       = format_date_in_iso($query->param('startdate'));
+    my $enddate       = format_date_in_iso($query->param('enddate'));
+    my $firstacquidate  = format_date_in_iso($query->param('firstacquidate'));    
 	my $subscriptionid = NewSubscription($auser,$branchcode,$aqbooksellerid,$cost,$aqbudgetid,$biblionumber,
 					$startdate,$periodicity,$dow,$numberlength,$weeklength,$monthlength,
 					$add1,$every1,$whenmorethan1,$setto1,$lastvalue1,$innerloop1,
 					$add2,$every2,$whenmorethan2,$setto2,$lastvalue2,$innerloop2,
 					$add3,$every3,$whenmorethan3,$setto3,$lastvalue3,$innerloop3,
 					$numberingmethod, $status, $notes,$letter,$firstacquidate,join(",",@irregularity),
-                    $numberpattern, $callnumber, $hemisphere,($manualhistory?$manualhistory:0),$internalnotes
+                    $numberpattern, $callnumber, $hemisphere,($manualhistory?$manualhistory:0),$internalnotes,
+                    $serialsadditems,$staffdisplaycount,$opacdisplaycount,$graceperiod,$location,$enddate
 				);
 
     print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
 } elsif ($op eq 'modsubscription') {
     my $subscriptionid = $query->param('subscriptionid');
-    my @irregular = $query->param('irregular');
-    my $irregular_count = @irregular;
-    for(my $i =0;$i<$irregular_count;$i++){
-      $irregularity .=$irregular[$i].",";
-      warn "irregular : $irregular[$i] string :$irregularity";
-    }
-    $irregularity =~ s/\,$//;
-
+	  my @irregularity = $query->param('irregularity_select');
     my $auser = $query->param('user');
     my $librarian => $query->param('librarian'),
     my $branchcode = $query->param('branchcode');
@@ -243,7 +221,11 @@ if ($op eq 'addsubscription') {
     my $biblionumber = $query->param('biblionumber');
     my $aqbudgetid = $query->param('aqbudgetid');
     my $startdate = format_date_in_iso($query->param('startdate'));
-    my $firstacquidate = format_date_in_iso($query->param('firstacquidate'));    
+    my $enddate = format_date_in_iso($query->param('enddate'));
+    my $nextacquidate = $query->param('nextacquidate') ?
+                            format_date_in_iso($query->param('nextacquidate')):
+                            format_date_in_iso($query->param('startdate'));
+    my $enddate = format_date_in_iso($query->param('enddate'));
     my $periodicity = $query->param('periodicity');
     my $dow = $query->param('dow');
     my $sublength = $query->param('sublength');
@@ -283,42 +265,83 @@ if ($op eq 'addsubscription') {
     my $hemisphere = $query->param('hemisphere');
     my $letter = $query->param('letter');
     my $manualhistory = $query->param('manualhist');
-    my $enddate = $query->param('enddate');
+    my $serialsadditems = $query->param('serialsadditems');
+    # subscription history
+    my $histenddate = format_date_in_iso($query->param('histenddate'));
     my $histstartdate = format_date_in_iso($query->param('histstartdate'));
     my $recievedlist = $query->param('recievedlist');
     my $missinglist = $query->param('missinglist');
     my $opacnote = $query->param('opacnote');
     my $librariannote = $query->param('librariannote');
-    &ModSubscription(
-        $auser,           $branchcode,   $aqbooksellerid, $cost,
-        $aqbudgetid,      $startdate,    $periodicity,    $firstacquidate,
-        $dow,             $irregularity, $numberpattern,  $numberlength,
-        $weeklength,      $monthlength,  $add1,           $every1,
-        $whenmorethan1,   $setto1,       $lastvalue1,     $innerloop1,
-        $add2,            $every2,       $whenmorethan2,  $setto2,
-        $lastvalue2,      $innerloop2,   $add3,           $every3,
-        $whenmorethan3,   $setto3,       $lastvalue3,     $innerloop3,
-        $numberingmethod, $status,       $biblionumber,   $callnumber,
-        $notes,           $letter,       $hemisphere,     $manualhistory,$internalnotes,
-        $subscriptionid);
+    my $history_only = $query->param('history_only');
+	my $staffdisplaycount = $query->param('staffdisplaycount');
+	my $opacdisplaycount = $query->param('opacdisplaycount');
+    my $graceperiod     = $query->param('graceperiod') || 0;
+    my $location = $query->param('location');
+	#  If it's  a mod, we need to check the current 'expected' issue, and mod it in the serials table if necessary.
+    if ( $nextacquidate ne $nextexpected->{planneddate}->output('iso') ) {
+        ModNextExpected($subscriptionid,C4::Dates->new($nextacquidate,'iso'));
+        # if we have not received any issues yet, then we also must change the firstacquidate for the subs.
+        $firstissuedate = $nextacquidate if($nextexpected->{isfirstissue});
+    }
 
-    ModSubscriptionHistory ($subscriptionid,$histstartdate,$enddate,$recievedlist,$missinglist,$opacnote,$librariannote);
+    if ($history_only) {
+        ModSubscriptionHistory ($subscriptionid,$histstartdate,$histenddate,$recievedlist,$missinglist,$opacnote,$librariannote);
+    } else {
+        &ModSubscription(
+            $auser,           $branchcode,   $aqbooksellerid, $cost,
+            $aqbudgetid,      $startdate,    $periodicity,    $firstissuedate,
+            $dow,             join(",",@irregularity), $numberpattern,  $numberlength,
+            $weeklength,      $monthlength,  $add1,           $every1,
+            $whenmorethan1,   $setto1,       $lastvalue1,     $innerloop1,
+            $add2,            $every2,       $whenmorethan2,  $setto2,
+            $lastvalue2,      $innerloop2,   $add3,           $every3,
+            $whenmorethan3,   $setto3,       $lastvalue3,     $innerloop3,
+            $numberingmethod, $status,       $biblionumber,   $callnumber,
+            $notes,           $letter,       $hemisphere,     $manualhistory,$internalnotes,
+            $serialsadditems, $staffdisplaycount,$opacdisplaycount,$graceperiod,$location,$enddate,$subscriptionid
+        );
+    }
     print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
 } else {
-
         while (@subscription_types) {
            my $sub_type = shift @subscription_types;
            my %row = ( 'name' => $sub_type );
-           if ( $sub_on eq $sub_type ) {
+           if ( defined $sub_on and $sub_on eq $sub_type ) {
 	     $row{'selected'} = ' selected';
            } else {
 	     $row{'selected'} = '';
            }
            push( @sub_type_data, \%row );
-        }    
+        }
     $template->param(subtype => \@sub_type_data,
- 	         weekarrayjs => $weekarrayjs,
-	         weekno => $weekno,
 	);
+
+    letter_loop('', $template);
+
+    my $new_biblionumber = $query->param('biblionumber_for_new_subscription');
+    if (defined $new_biblionumber) {
+        my $bib = GetBiblioData($new_biblionumber);
+        if (defined $bib) {
+            $template->param(bibnum      => $new_biblionumber);
+            $template->param(bibliotitle => $bib->{title});
+        }
+    }
 	output_html_with_http_headers $query, $cookie, $template->output;
 }
+
+sub letter_loop {
+    my ($selected_letter, $template) = @_;
+    my $letters = GetLetters('serial');
+    my @letterloop;
+    foreach my $thisletter (keys %$letters) {
+        my $selected = $thisletter eq $selected_letter ? 1 : 0;
+        push @letterloop, {
+            value => $thisletter,
+            selected => $selected,
+            lettername => $letters->{$thisletter},
+        };
+    }
+    $template->param(letterloop => \@letterloop) if @letterloop;
+    return;
+}