Attachment 10183 Details for Bug 8102 – [SIGNED-OFF] Bug 8102: DataTables integration in acquisition module [14]

[patch] [SIGNED-OFF] Bug 8102: DataTables integration in acquisition module [14]

SIGNED-OFF-Bug-8102-DataTables-integration-in-acqu.patch (text/plain), 3.85 KB, created by Katrin Fischer on 2012-06-11 11:21:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2012-06-11 11:21:41 UTC

Size: 3.85 KB

patch

obsolete

>From 88d40e666c16c142372ad61b754af354848ce8cc Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@biblibre.com>
>Date: Fri, 25 May 2012 16:27:40 +0200
>Subject: [PATCH] [SIGNED-OFF] Bug 8102: DataTables integration in acquisition
> module [14]
>
>supplier.tt
>
>http://bugs.koha-community.org/show_bug.cgi?id=8102
>Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
>Corrected bug number.
>---
> acqui/supplier.pl                                  |    1 +
> .../prog/en/modules/acqui/supplier.tt              |   31 ++++++++++++++++++--
> 2 files changed, 30 insertions(+), 2 deletions(-)
>
>diff --git a/acqui/supplier.pl b/acqui/supplier.pl
>index 0e2ab40..0387d35 100755
>--- a/acqui/supplier.pl
>+++ b/acqui/supplier.pl
>@@ -111,6 +111,7 @@ if ( $op eq 'display' ) {
>         basketcount   => $supplier->{'basketcount'},
>         subscriptioncount   => $supplier->{'subscriptioncount'},
>         contracts     => $contracts,
>+        dateformat    => C4::Context->preference("dateformat"),
>     );
> } elsif ( $op eq 'delete' ) {
>     # no further message needed for the user
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
>index 25b52ea..b5b9df2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
>@@ -1,7 +1,12 @@
> [% USE KohaDates %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Koha &rsaquo; Vendor [% bookselname %]</title>
>+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
> [% INCLUDE 'doc-head-close.inc' %]
>+<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
>+[% INCLUDE 'datatables-strings.inc' %]
>+<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
>+
> <script type="text/javascript">
> //<![CDATA[
> function confirm_deletion() {
>@@ -16,6 +21,23 @@ if (f.company.value == "") {
> }
>     f.submit();
> }
>+
>+ $(document).ready(function() {
>+    [% IF (dateformat == 'metric') %]
>+        dt_add_type_uk_date();
>+    [% END %]
>+    var contractst = $("#contractst").dataTable($.extend(true, {}, dataTablesDefaults, {
>+        "aoColumnDefs": [
>+          { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false },
>+          [% IF (dateformat == 'metric') %]
>+            { "aTargets": [ 2, 3 ], "sType": "uk_date" },
>+          [% END %]
>+        ],
>+        'bPaginate': false,
>+        'bFilter': false,
>+        'bInfo': false,
>+    } ) );
>+ });
> //]]>
> </script>
> </head>
>@@ -212,14 +234,18 @@ if (f.company.value == "") {
>         [% IF ( contracts ) %]
>             <div id="supplier-contracts" class="yui-g">
>                 <h2>Contract(s)</h2>
>-                <table>
>+                <table id="contractst">
>+                  <thead>
>                     <tr>
>                         <th scope="col">Name</th>
>                         <th scope="col">Description</th>
>                         <th scope="col">Start date</th>
>                         <th scope="col">End date</th>
>-                        <th scope="col" colspan="2">&nbsp; </th>
>+                        <th scope="col">&nbsp; </th>
>+                        <th scope="col">&nbsp; </th>
>                     </tr>
>+                  </thead>
>+                  <tbody>
>                     [% FOREACH contract IN contracts %]
>                         [% IF ( loop.even ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
>                         <td>
>@@ -232,6 +258,7 @@ if (f.company.value == "") {
>                         <td><a href="/cgi-bin/koha/admin/aqcontract.pl?op=delete_confirm&amp;contractnumber=[% contract.contractnumber %]&amp;booksellerid=[% contract.booksellerid %]">Delete</a></td>
>                         </tr>
>                     [% END %]
>+                  </tbody>
>                 </table>
>             </div>
>         [% END %]
>-- 
>1.7.9.5

Actions: View | Diff | Splinter Review

Attachments on bug 8102: 9608 | 9780 | 10183