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

Bug 34587: Code tidying

Browse source 
Signed-off-by: Jessica Zairo <jzairo@bywatersolutions.com>
Signed-off-by: Michaela Sieber <michaela.sieber@kit.edu>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Matt Blenkinsop 2023-08-17 12:21:54 +00:00 committed by Tomas Cohen Arazi
parent 9fc2151ead
commit e5ec3df36e
Signed by: tomascohen
GPG key ID: 0A272EA1B2F3C15F
35 changed files with 81 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Koha/ERM/CounterFile.pm
View file

@ -1,5 +1,7 @@
package Koha::ERM::CounterFile;
# Copyright 2023 PTFS Europe
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it

2
Koha/ERM/CounterFiles.pm
View file

@ -1,5 +1,7 @@
package Koha::ERM::CounterFiles;
# Copyright 2023 PTFS Europe
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it

2
Koha/ERM/CounterLog.pm
View file

@ -1,5 +1,7 @@
package Koha::ERM::CounterLog;
# Copyright 2023 PTFS Europe
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it

2
Koha/ERM/CounterLogs.pm
View file

@ -1,5 +1,7 @@
package Koha::ERM::CounterLogs;
# Copyright 2023 PTFS Europe
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it

2
Koha/ERM/DefaultUsageReport.pm
View file

@ -1,5 +1,7 @@
package Koha::ERM::DefaultUsageReport;
# Copyright 2023 PTFS Europe
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it

2
Koha/ERM/DefaultUsageReports.pm
View file

@ -1,5 +1,7 @@
package Koha::ERM::DefaultUsageReports;
# Copyright 2023 PTFS Europe
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it

2
Koha/ERM/MonthlyUsage.pm
View file

@ -1,5 +1,7 @@
package Koha::ERM::MonthlyUsage;
# Copyright 2023 PTFS Europe
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it

2
Koha/ERM/MonthlyUsages.pm
View file

@ -1,5 +1,7 @@
package Koha::ERM::MonthlyUsages;
# Copyright 2023 PTFS Europe
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it

2
Koha/ERM/UsageDataProvider.pm
View file

@ -1,5 +1,7 @@
package Koha::ERM::UsageDataProvider;
# Copyright 2023 PTFS Europe
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it

2
Koha/ERM/UsageDataProviders.pm
View file

@ -1,5 +1,7 @@
package Koha::ERM::UsageDataProviders;
# Copyright 2023 PTFS Europe
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it

2
Koha/ERM/UsageDatabase.pm
View file

@ -1,5 +1,7 @@
package Koha::ERM::UsageDatabase;
# Copyright 2023 PTFS Europe
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it

2
Koha/ERM/UsageDatabases.pm
View file

@ -1,5 +1,7 @@
package Koha::ERM::UsageDatabases;
# Copyright 2023 PTFS Europe
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it

2
Koha/ERM/UsageItem.pm
View file

@ -1,5 +1,7 @@
package Koha::ERM::UsageItem;
# Copyright 2023 PTFS Europe
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it

2
Koha/ERM/UsageItems.pm
View file

@ -1,5 +1,7 @@
package Koha::ERM::UsageItems;
# Copyright 2023 PTFS Europe
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it

2
Koha/ERM/UsagePlatform.pm
View file

@ -1,5 +1,7 @@
package Koha::ERM::UsagePlatform;
# Copyright 2023 PTFS Europe
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it

2
Koha/ERM/UsagePlatforms.pm
View file

@ -1,5 +1,7 @@
package Koha::ERM::UsagePlatforms;
# Copyright 2023 PTFS Europe
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it

2
Koha/ERM/UsageTitle.pm
View file

@ -1,5 +1,7 @@
package Koha::ERM::UsageTitle;
# Copyright 2023 PTFS Europe
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it

2
Koha/ERM/UsageTitles.pm
View file

@ -1,5 +1,7 @@
package Koha::ERM::UsageTitles;
# Copyright 2023 PTFS Europe
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it

2
Koha/ERM/YearlyUsage.pm
View file

@ -1,5 +1,7 @@
package Koha::ERM::YearlyUsage;
# Copyright 2023 PTFS Europe
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it

2
Koha/ERM/YearlyUsages.pm
View file

@ -1,5 +1,7 @@
package Koha::ERM::YearlyUsages;
# Copyright 2023 PTFS Europe
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it

2
Koha/REST/V1/ERM/CounterFiles.pm
View file

@ -1,5 +1,7 @@
package Koha::REST::V1::ERM::CounterFiles;
# Copyright 2023 PTFS Europe
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it

2
Koha/REST/V1/ERM/CustomReports.pm
View file

@ -1,5 +1,7 @@
package Koha::REST::V1::ERM::CustomReports;
# Copyright 2023 PTFS Europe
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it

2
Koha/REST/V1/ERM/DefaultUsageReports.pm
View file

@ -1,5 +1,7 @@
package Koha::REST::V1::ERM::DefaultUsageReports;
# Copyright 2023 PTFS Europe
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it

2
Koha/REST/V1/ERM/UsageDataProviders.pm
View file

@ -1,5 +1,7 @@
package Koha::REST::V1::ERM::UsageDataProviders;
# Copyright 2023 PTFS Europe
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it

2
Koha/REST/V1/ERM/UsageDatabases.pm
View file

@ -1,5 +1,7 @@
package Koha::REST::V1::ERM::UsageDatabases;
# Copyright 2023 PTFS Europe
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it

