Attachment #118581 for bug #27980

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




                [% IF ( itemdata_ccode ) %]<th id="[% tab | html %]_ccode" data-colname="[% tab | html %]_ccode">Collection</th>[% END %]
                <th id="[% tab | html %]_itemcallnumber" data-colname="[% tab | html %]_itemcallnumber">Call number</th>
                [% IF volinfo %]
                    <th id="[% tab | html %]_enumchron" data-colname="[% tab | html %]_enumchron">Serial enumeration / chronology</th>
                        <th id="[% tab | html %]_enumchron" data-colname="[% tab | html %]_enumchron" class="title-string">Serial enumeration / chronology</th>
                    [% ELSE %]
                        <th id="[% tab | html %]_enumchron" data-colname="[% tab | html %]_enumchron">Serial enumeration / chronology</th>
                    [% END %]
                [% END %]
                <th id="[% tab | html %]_status" data-colname="[% tab | html %]_status">Status</th>
                <th id="[% tab | html %]_lastseen" data-colname="[% tab | html %]_lastseen">Last seen</th>
                <th id="[% tab | html %]_dateaccessioned" data-colname="[% tab | html %]_dateaccessioned">Date accessioned</th>
                <th id="[% tab | html %]_datelastborrowed" data-colname="[% tab | html %]_datelastborrowed">Date last borrowed</th>
                <th id="[% tab | html %]_barcode" data-colname="[% tab | html %]_barcode">Barcode</th>
                [% IF ( itemdata_uri ) %]<th id="[% tab | html %]_uri" data-colname="[% tab | html %]_uri">URL</th>[% END %]
                [% IF ( itemdata_copynumber ) %]<th id="[% tab | html %]_copynumber" data-colname="[% tab | html %]_copynumber">Copy number</th>[% END %]

                    [% IF ( itemdata_ccode ) %]<td>[% item.ccode | html %]</td>[% END %]
                    <td class="itemcallnumber">[% IF ( item.itemcallnumber ) %] [% item.itemcallnumber | html %][% END %]</td>
                    [% IF ( volinfo ) %]
                        <td class="enumchron" data-order="[% item.publisheddate | html %]">
                            [% IF itemdata_publisheddate %]<span title="[% item.publisheddate | html %]">[% END %]
                            [% IF ( itemdata_enumchron ) %]
                                [% IF item.enumchron && item.serialseq %]
                                    <span class="enum">[% item.enumchron | html %]</span>

                        [% END %]

                    </td>
                    <td class="datelastseen" data-order="[% item.datelastseen | html %]">[% item.datelastseen | $KohaDates %]</td>
                    <td class="dateaccessioned" data-order="[% item.dateaccessioned | html %]">[% item.dateaccessioned | $KohaDates %]</td>
                    <td class="datelastborrowed" data-order="[% item.datelastborrowed | html %]">[% item.datelastborrowed | $KohaDates %]</td>
                    <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?type=[% item.type | uri %]&amp;itemnumber=[% item.itemnumber | uri %]&amp;biblionumber=[% item.biblionumber | uri %]&amp;bi=[% item.biblioitemnumber | uri %]#item[% item.itemnumber | uri %]">[% item.barcode | html %]</a></td>
                    [% IF ( itemdata_uri ) %]
                        [% IF item.uri.split(' \| ').size > 1 %]

            [% FOREACH latestserial IN subscription.latestserials %]
                <tr>
                    <td>[% latestserial.serialseq | html %]</td>
                    <td data-order="[% latestserial.planneddate | html %]">[% latestserial.planneddate | $KohaDates %]</td>
                    <td data-order="[% latestserial.publisheddate | html %]">[% latestserial.publisheddate | $KohaDates %]</td>
                    <td>
                      [% IF ( latestserial.status1 ) %]Expected[% END %]
                      [% IF ( latestserial.status2 ) %]Arrived[% END %]

          <th>Basket group</th>
          <th>Basket</th>
          <th>Order number</th>
          <th>Creation date</th>
          <th>Receive date</th>
          <th>Status</th>
          <th>Quantity</th>
          <th title="Estimated cost tax incl. while pending, actual cost tax incl. once received">Price</th>

                [% basket.basketname | html %] ([% basket.basketno | html %])
            [% END %]</td>
            <td>[% order.ordernumber | html %]</td>
            <td data-order="[% basket.creationdate | uri %]">[% basket.creationdate | $KohaDates%]</td>
            <td data-order="[% order.datereceived | uri %]">[% order.datereceived | $KohaDates%]</td>
            <td>
              [% SWITCH order.orderstatus %]
                [% CASE 'new' %]New




            <th>Checked out by</th>
            [% END %]
            <th>Renewed</th>
            <th>Checkout on</th>
            <th>Due date</th>
            <th>Checkin on</th>
            </tr></thead>
            <tbody>
        [% FOREACH checkout IN checkouts %]

                    [% ELSE %]
                        No
                    [% END %]</td>
                <td data-order="[% checkout.issuedate | html %]">
                    [% checkout.issuedate |$KohaDates  with_hours => 1 %]
                </td>
                <td data-order="[% checkout.date_due | html %]">
                    [% checkout.date_due |$KohaDates  with_hours => 1 %]
                </td>
                <td data-order="[% checkout.returndate | html %]">
                    [% checkout.returndate |$KohaDates  with_hours => 1 %]
                </td>
                    [% END %]</td>
                <td>[% IF checkout.returndate %]
                        <span title="[% checkout.returndate | html %]">[% checkout.returndate |$KohaDates  with_hours => 1 %]</span>
                    [% ELSE %]
                        <span title="Checked out"><small>Checked out</small></span>
                    [% END %]</td>
           </tr>
        [% END %]
        </tbody>




                [% FOREACH s IN current_authority_searches %]
                  <tr>
                    <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
                    <td data-order="[% s.time | html %]">[% s.time |$KohaDates  with_hours => 1 %]</td>
                    <td><a href="/cgi-bin/koha/authorities/authorities-home.pl?[% s.query_cgi | $raw %]">[% s.query_desc | html %]</a></td>
                    <td>[% s.total | html %]</td>
                  </tr>

                [% FOREACH s IN previous_authority_searches %]
                  <tr>
                    <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
                    <td data-order="[% s.time | html %]">[% s.time |$KohaDates  with_hours => 1 %]</td>
                    <td><a href="/cgi-bin/koha/authorities/authorities-home.pl?[% s.query_cgi | $raw %]">[% s.query_desc | html %]</a></td>
                    <td>[% s.total | html %]</td>
                  </tr>

        $(".historyt").dataTable($.extend(true, {}, dataTablesDefaults, {
            "aaSorting": [[ 1, "desc" ]],
            "aoColumnDefs": [
                { "aTargets": [ 0 ], "bSortable": false, "bSearchable": false }
                { "aTargets": [ 1 ], "sType": "title-string" },
            ],
            "sPaginationType": "full_numbers"
        }));
