[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] CVS: koha/bull serial-issues.pl,NONE,1.1 subscription-detail.
|
From: |
Paul POULAIN |
|
Subject: |
[Koha-cvs] CVS: koha/bull serial-issues.pl,NONE,1.1 subscription-detail.pl.new,NONE,1.1 subscription-renew.pl,NONE,1.1 order.pl,1.2,1.3 statecollection.pl,1.2,1.3 subscription-add.pl,1.3,1.4 subscription-bib-search.pl,1.2,1.3 subscription-detail.pl,1.3,1.4 |
|
Date: |
Thu, 12 Aug 2004 07:36:10 -0700 |
Update of /cvsroot/koha/koha/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27100/bull
Modified Files:
order.pl statecollection.pl subscription-add.pl
subscription-bib-search.pl subscription-detail.pl
Added Files:
serial-issues.pl subscription-detail.pl.new
subscription-renew.pl
Log Message:
serials : lot of bugfixes.
Works fine now. And is documented (clic Help)
--- NEW FILE ---
#!/usr/bin/perl
use strict;
use CGI;
use C4::Auth;
use C4::Koha;
use C4::Date;
use C4::Bull;
use C4::Output;
use C4::Interface::CGI::Output;
use C4::Context;
use HTML::Template;
my $query = new CGI;
my $op = $query->param('op');
my $dbh = C4::Context->dbh;
my $sth;
# my $id;
my ($template, $loggedinuser, $cookie);
my ($subscriptionid);
$subscriptionid = $query->param('subscriptionid');
my $subscription = &getsubscription($subscriptionid);
($template, $loggedinuser, $cookie)
= get_template_and_user({template_name => "bull/serial-issues.tmpl",
query => $query,
type => "intranet",
authnotrequired => 0,
flagsrequired => {catalogue => 1},
debug => 1,
});
# replace CR by <br> in librarian note
$subscription->{librariannote} =~ s/\n/\<br\/\>/g;
$template->param(
startdate => format_date($subscription->{startdate}),
periodicity => $subscription->{periodicity},
dow => $subscription->{dow},
numberlength => $subscription->{numberlength},
weeklength => $subscription->{weeklength},
monthlength => $subscription->{monthlength},
librariannote => $subscription->{librariannote},
numberingmethod => $subscription->{numberingmethod},
arrivalplanified => $subscription->{arrivalplanified},
status => $subscription->{status},
biblionumber => $subscription->{biblionumber},
bibliotitle => $subscription->{bibliotitle},
notes => $subscription->{notes},
subscriptionid => $subscription->{subscriptionid}
);
$template->param(
"periodicity$subscription->{periodicity}" => 1,
"arrival$subscription->{dow}" => 1,
);
output_html_with_http_headers $query, $cookie, $template->output;
--- NEW FILE ---
#!/usr/bin/perl
use strict;
use CGI;
use C4::Auth;
use C4::Bull;
use C4::Output;
use C4::Interface::CGI::Output;
use C4::Context;
use HTML::Template;
my $query = new CGI;
my $op = $query->param('op');
my $dbh = C4::Context->dbh;
my $sth;
my $id;
my ($template, $loggedinuser, $cookie, $subs);
if ($op eq 'modsubscription') {
&modsubscription($query->param('suscr'),$query->param('user'),$query->param('cost'),
$query->param('supplier'),$query->param('budget'),$query->param('begin'),
$query->param('frequency'),$query->param('arrival'),$query->param('numberlength'),
$query->param('weeklength'),$query->param('monthlength'),
$query->param('X'),$query->param('Xstate'),$query->param('Xfreq'),$query->param('Xstep'),
$query->param('Y'),$query->param('Ystate'),$query->param('Yfreq'),$query->param('Ystep'),
$query->param('Z'),$query->param('Zstate'),$query->param('Zfreq'),$query->param('Zstep'),
$query->param('sequence'),$query->param('arrivalplanified'),1,
$query->param('biblioid'),$query->param('notes')
);
($template, $loggedinuser, $cookie)
= get_template_and_user({template_name =>
"bull/subscription-detail.tmpl",
query => $query,
type => "intranet",
authnotrequired => 0,
flagsrequired => {catalogue => 1},
debug => 1,
});
my ($user, $cookie, $sessionID, $flags) = checkauth($query, 0,
{catalogue => 1}, "intranet");
warn "user =>".$query->param('user'),
"librarian =>".$query->param('user'),
"aqbooksellerid =>". $query->param('supplier'),
"cost =>". $query->param('cost'),
"aqbudgetid =>". $query->param('budget'),
"startdate =>". $query->param('begin'),
"frequency =>". $query->param('frequency'),
"arrival =>". $query->param('dow'),
"numberlength =>". $query->param('numberlength'),
"weeklength =>". $query->param('weeklength'),
"monthlength =>". $query->param('monthlength'),
"seqnum1 =>". $query->param('X'),
"startseqnum1 =>". $query->param('X'),
"seqtype1 =>". $query->param('Xstate'),
"freq1 =>". $query->param('Xfreq'),
"step1 =>". $query->param('Xstep'),
"seqnum2 =>". $query->param('Y'),
"startseqnum2 =>". $query->param('Y'),
"seqtype2 =>". $query->param('Ystate'),
"freq2 =>". $query->param('Yfreq'),
"step2 =>". $query->param('Ystep'),
"seqnum3 =>". $query->param('Z'),
"startseqnum3 =>". $query->param('Z'),
"seqtype3 =>". $query->param('Zstate'),
"freq3 =>". $query->param('Zfreq'),
"step3 =>". $query->param('Zstep'),
"sequence =>". $query->param('sequence'),
"arrivalplanified =>".
$query->param('arrivalplanified'),
"status =>". $query->param('status'),
"biblioid =>". $query->param('perioid'),
"notes =>". $query->param('notes'),
"suscr =>". $query->param('id');
$template->param(
user => $query->param('user'),
librarian => $query->param('user'),
aqbooksellerid => $query->param('supplier'),
cost => $query->param('cost'),
aqbudgetid => $query->param('budget'),
startdate => $query->param('begin'),
frequency => $query->param('frequency'),
arrival => $query->param('dow'),
numberlength => $query->param('numberlength'),
weeklength => $query->param('weeklength'),
monthlength => $query->param('monthlength'),
seqnum1 => $query->param('X'),
startseqnum1 => $query->param('X'),
seqtype1 => $query->param('Xstate'),
freq1 => $query->param('Xfreq'),
step1 => $query->param('Xstep'),
seqnum2 => $query->param('Y'),
startseqnum2 => $query->param('Y'),
seqtype2 => $query->param('Ystate'),
freq2 => $query->param('Yfreq'),
step2 => $query->param('Ystep'),
seqnum3 => $query->param('Z'),
startseqnum3 => $query->param('Z'),
seqtype3 => $query->param('Zstate'),
freq3 => $query->param('Zfreq'),
step3 => $query->param('Zstep'),
sequence => $query->param('sequence'),
arrivalplanified => $query->param('arrivalplanified'),
status => $query->param('status'),
biblioid => $query->param('perioid'),
notes => $query->param('notes'),
suscr => $query->param('id'));
$template->param(
"frequency$query->param('frequency')" => 1,
"Xstate".$query->param('Xstate') => 1,
"Ystate".$query->param('Ystate') => 1,
"Zstate".$query->param('Zstate') => 1,
"arrival".query->param('$dow') => 1,
);
} else {
$sth = $dbh->prepare('select * from subscription where subscriptionid =
?');
$id = $query->param('suscr');
$sth->execute($id);
$subs = $sth->fetchrow_hashref;
$sth->finish;
($template, $loggedinuser, $cookie)
= get_template_and_user({template_name =>
"bull/subscription-detail.tmpl",
query => $query,
type => "intranet",
authnotrequired => 0,
flagsrequired => {catalogue => 1},
debug => 1,
});
my ($user, $cookie, $sessionID, $flags) = checkauth($query, 0,
{catalogue => 1}, "intranet");
$template->param(user => $user);
$template->param(librarian => $subs->{'librarian'},
aqbooksellerid =>
$subs->{'aqbooksellerid'},
cost => $subs->{'cost'},
aqbudgetid =>
$subs->{'aqbudgetid'},
startdate =>
$subs->{'startdate'},
frequency =>
$subs->{'periodicity'},
arrival =>
$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'},
sequence =>
$subs->{'numberingmethod'},
arrivalplanified =>
$subs->{'arrivalplanified'},
status =>
$subs->{'status'},
biblioid =>
$subs->{'perioid'},
notes =>
$subs->{'notes'},
suscr => $id,
);
$template->param(
"frequency$subs->{'periodicity'}" => 1,
"Xstate$subs->{'seqtype1'}" => 1,
"Ystate$subs->{'seqtype2'}" => 1,
"Zstate$subs->{'seqtype3'}" => 1,
"arrival$subs->{'dow'}" => 1,
);
}
output_html_with_http_headers $query, $cookie, $template->output;
--- NEW FILE ---
#!/usr/bin/perl
# WARNING: 4-character tab stops here
# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
use strict;
require Exporter;
use CGI;
use C4::Koha;
use C4::Auth;
use C4::Date;
use HTML::Template;
use C4::Context;
use C4::Search;
use C4::Auth;
use C4::Output;
use C4::Interface::CGI::Output;
use C4::Bull;
my $query = new CGI;
my $dbh = C4::Context->dbh;
my $op = $query->param('op');
my $subscriptionid = $query->param('subscriptionid');
my ($template, $loggedinuser, $cookie)
= get_template_and_user({template_name =>
"bull/subscription-renew.tmpl",
query => $query,
type => "intranet",
authnotrequired => 0,
flagsrequired => {catalogue => 1},
debug => 1,
});
if ($op eq "renew") {
subscriptionrenew($subscriptionid,$loggedinuser,$query->param('startdate'),$query->param('numberlength'),$query->param('weeklength'),$query->param('monthlength'),$query->param('note'));
}
my $subscription= getsubscription($subscriptionid);
$template->param(startdate =>
format_date(subscriptionexpirationdate($subscriptionid)),
numberlength => $subscription->{numberlength},
weeklength => $subscription->{weeklength},
monthlength => $subscription->{monthlength},
subscriptionid => $subscriptionid,
bibliotitle => $subscription->{bibliotitle},
$op => 1,
);
# Print the page
output_html_with_http_headers $query, $cookie, $template->output;
# Local Variables:
# tab-width: 4
# End:
Index: order.pl
===================================================================
RCS file: /cvsroot/koha/koha/bull/order.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** order.pl 5 Aug 2004 16:34:42 -0000 1.2
--- order.pl 12 Aug 2004 14:36:07 -0000 1.3
***************
*** 25,29 ****
use strict;
- use C4::Acquisition;
use C4::Auth;
use C4::Biblio;
--- 25,28 ----
***************
*** 33,36 ****
--- 32,36 ----
use C4::Database;
use HTML::Template;
+ use C4::Acquisition;
use C4::Date;
***************
*** 48,52 ****
my ($count,@suppliers)=bookseller($supplier);
! my $colour='#EEEEEE';
my $toggle=0;
my @loop_suppliers;
--- 48,59 ----
my ($count,@suppliers)=bookseller($supplier);
! # check if we have to "close" a basket before building page
! my $op = $query->param('op');
! my $basket = $query->param('basket');
! if ($op eq 'close') {
! closebasket($basket);
! }
!
! #build reult page
my $toggle=0;
my @loop_suppliers;
***************
*** 55,70 ****
my %line;
if ($toggle==0){
! $line{color}='#EEEEEE';
$toggle=1;
} else {
! $line{color}='white';
$toggle=0;
}
! $line{id} =$suppliers[$i]->{'id'};
$line{name} = $suppliers[$i]->{'name'};
$line{active} = $suppliers[$i]->{'active'};
- $line{total} = $orders->[0]->{'count(*)'};
- $line{authorisedby} = $orders->[0]->{'authorisedby'};
- $line{entrydate} = $orders->[0]->{'entrydate'};
my @loop_basket;
for (my $i2=0;$i2<$ordcount;$i2++){
--- 62,74 ----
my %line;
if ($toggle==0){
! $line{even}=1;
$toggle=1;
} else {
! $line{even}=0;
$toggle=0;
}
! $line{supplierid} =$suppliers[$i]->{'id'};
$line{name} = $suppliers[$i]->{'name'};
$line{active} = $suppliers[$i]->{'active'};
my @loop_basket;
for (my $i2=0;$i2<$ordcount;$i2++){
***************
*** 73,77 ****
$inner_line{total} =$orders->[$i2]->{'count(*)'};
$inner_line{authorisedby} = $orders->[$i2]->{'authorisedby'};
! $inner_line{entrydate} =
format_date($orders->[$i2]->{'entrydate'});
push @loop_basket, \%inner_line;
}
--- 77,82 ----
$inner_line{total} =$orders->[$i2]->{'count(*)'};
$inner_line{authorisedby} = $orders->[$i2]->{'authorisedby'};
! $inner_line{creationdate} =
format_date($orders->[$i2]->{'creationdate'});
! $inner_line{closedate} =
format_date($orders->[$i2]->{'closedate'});
push @loop_basket, \%inner_line;
}
Index: statecollection.pl
===================================================================
RCS file: /cvsroot/koha/koha/bull/statecollection.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** statecollection.pl 5 Aug 2004 16:34:42 -0000 1.2
--- statecollection.pl 12 Aug 2004 14:36:07 -0000 1.3
***************
*** 4,7 ****
--- 4,8 ----
use CGI;
use C4::Auth;
+ use C4::Date;
use C4::Output;
use C4::Interface::CGI::Output;
***************
*** 14,21 ****
my $dbh = C4::Context->dbh;
my $subscriptionid = $query->param('subscriptionid');
- # warn "$ser la valeur du nom du formulaire";
my $auser = $query->param('user');
! my $startdate = $query->param('startdate');
! my $enddate = $query->param('enddate');
my $recievedlist = $query->param('recievedlist');
my $missinglist = $query->param('missinglist');
--- 15,21 ----
my $dbh = C4::Context->dbh;
my $subscriptionid = $query->param('subscriptionid');
my $auser = $query->param('user');
! my $histstartdate = format_date_in_iso($query->param('histstartdate'));
! my $enddate = format_date_in_iso($query->param('enddate'));
my $recievedlist = $query->param('recievedlist');
my $missinglist = $query->param('missinglist');
***************
*** 26,37 ****
my @planneddates = $query->param('planneddate');
my @status = $query->param('status');
if ($op eq 'modsubscriptionhistory') {
!
modsubscriptionhistory($subscriptionid,$startdate,$enddate,$recievedlist,$missinglist,$opacnote,$librariannote);
}
if ($op eq 'serialchangestatus') {
for (my $i=0;$i<=$#serialids;$i++) {
!
serialchangestatus($serialids[$i],$serialseqs[$i],$planneddates[$i],$status[$i]);
}
}
my @serialslist = getserials($subscriptionid);
--- 26,43 ----
my @planneddates = $query->param('planneddate');
my @status = $query->param('status');
+ my $hassubscriptionexpired = hassubscriptionexpired($subscriptionid);
if ($op eq 'modsubscriptionhistory') {
!
modsubscriptionhistory($subscriptionid,$histstartdate,$enddate,$recievedlist,$missinglist,$opacnote,$librariannote);
}
+ # change status except, if subscription has expired, for the "waited" issue.
if ($op eq 'serialchangestatus') {
+ my $sth = $dbh->prepare("select subscriptionid,status from serial where
serialid=?");
for (my $i=0;$i<=$#serialids;$i++) {
! $sth->execute($serialids[$i]);
! my ($x,$oldstatus) = $sth->fetchrow;
!
serialchangestatus($serialids[$i],$serialseqs[$i],format_date_in_iso($planneddates[$i]),$status[$i])
unless ($hassubscriptionexpired && $oldstatus == 1);
}
}
+ my $subs = &getsubscription($subscriptionid);
my @serialslist = getserials($subscriptionid);
***************
*** 49,58 ****
$template->param(
- # user => $user,
serialslist => address@hidden,
! # status => $sol->{'status'},
! # waited => $sol->{'serialseq'},
! startdate => $solhistory->{'startdate'},
! enddate => $solhistory->{'enddate'},
recievedlist => $solhistory->{'recievedlist'},
missinglist => $solhistory->{'missinglist'},
--- 55,61 ----
$template->param(
serialslist => address@hidden,
! histstartdate =>
format_date($solhistory->{'histstartdate'}),
! enddate => format_date($solhistory->{'enddate'}),
recievedlist => $solhistory->{'recievedlist'},
missinglist => $solhistory->{'missinglist'},
***************
*** 60,63 ****
--- 63,68 ----
librariannote => $solhistory->{'librariannote'},
subscriptionid => $subscriptionid,
+ bibliotitle => $subs->{bibliotitle},
+ hassubscriptionexpired =>$hassubscriptionexpired,
);
output_html_with_http_headers $query, $cookie, $template->output;
Index: subscription-add.pl
===================================================================
RCS file: /cvsroot/koha/koha/bull/subscription-add.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** subscription-add.pl 6 Aug 2004 16:38:41 -0000 1.3
--- subscription-add.pl 12 Aug 2004 14:36:07 -0000 1.4
***************
*** 1,4 ****
--- 1,5 ----
#!/usr/bin/perl
+
use strict;
use CGI;
***************
*** 22,26 ****
$add2,$every2,$whenmorethan2,$setto2,$lastvalue2,
$add3,$every3,$whenmorethan3,$setto3,$lastvalue3,
! $numberingmethod, $arrivalplanified, $status, $biblionumber,
$bibliotitle, $notes);
--- 23,27 ----
$add2,$every2,$whenmorethan2,$setto2,$lastvalue2,
$add3,$every3,$whenmorethan3,$setto3,$lastvalue3,
! $numberingmethod, $status, $biblionumber,
$bibliotitle, $notes);
***************
*** 68,72 ****
$lastvalue3 = $subs->{'lastvalue3'};
$numberingmethod = $subs->{'numberingmethod'};
- $arrivalplanified = $subs->{'arrivalplanified'};
$status = $subs->{status};
$biblionumber = $subs->{'biblionumber'};
--- 69,72 ----
***************
*** 104,108 ****
lastvalue3 => $lastvalue3,
numberingmethod => $numberingmethod,
- arrivalplanified => format_date($arrivalplanified),
status => $status,
biblionumber => $biblionumber,
--- 104,107 ----
***************
*** 152,168 ****
my $lastvalue3 = $query->param('lastvalue3');
my $numberingmethod = $query->param('numberingmethod');
- my $arrivalplanified = $query->param('arrivalplanified');
my $status = 1;
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
);
!
}
-
- output_html_with_http_headers $query, $cookie, $template->output;
--- 151,166 ----
my $lastvalue3 = $query->param('lastvalue3');
my $numberingmethod = $query->param('numberingmethod');
my $status = 1;
my $biblionumber = $query->param('biblionumber');
my $notes = $query->param('notes');
! my $subscriptionid =
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, $status, $notes
);
! print
$query->redirect("/cgi-bin/koha/bull/subscription-detail.pl?subscriptionid=$subscriptionid");
! } else {
! output_html_with_http_headers $query, $cookie, $template->output;
}
Index: subscription-bib-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/bull/subscription-bib-search.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** subscription-bib-search.pl 5 Aug 2004 16:34:42 -0000 1.2
--- subscription-bib-search.pl 12 Aug 2004 14:36:07 -0000 1.3
***************
*** 128,136 ****
}
}
- findseealso($dbh,address@hidden);
-
- # my $sth2 = $dbh->prepare("select b3.serial from biblioitems b2,
biblio b3 where b3.biblionumber = ? and b2.biblionumber = b3.biblionumber and
(b2.issn = ? or b3.serial like ?)");
-
-
my ($results,$total) = catalogsearch($dbh,
address@hidden,address@hidden,
address@hidden, address@hidden, address@hidden,
--- 128,131 ----
***************
*** 206,285 ****
numbers=>address@hidden,
);
!
! } elsif ($op eq "AddStatement") {
!
! ($template, $loggedinuser, $cookie)
! = get_template_and_user({template_name => "bull/search.tmpl",
! query => $query,
! type => "intranet",
! authnotrequired => 0,
! flagsrequired => {catalogue => 1},
! debug => 1,
! });
!
! # Gets the entered information
! my @marcfields = $query->param('marclist');
! my @and_or = $query->param('and_or');
! my @excluding = $query->param('excluding');
! my @operator = $query->param('operator');
! my @value = $query->param('value');
!
! my @statements = ();
!
! # List of the marc tags to display
! my $marcarray = create_marclist();
!
! my $nbstatements = $query->param('nbstatements');
! $nbstatements = 1 if(!defined $nbstatements);
!
! for(my $i = 0 ; $i < $nbstatements ; $i++)
! {
! my %fields = ();
!
! # Recreates the old scrolling lists with the previously
selected values
! my $marclist = create_scrolling_list({name=>"marclist",
! values=> $marcarray,
! size=> 1,
! default=>$marcfields[$i],
! onChange => "sql_update()"}
! );
!
! $fields{'marclist'} = $marclist;
! $fields{'first'} = 1 if($i == 0);
!
! # Restores the and/or parameters (no need to test the 'and' for
activation because it's the default value)
! $fields{'or'} = 1 if($and_or[$i] eq "or");
!
! #Restores the "not" parameters
! $fields{'not'} = 1 if($excluding[$i]);
!
! #Restores the operators (most common operators first);
! if($operator[$i] eq "=") { $fields{'eq'} = 1; }
! elsif($operator[$i] eq "contains") { $fields{'contains'} = 1; }
! elsif($operator[$i] eq "start") { $fields{'start'} = 1; }
! elsif($operator[$i] eq ">") { $fields{'gt'} = 1; }
#greater than
! elsif($operator[$i] eq ">=") { $fields{'ge'} = 1; } #greater or
equal
! elsif($operator[$i] eq "<") { $fields{'lt'} = 1; } #lower than
! elsif($operator[$i] eq "<=") { $fields{'le'} = 1; } #lower or
equal
!
! #Restores the value
! $fields{'value'} = $value[$i];
!
! push @statements, \%fields;
! }
! $nbstatements++;
!
! # The new scrolling list
! my $marclist = create_scrolling_list({name=>"marclist",
! values=> $marcarray,
! size=>1,
! onChange => "sql_update()"});
! push @statements, {"marclist" => $marclist };
!
! $template->param("statements" => address@hidden,
! "nbstatements" =>
$nbstatements);
!
! }
! else {
($template, $loggedinuser, $cookie)
= get_template_and_user({template_name => "bull/search.tmpl",
--- 201,205 ----
numbers=>address@hidden,
);
! } else {
($template, $loggedinuser, $cookie)
= get_template_and_user({template_name => "bull/search.tmpl",
Index: subscription-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/bull/subscription-detail.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** subscription-detail.pl 6 Aug 2004 16:38:41 -0000 1.3
--- subscription-detail.pl 12 Aug 2004 14:36:07 -0000 1.4
***************
*** 23,27 ****
$add2,$every2,$whenmorethan2,$setto2,$lastvalue2,
$add3,$every3,$whenmorethan3,$setto3,$lastvalue3,
! $numberingmethod, $arrivalplanified, $status, $biblionumber,
$bibliotitle, $notes);
$subscriptionid = $query->param('subscriptionid');
--- 23,27 ----
$add2,$every2,$whenmorethan2,$setto2,$lastvalue2,
$add3,$every3,$whenmorethan3,$setto3,$lastvalue3,
! $numberingmethod, $status, $biblionumber, $bibliotitle, $notes);
$subscriptionid = $query->param('subscriptionid');
***************
*** 34,38 ****
$biblionumber = $query->param('biblionumber');
$aqbudgetid = $query->param('aqbudgetid');
! $startdate = $query->param('startdate');
$periodicity = $query->param('periodicity');
$dow = $query->param('dow');
--- 34,38 ----
$biblionumber = $query->param('biblionumber');
$aqbudgetid = $query->param('aqbudgetid');
! $startdate = format_date_in_iso($query->param('startdate'));
$periodicity = $query->param('periodicity');
$dow = $query->param('dow');
***************
*** 56,60 ****
$lastvalue3 = $query->param('lastvalue3');
$numberingmethod = $query->param('numberingmethod');
- $arrivalplanified = $query->param('arrivalplanified');
$status = 1;
$notes = $query->param('notes');
--- 56,59 ----
***************
*** 65,105 ****
$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)
--- 64,72 ----
$add2,$every2,$whenmorethan2,$setto2,$lastvalue2,
$add3,$every3,$whenmorethan3,$setto3,$lastvalue3,
! $numberingmethod, $status,
$biblionumber, $notes, $subscriptionid);
}
!
! my $subs = &getsubscription($subscriptionid);
! my @serialslist = getserials($subscriptionid);
($template, $loggedinuser, $cookie)
***************
*** 116,158 ****
$template->param(
! user => $auser,
! librarian => $librarian,
! aqbooksellerid => $aqbooksellerid,
! aqbooksellername => $aqbooksellername,
! cost => $cost,
! aqbudgetid => $aqbudgetid,
! bookfundid => $bookfundid,
! startdate => format_date($startdate),
! periodicity => $periodicity,
! dow => $dow,
! numberlength => $numberlength,
! 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,
! status => $status,
! biblionumber => $biblionumber,
! bibliotitle => $bibliotitle,
! notes => $notes,
! subscriptionid => $subscriptionid
);
$template->param(
! "periodicity$periodicity" => 1,
! "arrival$dow" => 1,
);
--- 83,125 ----
$template->param(
! user => $subs->{auser},
! librarian => $subs->{librarian},
! aqbooksellerid => $subs->{aqbooksellerid},
! aqbooksellername => $subs->{aqbooksellername},
! cost => $subs->{cost},
! aqbudgetid => $subs->{aqbudgetid},
! bookfundid => $subs->{bookfundid},
! startdate => format_date($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},
! status => $subs->{status},
! biblionumber => $subs->{biblionumber},
! bibliotitle => $subs->{bibliotitle},
! notes => $subs->{notes},
! subscriptionid => $subs->{subscriptionid},
! serialslist => address@hidden,
);
$template->param(
! "periodicity$subs->{periodicity}" => 1,
! "arrival$subs->{dow}" => 1,
);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] CVS: koha/bull serial-issues.pl,NONE,1.1 subscription-detail.pl.new,NONE,1.1 subscription-renew.pl,NONE,1.1 order.pl,1.2,1.3 statecollection.pl,1.2,1.3 subscription-add.pl,1.3,1.4 subscription-bib-search.pl,1.2,1.3 subscription-detail.pl,1.3,1.4,
Paul POULAIN <=
- Prev by Date:
[Koha-cvs] CVS: koha/acqui acquire.pl,1.16,1.17 addorder.pl,1.20,1.21 basket.pl,1.19,1.20 finishreceive.pl,1.15,1.16 newbasket2.pl,1.13,1.14 newbiblio.pl,1.19,1.20 order.pl,1.12,1.13 receive.pl,1.12,1.13 recieveorder.pl,1.8,1.9 suggestion-select.pl,1.1,1.2 supplier.pl,1.8,1.9
- Next by Date:
[Koha-cvs] CVS: koha/C4 Acquisition.pm,1.2,1.3 Bull.pm,1.3,1.4
- Previous by thread:
[Koha-cvs] CVS: koha/acqui acquire.pl,1.16,1.17 addorder.pl,1.20,1.21 basket.pl,1.19,1.20 finishreceive.pl,1.15,1.16 newbasket2.pl,1.13,1.14 newbiblio.pl,1.19,1.20 order.pl,1.12,1.13 receive.pl,1.12,1.13 recieveorder.pl,1.8,1.9 suggestion-select.pl,1.1,1.2 supplier.pl,1.8,1.9
- Next by thread:
[Koha-cvs] CVS: koha/C4 Acquisition.pm,1.2,1.3 Bull.pm,1.3,1.4
- Index(es):