Bug 41563: acqui - auto tidy

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
This commit is contained in:
Jonathan Druart 2026-01-09 13:08:37 +01:00 committed by Lucas Gass
parent 5163b05ad6
commit a0fdafe8ff
No known key found for this signature in database
GPG Key ID: 60B447398B0D36CA
11 changed files with 785 additions and 740 deletions

View File

@ -210,76 +210,74 @@
<script>
var table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'acq_acqui-home', 'accounts', 'json' ) | $raw %];
</script>
<script>
dt_overwrite_html_sorting_localeCompare();
$(document).ready(function() {
var oTable = $("#accounts").kohaTable({
drawCallback: function ( oSettings ) {
if ( oSettings.aiDisplay.length == 0 )
{
return;
}
var nTrs = $('#accounts tbody tr');
var iColspan = nTrs[0].getElementsByTagName('td').length;
var sLastGroup = "";
for ( var i=0 ; i<nTrs.length ; i++ )
{
var iDisplayIndex = oSettings._iDisplayStart + i;
var sGroup = oSettings.aoData[ oSettings.aiDisplay[iDisplayIndex] ]._aData[1];
if ( sGroup != sLastGroup )
{
var nGroup = document.createElement( 'tr' );
var nCell = document.createElement( 'td' );
nCell.colSpan = iColspan;
nCell.className = "group";
nCell.innerHTML = sGroup;
nGroup.appendChild( nCell );
nTrs[i].parentNode.insertBefore( nGroup, nTrs[i] );
sLastGroup = sGroup;
$(document).ready(function () {
var oTable = $("#accounts").kohaTable(
{
drawCallback: function (oSettings) {
if (oSettings.aiDisplay.length == 0) {
return;
}
}
var nTrs = $("#accounts tbody tr");
var iColspan = nTrs[0].getElementsByTagName("td").length;
var sLastGroup = "";
for (var i = 0; i < nTrs.length; i++) {
var iDisplayIndex = oSettings._iDisplayStart + i;
var sGroup = oSettings.aoData[oSettings.aiDisplay[iDisplayIndex]]._aData[1];
if (sGroup != sLastGroup) {
var nGroup = document.createElement("tr");
var nCell = document.createElement("td");
nCell.colSpan = iColspan;
nCell.className = "group";
nCell.innerHTML = sGroup;
nGroup.appendChild(nCell);
nTrs[i].parentNode.insertBefore(nGroup, nTrs[i]);
sLastGroup = sGroup;
}
}
},
footerCallback: function (row, data, start, end, display) {
var api = this.api(),
data;
footer_column_sum(api, [6, 7, 8, 9]);
},
columnDefs: [{ orderable: false, targets: ["_all"] }],
ordering: true,
orderFixed: [[1, "asc"]],
paging: false,
autoWidth: false,
},
footerCallback: function ( row, data, start, end, display ) {
var api = this.api(), data;
footer_column_sum( api, [ 6, 7, 8, 9 ] );
},
columnDefs: [
{ "orderable": false, "targets": ["_all"] }
],
ordering: true,
orderFixed: [[ 1, 'asc' ]],
paging: false,
autoWidth: false
}, table_settings );
table_settings
);
let table_dt = oTable.DataTable();
$(oTable).treetable({
expandable: true
expandable: true,
});
$(oTable).treetable('expandAll');
$("#expand_all").click(function(e){
$(oTable).treetable("expandAll");
$("#expand_all").click(function (e) {
e.preventDefault();
$(oTable).treetable('expandAll');
$(oTable).treetable("expandAll");
});
$("#collapse_all").click(function(e){
$("#collapse_all").click(function (e) {
e.preventDefault();
$(oTable).treetable('collapseAll');
$(oTable).treetable("collapseAll");
});
$("#hide_inactive").click(function(e){
$("#hide_inactive").click(function (e) {
e.preventDefault();
table_dt.columns(0).search(1).draw(); // Show only active=1
});
$("#show_inactive").click(function(e){
$("#show_inactive").click(function (e) {
e.preventDefault();
table_dt.columns(0).search("").draw();
});
$("#hide_inactive").click();
$("#library-filter").change(function(){
$("#library-filter").change(function () {
$("#accounts").DataTable().search(this.value);
$("#accounts").DataTable().draw();
});

View File

@ -1434,73 +1434,76 @@
let skip_confirm_reopen = [% skip_confirm_reopen ? 1 : 0 | html %];
</script>
<script>
$(document).ready(function() {
$("#orders").kohaTable({
bKohaColumnsUseNames: true,
pagingType: "full",
autoWidth: false,
}, orders_table_settings);
$(document).ready(function () {
$("#orders").kohaTable(
{
bKohaColumnsUseNames: true,
pagingType: "full",
autoWidth: false,
},
orders_table_settings
);
$("#cancelledorderst").kohaTable({
pagingType: "full"
pagingType: "full",
});
$("#reopenform").on("submit",function(e){
$("#reopenform").on("submit", function (e) {
var is_confirmed = skip_confirm_reopen || confirm(_("Are you sure you want to reopen this basket?"));
if( is_confirmed ){ return true; }
else{ return false }
if (is_confirmed) {
return true;
} else {
return false;
}
});
// Generates a dynamic link for exporting the selections data as CSV
$("#exportbutton, #export-csv-menu a").click(function() {
$("#exportbutton, #export-csv-menu a").click(function () {
// Building the url from currently checked boxes
var url = '/cgi-bin/koha/acqui/basket.pl';
url += $('#exportbutton').attr('href');
if($(this).attr("data-value")) {
url += '&amp;csv_profile=' + $(this).attr("data-value");
var url = "/cgi-bin/koha/acqui/basket.pl";
url += $("#exportbutton").attr("href");
if ($(this).attr("data-value")) {
url += "&amp;csv_profile=" + $(this).attr("data-value");
}
// And redirecting to the CSV page
location.href = url;
return false;
});
$("#select_managing_library").on("change", function(){
$("#select_managing_library").on("change", function () {
$(this).parent().submit();
});
$(".edit_delivery_date").on("click", function(e) {
$(".edit_delivery_date").on("click", function (e) {
e.preventDefault();
var ordernumber = $(this).data("ordernumber");
var order_number_text = _("(order number %s)").format(ordernumber);
var modalTitle = $(this).attr("title") + " " + order_number_text;
var delivery_date = $( "#delivery_date_" + ordernumber ).data("delivery_date");
var delivery_date = $("#delivery_date_" + ordernumber).data("delivery_date");
const estimated_delivery_date = document.querySelector("#estimated_delivery_date")._flatpickr;
estimated_delivery_date.setDate( delivery_date );
estimated_delivery_date.setDate(delivery_date);
$("#dateEditor .modal-title").text(modalTitle);
$("#date_ordernumber").val(ordernumber);
$("#dateEditor").modal("show");
});
$("#dateEditor").on('hidden.bs.modal', function (e) {
$("#dateEditor").on("hidden.bs.modal", function (e) {
$("#dateEditorLabel").html("");
$("#dateEditor .modal-title").text("");
$("#estimated_delivery_date").html( "" );
$("#estimated_delivery_date").html("");
$("#date_ordernumber").val("");
});
});
function add_user(borrowernumber, borrowername) {
var ids = $("#users_ids").val();
if(ids.length > 0) {
ids = ids.split(':');
if (ids.length > 0) {
ids = ids.split(":");
} else {
ids = new Array;
ids = new Array();
}
if (ids.indexOf(borrowernumber.toString()) < 0) {
ids.push(borrowernumber);
$("#users_ids").val(ids.join(':'));
var li = '<li id="user_'+borrowernumber+'">'+borrowername
+ ' <a href="#" data-borrowernumber="'+borrowernumber+'" class="del_user"><i class="fa fa-trash-can"></i> '
+ _("Delete user") + '</a></li>';
$("#users_ids").val(ids.join(":"));
var li = '<li id="user_' + borrowernumber + '">' + borrowername + ' <a href="#" data-borrowernumber="' + borrowernumber + '" class="del_user"><i class="fa fa-trash-can"></i> ' + _("Delete user") + "</a></li>";
$("#users_names").prepend(li);
$("#add_user_submit").show();
return 0;
@ -1509,10 +1512,10 @@
}
function del_user(borrowernumber) {
$("#user_"+borrowernumber).remove();
var ids = $("#users_ids").val().split(':');
$("#user_" + borrowernumber).remove();
var ids = $("#users_ids").val().split(":");
ids.splice(ids.indexOf(borrowernumber.toString()), 1);
$("#users_ids").val(ids.join(':'));
$("#users_ids").val(ids.join(":"));
$("#add_user_submit").show();
}
</script>

View File

@ -400,7 +400,6 @@
let listclosed = [% listclosed ? 1 : 0 | html %];
let grouping = [% grouping ? 1 : 0 | html %];
</script>
<script>
function submitForm(form) {
if (form.closedbg.checked == true) {
@ -413,24 +412,24 @@
form.submit();
}
function closeandprint(bg){
if(document.location = '/cgi-bin/koha/acqui/basketgroup.pl?op=closeandprint&amp;basketgroupid=' + bg ){
function closeandprint(bg) {
if ((document.location = "/cgi-bin/koha/acqui/basketgroup.pl?op=closeandprint&amp;basketgroupid=" + bg)) {
setTimeout(() => {
window.location.reload();
}, 3000);
} else {
alert( _("Error downloading the file") );
alert(_("Error downloading the file"));
}
}
$(document).ready(function() {
if (listclosed){
$(document).ready(function () {
if (listclosed) {
$("#basket_groups a[href='#closed']").tab("show");
} else {
$("#basket_groups a[href='#opened']").tab("show");
}
if (!grouping){
if (!grouping) {
let dt_params = {
autoWidth: false,
pagingType: "full",
@ -456,39 +455,45 @@
});
}
$("#basketgroupcolumns").on("click", ".addtogroup", function(){
const row = $("#" + $(this).data("basketid") );
if( row ){
$(this).removeClass("addtogroup").addClass("removefromgroup").html("<i class=\"fa fa-trash-can\" aria-hidden=\"true\"></i> " + _("Remove") );
$("#basketgroupcolumns").on("click", ".addtogroup", function () {
const row = $("#" + $(this).data("basketid"));
if (row) {
$(this)
.removeClass("addtogroup")
.addClass("removefromgroup")
.html('<i class="fa fa-trash-can" aria-hidden="true"></i> ' + _("Remove"));
row.removeClass("ungrouped").addClass("grouped");
ungrouped.row( row ).remove().draw();
grouped.row.add( row ).draw();
ungrouped.row(row).remove().draw();
grouped.row.add(row).draw();
}
});
$("#basketgroupcolumns").on("click", ".removefromgroup", function(){
const row = $("#" + $(this).data("basketid") );
if( row ){
$(this).removeClass("removefromgroup").addClass("addtogroup").html("<i class=\"fa fa-plus\" aria-hidden=\"true\"></i> " + _("Add to group") );
$("#basketgroupcolumns").on("click", ".removefromgroup", function () {
const row = $("#" + $(this).data("basketid"));
if (row) {
$(this)
.removeClass("removefromgroup")
.addClass("addtogroup")
.html('<i class="fa fa-plus" aria-hidden="true"></i> ' + _("Add to group"));
$(this).removeClass("").addClass("");
row.removeClass("grouped").addClass("ungrouped");
grouped.row( row ).remove().draw();
ungrouped.row.add( row ).draw();
grouped.row(row).remove().draw();
ungrouped.row.add(row).draw();
}
});
$("#close_and_print").on("click", function(e){
$("#close_and_print").on("click", function (e) {
e.preventDefault();
const basketgroupid = $(this).data("basketgroupid");
closeandprint( basketgroupid );
closeandprint(basketgroupid);
});
$("#groupingform").on("submit", function(e){
$("#groupingform").on("submit", function (e) {
e.preventDefault();
submitForm(this);
});
$("#delete_basketgroup").on("click", function(e){
$("#delete_basketgroup").on("click", function (e) {
return confirm(_("Are you sure you want to delete this basket group?"));
});
});

View File

@ -318,43 +318,44 @@
const op = "[% op | html %]";
const has_results = [% result_order_loop ? 1 : 0 | html %];
</script>
<script>
function update_ordernumber_list(){
function update_ordernumber_list() {
var ordernumbers = [];
$("input[name='ordernumber']").filter(":checked").each(function(){
ordernumbers.push($(this).val());
});
$("input[name='ordernumbers']").val(ordernumbers.join(','));
$("input[name='ordernumber']")
.filter(":checked")
.each(function () {
ordernumbers.push($(this).val());
});
$("input[name='ordernumbers']").val(ordernumbers.join(","));
}
var MSG_NO_ITEM_SELECTED = _("Nothing is selected.");
var MSG_NO_FUND_SELECTED = _("No fund selected.");
$(document).ready(function() {
$('span.hint').hide();
$(document).ready(function () {
$("span.hint").hide();
$("#table_orders").kohaTable({
paging: false,
});
if (op == 'search' || op == 'select'){
if (op == "search" || op == "select") {
patron_autocomplete($("#find_patron"), {
"on-select-add-to": {
container: $("#basket_creators"),
input_name: 'created_by'
input_name: "created_by",
},
"on-select-callback": function( event, ui ) {
$("#find_patron").val('').focus();
"on-select-callback": function (event, ui) {
$("#find_patron").val("").focus();
return false;
}
},
});
}
$("#show_orders_filters, #hide_orders_filters").on('click', function(e) {
$("#show_orders_filters, #hide_orders_filters").on("click", function (e) {
e.preventDefault();
$('#orders_filters').toggle();
$('.toggle_orders_filters').toggle();
$("#orders_filters").toggle();
$(".toggle_orders_filters").toggle();
});
if ( op == 'search' || op == 'select' && !has_result ){
if (op == "search" || (op == "select" && !has_result)) {
$("#show_orders_filters").hide();
$("#orders_filters").show();
} else {
@ -362,73 +363,81 @@
$("#orders_filters").hide();
}
$("input[name='ordernumber']").on("change", function(){
if ( $(this).is(':checked') ) {
$(this).parents("tr").addClass("picked_to_duplicate");
} else {
$(this).parents("tr").removeClass("picked_to_duplicate");
}
}).on("click", function(e){
update_ordernumber_list();
});
$("input[name='ordernumber']")
.on("change", function () {
if ($(this).is(":checked")) {
$(this).parents("tr").addClass("picked_to_duplicate");
} else {
$(this).parents("tr").removeClass("picked_to_duplicate");
}
})
.on("click", function (e) {
update_ordernumber_list();
});
$("#select_all").on("click",function(e){
$("#select_all").on("click", function (e) {
e.preventDefault();
selectAll();
update_ordernumber_list();
});
$("#clear_all").on("click",function(e){
$("#clear_all").on("click", function (e) {
e.preventDefault();
clearAll();
update_ordernumber_list();
});
function selectAll () {
$("#table_orders").find("input[type='checkbox'][name='ordernumber']").each(function(){
$(this).prop("checked", true).change();
});
function selectAll() {
$("#table_orders")
.find("input[type='checkbox'][name='ordernumber']")
.each(function () {
$(this).prop("checked", true).change();
});
return false;
}
function clearAll () {
$("#table_orders").find("input[type='checkbox'][name='ordernumber']").each(function(){
$(this).prop("checked", false).change();
});
function clearAll() {
$("#table_orders")
.find("input[type='checkbox'][name='ordernumber']")
.each(function () {
$(this).prop("checked", false).change();
});
return false;
}
$(".go_to_batch_edit").on("click",function(e){
if ($("input[name='ordernumber']").filter(":checked").length == 0){
$(".go_to_batch_edit").on("click", function (e) {
if ($("input[name='ordernumber']").filter(":checked").length == 0) {
alert(MSG_NO_ITEM_SELECTED);
e.preventDefault();
}
});
$("#batch_edit_form").on("submit", function(e){
var budget_value_will_be_reused = $("input[name='copy_existing_value'][value='budget_id']").is(':checked');
if ( ! budget_value_will_be_reused ) {
if ($("#all_budget_id").find("option:selected").val() == "" ) {
$("#batch_edit_form").on("submit", function (e) {
var budget_value_will_be_reused = $("input[name='copy_existing_value'][value='budget_id']").is(":checked");
if (!budget_value_will_be_reused) {
if ($("#all_budget_id").find("option:selected").val() == "") {
alert(MSG_NO_FUND_SELECTED);
e.preventDefault();
}
}
});
$("input[name='copy_existing_value']").click(function(){
$("input[name='copy_existing_value']").click(function () {
render_disabled(this);
});
$("input[name='copy_existing_value']").each(function(){
$("input[name='copy_existing_value']").each(function () {
render_disabled(this);
});
});
function render_disabled (elt) {
function render_disabled(elt) {
var field = $(elt).val();
var hint_node = $("#hint_" + field);
var input_element = $(elt).parent().find("[name='all_"+field+"']");
var input_element = $(elt)
.parent()
.find("[name='all_" + field + "']");
if ($(elt).is(":checked")) {
$(input_element).prop('disabled', true);
$(input_element).prop("disabled", true);
$(hint_node).show();
} else {
$(input_element).prop('disabled', false);
$(input_element).prop("disabled", false);
$(hint_node).hide();
}
}

View File

@ -170,9 +170,8 @@
<script>
var table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'histsearch', 'histsearcht', 'json' ) | $raw %];
</script>
<script>
$(document).ready(function() {
$(document).ready(function () {
$("#histsearcht").kohaTable(
{
pagingType: "full",
@ -181,13 +180,12 @@
);
patron_autocomplete($("#find_patron"), {
'on-select-add-to': {container: $("#basket_creators"), input_name: 'created_by' },
'on-select-callback': function( event, ui ) {
$("#find_patron").val('').focus();
"on-select-add-to": { container: $("#basket_creators"), input_name: "created_by" },
"on-select-callback": function (event, ui) {
$("#find_patron").val("").focus();
return false;
}
},
});
});
</script>
[% END %]

View File

@ -583,13 +583,12 @@
const invoiceincgst = [% invoiceincgst ? 1 : 0 | html %];
const has_files = [% files ? 1 : 0 | html %];
</script>
<script>
function updateColumnsVisibility(visible) {
if ( visible ) {
if (visible) {
$("table .tax_excluded, .tax_included").show();
} else {
if (invoiceincgst){
if (invoiceincgst) {
$("table .tax_excluded").hide();
} else {
$("table .tax_included").hide();
@ -597,14 +596,14 @@
}
}
$(document).ready(function() {
$(document).ready(function () {
$("#orderst").kohaTable({
info: false,
paging: false,
searching: false,
dom: "t",
});
if (prefs.AcqEnableFiles && has_files){
if (prefs.AcqEnableFiles && has_files) {
$("#invoice_files_table").kohaTable({
info: false,
paging: false,
@ -612,112 +611,115 @@
dom: "t",
});
}
$("#show_all_details").click(function(){
updateColumnsVisibility( $(this).is(":checked") );
$("#show_all_details").click(function () {
updateColumnsVisibility($(this).is(":checked"));
});
$("#show_all_details").prop('checked', false);
$("#show_all_details").prop("checked", false);
updateColumnsVisibility(false);
$(".toggle_invoice_adjustment").on("click", function(e){
$(".toggle_invoice_adjustment").on("click", function (e) {
e.preventDefault();
$("#show_invoice_adjustment, #cancel_invoice_adjustment, #add_invoice_adjustment").toggle();
});
//keep a copy of all budgets before removing the inactives
var disabledBudgetsCopy = $("#all_fund_dropdown").html();
$(".fund_dropdown").each(function(){
$(this).html( disabledBudgetsCopy);
var selected = $(this).data('selected');
$(this).find('option[value="'+selected+'"]').removeClass('b_inactive');
$(this).val( selected );
$(".fund_dropdown").each(function () {
$(this).html(disabledBudgetsCopy);
var selected = $(this).data("selected");
$(this)
.find('option[value="' + selected + '"]')
.removeClass("b_inactive");
$(this).val(selected);
});
$('.b_inactive').remove();
$(".b_inactive").remove();
$('.showallfunds').on("change", function() {
var the_dropdown = $("#" + $(this).data("select-id") );
$(".showallfunds").on("change", function () {
var the_dropdown = $("#" + $(this).data("select-id"));
var selected = the_dropdown.val();
if ($(this).is(":checked")) {
the_dropdown.html( disabledBudgetsCopy ).val(selected);
the_dropdown.html(disabledBudgetsCopy).val(selected);
} else {
the_dropdown.find( 'option[value="' + selected + '"]' ).removeClass('b_inactive');
the_dropdown.find('.b_inactive').remove();
the_dropdown.find('option[value="' + selected + '"]').removeClass("b_inactive");
the_dropdown.find(".b_inactive").remove();
}
});
$(".modify_fund").on('click',function(e){
$(".modify_fund").on("click", function (e) {
e.preventDefault();
var selected = $(this).data('budget_id');
var sort1 = $(this).data('sort1');
var sort2 = $(this).data('sort2');
$("#update_fund").data('order_id',$(this).data('order_id'));
var selected = $(this).data("budget_id");
var sort1 = $(this).data("sort1");
var sort2 = $(this).data("sort2");
$("#update_fund").data("order_id", $(this).data("order_id"));
$("#modify_budget_id").html(disabledBudgetsCopy);
$("#modify_budget_id").val(selected).find('option[value="'+selected+'"]').removeClass('b_inactive');
$("#modify_budget_id")
.val(selected)
.find('option[value="' + selected + '"]')
.removeClass("b_inactive");
$("#updateFund").find('[name="sort1"]').val(sort1);
$("#updateFund").find('[name="sort2"]').val(sort2);
$("#modify_budget_id").find('.b_inactive').remove();
$("#modify_budget_id").find(".b_inactive").remove();
$("#modify_budget_id").change();
$("#updateFund").modal('show');
$("#updateFund").modal("show");
});
$("#update_fund").on('click',function(){
$("#update_fund").on("click", function () {
var new_fund = $("#modify_budget_id").val();
var sort1 = $("#updateFund").find('[name="sort1"]').val();
var sort2 = $("#updateFund").find('[name="sort2"]').val();
var new_fund_name = $('#modify_budget_id option[value="'+new_fund+'"]').text();
var order_id = $(this).data('order_id');
var new_fund_name = $('#modify_budget_id option[value="' + new_fund + '"]').text();
var order_id = $(this).data("order_id");
let options = {
url: "/api/v1/acquisitions/orders/" + order_id,
method: 'PUT',
contentType: 'application/json',
method: "PUT",
contentType: "application/json",
data: JSON.stringify({
fund_id: new_fund,
statistics_1: sort1,
statistics_2: sort2
})
statistics_2: sort2,
}),
};
$.ajax(options)
.then(function(thing,result){
$("#updateFund").modal('hide');
$('#updateFund .showallfunds').prop('checked',false);
$('.modify_fund[data-order_id="'+order_id+'"]').data('budget_id',new_fund);
$('.modify_fund[data-order_id="'+order_id+'"]').data('sort1',sort1);
$('.modify_fund[data-order_id="'+order_id+'"]').data('sort2',sort2);
$('.order_name[data-order_id="'+order_id+'"]').text(new_fund_name);
humanMsg.displayAlert( _("Order updated"), { className: 'humanError' } );
.then(function (thing, result) {
$("#updateFund").modal("hide");
$("#updateFund .showallfunds").prop("checked", false);
$('.modify_fund[data-order_id="' + order_id + '"]').data("budget_id", new_fund);
$('.modify_fund[data-order_id="' + order_id + '"]').data("sort1", sort1);
$('.modify_fund[data-order_id="' + order_id + '"]').data("sort2", sort2);
$('.order_name[data-order_id="' + order_id + '"]').text(new_fund_name);
humanMsg.displayAlert(_("Order updated"), { className: "humanError" });
})
.fail(function(err){
humanMsg.displayAlert( _("Failed to update order:") + err.responseText, { className: 'humanError' } );
.fail(function (err) {
humanMsg.displayAlert(_("Failed to update order:") + err.responseText, { className: "humanError" });
});
});
$("#modify_budget_id").change(function(){
var destination_sort1 = $(this).parents('.modal-body').find('input[name="sort1"]');
var sort1_authcat = $(this).find("option:selected").attr('data-sort1-authcat');
if ( destination_sort1.length < 1 ) {
destination_sort1 = $(this).parents('.modal-body').find('select[name="sort1"]');
$("#modify_budget_id").change(function () {
var destination_sort1 = $(this).parents(".modal-body").find('input[name="sort1"]');
var sort1_authcat = $(this).find("option:selected").attr("data-sort1-authcat");
if (destination_sort1.length < 1) {
destination_sort1 = $(this).parents(".modal-body").find('select[name="sort1"]');
}
var sort1 = $(destination_sort1).val() || "";
var destination_sort2 = $(this).parents('.modal-body').find('input[name="sort2"]');
var sort2_authcat = $(this).find("option:selected").attr('data-sort2-authcat');
if ( destination_sort2.length < 1 ) {
destination_sort2 = $(this).parents('.modal-body').find('select[name="sort2"]');
var destination_sort2 = $(this).parents(".modal-body").find('input[name="sort2"]');
var sort2_authcat = $(this).find("option:selected").attr("data-sort2-authcat");
if (destination_sort2.length < 1) {
destination_sort2 = $(this).parents(".modal-body").find('select[name="sort2"]');
}
var sort2 = $(destination_sort2).val() || "";
getAuthValueDropbox( 'sort1', sort1_authcat, destination_sort1, sort1 );
getAuthValueDropbox( 'sort2', sort2_authcat, destination_sort2, sort2 );
getAuthValueDropbox("sort1", sort1_authcat, destination_sort1, sort1);
getAuthValueDropbox("sort2", sort2_authcat, destination_sort2, sort2);
});
// same effort for the adjustments
var adjBudgetId = $("#budget_id_new");
var disabledAdjBudgetsCopy = adjBudgetId.html();
$('.ab_inactive').remove();
$('#showallfunds_adj').click(function() {
$(".ab_inactive").remove();
$("#showallfunds_adj").click(function () {
if ($(this).is(":checked")) {
adjBudgetId.html(disabledAdjBudgetsCopy); //Puts back all the funds
}
else {
$('.ab_inactive').remove();
} else {
$(".ab_inactive").remove();
}
});
});
</script>
[% END %]

View File

@ -377,44 +377,47 @@
<script>
var table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'lateorders', 'late_orders', 'json' ) | $raw %];
</script>
<script>
var late_orderst;
function check_uncheck() {
var all_nodes = late_orderst.DataTable().rows().nodes();
if ( $(all_nodes).find("input:checkbox[name=ordernumber]:checked").length > 0) {
if ($(all_nodes).find("input:checkbox[name=ordernumber]:checked").length > 0) {
var booksellerid = $(all_nodes).find("input:checkbox[name=ordernumber]:checked:first").attr("data-booksellerid");
$(all_nodes).find("input:checkbox[name=ordernumber][data-booksellerid!="+booksellerid+"]").prop('disabled', true);
$(all_nodes)
.find("input:checkbox[name=ordernumber][data-booksellerid!=" + booksellerid + "]")
.prop("disabled", true);
} else {
$("input:checkbox[name=ordernumber]").prop('disabled', false);
$("input:checkbox[name=ordernumber]").prop("disabled", false);
}
}
$(document).ready(function() {
late_orderst = $("#late_orders").kohaTable({
order: [[ 1, "asc" ]],
pagingType: "full",
autoWidth: false,
drawCallback: function() {
if ( typeof late_orderst != 'undefined' ) {
check_uncheck();
$('input:checkbox[name=ordernumber]').bind('click', check_uncheck);
};
}
}, table_settings );
$('input:checkbox[name=ordernumber]').bind('click', check_uncheck);
$('#CheckAll').click(function(e){
$(document).ready(function () {
late_orderst = $("#late_orders").kohaTable(
{
order: [[1, "asc"]],
pagingType: "full",
autoWidth: false,
drawCallback: function () {
if (typeof late_orderst != "undefined") {
check_uncheck();
$("input:checkbox[name=ordernumber]").bind("click", check_uncheck);
}
},
},
table_settings
);
$("input:checkbox[name=ordernumber]").bind("click", check_uncheck);
$("#CheckAll").click(function (e) {
e.preventDefault();
$("#late_orders input:checkbox").prop("checked", true);
});
$('#CheckNone').click(function(e){
$("#CheckNone").click(function (e) {
e.preventDefault();
$("#late_orders input:checkbox").prop("checked", false);
});
// Generates a dynamic link for exporting the selection's data as CSV
$("#exportbutton, #export-csv-menu a").click(function() {
$("#exportbutton, #export-csv-menu a").click(function () {
var all_nodes = late_orderst.DataTable().rows().nodes();
var selected = $(all_nodes).find("input[name='ordernumber']:checked");
@ -423,58 +426,58 @@
return false;
}
var url = $('#exportbutton').attr('href') + '?';
var url = $("#exportbutton").attr("href") + "?";
// Building the url from currently checked boxes
for (var i = 0; i < selected.length; i++) {
url += '&amp;ordernumber=' + selected[i].value;
url += "&amp;ordernumber=" + selected[i].value;
}
if($(this).attr("data-value")) {
url += '&amp;csv_profile=' + $(this).attr("data-value");
if ($(this).attr("data-value")) {
url += "&amp;csv_profile=" + $(this).attr("data-value");
}
// And redirecting to the CSV page
location.href = url;
return false;
});
$(".edit_note").on("click", function(e) {
$(".edit_note").on("click", function (e) {
e.preventDefault();
var ordernumber = $(this).data("ordernumber");
var note_type = $(this).data("note_type");
var modalTitle = _("%s (order number %s)").format($(this).attr("title"), ordernumber);
var note_text = $( "#" + note_type + "-note-" + ordernumber ).html();
var note_text = $("#" + note_type + "-note-" + ordernumber).html();
$("#noteEditor .modal-title").text(modalTitle);
$("#notes_ordernumber").val( ordernumber );
$("#ordernotes").html( note_text );
$("#type").val( note_type );
$("#notes_ordernumber").val(ordernumber);
$("#ordernotes").html(note_text);
$("#type").val(note_type);
$("#noteEditor").modal("show");
$("#ordernotes").focus();
});
$("#noteEditor").on('hidden.bs.modal', function (e) {
$("#noteEditor").on("hidden.bs.modal", function (e) {
$("#noteEditorLabel").html("");
$("#noteEditor .modal-title").text("");
$("#ordernotes").html( "" );
$("#ordernotes").html("");
$("#notes_ordernumber").val("");
$("#type").val("");
});
$(".edit_delivery_date").on("click", function(e) {
$(".edit_delivery_date").on("click", function (e) {
e.preventDefault();
var ordernumber = $(this).data("ordernumber");
var order_number_text = _("(order number %s)").format(ordernumber);
var modalTitle = $(this).attr("title") + " " + order_number_text;
var delivery_date = $( "#delivery_date_" + ordernumber ).data("delivery_date");
var delivery_date = $("#delivery_date_" + ordernumber).data("delivery_date");
const estimated_delivery_date = document.querySelector("#estimated_delivery_date")._flatpickr;
estimated_delivery_date.setDate( delivery_date );
estimated_delivery_date.setDate(delivery_date);
$("#dateEditor .modal-title").text(modalTitle);
$("#date_ordernumber").val(ordernumber);
$("#dateEditor").modal("show");
});
$("#dateEditor").on('hidden.bs.modal', function (e) {
$("#dateEditor").on("hidden.bs.modal", function (e) {
$("#dateEditorLabel").html("");
$("#dateEditor .modal-title").text("");
$("#estimated_delivery_date").html( "" );
$("#estimated_delivery_date").html("");
$("#date_ordernumber").val("");
});
});

View File

@ -133,24 +133,23 @@
<script>
const logged_in_user = [% To.json(logged_in_user.unblessed) | $raw %];
</script>
<script>
$(document).ready(function() {
var suggestionst = $("#suggestionst").kohaTable({
columnDefs: [
{ targets: [0], visible: false, searchable: true }, // must be searchable for filtering
],
pagingType: "full",
});
let table_dt = suggestionst.DataTable();
$("#show_only_mine").on('click', function(e){
e.preventDefault();
table_dt.columns(0).search(`^${logged_in_user.borrowernumber}$`, true).draw();
});
$("#show_all").on('click', function(e){
e.preventDefault();
table_dt.columns(0).search("").draw();
});
$(document).ready(function () {
var suggestionst = $("#suggestionst").kohaTable({
columnDefs: [
{ targets: [0], visible: false, searchable: true }, // must be searchable for filtering
],
pagingType: "full",
});
let table_dt = suggestionst.DataTable();
$("#show_only_mine").on("click", function (e) {
e.preventDefault();
table_dt.columns(0).search(`^${logged_in_user.borrowernumber}$`, true).draw();
});
$("#show_all").on("click", function (e) {
e.preventDefault();
table_dt.columns(0).search("").draw();
});
});
</script>
[% END %]

File diff suppressed because it is too large Load Diff

View File

@ -374,7 +374,6 @@
order: "[%tp("noun", "Order") | html %]",
};
</script>
<script>
dt_overwrite_html_sorting_localeCompare();
var PENDING_MULTI_SELECTION = _("Receive selected (%s)");

View File

@ -213,63 +213,75 @@
<script>
const vendor_id = [% vendor.id | html %];
</script>
<script>
$(document).ready(function() {
$(document).ready(function () {
var issues_table_url = `/api/v1/acquisitions/vendors/${vendor_id}/issues?`;
var issues_table = $("#vendor_issues").kohaTable({
ajax: {
url: issues_table_url
var issues_table = $("#vendor_issues").kohaTable(
{
ajax: {
url: issues_table_url,
},
embed: ["+strings"],
order: [[0, "desc"]],
columns: [
{
data: "issue_id",
searchable: true,
orderable: true,
render: function (data, type, row, meta) {
return '<a href="/cgi-bin/koha/acqui/vendor_issues.pl?op=show&amp;issue_id=' + encodeURIComponent(row.issue_id) + '">' + escape_str(row.issue_id) + "</a>";
},
},
{
data: "type",
searchable: true,
orderable: true,
render: function (data, type, row, meta) {
return row._strings.type ? escape_str(row._strings.type.str) : "";
},
},
{
data: "started_on",
searchable: true,
orderable: true,
render: function (data, type, row, meta) {
return $date(row.started_on);
},
},
{
data: "ended_on",
searchable: true,
orderable: true,
render: function (data, type, row, meta) {
return $date(row.ended_on);
},
},
{
data: function (row, type, val, meta) {
var result =
'<a class="btn btn-default btn-xs" role="button" href="/cgi-bin/koha/acqui/vendor_issues.pl?op=add_form&amp;issue_id=' +
encodeURIComponent(row.issue_id) +
'"><i class="fa fa-pencil" aria-hidden="true"></i> ' +
_("Edit") +
"</a>" +
"\n";
result +=
'<a class="btn btn-default btn-xs" role="button" href="/cgi-bin/koha/acqui/vendor_issues.pl?op=delete_confirm&amp;issue_id=' +
encodeURIComponent(row.issue_id) +
'"><i class="fa fa-trash" aria-hidden="true"></i> ' +
_("Delete") +
"</a>";
return result;
},
searchable: false,
orderable: false,
},
],
},
embed: ["+strings"],
order: [[ 0, "desc" ]],
columns: [
{
data: "issue_id",
searchable: true,
orderable: true,
render: function(data, type, row, meta) {
return '<a href="/cgi-bin/koha/acqui/vendor_issues.pl?op=show&amp;issue_id=' + encodeURIComponent(row.issue_id) +'">' + escape_str(row.issue_id) + '</a>';
},
},
{
data: "type",
searchable: true,
orderable: true,
render: function(data, type, row, meta) {
return row._strings.type ? escape_str(row._strings.type.str) : "";
}
},
{
data: "started_on",
searchable: true,
orderable: true,
render: function(data, type, row, meta) {
return $date(row.started_on);
}
},
{
data: "ended_on",
searchable: true,
orderable: true,
render: function(data, type, row, meta) {
return $date(row.ended_on);
}
},
{
data: function( row, type, val, meta ) {
var result = '<a class="btn btn-default btn-xs" role="button" href="/cgi-bin/koha/acqui/vendor_issues.pl?op=add_form&amp;issue_id='+ encodeURIComponent(row.issue_id) +'"><i class="fa fa-pencil" aria-hidden="true"></i> '+_("Edit")+'</a>'+"\n";
result += '<a class="btn btn-default btn-xs" role="button" href="/cgi-bin/koha/acqui/vendor_issues.pl?op=delete_confirm&amp;issue_id='+ encodeURIComponent(row.issue_id) +'"><i class="fa fa-trash" aria-hidden="true"></i> '+_("Delete")+'</a>';
return result;
},
searchable: false,
orderable: false
}
]
}, null, 1);
null,
1
);
});
</script>
[% END %]