first commit

This commit is contained in:
Julie Lenaerts 2021-12-03 18:58:57 +01:00
parent 8a4748dc2d
commit 793f5116ab
4 changed files with 63 additions and 31 deletions

View File

@ -129,6 +129,9 @@ div.accompanying_course_work-list {
@include dashboard_like_badge($social-action-color); @include dashboard_like_badge($social-action-color);
} }
} }
span.title_action {
@include badge_title($social-action-color);
}
} }
/// dashboard_like_badge in Activities on resume page /// dashboard_like_badge in Activities on resume page

View File

@ -22,19 +22,19 @@
<div v-if="suggestedEntities.length > 0"> <div v-if="suggestedEntities.length > 0">
<ul class="list-suggest add-items"> <ul class="list-suggest add-items">
<li v-for="p in suggestedEntities" :key="uniqueId(p)" @click="addSuggestedEntity(p)"> <li v-for="p in suggestedEntities" :key="uniqueId(p)" @click="addSuggestedEntity(p)">
<span>{{ p.text }}</span> <span>{{ p.text }}</span>
</li> </li>
</ul> </ul>
</div> </div>
<div> <div>
<add-persons <add-persons
buttonTitle="resources.add_resources" buttonTitle="resources.add_resources"
modalTitle="resources.add_resources" modalTitle="resources.add_resources"
v-bind:key="addPersons.key" v-bind:key="addPersons.key"
v-bind:options="addPersons.options" v-bind:options="addPersons.options"
@addNewPersons="addNewPersons" @addNewPersons="addNewPersons"
ref="addPersons"> <!-- to cast child method --> ref="addPersons"> <!-- to cast child method -->
</add-persons> </add-persons>
</div> </div>
@ -87,17 +87,17 @@ export default {
} }
) )
// filter persons appearing twice in requestor and resources // filter persons appearing twice in requestor and resources
.filter( .filter(
(e, index, suggested) => { (e, index, suggested) => {
for (let i = 0; i < suggested.length; i = i+1) { for (let i = 0; i < suggested.length; i = i+1) {
if (i < index && e.id === suggested[i].id) { if (i < index && e.id === suggested[i].id) {
return false return false
} }
} }
return true; return true;
} }
) )
}), }),
methods: { methods: {
removeResource(item) { removeResource(item) {

View File

@ -2,18 +2,20 @@
<div id="workEditor" class="my-4"> <div id="workEditor" class="my-4">
<div id="title" class="action-row"> <div id="title" class="action-row">
<label>{{ $t('action_title') }}</label> <h2 class="badge-title">
<p>{{ work.socialAction.text }}</p> <span class="title_label">Action</span>
<span class="title_action">{{ work.socialAction.text }}</span>
</h2>
</div> </div>
<div id="startDate" class="action-row"> <div id="startDate" class="action-row">
<label>{{ $t('startDate') }}</label> <label class="col-form-label col-sm-4">{{ $t('startDate') }}</label>
<input v-model="startDate" type="date" required="true"/> <input v-model="startDate" type="date" required="true" class="form-control" v-once/>
</div> </div>
<div id="endDate" class="action-row"> <div id="endDate" class="action-row">
<label>{{ $t('endDate') }}</label> <label class="col-form-label col-sm-4">{{ $t('endDate') }}</label>
<input v-model="endDate" type="date"/> <input v-model="endDate" type="date" class="form-control" />
</div> </div>
<div id="comment" class="action-row"> <div id="comment" class="action-row">
@ -146,14 +148,24 @@
</li> </li>
</ul> </ul>
</div> </div>
<div v-else> <div v-else class="flex-table">
<p>{{ handlingThirdParty.text }}</p> <!-- <p>{{ handlingThirdParty.text }}</p>
<address-render-box :address="handlingThirdParty.address"></address-render-box> <address-render-box :address="handlingThirdParty.address"></address-render-box> -->
<third-party-render-box
:thirdparty="handlingThirdParty"
:options="{
addLink: false,
addId: false,
addEntity: true,
addInfo: false,
hLevel: 3,
isMultiline: true,
isConfidential: false
}"></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"></button> @click="removeHandlingThirdParty"></button>
</li> </li>
</ul> </ul>
</div> </div>
@ -168,6 +180,21 @@
</div> </div>
<div v-else> <div v-else>
<!-- <div class="flex-bloc mb-3">
<third-party-render-box
:v-for="t in thirdParties"
:thirdparty="t"
:options="{ addLink : false, addId : false, addEntity: true, addInfo: false, hLevel: 3 }"
>
<template v-slot:record-actions>
<ul class="record_actions">
<li><on-the-fly :id="t.id" action="show"></on-the-fly></li>
<li><on-the-fly :id="t.id" action="edit" @saveFormOnTheFly="saveFormOnTheFly"></on-the-fly></li>
<li><button class="btn btn-sm btn-remove" :title="$t('action.remove')" @click.prevent="$emit('remove', resource)"></button></li>
</ul>
</template>
</third-party-render-box>
</div> -->
<ul> <ul>
<li v-for="t in thirdParties"> <li v-for="t in thirdParties">
<p>{{ t.text }}</p> <p>{{ t.text }}</p>
@ -243,6 +270,7 @@ import PersonRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/PersonRe
import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue'; import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue'; import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
import PickTemplate from 'ChillDocGeneratorAssets/vuejs/_components/PickTemplate.vue'; import PickTemplate from 'ChillDocGeneratorAssets/vuejs/_components/PickTemplate.vue';
import ThirdPartyRenderBox from 'ChillThirdPartyAssets/vuejs/_components/Entity/ThirdPartyRenderBox.vue';
const i18n = { const i18n = {
messages: { messages: {
@ -290,6 +318,7 @@ export default {
PersonRenderBox, PersonRenderBox,
AddressRenderBox, AddressRenderBox,
PickTemplate, PickTemplate,
ThirdPartyRenderBox,
}, },
i18n, i18n,
data() { data() {

@ -1 +1 @@
Subproject commit 5952eda44831896991989c2e4881adc26329140e Subproject commit bd95d3c96a437757b7e8f35cdfd30da9aeac1a01