[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/bull distributedto.tmpl,NONE,1.1 printlist.tmpl,NONE,1.1 statecollection.tmpl,1.10,1.11 subscription-add.tmpl,1.11,1.12 subscription-detail.tmpl,1.13,1.14

[Paul POULAIN]

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7952/koha-tmpl/intranet-tmpl/default/en/bull

Modified Files:
        statecollection.tmpl subscription-add.tmpl 
        subscription-detail.tmpl 
Added Files:
        distributedto.tmpl printlist.tmpl 
Log Message:
new features for serial module :
- the last 5 issues are now shown, and their status can be changed (but not 
reverted to "waited", as there can be only one "waited")
- the library can create a "distribution list". this paper contains a list of 
borrowers (selected from the borrower list, or manually entered), and print it 
for a given issue. once printed, the sheet can be put on the issue and 
distributed to every reader on the list (one by one).

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="popup-top.inc" -->
<div id="mainbloc">
        <h1>Select borrowers or enter manually the names</h1>
        <p>
                <form action="/cgi-bin/koha/bull/distributedto.pl" 
method="post" name="Aform">
                        <table>
                        <tr>
                        <td>
                                <input type="text" name="searchfield" 
value="<!-- TMPL_VAR name="searchfield" -->">
                                <input type="submit" class="button" 
value="Filter">
                        </td>
                        <td rowspan="2">
                                <h2>Distributed to</h2>
                                <p>
                                        <textarea name="distributedto" 
rows="15" cols="30"><!-- TMPL_VAR name="distributedto" --></textarea>
                                </p>
                                <p>
                                        <!-- TMPL_IF name="save" -->
                                                saved</p><p>
                                        <!-- /TMPL_IF -->
                                        <input type="hidden" name="SaveList" 
value="0">
                                        <input type="hidden" 
name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">
                                        <input type="button" name="save" 
value="Save" class="button" onClick="FSaveList()">
                                        <input type="button" name="clode" 
value="Close" class="button" onClick="javascript:window.close()">
                        </td>
                        </tr>
                        <tr>
                        <td>
                                <!-- TMPL_VAR NAME="borrowername" -->
                                <select name="borlist" size="15">
                                        <!-- TMPL_LOOP name="borlist" -->
                                                <option value="<!-- TMPL_VAR 
name="surname" --><!-- TMPL_VAR name="firstname" -->">
                                                        <!-- TMPL_VAR 
name="surname" --> <!-- TMPL_VAR name="firstname" -->
                                                </option>
                                        <!-- /TMPL_LOOP -->
                                </select>
                                <input type="button" name="insert" 
value="&gt;&gt;" class="button" onclick="insertValueQuery()" title="Insert" />
                        </td>
                        </tr>
                        </table>
                </form>
        </p>
        <script language="javascript" type="text/javascript">
                // GPL code coming from PhpMyAdmin
                function insertValueQuery() {
                        var myQuery = document.Aform.distributedto;
                        var myListBox = document.Aform.borlist;
                
                        if(myListBox.options.length > 0) {
                                var chaineAj = "";
                                var NbSelect = 0;
                                for(var i=0; i<myListBox.options.length; i++) {
                                        if (myListBox.options[i].selected){
                                                NbSelect++;
                                                if (NbSelect > 1)
                                                        chaineAj += ", ";
                                                chaineAj += 
myListBox.options[i].value;
                                        }
                                }
                
                                //IE support
                                if (document.selection) {
                                        myQuery.focus();
                                        sel = document.selection.createRange();
                                        sel.text = chaineAj;
                                        document.Aform.insert.focus();
                                }
                                //MOZILLA/NETSCAPE support
                                else if 
(document.Aform.distributedto.selectionStart || 
document.Aform.distributedto.selectionStart == "0") {
                                        var startPos = 
document.Aform.distributedto.selectionStart;
                                        var endPos = 
document.Aform.distributedto.selectionEnd;
                                        var chaineSql = 
document.Aform.distributedto.value;
                                        myQuery.value = chaineSql.substring(0, 
startPos) +''+ chaineAj+"\n" + chaineSql.substring(endPos, chaineSql.length);
                                } else {
                                        myQuery.value += chaineAj;
                                }
                        }
                }
                function FSaveList() {
                        document.Aform.SaveList.value=1;
                        document.Aform.submit();
                }
        </script>
</div>
<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

--- NEW FILE ---
<html>
<body onLoad="window.print();">
<h1>Distribution list</h1>
<h2>Title : <!-- TMPL_VAR name="title" -->, <!-- TMPL_VAR name="serialseq" 
--></h2>
<div style="border : 1px solid black;">
        <!-- TMPL_VAR name="distributedto" -->
</div>

<div style=border-top: 1px solid black;">
        <p><!-- TMPL_VAR name="branchname" --></p>
        <p><!-- TMPL_VAR name="branchaddress1" --></p>
        <p><!-- TMPL_VAR name="branchaddress2" --></p>
        <p><!-- TMPL_VAR name="branchaddress3" --></p>
        <p>phone : <!-- TMPL_VAR name="branchphone" --> <i><!-- TMPL_VAR 
name="branchemail" --></i></p>
</div>

</body>
</html>
Index: statecollection.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** statecollection.tmpl        26 Oct 2005 09:16:11 -0000      1.10
--- statecollection.tmpl        27 Oct 2005 12:08:44 -0000      1.11
***************
*** 74,77 ****
--- 74,80 ----
                                <input type="text" name="notes" value="<!-- 
TMPL_VAR name="notes" -->" size=20 maxlength=255>
                        </td>
+                       <td>
+                               <a href="javascript:PrintList(<!-- TMPL_VAR 
name="subscriptionid" -->,'<!-- TMPL_VAR name="serialseq" -->')" class="button 
bull">print</a>
+                       </td>
                </tr>
        <!-- /TMPL_LOOP -->
