Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 32030: Merge the agreement and ID columns

Browse source 
Signed-off-by: Jonathan Field <jonathan.field@ptfs-europe.com>

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Jonathan Druart 2022-05-03 07:57:46 +02:00 committed by Tomas Cohen Arazi
parent 0a3ede141d
commit 01acc744b2
Signed by: tomascohen
GPG key ID: 0A272EA1B2F3C15F
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue
View file

@ -75,7 +75,7 @@ export default {
},
"order": [[1, "asc"]],
"columnDefs": [{
"targets": [0, 1, 2, 3, 4],
"targets": [0, 2],
"render": function (data, type, row, meta) {
if (type == 'display') {
return escape_str(data)
@ -85,10 +85,13 @@ export default {
}],
"columns": [
{
"title": __("Agrement ID"),
"data": "agreement_id",
"title": __("Name"),
"data": ["me.agreement_id", "me.name"],
"searchable": true,
"orderable": true
"orderable": true,
"render": function (data, type, row, meta) {
return escape_str(`${row.name} (#${row.agreement_id})`)
}
},
{
"title": __("Vendor"),
@ -99,12 +102,6 @@ export default {
return row.vendor_id != undefined ? escape_str(vendors_map[row.vendor_id].name) : ""
}
},
{
"title": __("Name"),
"data": "name",
"searchable": true,
"orderable": true
},
{
"title": __("description"),
"data": "description",
@ -177,9 +174,9 @@ export default {
preDrawCallback: function (settings) {
var table_id = settings.nTable.id
$("#" + table_id).find("thead th").eq(1).attr('data-filter', 'av_vendors')
$("#" + table_id).find("thead th").eq(4).attr('data-filter', 'av_statuses')
$("#" + table_id).find("thead th").eq(5).attr('data-filter', 'av_closure_reasons')
$("#" + table_id).find("thead th").eq(7).attr('data-filter', 'av_renewal_priorities')
$("#" + table_id).find("thead th").eq(3).attr('data-filter', 'av_statuses')
$("#" + table_id).find("thead th").eq(4).attr('data-filter', 'av_closure_reasons')
$("#" + table_id).find("thead th").eq(6).attr('data-filter', 'av_renewal_priorities')
}
}, columns_settings, 1)