X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=koha-tmpl%2Fintranet-tmpl%2Fprog%2Fjs%2Fvue%2Fcomponents%2FERM%2FAgreementsFormAdd.vue;h=9229d8c1e4e8ab709f19ddd393dc0d139b1792dc;hb=64a838ce32f8ad6451729a4a7739d3353da8efcb;hp=2e8e693a9428f095fd00736ff676646f641be45e;hpb=a95b659e6845d09ba2fcf595bc0a9ecd5393fd0e;p=koha-ffzg.git

diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue
index 2e8e693a94..9229d8c1e4 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue
@@ -1,189 +1,209 @@
 <template>
-    <h2 v-if="agreement.agreement_id">Edit agreement</h2>
-    <h2 v-else>New agreement</h2>
-    <div>
-        <form @submit="onSubmit($event)">
-            <fieldset class="rows">
-                <ol>
-                    <li>
-                        <label class="required" for="agreement_name"
-                            >Agreement name:</label
-                        >
-                        <input
-                            id="agreement_name"
-                            v-model="agreement.name"
-                            placeholder="Agreement name"
-                            required
-                        />
-                        <span class="required">Required</span>
-                    </li>
-                    <li>
-                        <label for="agreement_vendor_id">Vendor:</label>
-                        <select
-                            id="agreement_vendor_id"
-                            v-model="agreement.vendor_id"
-                        >
-                            <option value=""></option>
-                            <option
-                                v-for="vendor in vendors"
-                                :key="vendor.vendor_id"
-                                :value="vendor.id"
-                                :selected="
-                                    vendor.id == agreement.vendor_id
-                                        ? true
-                                        : false
-                                "
-                            >
-                                {{ vendor.name }}
-                            </option>
-                        </select>
-                    </li>
-                    <li>
-                        <label for="agreement_description">Description: </label>
-                        <textarea
-                            id="agreement_description"
-                            v-model="agreement.description"
-                            placeholder="Description"
-                            rows="10"
-                            cols="50"
-                            required
-                        />
-                        <span class="required">Required</span>
-                    </li>
-                    <li>
-                        <label for="agreement_status">Status: </label>
-                        <select
-                            id="agreement_status"
-                            v-model="agreement.status"
-                            @change="onStatusChange($event)"
-                            required
-                        >
-                            <option value=""></option>
-                            <option
-                                v-for="status in av_agreement_statuses"
-                                :key="status.authorised_values"
-                                :value="status.authorised_value"
-                                :selected="
-                                    status.authorised_value == agreement.status
-                                        ? true
-                                        : false
-                                "
-                            >
-                                {{ status.lib }}
-                            </option>
-                        </select>
-                        <span class="required">Required</span>
-                    </li>
-                    <li>
-                        <label for="agreement_closure_reason"
-                            >Closure reason:</label
-                        >
-                        <select
-                            id="agreement_closure_reason"
-                            v-model="agreement.closure_reason"
-                            :disabled="
-                                agreement.status == 'closed' ? false : true
-                            "
-                        >
-                            <option value=""></option>
-                            <option
-                                v-for="r in av_agreement_closure_reasons"
-                                :key="r.authorised_values"
-                                :value="r.authorised_value"
-                                :selected="
-                                    r.authorised_value ==
-                                    agreement.closure_reason
-                                        ? true
-                                        : false
-                                "
+    <div v-if="!this.initialized">{{ $t("Loading") }}</div>
+    <div v-else id="agreements_add">
+        <h2 v-if="agreement.agreement_id">
+            {{ $t("Edit agreement .id", { id: agreement.agreement_id }) }}
+        </h2>
+        <h2 v-else>{{ $t("New agreement") }}</h2>
+        <div>
+            <form @submit="onSubmit($event)">
+                <fieldset class="rows">
+                    <ol>
+                        <li>
+                            <label class="required" for="agreement_name"
+                                >{{ $t("Agreement name") }}:</label
                             >
-                                {{ r.lib }}
-                            </option>
-                        </select>
-                    </li>
-                    <li>
-                        <label for="agreement_is_perpetual" class="radio"
-                            >Is perpetual:</label
-                        >
-                        <label for="agreement_is_perpetual_yes">
                             <input
-                                type="radio"
-                                name="is_perpetual"
-                                id="agreement_is_perpetual_yes"
-                                :value="true"
-                                v-model="agreement.is_perpetual"
+                                id="agreement_name"
+                                v-model="agreement.name"
+                                :placeholder="$t('Agreement name')"
+                                required
                             />
