Attachment #127216 for bug #29391

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

Lines 77-84 sub BreedingSearch { Link Here

(-)a/C4/Breeding.pm (-2 / +7 lines)
77	# normalise ISBN like at import	77	# normalise ISBN like at import
78	$isbn = C4::Koha::GetNormalizedISBN($isbn);	78	$isbn = C4::Koha::GetNormalizedISBN($isbn);
79		79
80	$query = "SELECT import_record_id, file_name, isbn, title, author	80	$query = "SELECT import_biblios.import_record_id,
81	FROM import_biblios	81	import_batches.file_name,
		82	import_biblios.isbn,
		83	import_biblios.title,
		84	import_biblios.author,
		85	import_batches.upload_timestamp
		86	FROM import_biblios
82	JOIN import_records USING (import_record_id)	87	JOIN import_records USING (import_record_id)
83	JOIN import_batches USING (import_batch_id)	88	JOIN import_batches USING (import_batch_id)
84	WHERE ";	89	WHERE ";




              columnname: checkin_on

  cataloguing:
    addbooks:
      reservoir-table:
        columns:
            -
              columnname: title
            -
              columnname: isbn
            -
              columnname: coming_from
            -
              columnname: import_date
            -
              columnname: actions
              cannot_be_toggled: 1
              cannot_be_modified: 1
    additem:
      itemst:
        # NOTE: These columns are in the same order as kohastructure.sql, and contain all items




    push @{$breeding_loop}, {
        id               => $resultsbr->{import_record_id},
        isbn             => $resultsbr->{isbn},
        copyrightdate    => $resultsbr->{copyrightdate},
        editionstatement => $resultsbr->{editionstatement},
        file             => $resultsbr->{file_name},
        title            => $resultsbr->{title},
        author           => $resultsbr->{author},
        upload_timestamp => $resultsbr->{upload_timestamp}
    };
}





[% USE raw %]
[% USE Koha %]
[% USE KohaDates %]
[% USE TablesSettings %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Cataloging [% IF ( total || breeding_loop ) %] &rsaquo; Search results [% ELSIF ( query ) %] &rsaquo; No results found [% END %] &rsaquo; Koha</title>

                    <div id="searchresult-breeding">
                        <h2>Records found in the reservoir</h2>
                        [% IF ( breeding_loop ) %]
                            <table id="reservoir-table">
                                <thead>
                                    <th>Title</th>
                                    <th>ISBN</th>
                                    <th>Date</th>
                                    <th>Edition</th>
                                    <th>Coming from</th>
                                    <th>&nbsp;</th>
                                </tr>
                                [% FOREACH breeding_loo IN breeding_loop %]
                                    <tr>
                                        <th>Title</th>
                                        <th>ISBN</th>
                                        <th>Coming from</th>
                                        <th>Import date</th>
                                        <th class="NoSort noExport">&nbsp;</th>
                                        <td>[% breeding_loo.copyrightdate | html %]</td>
                                        <td>[% breeding_loo.edition | html %]</td>
                                        <td>[% breeding_loo.file | html %]</td>
                                        <td>
                                            <div class="dropup">
                                                <a class="btn btn-default btn-xs dropdown-toggle" id="reservoirsearchactions[% breeding_loo.id | html %]" role="button" data-toggle="dropdown" href="#">
                                                    Actions <b class="caret"></b>
                                                </a>
                                                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="reservoirsearchactions[% breeding_loo.id | html %]">
                                                    <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.id | uri %]" class="previewData"><i class="fa fa-eye"></i> MARC preview</a></li>
                                                    <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.id | uri %]" class="previewData"><i class="fa fa-eye"></i> Card preview</a></li>
                                                    [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
                                                        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?breedingid=[% breeding_loo.id | uri %]"><i class="fa fa-plus"></i> Add biblio</a></li>
                                                    [% END %]
                                                </ul>
                                            </div>
                                        </td>
                                    </tr>
                                </thead>
                                <tbody>
                                    [% FOREACH breeding_loo IN breeding_loop %]
                                        <tr>
                                            <td>
                                                [% breeding_loo.title | html %] [% breeding_loo.author | html %]
                                            </td>
                                            <td>[% breeding_loo.isbn | html %]</td>
                                            <td>[% breeding_loo.file | html %]</td>
                                            <td data-sort="[% breeding_loo.upload_timestamp | html %]">[% breeding_loo.upload_timestamp | $KohaDates %]</td>
                                            <td>
                                                <div class="dropup">
                                                    <a class="btn btn-default btn-xs dropdown-toggle" id="reservoirsearchactions[% breeding_loo.id | html %]" role="button" data-toggle="dropdown" href="#">
                                                        Actions <b class="caret"></b>
                                                    </a>
                                                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="reservoirsearchactions[% breeding_loo.id | html %]">
                                                        <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.id | uri %]" class="previewData"><i class="fa fa-eye"></i> MARC preview</a></li>
                                                        <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.id | uri %]" class="previewData"><i class="fa fa-eye"></i> Card preview</a></li>
                                                        [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
                                                            <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?breedingid=[% breeding_loo.id | uri %]"><i class="fa fa-plus"></i> Add biblio</a></li>
                                                        [% END %]
                                                    </ul>
                                                </div>
                                            </td>
                                        </tr>
                                    [% END # /IF breeding_loo %]
                                </tbody>
                            </table>
                        [% ELSE %]
                            <h3 id="searchresult-breeding">No results found</h3>

        </div> <!-- /.row -->

[% MACRO jsinclude BLOCK %]
    [% INCLUDE 'datatables.inc' %]
    [% INCLUDE 'columns_settings.inc' %]
    <script>

         $(document).ready(function() {

                $("#dataPreview .modal-body").html("<div id=\"loading\"><img src=\"[% interface | html %]/[% theme | html %]/img/spinner-small.gif\" alt=\"\" /> "+_("Loading")+"</div>");
            });

            columns_settings = [% TablesSettings.GetColumns( 'cataloguing', 'addbooks', 'reservoir-table', 'json' ) | $raw %]
            var reservoirt = KohaTable("reservoir-table", {
                "pagingType": "simple"
            }, columns_settings );
        });

        /* this function open a popup to search on z3950 server.  */
