Bugzilla – Attachment 161024 Details for
Bug 35807
Update catalog statistics report
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 35807: Reindent catalogue_stats.tt
Bug-35807-Reindent-cataloguestatstt.patch (text/plain), 33.59 KB, created by
Katrin Fischer
on 2024-01-14 11:29:29 UTC
(
hide
)
Description:
Bug 35807: Reindent catalogue_stats.tt
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2024-01-14 11:29:29 UTC
Size:
33.59 KB
patch
obsolete
>From c19ef09abb8c00598e8b599df770e8f16241c599 Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <katrin.fischer.83@web.de> >Date: Sat, 13 Jan 2024 22:17:00 +0000 >Subject: [PATCH] Bug 35807: Reindent catalogue_stats.tt > >This patch only contains whitespace changes, including >switching from tabs to 4 spaces for indenting >consistently. > >To test: >* There should be no change in appearance and behavior >--- > .../en/modules/reports/catalogue_stats.tt | 574 +++++++++--------- > 1 file changed, 296 insertions(+), 278 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt >index 997497e3aa..db8843e6f0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt >@@ -43,289 +43,307 @@ > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > <main> >- >-<h1>Catalog statistics</h1> >-[% IF ( do_it ) %] >- [% FOREACH mainloo IN mainloop %] >- [% IF ( mainloo.loopfilter ) %] >- <p>Filtered on:</p> >- [% FOREACH loopfilte IN mainloo.loopfilter %] >- <p>[% loopfilte.crit | html %] =[% loopfilte.filter | html %]</p> >- [% END %] >- [% END %] >- >- <table id="catalogue_stats"> >- <thead> >- <tr> >- <th>[% mainloo.line | html %] / [% mainloo.column | html %]</th> >- [% FOREACH loopco IN mainloo.loopcol %] >- <th>[% loopco.coltitle | html %]</th> >- [% END %] >- <th>TOTAL</th> >- </tr> >- </thead> >- <tbody> >- [% FOREACH loopro IN mainloo.looprow %] >- <tr> >- [% IF ( loopro.hilighted ) %]<td class="hilighted">[% ELSE %]<td>[% END %] >- [% loopro.rowtitle | html %]</td> >- [% FOREACH loopcel IN loopro.loopcell %] >- [% IF ( loopcel.hilighted ) %]<td>[% ELSE %]<td>[% END %] >- [% IF ( loopcel.value ) %][% loopcel.value | html %] >- [% ELSE %] >- [% END %] >- </td> >- [% END %] >- [% IF ( loopro.hilighted ) %]<td>[% ELSE %]<td>[% END %] >- [% loopro.totalrow | html %] >- </td> >- </tr> >- [% END %] >- </tbody> >- <tfoot> >- <tr> >- <th>TOTAL (all results)</th> >- [% FOREACH loopfoote IN mainloo.loopfooter %] >- <th> >- [% loopfoote.totalcol | html %] >- </th> >- [% END %] >- <th>[% mainloo.total | html %]</th> >- </tr> >- </tfoot> >- </table> >- [% END %] >-[% ELSE %] >- >- <form method="post" action="/cgi-bin/koha/reports/catalogue_stats.pl"> >- <fieldset class="rows"> >- <legend>Catalog statistics</legend> >- <table> >- <thead> >- <tr> >- <th>Title</th> >- <th>Row</th> >- <th>Column</th> >- <th>Filter</th> >- </tr> >- </thead> >- <tbody> >- <tr> >- <td>Koha full call number</td> >- <td><input type="radio" name="Line" value="items.itemcallnumber" /></td> >- <td><input type="radio" name="Column" value="items.itemcallnumber" /></td> >- <td><label for="callnoFrom">From</label> <input type="text" name="Filter" id="callnoFrom" /> <label for="callnoTo">To</label> <input type="text" name="Filter" id="callnoTo" /></td> >- </tr> >- <tr> >- <td> </td> >- <td colspan="2"><select name="cotedigits" id="cotedigits"> >- <option value=""> </option> >- <option value ="1">1</option> >- <option value ="2">2</option> >- <option value ="3">3</option> >- <option value ="4">4</option> >- <option value ="5">5</option> >- </select> >- <label for="cotedigits">characters</label> >- </td> >- <td> </td> >- </tr> >- <tr> >- <td>Item type</td> >- <td><input type="radio" name="Line" value="[% item_itype | html %]" /></td> >- <td><input type="radio" checked="checked" name="Column" value="[% item_itype | html %]" /></td> >- <td><select name="Filter" id="[% item_itype | html %]"> >- <option value=""> </option> >- [% FOREACH itemtype IN itemtypes %] >- <option value="[% itemtype.itemtype | html %]">[% itemtype.translated_description | html %]</option> >- [% END %] >- </select> >- </td> >- </tr> >- <tr> >- <td>Publisher</td> >- <td><input type="radio" name="Line" value="publishercode" /></td> >- <td><input type="radio" name="Column" value="publishercode" /></td> >- <td><input type="text" name="Filter" /></td> >- </tr> >- <tr> >- <td>Publication year</td> >- <td><input type="radio" name="Line" value="publicationyear" /></td> >- <td><input type="radio" name="Column" value="publicationyear" /></td> >- <td><label for="pubyearFrom">From</label> <input type="text" name="Filter" id="pubYearFrom" /> <label for="pubyearTo">To</label> <input type="text" name="Filter" id="pubyearTo" /></td> >- </tr> >- <tr> >- <td>Home library</td> >- <td><input type="radio" checked="checked" name="Line" value="items.homebranch" /></td> >- <td><input type="radio" name="Column" value="items.homebranch" /></td> >- <td><select name="Filter" id="branch"> >- <option value=""> </option> >- [% PROCESS options_for_libraries libraries => Branches.all() %] >- </select> >- </td> >- </tr> >- <tr> >- <td>Shelving location</td> >- <td><input type="radio" name="Line" value="items.location" /></td> >- <td><input type="radio" name="Column" value="items.location" /></td> >- <td><select name="Filter" id="location"> >- <option value=""> </option> >- [% FOREACH locationloo IN locationloop %] >- [% IF ( locationloo.selected ) %]<option value="[% locationloo.code | html %]" selected="selected">[% locationloo.description | html %]</option>[% ELSE %]<option value="[% locationloo.code | html %]">[% locationloo.description | html %]</option>[% END %] >- [% END %] >- </select> >- </td> >- </tr> >- <tr> >- <td>Collection</td> >- <td><input type="radio" name="Line" value="items.ccode" /></td> >- <td><input type="radio" name="Column" value="items.ccode" /></td> >- <td><select name="Filter" id="ccode"> >- <option value=""> </option> >- [% FOREACH authval IN authvals %] >- [% IF ( authval.selected ) %]<option value="[% authval.code | html %]" selected="selected">[% authval.description | html %]</option>[% ELSE %]<option value="[% authval.code | html %]">[% authval.description | html %]</option>[% END %] >- [% END %] >- </select> >- </td> >- </tr> >- [% IF (notforloan) %] >- <tr> >- <td>[% notforloan_label | html %]</td> >- <td><input type="radio" name="Line" value="items.notforloan" /></td> >- <td><input type="radio" name="Column" value="items.notforloan" /></td> >- <td> >- [% IF (notforloan_avlist) %] >- <select name="Filter" id="notforloan"> >- <option value=""> </option> >- [% FOREACH av IN notforloan_avlist %] >- <option value="[% av.authorised_value | html %]"> >- [% av.lib | html %] >- </option> >- [% END %] >- </select> >- [% ELSE %] >- <input type="text" name="Filter" id="notforloan" /> >- [% END %] >- </td> >- </tr> >- [% ELSE %] >- <tr style="display:none"> >- <td colspan="4"><input type="hidden" name="Filter" /></td> >- </tr> >- [% END %] >- [% IF (materials) %] >- <tr> >- <td>[% materials_label | html %]</td> >- <td><input type="radio" name="Line" value="items.materials" /></td> >- <td><input type="radio" name="Column" value="items.materials" /></td> >- <td> >- [% IF (materials_avlist) %] >- <select name="Filter" id="materials"> >- <option value=""> </option> >- [% FOREACH av IN materials_avlist %] >- <option value="[% av.authorised_value | html %]"> >- [% av.lib | html %] >- </option> >- [% END %] >- </select> >- [% ELSE %] >- <input type="text" name="Filter" id="materials" /> >+ <h1>Catalog statistics</h1> >+ [% IF ( do_it ) %] >+ [% FOREACH mainloo IN mainloop %] >+ [% IF ( mainloo.loopfilter ) %] >+ <p>Filtered on:</p> >+ [% FOREACH loopfilte IN mainloo.loopfilter %] >+ <p>[% loopfilte.crit | html %] =[% loopfilte.filter | html %]</p> >+ [% END %] > [% 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> >- <select name="Filter" id="like"> >- <option value="1">like</option> >- <option value="0">not like</option> >- </select> >- <input type="text" name="Filter" id="barcode" /> >- (use * to do a fuzzy search) >- </td> >- </tr> >- <tr> >- <td>Date acquired (item)</td> >- <td><input type="radio" name="Line" value="items.dateaccessioned" /></td> >- <td><input type="radio" name="Column" value="items.dateaccessioned" /></td> >- <td> >- <label for="acqdateFrom">From</label> >- <input type="text" name="Filter" id="acqdateFrom" data-date_to="acqdateTo" class="flatpickr" /> > >- <label for="acqdateTo">To</label> >- <input type="text" name="Filter" id="acqdateTo" class="flatpickr" /> >- </td> >- </tr> >- <tr id="removeddatetr"> >- <td>Date deleted (item)</td> >- <td><input type="radio" name="Line" value="deleteditems.timestamp" /></td> >- <td><input type="radio" name="Column" value="deleteditems.timestamp" /></td> >- <td> >- <label for="deldateFrom">From</label> >- <input type="text" name="Filter" id="deldateFrom" data-date_to="deldateTo" class="flatpickr" /> >+ <table id="catalogue_stats"> >+ <thead> >+ <tr> >+ <th>[% mainloo.line | html %] / [% mainloo.column | html %]</th> >+ [% FOREACH loopco IN mainloo.loopcol %] >+ <th>[% loopco.coltitle | html %]</th> >+ [% END %] >+ <th>TOTAL</th> >+ </tr> >+ </thead> >+ <tbody> >+ [% FOREACH loopro IN mainloo.looprow %] >+ <tr> >+ [% IF ( loopro.hilighted ) %]<td class="hilighted">[% ELSE %]<td>[% END %] >+ [% loopro.rowtitle | html %]</td> >+ [% FOREACH loopcel IN loopro.loopcell %] >+ [% IF ( loopcel.hilighted ) %]<td>[% ELSE %]<td>[% END %] >+ [% IF ( loopcel.value ) %] >+ [% loopcel.value | html %] >+ [% ELSE %] >+ >+ [% END %] >+ </td> >+ [% END %] >+ [% IF ( loopro.hilighted ) %]<td>[% ELSE %]<td>[% END %] >+ [% loopro.totalrow | html %] >+ </td> >+ </tr> >+ [% END %] >+ </tbody> >+ <tfoot> >+ <tr> >+ <th>TOTAL (all results)</th> >+ [% FOREACH loopfoote IN mainloo.loopfooter %] >+ <th> >+ [% loopfoote.totalcol | html %] >+ </th> >+ [% END %] >+ <th>[% mainloo.total | html %]</th> >+ </tr> >+ </tfoot> >+ </table> >+ [% END %] >+ [% ELSE %] >+ <form method="post" action="/cgi-bin/koha/reports/catalogue_stats.pl"> >+ <fieldset class="rows"> >+ <legend>Catalog statistics</legend> >+ <table> >+ <thead> >+ <tr> >+ <th>Title</th> >+ <th>Row</th> >+ <th>Column</th> >+ <th>Filter</th> >+ </tr> >+ </thead> >+ <tbody> >+ <tr> >+ <td>Koha full call number</td> >+ <td><input type="radio" name="Line" value="items.itemcallnumber" /></td> >+ <td><input type="radio" name="Column" value="items.itemcallnumber" /></td> >+ <td><label for="callnoFrom">From</label> <input type="text" name="Filter" id="callnoFrom" /> <label for="callnoTo">To</label> <input type="text" name="Filter" id="callnoTo" /></td> >+ </tr> >+ <tr> >+ <td> </td> >+ <td colspan="2"> >+ <select name="cotedigits" id="cotedigits"> >+ <option value=""> </option> >+ <option value ="1">1</option> >+ <option value ="2">2</option> >+ <option value ="3">3</option> >+ <option value ="4">4</option> >+ <option value ="5">5</option> >+ </select> >+ <label for="cotedigits">characters</label> >+ </td> >+ <td> </td> >+ </tr> >+ <tr> >+ <td>Item type</td> >+ <td><input type="radio" name="Line" value="[% item_itype | html %]" /></td> >+ <td><input type="radio" checked="checked" name="Column" value="[% item_itype | html %]" /></td> >+ <td> >+ <select name="Filter" id="[% item_itype | html %]"> >+ <option value=""> </option> >+ [% FOREACH itemtype IN itemtypes %] >+ <option value="[% itemtype.itemtype | html %]">[% itemtype.translated_description | html %]</option> >+ [% END %] >+ </select> >+ </td> >+ </tr> >+ <tr> >+ <td>Publisher</td> >+ <td><input type="radio" name="Line" value="publishercode" /></td> >+ <td><input type="radio" name="Column" value="publishercode" /></td> >+ <td><input type="text" name="Filter" /></td> >+ </tr> >+ <tr> >+ <td>Publication year</td> >+ <td><input type="radio" name="Line" value="publicationyear" /></td> >+ <td><input type="radio" name="Column" value="publicationyear" /></td> >+ <td> >+ <label for="pubyearFrom">From</label> >+ <input type="text" name="Filter" id="pubYearFrom" /> >+ <label for="pubyearTo">To</label> <input type="text" name="Filter" id="pubyearTo" /> >+ </td> >+ </tr> >+ <tr> >+ <td>Home library</td> >+ <td><input type="radio" checked="checked" name="Line" value="items.homebranch" /></td> >+ <td><input type="radio" name="Column" value="items.homebranch" /></td> >+ <td> >+ <select name="Filter" id="branch"> >+ <option value=""> </option> >+ [% PROCESS options_for_libraries libraries => Branches.all() %] >+ </select> >+ </td> >+ </tr> >+ <tr> >+ <td>Shelving location</td> >+ <td><input type="radio" name="Line" value="items.location" /></td> >+ <td><input type="radio" name="Column" value="items.location" /></td> >+ <td> >+ <select name="Filter" id="location"> >+ <option value=""> </option> >+ [% FOREACH locationloo IN locationloop %] >+ [% IF ( locationloo.selected ) %] >+ <option value="[% locationloo.code | html %]" selected="selected">[% locationloo.description | html %]</option> >+ [% ELSE %] >+ <option value="[% locationloo.code | html %]">[% locationloo.description | html %]</option> >+ [% END %] >+ [% END %] >+ </select> >+ </td> >+ </tr> >+ <tr> >+ <td>Collection</td> >+ <td><input type="radio" name="Line" value="items.ccode" /></td> >+ <td><input type="radio" name="Column" value="items.ccode" /></td> >+ <td> >+ <select name="Filter" id="ccode"> >+ <option value=""> </option> >+ [% FOREACH authval IN authvals %] >+ [% IF ( authval.selected ) %] >+ <option value="[% authval.code | html %]" selected="selected">[% authval.description | html %]</option> >+ [% ELSE %] >+ <option value="[% authval.code | html %]">[% authval.description | html %]</option> >+ [% END %] >+ [% END %] >+ </select> >+ </td> >+ </tr> >+ [% IF (notforloan) %] >+ <tr> >+ <td>[% notforloan_label | html %]</td> >+ <td><input type="radio" name="Line" value="items.notforloan" /></td> >+ <td><input type="radio" name="Column" value="items.notforloan" /></td> >+ <td> >+ [% IF (notforloan_avlist) %] >+ <select name="Filter" id="notforloan"> >+ <option value=""> </option> >+ [% FOREACH av IN notforloan_avlist %] >+ <option value="[% av.authorised_value | html %]"> >+ [% av.lib | html %] >+ </option> >+ [% END %] >+ </select> >+ [% ELSE %] >+ <input type="text" name="Filter" id="notforloan" /> >+ [% END %] >+ </td> >+ </tr> >+ [% ELSE %] >+ <tr style="display:none"> >+ <td colspan="4"><input type="hidden" name="Filter" /></td> >+ </tr> >+ [% END %] >+ [% IF (materials) %] >+ <tr> >+ <td>[% materials_label | html %]</td> >+ <td><input type="radio" name="Line" value="items.materials" /></td> >+ <td><input type="radio" name="Column" value="items.materials" /></td> >+ <td> >+ [% IF (materials_avlist) %] >+ <select name="Filter" id="materials"> >+ <option value=""> </option> >+ [% FOREACH av IN materials_avlist %] >+ <option value="[% av.authorised_value | html %]"> >+ [% av.lib | html %] >+ </option> >+ [% END %] >+ </select> >+ [% ELSE %] >+ <input type="text" name="Filter" id="materials" /> >+ [% 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> >+ <select name="Filter" id="like"> >+ <option value="1">like</option> >+ <option value="0">not like</option> >+ </select> >+ <input type="text" name="Filter" id="barcode" /> >+ (use * to do a fuzzy search) >+ </td> >+ </tr> >+ <tr> >+ <td>Date acquired (item)</td> >+ <td><input type="radio" name="Line" value="items.dateaccessioned" /></td> >+ <td><input type="radio" name="Column" value="items.dateaccessioned" /></td> >+ <td> >+ <label for="acqdateFrom">From</label> >+ <input type="text" name="Filter" id="acqdateFrom" data-date_to="acqdateTo" class="flatpickr" /> >+ <label for="acqdateTo">To</label> >+ <input type="text" name="Filter" id="acqdateTo" class="flatpickr" /> >+ </td> >+ </tr> >+ <tr id="removeddatetr"> >+ <td>Date deleted (item)</td> >+ <td><input type="radio" name="Line" value="deleteditems.timestamp" /></td> >+ <td><input type="radio" name="Column" value="deleteditems.timestamp" /></td> >+ <td> >+ <label for="deldateFrom">From</label> >+ <input type="text" name="Filter" id="deldateFrom" data-date_to="deldateTo" class="flatpickr" /> >+ <label for="deldateTo">To</label> >+ <input type="text" name="Filter" id="deldateTo" class="flatpickr" /> >+ </td> >+ </tr> >+ </tbody> >+ </table> >+ </fieldset> > >- <label for="deldateTo">To</label> >- <input type="text" name="Filter" id="deldateTo" class="flatpickr" /> >- </td> >- </tr> >- </tbody> >- </table><br /></fieldset> >+ <fieldset class="rows"> >+ <legend>Cell value</legend> >+ <ol> >+ <li> >+ <label for="cellvalue_items">Count total items</label> >+ <input type="radio" name="Cellvalue" value="items" id="cellvalue_items" checked="checked" /> >+ </li> >+ <li> >+ <label for="cellvalue_biblios">Count unique bibliographic records</label> >+ <input type="radio" name="Cellvalue" value="biblios" id="cellvalue_biblios" /> >+ </li> >+ <li> >+ <label for="cellvalue_deleteditems">Count deleted items</label> >+ <input type="radio" name="Cellvalue" value="deleteditems" id="cellvalue_deleteditems" /> >+ </li> >+ </ol> >+ </fieldset> > >- <fieldset class="rows"> >- <legend>Cell value</legend> >- <ol> >- <li> >- <label for="cellvalue_items">Count total items</label> >- <input type="radio" name="Cellvalue" value="items" id="cellvalue_items" checked="checked" /> >- </li> >- <li> >- <label for="cellvalue_biblios">Count unique bibliographic records</label> >- <input type="radio" name="Cellvalue" value="biblios" id="cellvalue_biblios" /> >- </li> >- <li> >- <label for="cellvalue_deleteditems">Count deleted items</label> >- <input type="radio" name="Cellvalue" value="deleteditems" id="cellvalue_deleteditems" /> >- </li> >- </ol> >- </fieldset> >- >- <fieldset class="rows"> >- <legend>Output</legend> >- <ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /></li> >- <li><label for="outputfile">To a file: </label><input type="radio" name="output" value="file" id="outputfile" /> >- <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" /> >- <label class="inline" for="MIME">Into an application: </label> >- <select name="MIME" id="MIME"> >- [% FOREACH CGIextChoic IN CGIextChoice %] >- <option value="[% CGIextChoic.type | html %]">[% CGIextChoic.type | html %]</option> >- [% END %] >- </select> >- <!-- <label class="inline" for="sep">Delimiter: </label> --> >- <select name="sep" id="sep"> >- [% FOREACH value IN CGIsepChoice.values.sort() %] >- [% IF ( value == CGIsepChoice.default ) %] >- <option value="[% value | html %]" selected="selected">[% value | html %]</option> >- [% ELSE %] >- <option value="[% value | html %]">[% value | html %]</option> >- [% END %] >- [% END %] >- </select> >- </li> >- </ol> >- </fieldset> >+ <fieldset class="rows"> >+ <legend>Output</legend> >+ <ol> >+ <li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /></li> >+ <li> >+ <label for="outputfile">To a file: </label><input type="radio" name="output" value="file" id="outputfile" /> >+ <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" /> >+ <label class="inline" for="MIME">Into an application: </label> >+ <select name="MIME" id="MIME"> >+ [% FOREACH CGIextChoic IN CGIextChoice %] >+ <option value="[% CGIextChoic.type | html %]">[% CGIextChoic.type | html %]</option> >+ [% END %] >+ </select> >+ <!-- <label class="inline" for="sep">Delimiter: </label> --> >+ <select name="sep" id="sep"> >+ [% FOREACH value IN CGIsepChoice.values.sort() %] >+ [% IF ( value == CGIsepChoice.default ) %] >+ <option value="[% value | html %]" selected="selected">[% value | html %]</option> >+ [% ELSE %] >+ <option value="[% value | html %]">[% value | html %]</option> >+ [% END %] >+ [% END %] >+ </select> >+ </li> >+ </ol> >+ </fieldset> > >- <fieldset class="action"> >- <input type="submit" class="btn btn-primary" value="Submit" /> >- <input type="hidden" name="report_name" value="[% report_name | html %]" /> >- <input type="hidden" name="do_it" value="1" /> >- </fieldset> >- </form> >-[% END %] >+ <fieldset class="action"> >+ <input type="submit" class="btn btn-primary" value="Submit" /> >+ <input type="hidden" name="report_name" value="[% report_name | html %]" /> >+ <input type="hidden" name="do_it" value="1" /> >+ </fieldset> >+ </form> >+ [% END %] > > </main> > </div> <!-- /.col-sm-10.col-sm-push-2 --> >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 35807
: 161024 |
161025
|
161026