View | Details | Raw Unified | Return to bug 37930
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue (-24 / +22 lines)
Lines 51-57 Link Here
51
                                v-model="agreement.status"
51
                                v-model="agreement.status"
52
                                label="description"
52
                                label="description"
53
                                :reduce="av => av.value"
53
                                :reduce="av => av.value"
54
                                :options="av_agreement_statuses"
54
                                :options="
55
                                    authorisedValues['av_agreement_statuses']
56
                                "
55
                                @option:selected="onStatusChanged"
57
                                @option:selected="onStatusChanged"
56
                                :required="!agreement.status"
58
                                :required="!agreement.status"
57
                            >
59
                            >
Lines 75-81 Link Here
75
                                v-model="agreement.closure_reason"
77
                                v-model="agreement.closure_reason"
76
                                label="description"
78
                                label="description"
77
                                :reduce="av => av.value"
79
                                :reduce="av => av.value"
78
                                :options="av_agreement_closure_reasons"
80
                                :options="
81
                                    authorisedValues[
82
                                        'av_agreement_closure_reasons'
83
                                    ]
84
                                "
79
                                :disabled="
85
                                :disabled="
80
                                    agreement.status == 'closed' ? false : true
86
                                    agreement.status == 'closed' ? false : true
81
                                "
87
                                "
Lines 117-123 Link Here
117
                                v-model="agreement.renewal_priority"
123
                                v-model="agreement.renewal_priority"
118
                                label="description"
124
                                label="description"
119
                                :reduce="av => av.value"
125
                                :reduce="av => av.value"
120
                                :options="av_agreement_renewal_priorities"
126
                                :options="
127
                                    authorisedValues[
128
                                        'av_agreement_renewal_priorities'
129
                                    ]
130
                                "
121
                            />
131
                            />
122
                        </li>
132
                        </li>
123
                        <li>
133
                        <li>
Lines 141-161 Link Here
141
                <UserRoles
151
                <UserRoles
142
                    :user_type="$__('Agreement user %s')"
152
                    :user_type="$__('Agreement user %s')"
143
                    :user_roles="agreement.user_roles"
153
                    :user_roles="agreement.user_roles"
144
                    :av_user_roles="av_user_roles"
154
                    :av_user_roles="authorisedValues['av_user_roles']"
145
                />
155
                />
146
                <AgreementLicenses
156
                <AgreementLicenses
147
                    :agreement_licenses="agreement.agreement_licenses"
157
                    :agreement_licenses="agreement.agreement_licenses"
148
                    :av_agreement_license_statuses="
158
                    :av_agreement_license_statuses="
149
                        av_agreement_license_statuses
159
                        authorisedValues['av_agreement_license_statuses']
150
                    "
160
                    "
151
                    :av_agreement_license_location="
161
                    :av_agreement_license_location="
152
                        av_agreement_license_location
162
                        authorisedValues['av_agreement_license_location']
153
                    "
163
                    "
154
                />
164
                />
155
                <AgreementRelationships
165
                <AgreementRelationships
156
                    :agreement_id="agreement.agreement_id"
166
                    :agreement_id="agreement.agreement_id"
157
                    :relationships="agreement.agreement_relationships"
167
                    :relationships="agreement.agreement_relationships"
158
                    :av_agreement_relationships="av_agreement_relationships"
168
                    :av_agreement_relationships="
169
                        authorisedValues['av_agreement_relationships']
170
                    "
159
                />
171
                />
160
                <Documents :documents="agreement.documents" />
172
                <Documents :documents="agreement.documents" />
161
                <fieldset class="action">
173
                <fieldset class="action">
Lines 188-212 import { storeToRefs } from "pinia" Link Here
188
200
189
export default {
201
export default {
190
    setup() {
202
    setup() {
191
        const AVStore = inject("AVStore")
203
        const mainStore = inject("mainStore")
192
        const {
204
        const { authorisedValues } = storeToRefs(mainStore)
193
            av_agreement_statuses,
194
            av_agreement_closure_reasons,
195
            av_agreement_renewal_priorities,
196
            av_user_roles,
197
            av_agreement_license_statuses,
198
            av_agreement_license_location,
199
            av_agreement_relationships,
200
        } = storeToRefs(AVStore)
201
205
202
        return {
206
        return {
203
            av_agreement_statuses,
207
            authorisedValues,
204
            av_agreement_closure_reasons,
205
            av_agreement_renewal_priorities,
206
            av_user_roles,
207
            av_agreement_license_statuses,
208
            av_agreement_license_location,
209
            av_agreement_relationships,
210
            max_allowed_packet,
208
            max_allowed_packet,
211
        }
209
        }
212
    },
210
    },
(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue (-7 / +6 lines)
Lines 72-84 export default { Link Here
72
        const vendorStore = inject("vendorStore")
72
        const vendorStore = inject("vendorStore")
73
        const { vendors } = storeToRefs(vendorStore)
73
        const { vendors } = storeToRefs(vendorStore)
74
74
75
        const AVStore = inject("AVStore")
75
        const {
76
        const { get_lib_from_av, map_av_dt_filter } = AVStore
76
            setConfirmationDialog,
77
77
            setMessage,
78
        const { setConfirmationDialog, setMessage } = inject("mainStore")
78
            get_lib_from_av,
79
79
            map_av_dt_filter,
80
        const { authorisedValues } = inject("ERMStore")
80
        } = inject("mainStore")
81
        console.log(authorisedValues)
82
81
83
        const table = ref()
82
        const table = ref()
84
83
(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Main.vue (+1 lines)
Lines 91-96 export default { Link Here
91
            .then(config => {
91
            .then(config => {
92
                this.config = config
92
                this.config = config
93
                if (this.config.settings.ERMModule != 1) {
93
                if (this.config.settings.ERMModule != 1) {
94
                    this.loaded()
94
                    return this.setError(
95
                    return this.setError(
95
                        this.$__(
96
                        this.$__(
96
                            "The e-resource management module is disabled, turn on <a href='/cgi-bin/koha/admin/preferences.pl?tab=&op=search&searchfield=ERMModule'>ERMModule</a> to use it"
97
                            "The e-resource management module is disabled, turn on <a href='/cgi-bin/koha/admin/preferences.pl?tab=&op=search&searchfield=ERMModule'>ERMModule</a> to use it"
(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/stores/main.js (-2 lines)
Lines 112-118 export const useMainStore = defineStore("main", { Link Here
112
            });
112
            });
113
        },
113
        },
114
        async loadAuthorisedValues(authorisedValues) {
114
        async loadAuthorisedValues(authorisedValues) {
115
            console.log(authorisedValues);
116
            const AVsToFetch = Object.keys(authorisedValues).reduce(
115
            const AVsToFetch = Object.keys(authorisedValues).reduce(
117
                (acc, avKey) => {
116
                (acc, avKey) => {
118
                    if (Array.isArray(authorisedValues[avKey])) return acc;
117
                    if (Array.isArray(authorisedValues[avKey])) return acc;
119
- 

Return to bug 37930