-                            Yes
-                        </label>
-                        <label for="agreement_is_perpetual_no">
-                            <input
-                                type="radio"
-                                name="is_perpetual"
-                                id="agreement_is_perpetual_no"
-                                :value="false"
-                                v-model="agreement.is_perpetual"
+                            <span class="required">{{ $t("Required") }}</span>
+                        </li>
+                        <li>
+                            <label for="agreement_vendor_id"
+                                >{{ $t("Vendor") }}:</label
+                            >
+                            <select
+                                id="agreement_vendor_id"
+                                v-model="agreement.vendor_id"
+                            >
+                                <option value=""></option>
+                                <option
+                                    v-for="vendor in vendors"
+                                    :key="vendor.vendor_id"
+                                    :value="vendor.id"
+                                    :selected="
+                                        vendor.id == agreement.vendor_id
+                                            ? true
+                                            : false
+                                    "
+                                >
+                                    {{ vendor.name }}
+                                </option>
+                            </select>
+                        </li>
+                        <li>
+                            <label for="agreement_description"
+                                >{{ $t("Description") }}:
+                            </label>
+                            <textarea
+                                id="agreement_description"
+                                v-model="agreement.description"
+                                :placeholder="$t('Description')"
+                                rows="10"
+                                cols="50"
+                                required
                             />
-                            No
-                        </label>
-                    </li>
-                    <li>
-                        <label for="agreement_renewal_priority"
-                            >Renewal priority:</label
-                        >
-                        <select v-model="agreement.renewal_priority">
-                            <option value=""></option>
-                            <option
-                                v-for="p in av_agreement_renewal_priorities"
-                                :key="p.authorised_values"
-                                :value="p.authorised_value"
-                                :selected="
-                                    p.authorised_value ==
-                                    agreement.renewal_priority
-                                        ? true
-                                        : false
+                            <span class="required">{{ $t("Required") }}</span>
+                        </li>
+                        <li>
+                            <label for="agreement_status"
+                                >{{ $t("Status") }}:</label
+                            >
+                            <select
+                                id="agreement_status"
+                                v-model="agreement.status"
+                                @change="onStatusChange($event)"
+                                required
+                            >
+                                <option value=""></option>
+                                <option
+                                    v-for="status in av_agreement_statuses"
+                                    :key="status.authorised_values"
+                                    :value="status.authorised_value"
+                                    :selected="
+                                        status.authorised_value ==
+                                        agreement.status
+                                            ? true
+                                            : false
+                                    "
+                                >
+                                    {{ status.lib }}
+                                </option>
+                            </select>
+                            <span class="required">{{ $t("Required") }}</span>
+                        </li>
+                        <li>
+                            <label for="agreement_closure_reason"
+                                >{{ $t("Closure reason") }}:</label
+                            >
+                            <select
+                                id="agreement_closure_reason"
+                                v-model="agreement.closure_reason"
+                                :disabled="
+                                    agreement.status == 'closed' ? false : true
                                 "
                             >
-                                {{ p.lib }}
-                            </option>
-                        </select>
-                    </li>
-                    <li>
-                        <label for="agreement_license_info"
-                            >License info:
-                        </label>
-                        <textarea
-                            id="agreement_license_info"
-                            v-model="agreement.license_info"
-                            placeholder="License info"
-                        />
-                    </li>
+                                <option value=""></option>
+                                <option
+                                    v-for="r in av_agreement_closure_reasons"
+                                    :key="r.authorised_values"
+                                    :value="r.authorised_value"
+                                    :selected="
+                                        r.authorised_value ==
+                                        agreement.closure_reason
+                                            ? true
+                                            : false
+                                    "
+                                >
+                                    {{ r.lib }}
+                                </option>
+                            </select>
+                        </li>
+                        <li>
+                            <label for="agreement_is_perpetual" class="radio"
+                                >{{ $t("Is perpetual") }}:</label
+                            >
+                            <label for="agreement_is_perpetual_yes">
+                                <input
+                                    type="radio"
+                                    name="is_perpetual"
+                                    id="agreement_is_perpetual_yes"
+                                    :value="true"
+                                    v-model="agreement.is_perpetual"
+                                />
+                                Yes
+                            </label>
+                            <label for="agreement_is_perpetual_no">
+                                <input
+                                    type="radio"
+                                    name="is_perpetual"
+                                    id="agreement_is_perpetual_no"
+                                    :value="false"
+                                    v-model="agreement.is_perpetual"
+                                />
+                                No
+                            </label>
+                        </li>
+                        <li>
+                            <label for="agreement_renewal_priority"
+                                >{{ $t("Renewal priority") }}:</label
+                            >
+                            <select v-model="agreement.renewal_priority">
+                                <option value=""></option>
+                                <option
+                                    v-for="p in av_agreement_renewal_priorities"
+                                    :key="p.authorised_values"
+                                    :value="p.authorised_value"
+                                    :selected="
+                                        p.authorised_value ==
+                                        agreement.renewal_priority
+                                            ? true
+                                            : false
+                                    "
+                                >
+                                    {{ p.lib }}
+                                </option>
+                            </select>
+                        </li>
+                        <li>
+                            <label for="agreement_license_info"
+                                >{{ $t("License info") }}:
+                            </label>
+                            <textarea
+                                id="agreement_license_info"
+                                v-model="agreement.license_info"
+                                placeholder="License info"
+                            />
+                        </li>
 
