Attachment 3668 Details for Bug 6054 – Signed-off patch

[patch] Signed-off patch

0001-SIGNED-OFF-bug-6054-Add-a-filter-by-active-budget-on.patch (text/plain), 5.85 KB, created by Katrin Fischer on 2011-04-05 11:45:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2011-04-05 11:45:10 UTC

Size: 5.85 KB

patch

obsolete

>From b6adbf2db2c37080f92a5d0a419559fafdf49430 Mon Sep 17 00:00:00 2001
>From: Alex Arnaud <alex.arnaud@biblibre.com>
>Date: Tue, 5 Apr 2011 13:33:11 +0200
>Subject: [PATCH] [SIGNED-OFF] bug #6054 - Add a filter by active budget on acqui-home
>Content-Type: text/plain; charset="utf-8"
>
>Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
>---
> acqui/acqui-home.pl                                |   18 +++++++-
> .../prog/en/modules/acqui/acqui-home.tmpl          |   46 +++++++++++++++++--
> 2 files changed, 58 insertions(+), 6 deletions(-)
>
>diff --git a/acqui/acqui-home.pl b/acqui/acqui-home.pl
>index ed96a9e..0d9c207 100755
>--- a/acqui/acqui-home.pl
>+++ b/acqui/acqui-home.pl
>@@ -88,6 +88,11 @@ my $totordered = 0;
> my $totcomtd   = 0;
> my $totavail   = 0;
> 
>+my $total_active        = 0;
>+my $totspent_active     = 0;
>+my $totordered_active   = 0;
>+my $totavail_active     = 0;
>+
> foreach my $budget ( @{$budget_arr} ) {
> 
>     $budget->{budget_code_indent} =~ s/\ /\&nbsp\;/g;
>@@ -121,6 +126,13 @@ foreach my $budget ( @{$budget_arr} ) {
>     $totordered += $budget->{'budget_ordered'};
>     $totavail   += $budget->{'budget_avail'};
> 
>+    if ($budget->{budget_period_active}){
>+	$total_active      += $budget->{'budget_amount'};
>+	$totspent_active   += $budget->{'budget_spent'};
>+	$totordered_active += $budget->{'budget_ordered'};
>+	$totavail_active   += $budget->{'budget_avail'};    
>+    }
>+
>     for my $field (qw( budget_amount budget_spent budget_ordered budget_avail ) ) {
>         $budget->{$field} = $num_formatter->format_price( $budget->{$field} );
>     }
>@@ -135,7 +147,11 @@ $template->param(
>     totordered    => $num_formatter->format_price($totordered),
>     totcomtd      => $num_formatter->format_price($totcomtd),
>     totavail      => $num_formatter->format_price($totavail),
>-    suggestions_count    => $suggestions_count,
>+    total_active  => $num_formatter->format_price($total_active),
>+    totspent_active     => $num_formatter->format_price($totspent_active),
>+    totordered_active   => $num_formatter->format_price($totordered_active),
>+    totavail_active     => $num_formatter->format_price($totavail_active),
>+    suggestions_count   => $suggestions_count,
> );
> 
> output_html_with_http_headers $query, $cookie, $template->output;
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl
>index 02f5f22..66df546 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl
>@@ -1,6 +1,27 @@
> 
> <title>Koha &rsaquo; Acquisitions</title>
> 
>+<script type="text/javascript">
>+//<![CDATA[
>+$(document).ready(function() {
>+    $('#showallbudgets').click(function() {
>+	if ( $('#showallbudgets:checked').val() !== undefined) {
>+	    $('.b_inactive').show();
>+	    $('#b_inactive').show();
>+	    $('.bu_active').show();
>+	    $('.bu_inactive').hide();
>+	}
>+	else {
>+	    $('.b_inactive').hide();
>+	    $('#b_inactive').hide();
>+	    $('.bu_inactive').show();
>+	    $('.bu_active').hide();
>+	}
>+    });
>+});
>+//]]>
>+</script>
>+
> </head>
> <body>
> 
>@@ -83,14 +104,15 @@
>             <th>Total</th>
>             <th>&nbsp;</th>
>             <th>&nbsp;</th>
>-            <th align="right" ></th>
>-            <th align="right" ></th>
>-            <th align="right" ></th>
>-            <th align="right" ></th>
>+            <th align="right" ><span class="bu_active" style="display : none;"></span><span class="bu_inactive" ></span></th>
>+            <th align="right" ><span class="bu_active" style="display : none;"></span><span class="bu_inactive" ></span></th>
>+            <th align="right" ><span class="bu_active" style="display : none;"></span><span class="bu_inactive" ></span></th>
>+            <th align="right" ><span class="bu_active" style="display : none;"></span><span class="bu_inactive" ></span></th>
>         </tr>
>         </tfoot>
>         <tbody>
>         
>+	    
>             
>                 <tr>
>             
>@@ -104,10 +126,24 @@
>                 <td align="right" ></td>
>                 <td align="right" ></td>
>             </tr>
>+            
>+            
>+                <tr class="b_inactive" style="display : none;">
>+            
>+                <tr class="highlight" id = "b_inactive" style="display : none;">
>+            
>+            <td align="center" ></td>
>+                <td align="center"></td>
>+                <td align="center"></td>
>+                <td align="right" ></td>
>+                <td align="right" ></td>
>+                <td align="right" ></td>
>+                <td align="right" ></td>
>+            
>         
>         </tbody>
>     </table>
>-    </div>
>+    </div><span class="label">Show all :&nbsp;</span><input type="checkbox" id="showallbudgets" />
>     
> </div>
> 
>-- 
>1.7.1
>

Actions: View | Diff | Splinter Review

Attachments on bug 6054: 3665 | 3668