- 

Return to bug 27980

Lines 296-311 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-19 / +14 lines)
296	[% IF ( itemdata_ccode ) %]<th id="[% tab \| html %]_ccode" data-colname="[% tab \| html %]_ccode">Collection</th>[% END %]	296	[% IF ( itemdata_ccode ) %]<th id="[% tab \| html %]_ccode" data-colname="[% tab \| html %]_ccode">Collection</th>[% END %]
297	<th id="[% tab \| html %]_itemcallnumber" data-colname="[% tab \| html %]_itemcallnumber">Call number</th>	297	<th id="[% tab \| html %]_itemcallnumber" data-colname="[% tab \| html %]_itemcallnumber">Call number</th>
298	[% IF volinfo %]	298	[% IF volinfo %]
299	[% IF itemdata_publisheddate #If there is at least one published date, use it for sorting%]	299	<th id="[% tab \| html %]_enumchron" data-colname="[% tab \| html %]_enumchron">Serial enumeration / chronology</th>
300	<th id="[% tab \| html %]_enumchron" data-colname="[% tab \| html %]_enumchron" class="title-string">Serial enumeration / chronology</th>
301	[% ELSE %]
302	<th id="[% tab \| html %]_enumchron" data-colname="[% tab \| html %]_enumchron">Serial enumeration / chronology</th>
303	[% END %]
304	[% END %]	300	[% END %]
305	<th id="[% tab \| html %]_status" data-colname="[% tab \| html %]_status">Status</th>	301	<th id="[% tab \| html %]_status" data-colname="[% tab \| html %]_status">Status</th>
306	<th id="[% tab \| html %]_lastseen" data-colname="[% tab \| html %]_lastseen" class="title-string">Last seen</th>	302	<th id="[% tab \| html %]_lastseen" data-colname="[% tab \| html %]_lastseen">Last seen</th>
307	<th id="[% tab \| html %]_dateaccessioned" data-colname="[% tab \| html %]_dateaccessioned" class="title-string">Date accessioned</th>	303	<th id="[% tab \| html %]_dateaccessioned" data-colname="[% tab \| html %]_dateaccessioned">Date accessioned</th>
308	<th id="[% tab \| html %]_datelastborrowed" data-colname="[% tab \| html %]_datelastborrowed" class="title-string">Date last borrowed</th>	304	<th id="[% tab \| html %]_datelastborrowed" data-colname="[% tab \| html %]_datelastborrowed">Date last borrowed</th>
309	<th id="[% tab \| html %]_barcode" data-colname="[% tab \| html %]_barcode">Barcode</th>	305	<th id="[% tab \| html %]_barcode" data-colname="[% tab \| html %]_barcode">Barcode</th>
310	[% IF ( itemdata_uri ) %]<th id="[% tab \| html %]_uri" data-colname="[% tab \| html %]_uri">URL</th>[% END %]	306	[% IF ( itemdata_uri ) %]<th id="[% tab \| html %]_uri" data-colname="[% tab \| html %]_uri">URL</th>[% END %]
311	[% IF ( itemdata_copynumber ) %]<th id="[% tab \| html %]_copynumber" data-colname="[% tab \| html %]_copynumber">Copy number</th>[% END %]	307	[% IF ( itemdata_copynumber ) %]<th id="[% tab \| html %]_copynumber" data-colname="[% tab \| html %]_copynumber">Copy number</th>[% END %]
Lines 374-381 Note that permanent location is a code, and location may be an authval. Link Here
374	[% IF ( itemdata_ccode ) %]<td>[% item.ccode \| html %]</td>[% END %]	370	[% IF ( itemdata_ccode ) %]<td>[% item.ccode \| html %]</td>[% END %]
375	<td class="itemcallnumber">[% IF ( item.itemcallnumber ) %] [% item.itemcallnumber \| html %][% END %]</td>	371	<td class="itemcallnumber">[% IF ( item.itemcallnumber ) %] [% item.itemcallnumber \| html %][% END %]</td>
376	[% IF ( volinfo ) %]	372	[% IF ( volinfo ) %]
377	<td class="enumchron">	373	<td class="enumchron" data-order="[% item.publisheddate \| html %]">
378	[% IF itemdata_publisheddate %]<span title="[% item.publisheddate \| html %]">[% END %]
379	[% IF ( itemdata_enumchron ) %]	374	[% IF ( itemdata_enumchron ) %]
380	[% IF item.enumchron && item.serialseq %]	375	[% IF item.enumchron && item.serialseq %]
381	<span class="enum">[% item.enumchron \| html %]</span>	376	<span class="enum">[% item.enumchron \| html %]</span>
Lines 482-490 Note that permanent location is a code, and location may be an authval. Link Here
482	[% END %]	477	[% END %]
483		478
484	</td>	479	</td>
485	<td class="datelastseen"><span title="[% item.datelastseen \| html %]">[% item.datelastseen \| $KohaDates %]</span></td>	480	<td class="datelastseen" data-order="[% item.datelastseen \| html %]">[% item.datelastseen \| $KohaDates %]</td>
486	<td class="dateaccessioned"><span title="[% item.dateaccessioned \| html %]">[% item.dateaccessioned \| $KohaDates %]</span></td>	481	<td class="dateaccessioned" data-order="[% item.dateaccessioned \| html %]">[% item.dateaccessioned \| $KohaDates %]</td>
487	<td class="datelastborrowed"><span title="[% item.datelastborrowed \| html %]">[% item.datelastborrowed \| $KohaDates %]</span></td>	482	<td class="datelastborrowed" data-order="[% item.datelastborrowed \| html %]">[% item.datelastborrowed \| $KohaDates %]</td>
488	<td><a href="/cgi-bin/koha/catalogue/moredetail.pl?type=[% item.type \| uri %]&itemnumber=[% item.itemnumber \| uri %]&biblionumber=[% item.biblionumber \| uri %]&bi=[% item.biblioitemnumber \| uri %]#item[% item.itemnumber \| uri %]">[% item.barcode \| html %]</a></td>	483	<td><a href="/cgi-bin/koha/catalogue/moredetail.pl?type=[% item.type \| uri %]&itemnumber=[% item.itemnumber \| uri %]&biblionumber=[% item.biblionumber \| uri %]&bi=[% item.biblioitemnumber \| uri %]#item[% item.itemnumber \| uri %]">[% item.barcode \| html %]</a></td>
489	[% IF ( itemdata_uri ) %]	484	[% IF ( itemdata_uri ) %]
490	[% IF item.uri.split(' \\| ').size > 1 %]	485	[% IF item.uri.split(' \\| ').size > 1 %]
Lines 679-686 Note that permanent location is a code, and location may be an authval. Link Here
679	[% FOREACH latestserial IN subscription.latestserials %]	674	[% FOREACH latestserial IN subscription.latestserials %]
680	<tr>	675	<tr>
681	<td>[% latestserial.serialseq \| html %]</td>	676	<td>[% latestserial.serialseq \| html %]</td>
682	<td><span title="[% latestserial.planneddate \| html %]">[% latestserial.planneddate \| $KohaDates %]</span></td>	677	<td data-order="[% latestserial.planneddate \| html %]">[% latestserial.planneddate \| $KohaDates %]</td>
683	<td><span title="[% latestserial.publisheddate \| html %]">[% latestserial.publisheddate \| $KohaDates %]</span></td>	678	<td data-order="[% latestserial.publisheddate \| html %]">[% latestserial.publisheddate \| $KohaDates %]</td>
684	<td>	679	<td>
685	[% IF ( latestserial.status1 ) %]Expected[% END %]	680	[% IF ( latestserial.status1 ) %]Expected[% END %]
686	[% IF ( latestserial.status2 ) %]Arrived[% END %]	681	[% IF ( latestserial.status2 ) %]Arrived[% END %]
Lines 717-724 Note that permanent location is a code, and location may be an authval. Link Here
717	<th>Basket group</th>	712	<th>Basket group</th>
718	<th>Basket</th>	713	<th>Basket</th>
719	<th>Order number</th>	714	<th>Order number</th>
720	<th class="title-string">Creation date</th>	715	<th>Creation date</th>
721	<th class="title-string">Receive date</th>	716	<th>Receive date</th>
722	<th>Status</th>	717	<th>Status</th>
723	<th>Quantity</th>	718	<th>Quantity</th>
724	<th title="Estimated cost tax incl. while pending, actual cost tax incl. once received">Price</th>	719	<th title="Estimated cost tax incl. while pending, actual cost tax incl. once received">Price</th>
Lines 762-769 Note that permanent location is a code, and location may be an authval. Link Here
762	[% basket.basketname \| html %] ([% basket.basketno \| html %])	757	[% basket.basketname \| html %] ([% basket.basketno \| html %])
763	[% END %]</td>	758	[% END %]</td>
764	<td>[% order.ordernumber \| html %]</td>	759	<td>[% order.ordernumber \| html %]</td>
765	<td><span title="[% basket.creationdate \| uri %]">[% basket.creationdate \| $KohaDates%]</span></td>	760	<td data-order="[% basket.creationdate \| uri %]">[% basket.creationdate \| $KohaDates%]</td>
766	<td><span title="[% order.datereceived \| uri %]">[% order.datereceived \| $KohaDates%]</span></td>	761	<td data-order="[% order.datereceived \| uri %]">[% order.datereceived \| $KohaDates%]</td>
767	<td>	762	<td>
768	[% SWITCH order.orderstatus %]	763	[% SWITCH order.orderstatus %]
769	[% CASE 'new' %]New	764	[% CASE 'new' %]New

Lines 41-49 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt (-18 / +12 lines)
41	<th>Checked out by</th>	41	<th>Checked out by</th>
42	[% END %]	42	[% END %]
43	<th>Renewed</th>	43	<th>Renewed</th>
44	<th class='title-string'>Checkout on</th>	44	<th>Checkout on</th>
45	<th class='title-string'>Due date</th>	45	<th>Due date</th>
46	<th class='title-string'>Checkin on</th>	46	<th>Checkin on</th>
47	</tr></thead>	47	</tr></thead>
48	<tbody>	48	<tbody>
49	[% FOREACH checkout IN checkouts %]	49	[% FOREACH checkout IN checkouts %]
Lines 79-99 Link Here
79	[% ELSE %]	79	[% ELSE %]
80	No	80	No
81	[% END %]</td>	81	[% END %]</td>
82	<td>[% IF checkout.issuedate %]	82	<td data-order="[% checkout.issuedate \| html %]">
83	<span title="[% checkout.issuedate \| html %]">[% checkout.issuedate \|$KohaDates with_hours => 1 %]</span>	83	[% checkout.issuedate \|$KohaDates with_hours => 1 %]
84	[% ELSE %]	84	</td>
85	<span title="0000-00-00"></span>	85	<td data-order="[% checkout.date_due \| html %]">
86	[% END %]</td>	86	[% checkout.date_due \|$KohaDates with_hours => 1 %]
87	<td>[% IF checkout.date_due %]	87	</td>
88	<span title="[% checkout.date_due \| html %]">[% checkout.date_due \|$KohaDates with_hours => 1 %]</span>	88	<td data-order="[% checkout.returndate \| html %]">
89	[% ELSE %]	89	[% checkout.returndate \|$KohaDates with_hours => 1 %]
90	<span title="0000-00-00"></span>	90	</td>
91	[% END %]</td>
92	<td>[% IF checkout.returndate %]
93	<span title="[% checkout.returndate \| html %]">[% checkout.returndate \|$KohaDates with_hours => 1 %]</span>
94	[% ELSE %]
95	<span title="Checked out"><small>Checked out</small></span>
96	[% END %]</td>
97	</tr>	91	</tr>
98	[% END %]	92	[% END %]
99	</tbody>	93	</tbody>

Lines 139-145 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt (-5 / +3 lines)
139	[% FOREACH s IN current_authority_searches %]	139	[% FOREACH s IN current_authority_searches %]
140	<tr>	140	<tr>
141	<td><input type="checkbox" name="id" value="[% s.id \| html %]" /></td>	141	<td><input type="checkbox" name="id" value="[% s.id \| html %]" /></td>
142	<td><span title="[% s.time \| html %]">[% s.time \|$KohaDates with_hours => 1 %]</span></td>	142	<td data-order="[% s.time \| html %]">[% s.time \|$KohaDates with_hours => 1 %]</td>
143	<td><a href="/cgi-bin/koha/authorities/authorities-home.pl?[% s.query_cgi \| $raw %]">[% s.query_desc \| html %]</a></td>	143	<td><a href="/cgi-bin/koha/authorities/authorities-home.pl?[% s.query_cgi \| $raw %]">[% s.query_desc \| html %]</a></td>
144	<td>[% s.total \| html %]</td>	144	<td>[% s.total \| html %]</td>
145	</tr>	145	</tr>
Lines 180-186 Link Here
180	[% FOREACH s IN previous_authority_searches %]	180	[% FOREACH s IN previous_authority_searches %]
181	<tr>	181	<tr>
182	<td><input type="checkbox" name="id" value="[% s.id \| html %]" /></td>	182	<td><input type="checkbox" name="id" value="[% s.id \| html %]" /></td>
183	<td><span title="[% s.time \| html %]">[% s.time \|$KohaDates with_hours => 1 %]</span></td>	183	<td data-order="[% s.time \| html %]">[% s.time \|$KohaDates with_hours => 1 %]</td>
184	<td><a href="/cgi-bin/koha/authorities/authorities-home.pl?[% s.query_cgi \| $raw %]">[% s.query_desc \| html %]</a></td>	184	<td><a href="/cgi-bin/koha/authorities/authorities-home.pl?[% s.query_cgi \| $raw %]">[% s.query_desc \| html %]</a></td>
185	<td>[% s.total \| html %]</td>	185	<td>[% s.total \| html %]</td>
186	</tr>	186	</tr>
Lines 207-214 Link Here
207	$(".historyt").dataTable($.extend(true, {}, dataTablesDefaults, {	207	$(".historyt").dataTable($.extend(true, {}, dataTablesDefaults, {
208	"aaSorting": [[ 1, "desc" ]],	208	"aaSorting": [[ 1, "desc" ]],
209	"aoColumnDefs": [	209	"aoColumnDefs": [
210	{ "aTargets": [ 0 ], "bSortable": false, "bSearchable": false },	210	{ "aTargets": [ 0 ], "bSortable": false, "bSearchable": false }
211	{ "aTargets": [ 1 ], "sType": "title-string" },
212	],	211	],
213	"sPaginationType": "full_numbers"	212	"sPaginationType": "full_numbers"
214	}));	213	}));
215	-