-                    <AgreementPeriods :periods="agreement.periods" />
-                    <AgreementUserRoles
-                        :user_roles="agreement.user_roles"
-                        :av_agreement_user_roles="av_agreement_user_roles"
-                    />
-                    <AgreementLicenses
-                        :agreement_licenses="agreement.agreement_licenses"
-                        :av_agreement_license_statuses="
-                            av_agreement_license_statuses
-                        "
-                        :av_agreement_license_location="
-                            av_agreement_license_location
-                        "
-                    />
-                </ol>
-            </fieldset>
-            <fieldset class="action">
-                <input type="submit" value="Submit" />
-                <a
-                    role="button"
-                    class="cancel"
-                    @click="$emit('switch-view', 'list')"
-                    >Cancel</a
-                >
-            </fieldset>
-        </form>
+                        <AgreementPeriods :periods="agreement.periods" />
+                        <AgreementUserRoles
+                            :user_roles="agreement.user_roles"
+                            :av_agreement_user_roles="av_agreement_user_roles"
+                        />
+                        <AgreementLicenses
+                            :agreement_licenses="agreement.agreement_licenses"
+                            :av_agreement_license_statuses="
+                                av_agreement_license_statuses
+                            "
+                            :av_agreement_license_location="
+                                av_agreement_license_location
+                            "
+                        />
+                        <AgreementRelationships
+                            :agreement_id="agreement.agreement_id"
+                            :relationships="agreement.agreement_relationships"
+                            :av_agreement_relationships="
+                                av_agreement_relationships
+                            "
+                        />
+                        <AgreementDocuments :documents="agreement.documents" />
+                    </ol>
+                </fieldset>
+                <fieldset class="action">
+                    <input type="submit" value="Submit" />
+                    <router-link
+                        to="/cgi-bin/koha/erm/agreements"
+                        role="button"
+                        class="cancel"
+                        >{{ $t("Cancel") }}</router-link
+                    >
+                </fieldset>
+            </form>
+        </div>
     </div>
 </template>
 
@@ -191,15 +211,38 @@
 import AgreementPeriods from './AgreementPeriods.vue'
 import AgreementUserRoles from './AgreementUserRoles.vue'
 import AgreementLicenses from './AgreementLicenses.vue'
+import AgreementRelationships from './AgreementRelationships.vue'
+import AgreementDocuments from './AgreementDocuments.vue'
 import { useVendorStore } from "../../stores/vendors"
+import { useAVStore } from "../../stores/authorised_values"
+import { setMessage, setError, setWarning } from "../../messages"
+import { fetchAgreement } from '../../fetch'
 import { storeToRefs } from "pinia"
 
 export default {
     setup() {
         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)
+
         return {
             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() {
@@ -217,31 +260,66 @@ export default {
                 periods: [],
                 user_roles: [],
                 agreement_licenses: [],
-            }
+                agreement_relationships: [],
+                documents: [],
+            },
+            initialized: false,
         }
     },
