[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] CVS: koha/bull serial-issues.pl,1.1,1.1.2.1 subscription-deta
From: |
Paul POULAIN |
Subject: |
[Koha-cvs] CVS: koha/bull serial-issues.pl,1.1,1.1.2.1 subscription-detail.pl,1.5.2.1,1.5.2.2 |
Date: |
Tue, 02 Aug 2005 08:00:40 -0700 |
Update of /cvsroot/koha/koha/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18139/bull
Modified Files:
Tag: rel_2_2
serial-issues.pl subscription-detail.pl
Log Message:
introducing history list as in OPAC
+ adding some links & renaming some link not clear enough.
Index: serial-issues.pl
===================================================================
RCS file: /cvsroot/koha/koha/bull/serial-issues.pl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** serial-issues.pl 12 Aug 2004 14:36:07 -0000 1.1
--- serial-issues.pl 2 Aug 2005 15:00:36 -0000 1.1.2.1
***************
*** 15,58 ****
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;
--- 15,73 ----
my $op = $query->param('op');
my $dbh = C4::Context->dbh;
+ my $selectview = $query->param('selectview');
+ $selectview = C4::Context->preference("SubscriptionHistory") unless
$selectview;
+
my $sth;
# my $id;
my ($template, $loggedinuser, $cookie);
! my $biblionumber = $query->param('biblionumber');
! if ($selectview eq "full"){
! my $subscriptions =
get_full_subscription_list_from_biblionumber($biblionumber);
!
! my $title = $subscriptions->[0]{bibliotitle};
! my $yearmin=$subscriptions->[0]{year};
! my $yearmax=$subscriptions->[scalar(@$subscriptions)-1]{year};
! ($template, $loggedinuser, $cookie)
! = get_template_and_user({template_name =>
"bull/full-serial-issues.tmpl",
! query => $query,
! type => "intranet",
! authnotrequired => 1,
! debug => 1,
! });
!
! # replace CR by <br> in librarian note
! # $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
!
! $template->param(
! biblionumber => $query->param('biblionumber'),
! years => $subscriptions,
! yearmin => $yearmin,
! yearmax =>$yearmax,
! bibliotitle => $title,
! suggestion => C4::Context->preference("suggestion"),
! virtualshelves => C4::Context->preference("virtualshelves"),
! );
+ } else {
+ my $subscriptions =
get_subscription_list_from_biblionumber($biblionumber);
+
+ ($template, $loggedinuser, $cookie)
+ = get_template_and_user({template_name => "bull/serial-issues.tmpl",
+ query => $query,
+ type => "intranet",
+ authnotrequired => 1,
+ debug => 1,
+ });
+
+ # replace CR by <br> in librarian note
+ # $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
+
+ $template->param(
+ biblionumber => $query->param('biblionumber'),
+ subscription_LOOP => $subscriptions,
+ suggestion => C4::Context->preference("suggestion"),
+ virtualshelves => C4::Context->preference("virtualshelves"),
+ );
+ }
output_html_with_http_headers $query, $cookie, $template->output;
Index: subscription-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/bull/subscription-detail.pl,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -C2 -r1.5.2.1 -r1.5.2.2
*** subscription-detail.pl 11 Jan 2005 15:07:58 -0000 1.5.2.1
--- subscription-detail.pl 2 Aug 2005 15:00:36 -0000 1.5.2.2
***************
*** 78,81 ****
--- 78,82 ----
my $subs = &getsubscription($subscriptionid);
my ($totalissues,@serialslist) = getserials($subscriptionid);
+ warn " => $totalissues";
$totalissues-- if $totalissues; # the -1 is to have 0 if this is a new
subscription (only 1 issue)
# the subscription must be deletable if there is NO issues for a reason or
another (should not happend, but...)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] CVS: koha/bull serial-issues.pl,1.1,1.1.2.1 subscription-detail.pl,1.5.2.1,1.5.2.2,
Paul POULAIN <=
- Prev by Date:
[Koha-cvs] CVS: koha/C4 Context.pm,1.18.2.1,1.18.2.2
- Next by Date:
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/bull full-serial-issues.tmpl,NONE,1.1.2.1 bull-home.tmpl,1.2.2.1,1.2.2.2 serial-issues.tmpl,1.1,1.1.2.1 statecollection.tmpl,1.4.2.2,1.4.2.3 subscription-detail.tmpl,1.6.2.4,1.6.2.5
- Previous by thread:
[Koha-cvs] CVS: koha/C4 Context.pm,1.18.2.1,1.18.2.2
- Next by thread:
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/bull full-serial-issues.tmpl,NONE,1.1.2.1 bull-home.tmpl,1.2.2.1,1.2.2.2 serial-issues.tmpl,1.1,1.1.2.1 statecollection.tmpl,1.4.2.2,1.4.2.3 subscription-detail.tmpl,1.6.2.4,1.6.2.5
- Index(es):