Attachment #23690 for bug #7683

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




                    <td colspan="4"><input type="hidden" name="Filter" /></td>
                </tr>
            [% END %]
            [% IF (statisticvalue) %]
                <tr>
                    <td>[% statisticvalue_label %]</td>
                    <td><input type="radio" name="Line"   value="items.statisticvalue" /></td>
                    <td><input type="radio" name="Column" value="items.statisticvalue" /></td>
                    <td>
                        [% IF (statisticvalue_avlist) %]
                            <select name="Filter" id="statisticvalue">
                                <option value="">&nbsp;</option>
                                [% FOREACH av IN statisticvalue_avlist %]
                                    <option value="[% av.authorised_value %]">
                                        [% av.lib %]
                                    </option>
                                [% END %]
                            </select>
                        [% ELSE %]
                            <input type="text" name="Filter" id="statisticvalue" />
                        [% END %]
                    </td>
                </tr>
            [% ELSE %]
                <tr style="display:none">
                    <td colspan="4"><input type="hidden" name="Filter" /></td>
                </tr>
            [% END %]
            <tr>
                <td colspan="3">Filter barcode</td>
                <td>




        push @locations, { code => $_, description => "$_ - " . $locations->{$_} };
    }

    foreach my $kohafield (qw(items.notforloan items.materials)) {
        my $subfield_structure = GetMarcSubfieldStructureFromKohaField($kohafield);
        if($subfield_structure) {
            my $avlist;

        CGIextChoice => \@mime,
        CGIsepChoice => GetDelimiterChoices,
        item_itype   => $item_itype,
        DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
    );

}

              : ( $i == 12 ) ? "Collection Code"
              : ( $i == 13 ) ? "Status"
              : ( $i == 14 ) ? "Materials"
              : ( $i == 16 and $filters->[15] == 0 ) ? "Barcode (not like)"
              : ( $i == 16 and $filters->[15] == 1 ) ? "Barcode (like)"
              : ( $i == 17 ) ? "Acquired date from"
              : ( $i == 18 ) ? "Acquired date to"
              : ( $i == 19 ) ? "Removed date from"
              : ( $i == 20 ) ? "Removed date to"
              : ( $i == 21 ) ? "Removed date to"
              :                '';

            push @loopfilter, \%cell;
- 

Return to bug 7683

Lines 275-305 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt (-25 lines)
275	<td colspan="4"><input type="hidden" name="Filter" /></td>	275	<td colspan="4"><input type="hidden" name="Filter" /></td>
276	</tr>	276	</tr>
277	[% END %]	277	[% END %]
278	[% IF (statisticvalue) %]
279	<tr>
280	<td>[% statisticvalue_label %]</td>
281	<td><input type="radio" name="Line" value="items.statisticvalue" /></td>
282	<td><input type="radio" name="Column" value="items.statisticvalue" /></td>
283	<td>
284	[% IF (statisticvalue_avlist) %]
285	<select name="Filter" id="statisticvalue">
286	<option value=""> </option>
287	[% FOREACH av IN statisticvalue_avlist %]
288	<option value="[% av.authorised_value %]">
289	[% av.lib %]
290	</option>
291	[% END %]
292	</select>
293	[% ELSE %]
294	<input type="text" name="Filter" id="statisticvalue" />
295	[% END %]
296	</td>
297	</tr>
298	[% ELSE %]
299	<tr style="display:none">
300	<td colspan="4"><input type="hidden" name="Filter" /></td>
301	</tr>
302	[% END %]
303	<tr>	278	<tr>
304	<td colspan="3">Filter barcode</td>	279	<td colspan="3">Filter barcode</td>
305	<td>	280	<td>

Lines 160-166 if ($do_it) { Link Here

(-)a/reports/catalogue_stats.pl (-10 / +7 lines)
160	push @locations, { code => $_, description => "$_ - " . $locations->{$_} };	160	push @locations, { code => $_, description => "$_ - " . $locations->{$_} };
161	}	161	}
162		162
163	foreach my $kohafield (qw(items.notforloan items.materials items.statisticvalue)) {	163	foreach my $kohafield (qw(items.notforloan items.materials)) {
164	my $subfield_structure = GetMarcSubfieldStructureFromKohaField($kohafield);	164	my $subfield_structure = GetMarcSubfieldStructureFromKohaField($kohafield);
165	if($subfield_structure) {	165	if($subfield_structure) {
166	my $avlist;	166	my $avlist;
Lines 191-197 if ($do_it) { Link Here
191	CGIextChoice => \@mime,	191	CGIextChoice => \@mime,
192	CGIsepChoice => GetDelimiterChoices,	192	CGIsepChoice => GetDelimiterChoices,
193	item_itype => $item_itype,	193	item_itype => $item_itype,
194	DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
195	);	194	);
196		195
197	}	196	}
Lines 255-267 sub calculate { Link Here
255	: ( $i == 12 ) ? "Collection Code"	254	: ( $i == 12 ) ? "Collection Code"
256	: ( $i == 13 ) ? "Status"	255	: ( $i == 13 ) ? "Status"
257	: ( $i == 14 ) ? "Materials"	256	: ( $i == 14 ) ? "Materials"
258	: ( $i == 15 ) ? "Statistic value"	257	: ( $i == 16 and $filters->[15] == 0 ) ? "Barcode (not like)"
259	: ( $i == 17 and $filters->[16] == 0 ) ? "Barcode (not like)"	258	: ( $i == 16 and $filters->[15] == 1 ) ? "Barcode (like)"
260	: ( $i == 17 and $filters->[16] == 1 ) ? "Barcode (like)"	259	: ( $i == 17 ) ? "Acquired date from"
261	: ( $i == 18 ) ? "Acquired date from"	260	: ( $i == 18 ) ? "Acquired date to"
262	: ( $i == 19 ) ? "Acquired date to"	261	: ( $i == 19 ) ? "Removed date from"
263	: ( $i == 20 ) ? "Removed date from"	262	: ( $i == 20 ) ? "Removed date to"
264	: ( $i == 21 ) ? "Removed date to"
265	: '';	263	: '';
266		264
267	push @loopfilter, \%cell;	265	push @loopfilter, \%cell;
268	-