gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 32030: Move get_lib_from_av to AVStore 

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-19 10:26:24 +02:00 committed by Tomas Cohen Arazi
parent 4b46125994
commit c6e7fa106d
No known key found for this signature in database
GPG Key ID: 0A272EA1B2F3C15F
3 changed files with 19 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsShow.vue
View File

@ -45,7 +45,7 @@
<label>Status: </label>
<span>{{
get_lib_from_av(
av_agreement_statuses,
'av_agreement_statuses',
agreement.status
)
}}</span>
@ -54,7 +54,7 @@
<label>Closure reason:</label>
<span>{{
get_lib_from_av(
av_agreement_closure_reasons,
'av_agreement_closure_reasons',
agreement.closure_reason
)
}}</span>
@ -68,7 +68,7 @@
<label>Renewal priority:</label>
<span>{{
get_lib_from_av(
av_agreement_renewal_priorities,
'av_agreement_renewal_priorities',
agreement.renewal_priority
)
}}</span>
@ -129,7 +129,7 @@
<td>
{{
get_lib_from_av(
av_agreement_user_roles,
'av_agreement_user_roles',
role.role
)
}}
@ -166,7 +166,7 @@
<td>
{{
get_lib_from_av(
av_agreement_license_statuses,
'av_agreement_license_statuses',
agreement_license.status
)
}}
@ -174,7 +174,7 @@
<td>
{{
get_lib_from_av(
av_agreement_license_location,
'av_agreement_license_location',
agreement_license.physical_location
)
}}
@ -202,7 +202,7 @@
>
{{
get_lib_from_av(
av_agreement_relationships,
'av_agreement_relationships',
relationship.relationship
)
}}
@ -235,38 +235,18 @@ export default {
setup() {
const format_date = $date
const patron_to_html = $patron_to_html
const get_lib_from_av = function (arr, av) {
let o = arr.find(
(e) => e.authorised_value == av
)
return o ? o.lib : ""
}
const vendorStore = useVendorStore()
const { vendors } = storeToRefs(vendorStore)
const AVStore = useAVStore()
const {
av_agreement_statuses,
av_agreement_closure_reasons,
av_agreement_renewal_priorities,
av_agreement_user_roles,
av_agreement_license_statuses,
av_agreement_license_location,
av_agreement_relationships,
} = storeToRefs(AVStore)
const { get_lib_from_av } = AVStore
return {
format_date,
patron_to_html,
get_lib_from_av,
vendors,
av_agreement_statuses,
av_agreement_closure_reasons,
av_agreement_renewal_priorities,
av_agreement_user_roles,
av_agreement_license_statuses,
av_agreement_license_location,
av_agreement_relationships,
}
},
data() {
@ -312,7 +292,7 @@ export default {
</script>
<style scoped>
.action_links a {
padding-left: .2em;
padding-left: 0.2em;
font-size: 11px;
}
</style>

17
koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesShow.vue
View File

@ -34,13 +34,13 @@
<li>
<label>Type: </label>
<span>{{
get_lib_from_av(av_license_types, license.type)
get_lib_from_av('av_license_types', license.type)
}}</span>
</li>
<li>
<label>Status: </label>
<span>{{
get_lib_from_av(av_license_statuses, license.status)
get_lib_from_av('av_license_statuses', license.status)
}}</span>
</li>
@ -75,24 +75,13 @@ import { fetchLicense } from "../../fetch"
export default {
setup() {
const format_date = $date
const get_lib_from_av = function (arr, av) {
let o = arr.find(
(e) => e.authorised_value == av
)
return o ? o.lib : ""
}
const AVStore = useAVStore()
const {
av_license_types,
av_license_statuses,
} = storeToRefs(AVStore)
const { get_lib_from_av } = AVStore
return {
format_date,
get_lib_from_av,
av_license_types,
av_license_statuses,
}
},
data() {

7
koha-tmpl/intranet-tmpl/prog/js/vue/stores/authorised_values.js
View File

@ -34,5 +34,10 @@ export const useAVStore = defineStore("authorised_values", {
{ authorised_value: "related_to", lib: "related_to" },
],
}),
// FIXME We could move get_lib_from_av here
actions: {
get_lib_from_av(arr_name, av) {
let o = this[arr_name].find((e) => e.authorised_value == av);
return o ? o.lib : "";
},
},
});