$add2,$every2,$whenmorethan2,$setto2,$lastvalue2,$innerloop2,
$add3,$every3,$whenmorethan3,$setto3,$lastvalue3,$innerloop3,
$numberingmethod, $status, $biblionumber,
- $bibliotitle, $callnumber, $notes, $hemisphere, $letter, $manualhistory);
+ $bibliotitle, $callnumber, $notes, $hemisphere, $letter, $manualhistory,$serialsadditems);
my @budgets;
my ($template, $loggedinuser, $cookie)
});
-my $weekarrayjs='';
-my $count = 0;
-# FIXME - This assumes first pub date of today().
-# You can't enter past-date irregularities.
-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($year,1,1,$i - 1);
-#warn "$y-$m-$d";
- #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 = (
C4::Context->userenv->{branch};
my $branches = GetBranches($onlymine);
my @branchloop;
-foreach my $thisbranch (keys %$branches) {
+for my $thisbranch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) {
my $selected = 1 if $thisbranch eq C4::Context->userenv->{'branch'};
my %row =(value => $thisbranch,
selected => $selected,
$template->param(branchloop => \@branchloop,
DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
);
+my $subscriptionid;
+my $subs;
+my $firstissuedate;
+my $nextexpected;
-if ($op eq 'mod'||$op eq 'dup') {
+if ($op eq 'mod' || $op eq 'dup' || $op eq 'modsubscription') {
- my $subscriptionid = $query->param('subscriptionid');
-# warn "irregularity :$irregularity numberpattern : $numberpattern, callnumber :$callnumber, firstacquidate :$firstacquidate";
- my $subs = &GetSubscription($subscriptionid);
+ $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");
- }
- for (qw(startdate firstacquidate histstartdate enddate histenddate)) {
+ }
+ $firstissuedate = $subs->{firstacquidate}; # in iso format.
+ for (qw(startdate firstacquidate histstartdate enddate histenddate)) {
+ # TODO : Handle date formats properly.
if ($subs->{$_} eq '0000-00-00') {
$subs->{$_} = ''
} else {
- $subs->{$_} = format_date($subs->{$_});
+ $subs->{$_} = format_date($subs->{$_});
}
}
$subs->{'letter'}='' unless($subs->{'letter'});
$irregularity = $subs->{'irregularity'};
$numberpattern = $subs->{'numberpattern'};
+ $nextexpected = GetNextExpected($subscriptionid);
+ $nextexpected->{ isfirstissue => ($nextexpected->{planneddate}->output('iso') eq $firstissuedate)};
+ # firstacquidate is taken to be the upcoming issue's planned date if we're modifying the sub
+ $subs->{nextacquidate} = $nextexpected->{planneddate}->output() if($op eq 'mod');
-
+ unless($op eq 'modsubscription') {
if($subs->{numberlength} > 0){
$sublength = $subs->{numberlength};
$sub_on = $subscription_types[0];
$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(
+ $op => 1,
+ subtype => \@sub_type_data,
+ sublength =>$sublength,
+ history => ($op eq 'mod' && ($subs->{recievedlist}||$subs->{missinglist}||$subs->{opacnote}||$subs->{librariannote})),
"periodicity".$subs->{'periodicity'} => 1,
"dow".$subs->{'dow'} => 1,
"numberpattern".$subs->{'numberpattern'} => 1,
+ firstacquiyear => substr($firstissuedate,0,4),
);
+ }
}
+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 $firstacquidate = $query->param('firstacquidate');
my $periodicity = $query->param('periodicity');
my $dow = $query->param('dow');
- my @irregularity = $query->param('irregular');
+ my @irregularity = $query->param('irregularity_select');
my $numberlength = 0;
my $weeklength = 0;
my $monthlength = 0;
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 $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,
);
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');
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 $nextacquidate = format_date_in_iso($query->param('nextacquidate'));
my $periodicity = $query->param('periodicity');
my $dow = $query->param('dow');
my $sublength = $query->param('sublength');
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'));
- warn "HIST END : $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');
my $history_only = $query->param('history_only');
+ # If it's a mod, we need to check the current 'expected' issue, and mod it in the serials table if necessary.
+ # Here firstacquidate is interpreted as nextacquidate.
+
+ if ( $nextacquidate ne $nextexpected->{planneddate}->output('iso') ) {
+ ModNextExpected($subscriptionid,C4::Dates->new($nextacquidate,'iso'));
+ $firstissuedate = $nextexpected->{planneddate}->output('iso') if($nextexpected->{isfirstissue});
+ }
+
if ($history_only) {
ModSubscriptionHistory ($subscriptionid,$histstartdate,$histenddate,$recievedlist,$missinglist,$opacnote,$librariannote);
} else {
&ModSubscription(
$auser, $branchcode, $aqbooksellerid, $cost,
- $aqbudgetid, $startdate, $periodicity, $firstacquidate,
- $dow, $irregularity, $numberpattern, $numberlength,
+ $aqbudgetid, $startdate, $periodicity, $firstissuedate,
+ $dow, join(",",@irregularity), $numberpattern, $numberlength,
$weeklength, $monthlength, $add1, $every1,
$whenmorethan1, $setto1, $lastvalue1, $innerloop1,
$add2, $every2, $whenmorethan2, $setto2,
$whenmorethan3, $setto3, $lastvalue3, $innerloop3,
$numberingmethod, $status, $biblionumber, $callnumber,
$notes, $letter, $hemisphere, $manualhistory,$internalnotes,
- $subscriptionid);
+ $serialsadditems, $subscriptionid,
+ );
}
print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
} else {
push( @sub_type_data, \%row );
}
$template->param(subtype => \@sub_type_data,
- weekarrayjs => $weekarrayjs,
- weekno => $weekno,
);
output_html_with_http_headers $query, $cookie, $template->output;
}
projects / koha.git / blobdiff