***************
*** 129,136 ****
  <script language="JavaScript" type="text/javascript">
  
! function popup()
! {
         window.open("subscription-renew.pl?subscriptionid=<!-- TMPL_VAR 
name="subscriptionid">","subscription 
renewal",'width=700,height=400,toolbar=false,scrollbars=yes');
  }
  </script>
  
--- 132,142 ----
  <script language="JavaScript" type="text/javascript">
  
! function popup() {
         window.open("subscription-renew.pl?subscriptionid=<!-- TMPL_VAR 
name="subscriptionid">","subscription 
renewal",'width=700,height=400,toolbar=false,scrollbars=yes');
  }
+ 
+ function PrintList(subscriptionid,serialseq) {
+       
window.open("printlist.pl?subscriptionid="+subscriptionid+"&serialseq="+serialseq);
+ }
  </script>
  

Index: subscription-add.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** subscription-add.tmpl       22 Sep 2005 15:34:17 -0000      1.11
--- subscription-add.tmpl       27 Oct 2005 12:08:44 -0000      1.12
***************
*** 16,21 ****
                <input type="hidden" name="user" value="<!-- TMPL_VAR 
name="user" -->">
                <p>Librarian</td><td> <!-- TMPL_VAR name="user" --></p>
!               <p><label class="label100">Supplier</label><input type="text" 
name="aqbooksellerid" value="<!-- TMPL_VAR name="aqbooksellerid" -->" size=4> 
(<input type="text" name="aqbooksellername" value="<!-- TMPL_VAR 
name="aqbooksellername" -->" disabled readonly>)<a href="#" 
onClick="FindAcqui(f)">...</a></p>
!               <p><label class="label100">Biblio</label><input type="text" 
name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" size=4> 
(<input type="text" name="title" value="<!-- TMPL_VAR name="bibliotitle" -->" 
disabled readonly>)<a href="#" onClick="Plugin(f)">...</a></p>
                <p><label class="label100">Notes</label><textarea name="notes" 
cols="30" rows="2"><!-- TMPL_VAR name="notes" --></textarea></p>
                <!-- TMPL_IF name="letters" -->
--- 16,21 ----
                <input type="hidden" name="user" value="<!-- TMPL_VAR 
name="user" -->">
                <p>Librarian</td><td> <!-- TMPL_VAR name="user" --></p>
!               <p><label class="label100">Supplier</label><input type="text" 
name="aqbooksellerid" value="<!-- TMPL_VAR name="aqbooksellerid" -->" size=4> 
(<input type="text" name="aqbooksellername" value="<!-- TMPL_VAR 
name="aqbooksellername" -->" disabled readonly>)<a href="#" 
onClick="FindAcqui(f)" class="button bull">...</a></p>
!               <p><label class="label100">Biblio</label><input type="text" 
name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" size=4> 
(<input type="text" name="title" value="<!-- TMPL_VAR name="bibliotitle" -->" 
disabled readonly>)<a href="#" onClick="Plugin(f)" class="button 
bull">...</a></p>
                <p><label class="label100">Notes</label><textarea name="notes" 
cols="30" rows="2"><!-- TMPL_VAR name="notes" --></textarea></p>
                <!-- TMPL_IF name="letters" -->
***************
*** 33,36 ****
--- 33,37 ----
                        </p>
                <!-- /TMPL_IF -->
+               <p><label class="label100">Distributed to </label><a href="#" 
onClick="DistributedTo()" class="button bull">...</a></p>
                <p class="problem">warning</p>
                <ul>
***************
*** 233,236 ****
--- 234,242 ----
  }
  
+ function DistributedTo()
+ {
+        window.open("distributedto.pl?subscriptionid=<!-- TMPL_VAR 
name="subscriptionid" -->","Distributed 
to",'width=800,height=600,toolbar=false,scrollbars=yes');
+ }
+ 
  
  function Check(f)

Index: subscription-detail.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** subscription-detail.tmpl    26 Oct 2005 09:16:11 -0000      1.13
--- subscription-detail.tmpl    27 Oct 2005 12:08:44 -0000      1.14
***************
*** 5,9 ****
  <a href="subscription-add.pl?op=mod&subscriptionid=<!-- TMPL_VAR 
name="subscriptionid" -->" class="button bull" title="Modify 
subscription">Edit</a>
  <a href="statecollection.pl?subscriptionid=<!-- TMPL_VAR 
name="subscriptionid" -->" class="button bull" title="Recieve issues">Receive 
issues</a>
- <a href="distribution.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" 
-->" class="button bull" title="Recieve issues">Define distribution</a>
  <a href="serial-issues.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" 
class="button bull" title="All issues on this title">Issue history</a>
  <a href="/cgi-bin/koha/bull-home.pl?biblionumber=<!-- TMPL_VAR 
name="biblionumber" -->" class="button bull" title="all subscriptions on <!-- 
TMPL_VAR name="bibliotitle" -->">Subscriptions</a>
--- 5,8 ----
***************
*** 33,38 ****
                        <!-- /TMPL_IF -->
                </p>
!               <p><label>Distributed to</label></p>
!               <p><!-- TMPL_IF name="distributedto" --></p>
  </div>
  <div id="bloc25">
--- 32,37 ----
                        <!-- /TMPL_IF -->
                </p>
!               <p><label>Distributed to</label>
!               <p><ul><!-- TMPL_VAR name="distributedto" --></ul></p>
  </div>
  <div id="bloc25">