View | Details | Raw Unified | Return to bug 32588
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt (-17 / +28 lines)
Lines 40-63 Link Here
40
                    [% FOREACH mainloo IN mainloop %]
40
                    [% FOREACH mainloo IN mainloop %]
41
                        [% IF ( mainloo.loopfilter ) %]
41
                        [% IF ( mainloo.loopfilter ) %]
42
                            <p>Filtered on:</p>
42
                            <p>Filtered on:</p>
43
                            [% FOREACH loopfilte IN mainloo.loopfilter %]
43
                            <ul>
44
                                [% IF ( loopfilte.err ) %]
44
                                [% FOREACH loopfilte IN mainloo.loopfilter %]
45
                                    <p class="error">Error:
45
                                    [% IF ( loopfilte.err ) %]
46
                                [% ELSE %]
46
                                        <p class="error">Error: [% loopfilte.filter | html %]</p>
47
                                    <p>
47
                                    [% ELSIF ( loopfilte.sql ) %]
48
                                [% END %]
48
                                        <span class="sql">
49
                                [% IF ( loopfilte.sql ) %]
49
                                            [% loopfilte.crit | html %] = [% loopfilte.filter | html %]
50
                                    <span class="sql">
50
                                        </span>
51
                                        [% loopfilte.crit | html %] = [% loopfilte.filter | html %]
51
                                    [% ELSE %]
52
                                    </span>
52
                                        [% SWITCH loopfilte.crit %]
53
                                [% ELSE %]
53
                                            [% CASE 'homelibrary' %]<li>Home library: [% Branches.GetName( loopfilte.filter ) | html %]</li>
54
                                    <span>[% loopfilte.crit | html %] = [% loopfilte.filter | html %]</span>
54
                                            [% CASE 'itemtype' %]<li>Item type: [% ItemTypes.GetDescription( loopfilte.filter ) | html %]</li>
55
                                    [% IF ( loopfilte.crit == "by" ) %]
55
                                            [% CASE 'limit' %]<li>Limit: [% loopfilte.filter | html %]</li>
56
                                        [% group_by = loopfilte.filter %]
56
                                            [% CASE 'by' %]
57
                                                <li>By: 
58
                                                    [% group_by = loopfilte.filter %]
59
                                                    [% IF ( group_by == "homebranch") %]
60
                                                        Home library
61
                                                    [% ELSIF ( group_by == "itype" ) %]
62
                                                        Item type
63
                                                    [% ELSE %]
64
                                                        None
65
                                                    [% END %]
66
                                                </li>
67
                                            [% CASE %]<li>[% loopfilte.crit %]: [% loopfilte.filter | html %]</li>
68
                                        [% END %]
57
                                    [% END %]
69
                                    [% END %]
58
                                [% END %]
70
                                [% END %]
59
                                </p>
71
                            </ul>
60
                            [% END %]
61
                        [% END %]
72
                        [% END %]
62
73
63
                        [% IF ( mainloo.looptables ) %]
74
                        [% IF ( mainloo.looptables ) %]
Lines 78-84 Link Here
78
                                                [% ELSIF ( group_by=="homebranch" ) %]
89
                                                [% ELSIF ( group_by=="homebranch" ) %]
79
                                                    <a href="#table[% looptable.coltitle | uri %]">[% Branches.GetName( looptable.coltitle ) | html %]</a>
90
                                                    <a href="#table[% looptable.coltitle | uri %]">[% Branches.GetName( looptable.coltitle ) | html %]</a>
80
                                                [% ELSE %]
91
                                                [% ELSE %]
81
                                                    <a href="#table[% looptable.coltitle | uri %]">[% looptable.coltitle | html %]</a>
92
                                                    <a href="#table[% looptable.coltitle | uri %]">Ungrouped</a>
82
                                                [% END %]
93
                                                [% END %]
83
                                            </td>
94
                                            </td>
84
                                            <td>
95
                                            <td>
(-)a/reports/catalogue_out.pl (-3 / +2 lines)
Lines 76-83 sub calculate { Link Here
76
            if ( ( $i == 1 ) and ( @$filters[ $i - 1 ] ) ) {
76
            if ( ( $i == 1 ) and ( @$filters[ $i - 1 ] ) ) {
77
                $cell{err} = 1 if ( @$filters[$i] < @$filters[ $i - 1 ] );
77
                $cell{err} = 1 if ( @$filters[$i] < @$filters[ $i - 1 ] );
78
            }
78
            }
79
            $cell{crit} = "Branch"   if ( $i == 0 );
79
            $cell{crit} = "homelibrary"   if ( $i == 0 );
80
            $cell{crit} = "Doc Type" if ( $i == 1 );
80
            $cell{crit} = "itemtype" if ( $i == 1 );
81
            push @loopfilter, \%cell;
81
            push @loopfilter, \%cell;
82
        }
82
        }
83
    }
83
    }
84
- 

Return to bug 32588