2
Koha/REST/V1/ERM/UsageItems.pm
View file

@ -1,5 +1,7 @@
package Koha::REST::V1::ERM::UsageItems;
# Copyright 2023 PTFS Europe
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it

2
Koha/REST/V1/ERM/UsagePlatforms.pm
View file

@ -1,5 +1,7 @@
package Koha::REST::V1::ERM::UsagePlatforms;
# Copyright 2023 PTFS Europe
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it

2
Koha/REST/V1/ERM/UsageTitles.pm
View file

@ -1,5 +1,7 @@
package Koha::REST::V1::ERM::UsageTitles;
# Copyright 2023 PTFS Europe
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it

6
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersFileImport.vue
View file

@ -1,7 +1,7 @@
<template>
<div class="page-section" id="files">
<form @submit="addDocument($event)" class="file_upload">
<h2>Manual upload:</h2>
<h2>{{ $__("Manual upload:") }}</h2>
<label>{{ $__("File") }}:</label>
<div class="file_information">
<span v-if="!file.filename">
@ -35,10 +35,8 @@
</template>
<script>
import { inject } from "vue"
import ButtonSubmit from "../ButtonSubmit.vue"
import { setMessage, setError, setWarning } from "../../messages"
import { storeToRefs } from "pinia"
import { setMessage } from "../../messages"
import { APIClient } from "../../fetch/api-client.js"
export default {

2
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersFormAdd.vue
View file

@ -221,7 +221,7 @@
<script>
import ButtonSubmit from "../ButtonSubmit.vue"
import { setMessage, setError, setWarning } from "../../messages"
import { setMessage } from "../../messages"
import { APIClient } from "../../fetch/api-client.js"
import { inject } from "vue"
import { storeToRefs } from "pinia"

6
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersShow.vue
View file

@ -41,7 +41,7 @@
role="tab"
data-content="detail"
@click="change_tab_content"
>Detail</a
>{{ $__("Detail") }}</a
>
</li>
<li
@ -69,7 +69,7 @@
role="tab"
data-content="upload"
@click="change_tab_content"
>Manual upload</a
>{{ $__("Manual upload") }}</a
>
</li>
<li
@ -81,7 +81,7 @@
role="tab"
data-content="imports"
@click="change_tab_content"
>Import logs</a
>{{ $__("Import logs") }}</a
>
</li>
</ul>

21
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsReportBuilder.vue
View file

@ -203,7 +203,6 @@
v-bind:key="index"
class="checkbox_options"
>
<!-- TODO: Check translations -->
<label :for="prop.name" class="checkbox"
>{{ $__(prop.name) }}:</label
>
@ -246,8 +245,11 @@
@change="monthSelector($event)"
:checked="yearly_filter_required ? true : false"
/>
Yes - Table will be limited to 12 columns (Jan-Dec)
with the option to switch between years
{{
$__(
"Yes - Table will be limited to 12 columns (Jan-Dec) with the option to switch between years"
)
}}
</label>
<label
for="yearly_filter_required_no"
@ -262,8 +264,11 @@
!yearly_filter_required ? true : false
"
/>
No - Table will include one column for every month
of data selected
{{
$__(
"No - Table will include one column for every month of data selected"
)
}}
</label>
</div>
</div>
@ -309,7 +314,7 @@
<fieldset class="action">
<ButtonSubmit />
<button @click="clearForm($event)" class="button_format">
Clear
{{ $__("Clear") }}
</button>
</fieldset>
<div class="save_report">
@ -323,7 +328,7 @@
@click="saveToDefaultReports($event)"
class="button_format"
>
Save report
{{ $__("Save report") }}
</button>
</div>
</form>
@ -633,7 +638,7 @@ export default {
url = `/api/v1/erm/eUsage/metric_types_report/${db_table}`
prefix = "erm_usage_muses"
break
case "usage_data_provider": // TODO: platform/item/database table embeds?
case "usage_data_provider":
url = `/api/v1/erm/eUsage/provider_rollup_report/${db_table}`
prefix = `erm_usage_${db_table}s.erm_usage_muses`
break

6
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsReportsHome.vue
View file

@ -1,7 +1,7 @@
<template>
<div v-if="!initialized">{{ $__("Loading") }}</div>
<div v-else id="report_builder">
<h2>Usage Statistics Reports</h2>
<h2>{{ $__("Usage statistics reports") }}</h2>
<div id="usage_data_providerstabs" class="toptabs numbered">
<ul class="nav nav-tabs" role="tablist">
<li
@ -15,7 +15,7 @@
role="tab"
data-content="default"
@click="changeCustomOrDefault"
>Saved reports</a
>{{ $__("Saved reports") }}</a
>
</li>
<li
@ -29,7 +29,7 @@
role="tab"
data-content="custom"
@click="changeCustomOrDefault"
>Create report</a
>{{ $__("Create report") }}</a
>
</li>
</ul>

2
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsSavedReports.vue
View file

@ -48,7 +48,7 @@
@click="deleteSavedReport($event)"
class="button_format"
>
Delete report
{{ $__("Delete report") }}
</button>
</fieldset>
</form>

2
t/db_dependent/api/v1/erm_usage_titles.t
View file

@ -1,5 +1,7 @@
#!/usr/bin/env perl
# Copyright 2023 PTFS Europe
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it