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

first commit

Browse Source
This commit is contained in:
Julie Lenaerts 2021-12-03 18:58:57 +01:00
parent 6e521642a4
commit 32a7734d30
3 changed files with 68 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss
View File

@ -115,7 +115,7 @@ a.badge-link {
} }
/// badge_title in AccompanyingCourse Work list Page /// badge_title in AccompanyingCourse Work list Page
div.accompanying_course_work-list {
h2.badge-title { h2.badge-title {
span.title_label { span.title_label {
// Calculate same color then border:groove // Calculate same color then border:groove
@ -125,7 +125,7 @@ div.accompanying_course_work-list {
@include badge_title($social-action-color); @include badge_title($social-action-color);
} }
} }
}
/// badge_title in Activities on resume page /// badge_title in Activities on resume page
div.activity-list { div.activity-list {

49
src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
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,10 +148,20 @@
</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"
@ -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>
@ -230,6 +257,7 @@ import AddEvaluation from './components/AddEvaluation.vue';
import PersonRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/PersonRenderBox.vue'; import PersonRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/PersonRenderBox.vue';
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 ThirdPartyRenderBox from 'ChillThirdPartyAssets/vuejs/_components/Entity/ThirdPartyRenderBox.vue';
const i18n = { const i18n = {
messages: { messages: {
@ -276,6 +304,7 @@ export default {
AddPersons, AddPersons,
PersonRenderBox, PersonRenderBox,
AddressRenderBox, AddressRenderBox,
ThirdPartyRenderBox,
}, },
i18n, i18n,
data() { data() {