-    created() {
-        if (!this.agreement_id) return
-        const apiUrl = '/api/v1/erm/agreements/' + this.agreement_id
-
-        fetch(apiUrl, {
-            headers: {
-                'x-koha-embed': 'periods,user_roles,user_roles.patron,agreement_licenses,agreement_licenses.license'
+    beforeRouteEnter(to, from, next) {
+        next(vm => {
+            if (to.params.agreement_id) {
+                vm.agreement = vm.getAgreement(to.params.agreement_id)
+            } else {
+                vm.initialized = true
             }
         })
-            .then(res => res.json())
-            .then(
-                (result) => {
-                    this.agreement = result
-                }
-            )
     },
     methods: {
+        async getAgreement(agreement_id) {
+            const agreement = await fetchAgreement(agreement_id)
+            this.agreement = agreement
+            this.initialized = true
+        },
+        checkForm(agreement) {
+            let errors = []
+
+            let agreement_licenses = agreement.agreement_licenses
+            // Do not use al.license.name here! Its name is not the one linked with al.license_id
+            // At this point al.license is meaningless, form/template only modified al.license_id
+            const license_ids = agreement_licenses.map(al => al.license_id)
+            const duplicate_license_ids = license_ids.filter((id, i) => license_ids.indexOf(id) !== i)
+
+            if (duplicate_license_ids.length) {
+                errors.push(this.$t("A license is used several times"))
+            }
+
+            const related_agreement_ids = agreement.agreement_relationships.map(rs => rs.related_agreement_id)
+            const duplicate_related_agreement_ids = related_agreement_ids.filter((id, i) => related_agreement_ids.indexOf(id) !== i)
+
+            if (duplicate_related_agreement_ids.length) {
+                errors.push(this.$t("An agreement is used as relationship several times"))
+            }
+
+            if (agreement_licenses.filter(al => al.status == 'controlling').length > 1) {
+                errors.push(this.$t("Only one controlling license is allowed"))
+            }
+
+            errors.forEach(function (e) {
+                setWarning(e)
+            })
+            return !errors.length
+        },
         onSubmit(e) {
             e.preventDefault()
 
             //let agreement= Object.assign( {} ,this.agreement); // copy
             let agreement = JSON.parse(JSON.stringify(this.agreement)) // copy
+
+            if (!this.checkForm(agreement)) {
+                return false
+            }
+
             let apiUrl = '/api/v1/erm/agreements'
 
             let method = 'POST'
@@ -252,6 +330,10 @@ export default {
             delete agreement.agreement_id
             agreement.is_perpetual = agreement.is_perpetual ? true : false
 
+            if (agreement.vendor_id == "") {
+                agreement.vendor_id = null
+            }
+
             agreement.periods.forEach(p => {
                 p.started_on = $date_to_rfc3339(p.started_on)
                 p.ended_on = p.ended_on ? $date_to_rfc3339(p.ended_on) : null
@@ -264,6 +346,12 @@ export default {
 
             agreement.agreement_licenses = agreement.agreement_licenses.map(({ license, agreement_id, agreement_license_id, ...keepAttrs }) => keepAttrs)
 
+            agreement.agreement_relationships = agreement.agreement_relationships.map(({ related_agreement, ...keepAttrs }) => keepAttrs)
+
+            agreement.documents = agreement.documents.map(({ file_type, uploaded_on, ...keepAttrs }) => keepAttrs)
+
+            delete agreement.agreement_packages
+
             const options = {
                 method: method,
                 body: JSON.stringify(agreement),
@@ -275,15 +363,17 @@ export default {
             fetch(apiUrl, options)
                 .then(response => {
                     if (response.status == 200) {
-                        this.$emit('agreement-updated')
+                        this.$router.push("/cgi-bin/koha/erm/agreements")
+                        setMessage(this.$t("Agreement updated"))
                     } else if (response.status == 201) {
-                        this.$emit('agreement-created')
+                        this.$router.push("/cgi-bin/koha/erm/agreements")
+                        setMessage(this.$t("Agreement created"))
                     } else {
-                        this.$emit('set-error', response.message || response.statusText)
+                        setError(response.message || response.statusText)
                     }
                 }).catch(
                     (error) => {
-                        this.$emit('set-error', error)
+                        this.setError(error)
                     }
                 )
         },
@@ -293,20 +383,12 @@ export default {
             }
         }
     },
-    emits: ['agreement-created', 'agreement-updated', 'set-error', 'switch-view'],
-    props: {
-        agreement_id: Number,
-        av_agreement_statuses: Array,
-        av_agreement_closure_reasons: Array,
-        av_agreement_renewal_priorities: Array,
-        av_agreement_user_roles: Array,
-        av_agreement_license_statuses: Array,
-        av_agreement_license_location: Array,
-    },
     components: {
         AgreementPeriods,
         AgreementUserRoles,
         AgreementLicenses,
+        AgreementRelationships,
+        AgreementDocuments,
     },
     name: "AgreementsFormAdd",
 }