- 

Return to bug 29391

Lines 465-470 modules: Link Here

(-)a/admin/columns_settings.yml (+15 lines)
465	columnname: checkin_on	465	columnname: checkin_on
466		466
467	cataloguing:	467	cataloguing:
		468	addbooks:
		469	reservoir-table:
		470	columns:
		471	-
		472	columnname: title
		473	-
		474	columnname: isbn
		475	-
		476	columnname: coming_from
		477	-
		478	columnname: import_date
		479	-
		480	columnname: actions
		481	cannot_be_toggled: 1
		482	cannot_be_modified: 1
468	additem:	483	additem:
469	itemst:	484	itemst:
470	# NOTE: These columns are in the same order as kohastructure.sql, and contain all items	485	# NOTE: These columns are in the same order as kohastructure.sql, and contain all items

Lines 127-137 for my $resultsbr (@resultsbr) { Link Here

(-)a/cataloguing/addbooks.pl (-2 / +1 lines)
127	push @{$breeding_loop}, {	127	push @{$breeding_loop}, {
128	id => $resultsbr->{import_record_id},	128	id => $resultsbr->{import_record_id},
129	isbn => $resultsbr->{isbn},	129	isbn => $resultsbr->{isbn},
130	copyrightdate => $resultsbr->{copyrightdate},
131	editionstatement => $resultsbr->{editionstatement},
132	file => $resultsbr->{file_name},	130	file => $resultsbr->{file_name},
133	title => $resultsbr->{title},	131	title => $resultsbr->{title},
134	author => $resultsbr->{author},	132	author => $resultsbr->{author},
		133	upload_timestamp => $resultsbr->{upload_timestamp}
135	};	134	};
136	}	135	}
137		136

Lines 1-5 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt (-34 / +42 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Koha %]	2	[% USE Koha %]
		3	[% USE KohaDates %]
		4	[% USE TablesSettings %]
