@@ -, +, @@ Acquisitions - Acquisitions home page - Datatable, Inactive budget controls - Vendor search results - Acquisitions -> Vendor search - Datatables, "Show all" links - Basket - Acquisitions -> Vendor -> Basket - Datatables, button controls, add managing user - Add to basket from a staged file - Acquisitions -> Vendor -> Basket -> Add to basket from a staged file - Datatables, tabs, selection controls - Edit basket - Acquisitions -> Vendor -> Edit basket - Form validation - EDIFACT messages - Acquisitions -> EDIFACT messages - Datatables, message preview - Orders search - Acquisitions -> Order search - Full orders search form - Patron autocomplete in "Basket created by" field - Datepickers - Orders search results - Datatables, column visibility - Invoices - Acquisitions -> Vendor -> Invoices -> Invoice - Form validation, datepickers, datatables - Invoice files (enable AcqEnableFiles preference) - Manage invoice files - File list datatable --- .../prog/en/modules/acqui/acqui-home.tt | 160 +++++----- .../prog/en/modules/acqui/addorderiso2709.tt | 332 +++++++++++---------- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 324 ++++++++++---------- .../prog/en/modules/acqui/basketheader.tt | 8 +- .../prog/en/modules/acqui/booksellers.tt | 88 +++--- .../prog/en/modules/acqui/edifactmsgs.tt | 73 +++-- .../prog/en/modules/acqui/histsearch.tt | 63 ++-- .../prog/en/modules/acqui/invoice-files.tt | 46 +-- .../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 103 +++---- 9 files changed, 612 insertions(+), 585 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt @@ -1,90 +1,13 @@ [% USE Price %] [% USE Branches %] +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Acquisitions [% INCLUDE 'doc-head-close.inc' %] -[% INCLUDE 'datatables.inc' %] - - - - + [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] @@ -243,4 +166,83 @@ $(document).ready(function() { [% INCLUDE 'acquisitions-menu.inc' %] + +[% MACRO jsinclude BLOCK %] + [% INCLUDE 'datatables.inc' %] + + + +[% END %] + [% INCLUDE 'intranet-bottom.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -1,5 +1,6 @@ [% USE KohaDates %] [% USE Branches %] +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Acquisitions › Order staged MARC records [% IF ( batch_details ) %] @@ -11,169 +12,8 @@ <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> <style type="text/css">#dataPreview { width : 80%; } @media (max-width: 767px) { #dataPreview { margin: 0; width : auto; } }</style> [% INCLUDE 'doc-head-close.inc' %] -[% INCLUDE 'datatables.inc' %] -<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> -<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script> -<script type="text/JavaScript"> -//<![CDATA[ - $(document).ready(function() { - $("#files").dataTable($.extend(true, {}, dataTablesDefaults, { - "aoColumnDefs": [ - { "bSortable": false, "bSearchable": false, 'aTargets': [ 'NoSort' ] }, - { "sType": "anti-the", "aTargets" : [ "anti-the" ] }, - { "sType": "title-string", "aTargets" : [ "title-string" ] } - ], - "sPaginationType": "four_button", - "aaSorting": [] - } ) ); - - // keep copy of the inactive budgets - disabledBudgetsCopy = $("select[name='all_budget_id']").html(); - $("select[name='all_budget_id'] .b_inactive").remove(); - $("select[name='budget_id'] .b_inactive").remove(); - - $("#showallbudgets").click(function() { - if ($(this).is(":checked")) { - $("select[name='budget_id']").html(disabledBudgetsCopy) - } - else { - $("select[name='budget_id'] .b_inactive").remove(); - } - }); - - $("#all_showallbudgets").click(function() { - if ($(this).is(":checked")) { - $("select[name='all_budget_id']").html(disabledBudgetsCopy); - } - else { - $("select[name='all_budget_id'] .b_inactive").remove(); - } - }); - - $("select[name='budget_id']").change(function(){ - var sort1_authcat = $(this).find("option:selected").attr('data-sort1-authcat'); - var sort2_authcat = $(this).find("option:selected").attr('data-sort2-authcat'); - var destination_sort1 = $(this).parents('fieldset').find('li.sort1').find('input[name="sort1"]'); - var sort1 = $(destination_sort1).val() || ""; - if ( destination_sort1.length < 1 ) { - destination_sort1 = $(this).parents('fieldset').find('li.sort1 > select[name="sort1"]'); - } - var destination_sort2 = $(this).parents('fieldset').find('li.sort2').find('input[name="sort2"]'); - var sort2 = $(destination_sort2).val() || ""; - if ( destination_sort2.length < 1 ) { - destination_sort2 = $(this).parents('fieldset').find('li.sort2').find('select[name="sort2"]'); - } - getAuthValueDropbox( 'sort1', sort1_authcat, destination_sort1, sort1 ); - - getAuthValueDropbox( 'sort2', sort2_authcat, destination_sort2, sort2 ); - } ); - - $("select[name='budget_id']").change(); - - $("select[name='all_budget_id']").change(function(){ - var sort1_authcat = $(this).find("option:selected").attr('data-sort1-authcat'); - var sort2_authcat = $(this).find("option:selected").attr('data-sort2-authcat'); - var destination_sort1 = $(this).parent().siblings('li').find('input[name="all_sort1"]'); - if ( destination_sort1.length < 1 ) { - destination_sort1 = $(this).parent().siblings('li').find('select[name="all_sort1"]'); - } - var destination_sort2 = $(this).parent().siblings('li').find('input[name="all_sort2"]'); - if ( destination_sort2.length < 1 ) { - destination_sort2 = $(this).parent().siblings('li').find('select[name="all_sort2"]'); - } - getAuthValueDropbox( 'sort1', sort1_authcat, destination_sort1 ); - getAuthValueDropbox( 'sort2', sort2_authcat, destination_sort2 ); - $(this).parent().siblings('li').find('select[name="sort1"]').attr('name', 'all_sort1'); - $(this).parent().siblings('li').find('input[name="sort1"]').attr('name', 'all_sort1'); - $(this).parent().siblings('li').find('select[name="sort2"]').attr('name', 'all_sort2'); - $(this).parent().siblings('li').find('input[name="sort2"]').attr('name', 'all_sort2'); - } ); - - $("select[name='all_budget_id']").change(); - - $("#records_to_import fieldset.rows div").hide(); - $('input:checkbox[name="import_record_id"]').change(function(){ - var container = $(this).parents("fieldset"); - if ( $(this).is(':checked') ) { - $(container).addClass("selected"); - $(container).removeClass("unselected"); - $(container).find("div").toggle(true); - } else { - $(container).addClass("unselected"); - $(container).removeClass("selected"); - $(container).find("div").toggle(false); - } - } ); - - $("input:checkbox").prop("checked", false); - $("div.biblio.unselected select").prop('disabled', false); - $("div.biblio.unselected input").prop('disabled', false); - - $("#checkAll").click(function(){ - $("#Aform").checkCheckboxes(); - $("input:checkbox[name='import_record_id']").change(); - return false; - }); - $("#unCheckAll").click(function(){ - $("#Aform").unCheckCheckboxes(); - $("input:checkbox[name='import_record_id']").change(); - return false; - }); - - $("#Aform").on("submit", function(){ - if ( $("input:checkbox[name='import_record_id']:checked").length < 1 ) { - alert(_("There is no record selected")); - return false; - } - - var error = 0; - $("input:checkbox[name='import_record_id']:checked").parents('fieldset').find('input[name="quantity"]').each(function(){ - if ( $(this).val().length < 1 || isNaN( $(this).val() ) ) { - error++; - } - }); - if ( error > 0 ) { - alert(error + " " + _("quantity values are not filled in or are not numbers")); - return false; - - } - var error = 0; - $("select[name='budget_id']").each(function() { - if (!$(this).val()) { - error++; - } - }); - if ( error > 0 ) { - alert(_("Some budgets are not defined in item records")); - return false; - } - - return disableUnchecked($(this)); - }); - $('#tabs').tabs(); - $(".previewData").on("click", function(e){ - e.preventDefault(); - var ltitle = $(this).text(); - var page = $(this).attr("href"); - $("#dataPreviewLabel").text(ltitle); - $("#dataPreview .modal-body").load(page + " div"); - $('#dataPreview').modal({show:true}); - }); - $("#dataPreview").on("hidden", function(){ - $("#dataPreviewLabel").html(""); - $("#dataPreview .modal-body").html("<div id=\"loading\"><img src=\"[% interface %]/[% theme %]/img/spinner-small.gif\" alt=\"\" /> "+_("Loading")+"</div>"); - }); - }); - - function disableUnchecked(form){ - $("fieldset.biblio.unselected").each(function(){ - $(this).remove(); - }); - return 1; - } -//]]> -</script> </head> + <body id="acq_addorderiso2709" class="acq"> [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] @@ -583,5 +423,169 @@ </div> </div> </div> -</body> -</html> + +[% MACRO jsinclude BLOCK %] + <script type="text/javascript" src="[% interface %]/[% theme %]/js/acquisitions-menu.js"></script> +[% INCLUDE 'datatables.inc' %] + <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> + <script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script> + <script type="text/JavaScript"> + $(document).ready(function() { + $("#files").dataTable($.extend(true, {}, dataTablesDefaults, { + "aoColumnDefs": [ + { "bSortable": false, "bSearchable": false, 'aTargets': [ 'NoSort' ] }, + { "sType": "anti-the", "aTargets" : [ "anti-the" ] }, + { "sType": "title-string", "aTargets" : [ "title-string" ] } + ], + "sPaginationType": "four_button", + "aaSorting": [] + } ) ); + + // keep copy of the inactive budgets + disabledBudgetsCopy = $("select[name='all_budget_id']").html(); + $("select[name='all_budget_id'] .b_inactive").remove(); + $("select[name='budget_id'] .b_inactive").remove(); + + $("#showallbudgets").click(function() { + if ($(this).is(":checked")) { + $("select[name='budget_id']").html(disabledBudgetsCopy) + } + else { + $("select[name='budget_id'] .b_inactive").remove(); + } + }); + + $("#all_showallbudgets").click(function() { + if ($(this).is(":checked")) { + $("select[name='all_budget_id']").html(disabledBudgetsCopy); + } + else { + $("select[name='all_budget_id'] .b_inactive").remove(); + } + }); + + $("select[name='budget_id']").change(function(){ + var sort1_authcat = $(this).find("option:selected").attr('data-sort1-authcat'); + var sort2_authcat = $(this).find("option:selected").attr('data-sort2-authcat'); + var destination_sort1 = $(this).parents('fieldset').find('li.sort1').find('input[name="sort1"]'); + var sort1 = $(destination_sort1).val() || ""; + if ( destination_sort1.length < 1 ) { + destination_sort1 = $(this).parents('fieldset').find('li.sort1 > select[name="sort1"]'); + } + var destination_sort2 = $(this).parents('fieldset').find('li.sort2').find('input[name="sort2"]'); + var sort2 = $(destination_sort2).val() || ""; + if ( destination_sort2.length < 1 ) { + destination_sort2 = $(this).parents('fieldset').find('li.sort2').find('select[name="sort2"]'); + } + getAuthValueDropbox( 'sort1', sort1_authcat, destination_sort1, sort1 ); + + getAuthValueDropbox( 'sort2', sort2_authcat, destination_sort2, sort2 ); + } ); + + $("select[name='budget_id']").change(); + + $("select[name='all_budget_id']").change(function(){ + var sort1_authcat = $(this).find("option:selected").attr('data-sort1-authcat'); + var sort2_authcat = $(this).find("option:selected").attr('data-sort2-authcat'); + var destination_sort1 = $(this).parent().siblings('li').find('input[name="all_sort1"]'); + if ( destination_sort1.length < 1 ) { + destination_sort1 = $(this).parent().siblings('li').find('select[name="all_sort1"]'); + } + var destination_sort2 = $(this).parent().siblings('li').find('input[name="all_sort2"]'); + if ( destination_sort2.length < 1 ) { + destination_sort2 = $(this).parent().siblings('li').find('select[name="all_sort2"]'); + } + getAuthValueDropbox( 'sort1', sort1_authcat, destination_sort1 ); + getAuthValueDropbox( 'sort2', sort2_authcat, destination_sort2 ); + $(this).parent().siblings('li').find('select[name="sort1"]').attr('name', 'all_sort1'); + $(this).parent().siblings('li').find('input[name="sort1"]').attr('name', 'all_sort1'); + $(this).parent().siblings('li').find('select[name="sort2"]').attr('name', 'all_sort2'); + $(this).parent().siblings('li').find('input[name="sort2"]').attr('name', 'all_sort2'); + } ); + + $("select[name='all_budget_id']").change(); + + $("#records_to_import fieldset.rows div").hide(); + $('input:checkbox[name="import_record_id"]').change(function(){ + var container = $(this).parents("fieldset"); + if ( $(this).is(':checked') ) { + $(container).addClass("selected"); + $(container).removeClass("unselected"); + $(container).find("div").toggle(true); + } else { + $(container).addClass("unselected"); + $(container).removeClass("selected"); + $(container).find("div").toggle(false); + } + } ); + + $("input:checkbox").prop("checked", false); + $("div.biblio.unselected select").prop('disabled', false); + $("div.biblio.unselected input").prop('disabled', false); + + $("#checkAll").click(function(){ + $("#Aform").checkCheckboxes(); + $("input:checkbox[name='import_record_id']").change(); + return false; + }); + $("#unCheckAll").click(function(){ + $("#Aform").unCheckCheckboxes(); + $("input:checkbox[name='import_record_id']").change(); + return false; + }); + + $("#Aform").on("submit", function(){ + if ( $("input:checkbox[name='import_record_id']:checked").length < 1 ) { + alert(_("There is no record selected")); + return false; + } + + var error = 0; + $("input:checkbox[name='import_record_id']:checked").parents('fieldset').find('input[name="quantity"]').each(function(){ + if ( $(this).val().length < 1 || isNaN( $(this).val() ) ) { + error++; + } + }); + if ( error > 0 ) { + alert(error + " " + _("quantity values are not filled in or are not numbers")); + return false; + + } + var error = 0; + $("select[name='budget_id']").each(function() { + if (!$(this).val()) { + error++; + } + }); + if ( error > 0 ) { + alert(_("Some budgets are not defined in item records")); + return false; + } + + return disableUnchecked($(this)); + }); + $('#tabs').tabs(); + $(".previewData").on("click", function(e){ + e.preventDefault(); + var ltitle = $(this).text(); + var page = $(this).attr("href"); + $("#dataPreviewLabel").text(ltitle); + $("#dataPreview .modal-body").load(page + " div"); + $('#dataPreview').modal({show:true}); + }); + $("#dataPreview").on("hidden", function(){ + $("#dataPreviewLabel").html(""); + $("#dataPreview .modal-body").html("<div id=\"loading\"><img src=\"[% interface %]/[% theme %]/img/spinner-small.gif\" alt=\"\" /> "+_("Loading")+"</div>"); + }); + }); + + function disableUnchecked(form){ + $("fieldset.biblio.unselected").each(function(){ + $(this).remove(); + }); + return 1; + } + </script> +[% END %] + +[% INCLUDE 'intranet-bottom.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -16,178 +16,16 @@ [% USE Branches %] [% USE Price %] [% USE AuthorisedValues %] - +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] <title>Koha › Acquisitions › [% UNLESS ( basketno ) %]New [% END %]Basket [% basketname|html %] ([% basketno |html %]) for [% booksellername|html %] [% INCLUDE 'doc-head-close.inc' %] -[% INCLUDE 'datatables.inc' %] - - - -[% UNLESS ( closedate ) %] - -[% ELSE %] - -[% UNLESS ( grouped ) %] - -[% END %] -[% END %] - + [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] @@ -842,4 +680,160 @@ [% INCLUDE 'acquisitions-menu.inc' %] + +[% MACRO jsinclude BLOCK %] + +[% INCLUDE 'datatables.inc' %] + + + + [% UNLESS ( closedate ) %] + + [% ELSE %] + + [% UNLESS ( grouped ) %] + + [% END %] + [% END %] + +[% END %] + [% INCLUDE 'intranet-bottom.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt @@ -1,5 +1,6 @@ [% USE Branches %] [% USE Koha %] +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Acquisitions › [% IF ( add_form ) %] @@ -9,8 +10,8 @@ [% END %] [% INCLUDE 'doc-head-close.inc' %] - + [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] @@ -139,4 +140,9 @@ +[% MACRO jsinclude BLOCK %] + + +[% END %] + [% INCLUDE 'intranet-bottom.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt @@ -1,4 +1,5 @@ [% USE KohaDates %] +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Search for vendor [% supplier %] [% INCLUDE 'doc-head-close.inc' %] @@ -8,49 +9,8 @@ } -[% INCLUDE 'datatables.inc' %] - - + [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] @@ -222,4 +182,48 @@ $(document).ready(function() { [% INCLUDE 'acquisitions-menu.inc' %] + +[% MACRO jsinclude BLOCK %] + + [% INCLUDE 'datatables.inc' %] + +[% END %] + [% INCLUDE 'intranet-bottom.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt @@ -1,45 +1,14 @@ [% USE KohaDates %] +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Acquisitions › EDIFACT messages [% INCLUDE 'doc-head-close.inc' %] -[% INCLUDE 'datatables.inc' %] - + [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] @@ -139,4 +108,42 @@ $(document).ready(function() { [% INCLUDE 'acquisitions-menu.inc' %] + +[% MACRO jsinclude BLOCK %] + + [% INCLUDE 'datatables.inc' %] + +[% END %] + [% INCLUDE 'intranet-bottom.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt @@ -1,40 +1,12 @@ [% USE KohaDates %] [% USE ColumnsSettings %] +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Acquisitions › [% IF ( order_loop ) %]Orders search › Search results[% ELSE %]Order search[% END %] [% INCLUDE 'doc-head-close.inc' %] -[% INCLUDE 'calendar.inc' %] -[% INCLUDE 'datatables.inc' %] -[% INCLUDE 'columns_settings.inc' %] - - - + [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] @@ -233,4 +205,35 @@ var MSG_REMOVE_PATRON = _("Remove"); [% INCLUDE 'acquisitions-menu.inc' %] + +[% MACRO jsinclude BLOCK %] + +[% INCLUDE 'calendar.inc' %] + [% INCLUDE 'datatables.inc' %] + [% INCLUDE 'columns_settings.inc' %] + + +[% END %] + [% INCLUDE 'intranet-bottom.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt @@ -1,30 +1,11 @@ [% USE KohaDates %] - +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Acquisitions › Invoice › Files [% INCLUDE 'doc-head-close.inc' %] -[% INCLUDE 'datatables.inc' %] - + [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] @@ -102,4 +83,27 @@ [% INCLUDE 'acquisitions-menu.inc' %] + +[% MACRO jsinclude BLOCK %] + + [% INCLUDE 'datatables.inc' %] + +[% END %] + [% INCLUDE 'intranet-bottom.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt @@ -1,60 +1,11 @@ [% USE Koha %] [% USE KohaDates %] [% USE Price %] - +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Acquisitions › Invoice [% INCLUDE 'doc-head-close.inc' %] -[% INCLUDE 'calendar.inc' %] -[% INCLUDE 'datatables.inc' %] - @@ -257,4 +208,56 @@ [% INCLUDE 'acquisitions-menu.inc' %] + +[% MACRO jsinclude BLOCK %] + + [% INCLUDE 'calendar.inc' %] + [% INCLUDE 'datatables.inc' %] + +[% END %] + [% INCLUDE 'intranet-bottom.inc' %] --