@@ -, +, @@
---
Koha/ERM/EUsage/CounterFile.pm | 5 ++++-
.../ERM/UsageStatisticsDataProvidersCounterLogs.vue | 9 ++++++---
misc/cronjobs/erm_run_harvester.pl | 2 +-
3 files changed, 11 insertions(+), 5 deletions(-)
--- a/Koha/ERM/EUsage/CounterFile.pm
+++ a/Koha/ERM/EUsage/CounterFile.pm
@@ -35,6 +35,8 @@ use Koha::ERM::EUsage::UsageDataProvider;
use Koha::ERM::EUsage::SushiCounter;
use Koha::Exceptions::ERM::EUsage::CounterFile;
+use C4::Context;
+
use base qw(Koha::Object);
use Koha::ERM::EUsage::CounterLogs;
@@ -558,10 +560,11 @@ Adds a erm_counter_logs database entry
sub _add_counter_log_entry {
my ($self) = @_;
+ my $user = C4::Context->userenv()->{'number'};
Koha::ERM::EUsage::CounterLog->new(
{
#TODO: borrowernumber only required for manual uploads or "harvest now" button clicks
- borrowernumber => undef,
+ borrowernumber => $user,
counter_files_id => $self->erm_counter_files_id,
importdate => $self->date_uploaded,
filename => $self->filename,
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersCounterLogs.vue
+++ a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersCounterLogs.vue
@@ -40,7 +40,9 @@ export default {
building_table: false,
tableOptions: {
columns: this.getTableColumns(),
- options: {},
+ options: {
+ embed: "borrowernumber",
+ },
url: () => this.table_url(),
table_settings: this.counter_log_table_settings,
add_filters: true,
@@ -137,8 +139,9 @@ export default {
{
title: __("Imported by"),
render: function (data, type, row, meta) {
- const importer = row.borrowernumber
- ? `Borrowernumber ${row.borrowernumber}`
+ const borrower = row.borrowernumber
+ const importer = borrower
+ ? `${borrower.firstname} ${borrower.surname}`
: this.$__("Cronjob")
return importer
},
--- a/misc/cronjobs/erm_run_harvester.pl
+++ a/misc/cronjobs/erm_run_harvester.pl
@@ -22,7 +22,7 @@ use Getopt::Long qw( GetOptions );
use Koha::DateUtils qw( dt_from_string );
use POSIX;
-use Koha::Script;
+use Koha::Script -cron;
use Koha::ERM::EUsage::UsageDataProviders;
# Command line option values
--