3	[% SET footerjs = 1 %]	5	[% SET footerjs = 1 %]
4	[% INCLUDE 'doc-head-open.inc' %]	6	[% INCLUDE 'doc-head-open.inc' %]
5	<title>Cataloging [% IF ( total \|\| breeding_loop ) %] &rsaquo; Search results [% ELSIF ( query ) %] &rsaquo; No results found [% END %] &rsaquo; Koha</title>	7	<title>Cataloging [% IF ( total \|\| breeding_loop ) %] &rsaquo; Search results [% ELSIF ( query ) %] &rsaquo; No results found [% END %] &rsaquo; Koha</title>
Lines 200-240 Link Here
200	<div id="searchresult-breeding">	202	<div id="searchresult-breeding">
201	<h2>Records found in the reservoir</h2>	203	<h2>Records found in the reservoir</h2>
202	[% IF ( breeding_loop ) %]	204	[% IF ( breeding_loop ) %]
203	<table>	205	<table id="reservoir-table">
204	<tr>	206	<thead>
205	<th>Title</th>
206	<th>ISBN</th>
207	<th>Date</th>
208	<th>Edition</th>
209	<th>Coming from</th>
210	<th> </th>
211	</tr>
212	[% FOREACH breeding_loo IN breeding_loop %]
213	<tr>	207	<tr>
214	<td>	208	<th>Title</th>
215	[% breeding_loo.title \| html %]	209	<th>ISBN</th>
216	[% breeding_loo.author \| html %]	210	<th>Coming from</th>
217	</td>	211	<th>Import date</th>
218	<td>[% breeding_loo.isbn \| html %]</td>	212	<th class="NoSort noExport"> </th>
219	<td>[% breeding_loo.copyrightdate \| html %]</td>
220	<td>[% breeding_loo.edition \| html %]</td>
221	<td>[% breeding_loo.file \| html %]</td>
222	<td>
223	<div class="dropup">
224	<a class="btn btn-default btn-xs dropdown-toggle" id="reservoirsearchactions[% breeding_loo.id \| html %]" role="button" data-toggle="dropdown" href="#">
225	Actions <b class="caret"></b>
226	</a>
227	<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="reservoirsearchactions[% breeding_loo.id \| html %]">
228	<li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.id \| uri %]" class="previewData"><i class="fa fa-eye"></i> MARC preview</a></li>
229	<li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&importid=[% breeding_loo.id \| uri %]" class="previewData"><i class="fa fa-eye"></i> Card preview</a></li>
230	[% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
231	<li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?breedingid=[% breeding_loo.id \| uri %]"><i class="fa fa-plus"></i> Add biblio</a></li>
232	[% END %]
233	</ul>
234	</div>
235	</td>
236	</tr>	213	</tr>
237	[% END # /IF breeding_loo %]	214	</thead>
		215	<tbody>
		216	[% FOREACH breeding_loo IN breeding_loop %]
		217	<tr>
		218	<td>
		219	[% breeding_loo.title \| html %] [% breeding_loo.author \| html %]
		220	</td>
		221	<td>[% breeding_loo.isbn \| html %]</td>
		222	<td>[% breeding_loo.file \| html %]</td>
		223	<td data-sort="[% breeding_loo.upload_timestamp \| html %]">[% breeding_loo.upload_timestamp \| $KohaDates %]</td>
		224	<td>
		225	<div class="dropup">
		226	<a class="btn btn-default btn-xs dropdown-toggle" id="reservoirsearchactions[% breeding_loo.id \| html %]" role="button" data-toggle="dropdown" href="#">
		227	Actions <b class="caret"></b>
		228	</a>
		229	<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="reservoirsearchactions[% breeding_loo.id \| html %]">
		230	<li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.id \| uri %]" class="previewData"><i class="fa fa-eye"></i> MARC preview</a></li>
		231	<li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&importid=[% breeding_loo.id \| uri %]" class="previewData"><i class="fa fa-eye"></i> Card preview</a></li>
		232	[% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
		233	<li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?breedingid=[% breeding_loo.id \| uri %]"><i class="fa fa-plus"></i> Add biblio</a></li>
		234	[% END %]
		235	</ul>
		236	</div>
		237	</td>
		238	</tr>
		239	[% END # /IF breeding_loo %]
		240	</tbody>
238	</table>	241	</table>
239	[% ELSE %]	242	[% ELSE %]
240	<h3 id="searchresult-breeding">No results found</h3>	243	<h3 id="searchresult-breeding">No results found</h3>
Lines 262-267 Link Here
262	</div> <!-- /.row -->	265	</div> <!-- /.row -->
263		266
264	[% MACRO jsinclude BLOCK %]	267	[% MACRO jsinclude BLOCK %]
		268	[% INCLUDE 'datatables.inc' %]
		269	[% INCLUDE 'columns_settings.inc' %]
265	<script>	270	<script>
266		271
267	$(document).ready(function() {	272	$(document).ready(function() {
Lines 306-311 Link Here
306	$("#dataPreview .modal-body").html("<div id=\"loading\"><img src=\"[% interface \| html %]/[% theme \| html %]/img/spinner-small.gif\" alt=\"\" /> "+_("Loading")+"</div>");	311	$("#dataPreview .modal-body").html("<div id=\"loading\"><img src=\"[% interface \| html %]/[% theme \| html %]/img/spinner-small.gif\" alt=\"\" /> "+_("Loading")+"</div>");
307	});	312	});
308		313
		314	columns_settings = [% TablesSettings.GetColumns( 'cataloguing', 'addbooks', 'reservoir-table', 'json' ) \| $raw %]
		315	var reservoirt = KohaTable("reservoir-table", {
		316	"pagingType": "simple"
		317	}, columns_settings );
309	});	318	});
310		319
311	/* this function open a popup to search on z3950 server. */	320	/* this function open a popup to search on z3950 server. */
312	-