From a5c60cc0081acc60ebb321ad6605e3baa3069f18 Mon Sep 17 00:00:00 2001 From: Matthias Meusburger Date: Fri, 11 Sep 2009 17:03:01 +0200 Subject: [PATCH] 1110 : Balance carts and lists, follow-up : Added Opac lists features to admin lists Signed-off-by: Henri-Damien LAURENT --- koha-tmpl/intranet-tmpl/prog/en/css/print.css | 4 + koha-tmpl/intranet-tmpl/prog/en/js/basket.js | 470 ++++++++++++++++++ .../modules/virtualshelves/downloadshelf.tmpl | 33 ++ .../en/modules/virtualshelves/sendshelf.tmpl | 43 ++ .../modules/virtualshelves/sendshelfform.tmpl | 38 ++ .../en/modules/virtualshelves/shelves.tmpl | 13 +- virtualshelves/sendshelf.pl | 173 +++++++ 7 files changed, 772 insertions(+), 2 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/js/basket.js create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/downloadshelf.tmpl create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tmpl create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelfform.tmpl create mode 100755 virtualshelves/sendshelf.pl diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/print.css b/koha-tmpl/intranet-tmpl/prog/en/css/print.css index 724687b548..16996611f5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/print.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/print.css @@ -202,6 +202,10 @@ tr.highlight { display : none; } +input, fieldset.action, .list-actions { + display: none; +} + tr.overdue { font-weight : bold; diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/basket.js b/koha-tmpl/intranet-tmpl/prog/en/js/basket.js new file mode 100644 index 0000000000..f0bbf7b94b --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/js/basket.js @@ -0,0 +1,470 @@ +////////////////////////////////////////////////////////////////////////////// +// BASIC FUNCTIONS FOR COOKIE MANAGEMENT // +////////////////////////////////////////////////////////////////////////////// + +var CGIBIN = "/cgi-bin/koha/"; + +var nameCookie = "intranet_bib_list"; +var nameParam = "bib_list"; +var valCookie = readCookie(nameCookie); + +if(valCookie){ + var arrayRecords = valCookie.split("/"); + if(arrayRecords.length > 0){ + var basketcount = arrayRecords.length-1; + } else { + var basketcount = ""; + } +} else { + var basketcount = ""; +} + +function writeCookie(name, val, wd) { + if (wd) { + parent.opener.document.cookie = name + "=" + val + "; path=/"; + } + else { + parent.document.cookie = name + "=" + val + "; path=/"; + } +} + +function readCookieValue (str, val_beg) { + var val_end = str.indexOf(";", val_end); + if (val_end == -1) + val_end = str.length; + return str.substring(val_beg, val_end); +} + +function readCookie(name, wd) { + var str_name = name + "="; + var str_len = str_name.length; + var str_cookie = ""; + if (wd) { + str_cookie = parent.opener.document.cookie; + } + else { + str_cookie = parent.document.cookie; + } + // fixed - getting the part of the basket that is bib_list + var cookie_parts = str_cookie.split(";"); + for(var i=0;i < cookie_parts.length;i++) { + var c = cookie_parts[i]; + while (c.charAt(0)==' ') c = c.substring(1,c.length); + if(c.indexOf(str_name) == 0) return c.substring(str_name.length,c.length); + } + return null; +} + +function delCookie(name) { + var exp = new Date(); + exp.setTime(exp.getTime()-1); + if(parent.opener){ + parent.opener.document.cookie = name + "=null; path=/; expires=" + exp.toGMTString(); + } else { + document.cookie = name + "=null; path=/; expires=" + exp.toGMTString(); + } +} + +/////////////////////////////////////////////////////////////////// +// SPECIFIC FUNCTIONS USING COOKIES // +/////////////////////////////////////////////////////////////////// + +function openBasket() { + var strCookie = ""; + var valCookie = readCookie(nameCookie); + if ( valCookie ) { + strCookie = nameParam + "=" + valCookie; + } + + if ( strCookie ) { + var iW = 820; + var iH = 450; + var optWin = "dependant=yes,status=yes,scrollbars=yes,resizable=yes,toolbar=no,location=yes,height="+iH+",width="+iW; + var loc = CGIBIN + "basket/basket.pl?" + strCookie; + var basket = open(loc, "basket", optWin); + if (window.focus) {basket.focus()} + } + else { + showCartUpdate(MSG_BASKET_EMPTY); + } +} + +function addRecord(val, selection,NoMsgAlert) { + var valCookie = readCookie(nameCookie); + var write = 0; + + if ( ! valCookie ) { // empty basket + valCookie = val + '/'; + write = 1; + updateBasket(1); + } + else { + // is this record already in the basket ? + var found = false; + var arrayRecords = valCookie.split("/"); + for (var i = 0; i < valCookie.length - 1; i++) { + if (val == arrayRecords[i]) { + found = true; + break; + } + } + if ( found ) { + if (selection) { + return 0; + } + if (! NoMsgAlert ) { + showCartUpdate(MSG_RECORD_IN_BASKET); + } + } + else { + valCookie += val + '/'; + write = 1; + updateBasket(arrayRecords.length); + } + } + + if (write) { + writeCookie(nameCookie, valCookie); + if (selection) { // when adding a selection of records + return 1; + } + if (! NoMsgAlert ) { + showCartUpdate(MSG_RECORD_ADDED); + } + } +} + +function AllAreChecked(s){ + if (! s.length) { return false;} + var l = s.length; + for (var i=0; i < l; i++) { + if(! s[i].checked) { return false; } + } + return true; +} + +function SelectAll(){ + if(document.bookbag_form.biblionumber.length > 0) { + var checky = AllAreChecked(document.bookbag_form.biblionumber); + var l = document.bookbag_form.biblionumber.length; + for (var i=0; i < l; i++) { + document.bookbag_form.biblionumber[i].checked = (checky) ? false : true; + } + } +} + +function addMultiple(){ + var c_value = ""; + if(document.bookbag_form.biblionumber.length > 0) { + for (var i=0; i < document.bookbag_form.biblionumber.length; i++) { + if (document.bookbag_form.biblionumber[i].checked) { + c_value = c_value + document.bookbag_form.biblionumber[i].value + "/"; + } + } + addSelRecords(c_value); + } else { + c_value = c_value + document.bookbag_form.biblionumber.value + "/"; + addSelRecords(c_value); + } +} + +function addSelRecords(valSel) { // function for adding a selection of biblios to the basket + // from the results list + var arrayRecords = valSel.split("/"); + var i = 0; + var nbAdd = 0; + for (i=0;i nbAdd) { + msg = nbAdd+" "+MSG_NRECORDS_ADDED+", "+(i-nbAdd)+" "+MSG_NRECORDS_IN_BASKET; + } + else { + msg = nbAdd+" "+MSG_NRECORDS_ADDED; + } + } + else { + if (i < 1) { + msg = MSG_NO_RECORD_SELECTED; + } + else { + msg = MSG_NO_RECORD_ADDED+" ("+MSG_NRECORDS_IN_BASKET+") !"; + } + } + showCartUpdate(msg); +} + +function showCartUpdate(msg){ + // set body of popup window + $("#cartDetails").html(msg); + showCart(); + setTimeout("hideCart()",2000); +} + +function showListsUpdate(msg){ + // set body of popup window + $("#listsDetails").html(msg); + showLists(); + setTimeout("hideLists()",2000); +} + +function selRecord(num, status) { + var str = document.myform.records.value + if (status){ + str += num+"/"; + } + else { + str = delRecord(num, str); + } + + document.myform.records.value = str; +} + +function delSelRecords() { + var recordsSel = 0; + var end = 0; + var valCookie = readCookie(nameCookie, 1); + + if (valCookie) { + var str = document.myform.records.value; + if (str.length > 0){ + recordsSel = 1; + var str2 = valCookie; + while (!end){ + s = str.indexOf("/"); + if (s>0){ + num = str.substring(0, s) + str = delRecord(num,str); + str2 = delRecord(num,str2); + } else { + end = 1; + } + } + + if (str2.length == 0) { // equivalent to emptying the basket + var rep = false; + rep = confirm(MSG_CONFIRM_DEL_BASKET); + if (rep) { + delCookie(nameCookie); + document.location = "about:blank"; + updateBasket(0,top.opener); + window.close(); + } else { + return; + } + } else { + writeCookie(nameCookie, str2, 1); + } + } + } + + if (recordsSel) { + var strCookie = ""; + var valCookie = readCookie(nameCookie, 1); + strCookie = nameParam + "=" + valCookie; + var arrayRecords = valCookie.split("/"); + updateBasket(arrayRecords.length-1,top.opener); + document.location = CGIBIN + "basket/basket.pl?" + strCookie; + } + else { + alert(MSG_NO_RECORD_SELECTED); + } +} + +function delRecord (n, s) { + var re = /\d/; + var aux = s; + var found = 0; + var pos = -1; + + while (!found) { + pos = aux.indexOf(n, pos+1); + var charAfter = aux.charAt(pos+n.length); // character right after the researched string + if (charAfter.match(re)) { // record number inside another one + continue; + } + else { // good record number + aux = s.substring(0, pos)+ s.substring(pos+n.length+1, s.length); + s = aux; + found = 1; + } + } + + return s; +} + + +function delBasket() { + + var rep = false; + rep = confirm(MSG_CONFIRM_DEL_BASKET); + if (rep) { + delCookie(nameCookie); + document.location = "about:blank"; + updateBasket(0,top.opener); + window.close(); + } +} + + +function quit() { + if (document.myform.records.value) { + var rep = false; + rep = confirm(MSG_CONFIRM_DEL_RECORDS); + if (rep) { + delSelRecords(); + } + } + updateBasket(arrayRecords.length-1,top.opener); + window.close(); +} + +function sendBasket() { + var valCookie = readCookie(nameCookie); + var strCookie = nameParam + "=" + valCookie; + + var loc = CGIBIN + "basket/sendbasket.pl?" + strCookie; + + var optWin="dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100"; + var win_form = open(loc,"win_form",optWin); +} + +function downloadBasket() { + var valCookie = readCookie(nameCookie); + var strCookie = nameParam + "=" + valCookie; + + var loc = CGIBIN + "basket/downloadcart.pl?" + strCookie; + + open(loc,"win_form",'dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100'); +} + +function printBasket() { + var loc = document.location + "&print=1"; + document.location = loc; +} + +function showMore() { + var strCookie = ""; + + var valCookie = readCookie(nameCookie); + if (valCookie) { + strCookie = nameParam + "=" + valCookie; + } + var loc = CGIBIN + "basket/basket.pl?" + strCookie + "&verbose=1"; + document.location = loc; +} + +function showLess() { + var strCookie = ""; + + var valCookie = readCookie(nameCookie); + if (valCookie) { + strCookie = nameParam + "=" + valCookie; + } + var loc = CGIBIN + "basket/basket.pl?" + strCookie + "&verbose=0"; + document.location = loc; +} + +function updateBasket(updated_value,target) { + if(target){ + target.$('#basketcount').html(""+updated_value+""); + target.$('#cartDetails').html(_("Your cart contains ")+updated_value+_(" items")); + } else { + $('#basketcount').html(""+updated_value+""); + $('#cartDetails').html(_("Your cart contains ")+updated_value+_(" items")); + } + var basketcount = updated_value; +} + +function openBiblio(dest,biblionumber) { + openerURL=dest+"?biblionumber="+biblionumber; + opener.document.location = openerURL; + opener.focus(); +} + +function addSelToShelf() { + var items = document.getElementById('records').value; + if(items){ + document.location = "/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?biblionumber="+items; + } else { + alert(MSG_NO_RECORD_SELECTED); + } +} + +/// vShelfAdd() builds url string for multiple-biblio adds. + +function vShelfAdd() { + bibs= new Array; + if(document.bookbag_form.biblionumber.length > 0) { + for (var i=0; i < document.bookbag_form.biblionumber.length; i++) { + if (document.bookbag_form.biblionumber[i].checked) { + bibs.push("biblionumber=" + document.bookbag_form.biblionumber[i].value); + } + } + if (bibs.length == 0) { showListsUpdate(MSG_NO_RECORD_SELECTED); } + return bibs.join("&"); + } else { + if (document.bookbag_form.biblionumber.checked) { + return "biblionumber=" + document.bookbag_form.biblionumber.value; + } + } +} + +function showCart(){ + var position = $("#cartmenulink").offset(); + var top = position.top + $("#cartmenulink").outerHeight(); + var menuWidth = 200; + var buttonWidth = $("#cartmenulink").innerWidth(); + var buttonOffset = menuWidth - buttonWidth; + var left = position.left - buttonOffset; + $("#cartDetails").css("position","absolute").css("top",top); + $("#cartDetails").css("position","absolute").css("left",left); + $("#cartDetails").fadeIn("fast",function(){ + $("#cartDetails").dropShadow({left: 3, top: 3, blur: 0, color: "#000", opacity: 0.1}); + }); +} + +function showLists(){ + var position = $("#listsmenulink").offset(); + var top = position.top + $("#listsmenulink").outerHeight(); + var menuWidth = 200; + var buttonWidth = $("#listsmenulink").innerWidth(); + var buttonOffset = menuWidth - buttonWidth; + var left = position.left - buttonOffset; + $("#listsDetails").css("position","absolute").css("top",top); + $("#listsDetails").css("position","absolute").css("left",left); + $("#listsDetails").fadeIn("fast",function(){ + $("#listsDetails").dropShadow({left: 3, top: 3, blur: 0, color: "#000", opacity: 0.1}); + }); +} + +function hideCart(){ + $("#cartDetails").removeShadow(); + $("#cartDetails").fadeOut("fast"); +} + +function hideLists(){ + $("#listsDetails").removeShadow(); + $("#listsDetails").fadeOut("fast"); +} + + +$(document).ready(function(){ + $("#cartmenulink").click(function(){ openBasket(); return false; }); + $("#cartDetails,#cartmenulink").click(function(){ hideCart(); }); + $("#cartmenulink").hover(function(){ + showCart(); + },function(){ + hideCart(); + }); + if(basketcount){ updateBasket(basketcount); } +}); + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/downloadshelf.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/downloadshelf.tmpl new file mode 100644 index 0000000000..52ae03d2bc --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/downloadshelf.tmpl @@ -0,0 +1,33 @@ + +Download shelf + + + + + Your Download should automatically start + +
+
+ Download Shelf + + + " /> + +
+
+ +

Close this window

+
+ + + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tmpl new file mode 100644 index 0000000000..3f8502e795 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tmpl @@ -0,0 +1,43 @@ + +Your List : + + +
+Hi, + +Here is your list called , sent from our online catalog. + +Please note that the attached file is a MARC biblographic records file +which can be imported into a Personal Bibliographic Software like EndNote, +Reference Manager or ProCite. + + + +--------------------------------------------- + + + + +Author(s): ; + +ISBN: +Published by: in , , +Collection: +Subject: +Copyright year: +Notes : +Unified title: +Serial: +Dewey: +Classification: +LCCN: +URL : +In the online catalog: +/cgi-bin/koha/opac-detail.pl?biblionumber= +Items : + () + +--------------------------------------------- + + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelfform.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelfform.tmpl new file mode 100644 index 0000000000..41f7d32b36 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelfform.tmpl @@ -0,0 +1,38 @@ +Koha Online Catalog › Sending Your List + + + +
+ + +

Message Sent

+

The list was sent to:

+

Close window

+ + +

Problem sending the list...

+ + + + +
" method="post"> + +
+Sending your list +
  1. + + +
    2. +
  2. + + +
    3. +
  3. + " /> +
+
Cancel
+
+ +
+ + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl index c39275b88b..6901524372 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl @@ -121,7 +121,16 @@ $(document).ready(function(){
Contents of -

+ @@ -191,7 +200,7 @@ $(document).ready(function(){
-
+
Add an item to
  1. diff --git a/virtualshelves/sendshelf.pl b/virtualshelves/sendshelf.pl new file mode 100755 index 0000000000..f7cafda960 --- /dev/null +++ b/virtualshelves/sendshelf.pl @@ -0,0 +1,173 @@ +#!/usr/bin/perl + +# Copyright 2009 BibLibre +# +# 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; +use warnings; + +use CGI; +use Encode qw(encode); + +use Mail::Sendmail; +use MIME::QuotedPrint; +use MIME::Base64; +use C4::Auth; +use C4::Biblio; +use C4::Items; +use C4::Output; +use C4::VirtualShelves; + +my $query = new CGI; + +my ( $template, $borrowernumber, $cookie ) = get_template_and_user ( + { + template_name => "virtualshelves/sendshelfform.tmpl", + query => $query, + type => "intranet", + authnotrequired => 0, + flagsrequired => { catalogue => 1 }, + } +); + +my $shelfid = $query->param('shelfid'); +my $email = $query->param('email'); + +my $dbh = C4::Context->dbh; + +if ( $email ) { + my $email_from = C4::Context->preference('KohaAdminEmailAddress'); + my $comment = $query->param('comment'); + + my %mail = ( + To => $email, + From => $email_from + ); + + my ( $template2, $borrowernumber, $cookie ) = get_template_and_user( + { + template_name => "virtualshelves/sendshelf.tmpl", + query => $query, + type => "intranet", + authnotrequired => 0, + flagsrequired => { catalogue => 1 }, + } + ); + + my @shelf = GetShelf($shelfid); + my ($items, $totitems) = GetShelfContents($shelfid); + my $marcflavour = C4::Context->preference('marcflavour'); + my $iso2709; + my @results; + + # retrieve biblios from shelf + foreach my $biblio (@$items) { + my $biblionumber = $biblio->{biblionumber}; + + my $dat = GetBiblioData($biblionumber); + my $record = GetMarcBiblio($biblionumber); + my $marcnotesarray = GetMarcNotes( $record, $marcflavour ); + my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour ); + my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour ); + + my @items = &GetItemsInfo( $biblionumber, 'opac' ); + + $dat->{MARCNOTES} = $marcnotesarray; + $dat->{MARCSUBJCTS} = $marcsubjctsarray; + $dat->{MARCAUTHORS} = $marcauthorsarray; + $dat->{'biblionumber'} = $biblionumber; + $dat->{ITEM_RESULTS} = \@items; + + $iso2709 .= $record->as_usmarc(); + + push( @results, $dat ); + } + + $template2->param( + BIBLIO_RESULTS => \@results, + email_sender => $email_from, + comment => $comment, + shelfname => $shelf[1], + ); + + # Getting template result + my $template_res = $template2->output(); + my $body; + + # Analysing information and getting mail properties + if ( $template_res =~ /\n(.*)\n/s ) { + $mail{'subject'} = $1; + } + else { $mail{'subject'} = "no subject"; } + + my $email_header = ""; + if ( $template_res =~ /
    \n(.*)\n/s ) { + $email_header = $1; + } + + my $email_file = "basket.txt"; + if ( $template_res =~ /\n(.*)\n/s ) { + $email_file = $1; + } + + if ( $template_res =~ /\n(.*)\n/s ) { $body = encode_qp($1); } + + my $boundary = "====" . time() . "===="; + + # We set and put the multipart content + $mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\""; + + my $isofile = encode_base64(encode("UTF-8", $iso2709)); + $boundary = '--' . $boundary; + + $mail{body} = <param( SENT => "1" ); + } + else { + # do something if it doesnt work.... + warn "Error sending mail: $Mail::Sendmail::error \n"; + $template->param( error => 1 ); + } + + $template->param( email => $email ); + output_html_with_http_headers $query, $cookie, $template->output; + + +}else{ + $template->param( shelfid => $shelfid, + url => "/cgi-bin/koha/virtualshelves/sendshelf.pl", + ); + output_html_with_http_headers $query, $cookie, $template->output; +} -- 2.39.5