Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

Using thirdparty renderbox to display intervening thirdparties

Browse Source
This commit is contained in:
Julie Lenaerts 2021-12-09 12:35:52 +01:00
parent 21e3da0266
commit 534a8bb3af
2 changed files with 41 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
View File

@ -148,9 +148,7 @@
</li> </li>
</ul> </ul>
</div> </div>
<div v-else class="flex-table"> <div v-else class="flex-table">
<!-- <p>{{ handlingThirdParty.text }}</p>
<address-render-box :address="handlingThirdParty.address"></address-render-box> -->
<third-party-render-box <third-party-render-box
:thirdparty="handlingThirdParty" :thirdparty="handlingThirdParty"
:options="{ :options="{
@ -164,8 +162,7 @@
}"></third-party-render-box> }"></third-party-render-box>
<ul class="record_actions"> <ul class="record_actions">
<li> <li>
<button :title="$t('remove_handling_thirdparty')" class="btn btn-remove" <button :title="$t('remove_handling_thirdparty')" class="btn btn-remove" @click="removeHandlingThirdParty"/>
@click="removeHandlingThirdParty"></button>
</li> </li>
</ul> </ul>
</div> </div>
@ -180,32 +177,22 @@
</div> </div>
<div v-else> <div v-else>
<!-- <div class="flex-bloc mb-3"> <div class="flex-bloc mb-3">
<third-party-render-box <third-party-render-box
:v-for="t in thirdParties" v-for="thirdparty in thirdParties"
:thirdparty="t" :key="thirdparty.id"
:thirdparty="thirdparty"
:options="{ addLink : false, addId : false, addEntity: true, addInfo: false, hLevel: 3 }" :options="{ addLink : false, addId : false, addEntity: true, addInfo: false, hLevel: 3 }"
> >
<template v-slot:record-actions> <template v-slot:record-actions>
<ul class="record_actions"> <ul class="record_actions">
<li><on-the-fly :id="t.id" action="show"></on-the-fly></li> <li>
<li><on-the-fly :id="t.id" action="edit" @saveFormOnTheFly="saveFormOnTheFly"></on-the-fly></li> <button :title="$t('remove_thirdparty')" class="btn btn-remove" @click="removeThirdParty(thirdparty)" />
<li><button class="btn btn-sm btn-remove" :title="$t('action.remove')" @click.prevent="$emit('remove', resource)"></button></li> </li>
</ul> </ul>
</template> </template>
</third-party-render-box> </third-party-render-box>
</div> --> </div>
<ul>
<li v-for="t in thirdParties">
<p>{{ t.text }}</p>
<address-render-box :address="t.address"></address-render-box>
<ul class="record_actions">
<button :title="$t('remove_thirdparty')" class="btn btn-remove"
@click="removeThirdParty(t)"></button>
</ul>
</li>
</ul>
</div> </div>
<ul class="record_actions"> <ul class="record_actions">
@ -222,17 +209,17 @@
</ul> </ul>
</div> </div>
<div> <div>
<pick-template <pick-template
entityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork" entityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork"
:templates="this.templatesAvailablesForAction" :templates="this.templatesAvailablesForAction"
:entityId="work.id" :entityId="work.id"
:beforeMove="beforeGenerateTemplate"> :beforeMove="beforeGenerateTemplate">
<template v-slot:title> <template v-slot:title>
<h3>{{ $t('Generate doc') }}</h3> <h3>{{ $t('Generate doc') }}</h3>
</template> </template>
</pick-template> </pick-template>
</div> </div>
<div v-if="errors.length > 0" id="errors" class="alert alert-danger flashbag"> <div v-if="errors.length > 0" id="errors" class="alert alert-danger flashbag">
<p>{{ $t('fix_these_errors') }}</p> <p>{{ $t('fix_these_errors') }}</p>
@ -459,8 +446,8 @@ export default {
this.$store.dispatch('submit'); this.$store.dispatch('submit');
}, },
beforeGenerateTemplate() { beforeGenerateTemplate() {
console.log('before generate'); console.log('before generate');
return Promise.resolve(); return Promise.resolve();
} }
} }
}; };
@ -476,15 +463,15 @@ div#workEditor {
grid-template-columns: 50%; grid-template-columns: 50%;
column-gap: 0rem; column-gap: 0rem;
grid-template-areas: grid-template-areas:
"title title" "title title"
"startDate endDate" "startDate endDate"
"comment comment" "comment comment"
"objectives objectives" "objectives objectives"
"evaluations evaluations" "evaluations evaluations"
"persons persons" "persons persons"
"handling handling" "handling handling"
"tparties tparties" "tparties tparties"
"errors errors"; "errors errors";
#title { #title {
grid-area: title; } grid-area: title; }

18
src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
View File

@ -16,7 +16,7 @@
{{ $t('thirdparty.child')}} {{ $t('thirdparty.child')}}
</span> </span>
<span class="badge bg-thirdparty-company" v-else-if="thirdparty.kind == 'company'"> <span class="badge bg-thirdparty-company" v-else-if="thirdparty.kind == 'company'">
{{ $t('thirdparty.company')}} {{ $t('thirdparty.company')}}
</span> </span>
<span class="badge bg-thirdparty-contact" v-else> <span class="badge bg-thirdparty-contact" v-else>
{{ $t('thirdparty.contact')}} {{ $t('thirdparty.contact')}}
@ -40,12 +40,12 @@
<div class="item-col"> <div class="item-col">
<div class="float-button bottom"> <div class="float-button bottom">
<div class="box"> <div class="box">
<div class="action"> <div class="action">
<slot name="record-actions"></slot> <slot name="record-actions"></slot>
</div> </div>
<confidential v-if="thirdparty.contactDataAnonymous"> <confidential v-if="thirdparty.contactDataAnonymous">
<template v-slot:confidential-content> <template v-slot:confidential-content>
<ul class="list-content fa-ul"> <ul class="list-content fa-ul">
<li v-if="thirdparty.address"> <li v-if="thirdparty.address">
@ -77,8 +77,8 @@
<a :href="'mailto: ' + thirdparty.email">{{ thirdparty.email }}</a> <a :href="'mailto: ' + thirdparty.email">{{ thirdparty.email }}</a>
</li> </li>
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>
</div> </div>