Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-07-03 15:36:14 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'improve_person_resource_form' into 'master'

Browse Source 
Improve person resource form

See merge request Chill-Projet/chill-bundles!846
This commit is contained in:
LenaertsJ 2025-07-01 14:01:44 +00:00
commit b4bbb1a456
8 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.changes/unreleased/Fixed-20250611-164623.yaml Normal file
View File

@ -0,0 +1,6 @@
kind: Fixed
body: Fix admin entity edit actions for event admin entities and activity reason (category) entities
time: 2025-06-11T16:46:23.113506434+02:00
custom:
Issue: ""
SchemaChange: No schema change

6
.changes/unreleased/UX-20250617-192650.yaml Normal file
View File

@ -0,0 +1,6 @@
kind: UX
body: Improve labeling of fields in person resource creation form
time: 2025-06-17T19:26:50.599703116+02:00
custom:
Issue: ""
SchemaChange: No schema change

1
src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
View File

@ -17,7 +17,6 @@ use Chill\ActivityBundle\Repository\ActivityReasonRepository;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* ActivityReason controller.

8
src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/UserRenderBoxBadge.vue
View File

@ -1,11 +1,11 @@
<template>
<span class="chill-entity entity-user">
{{ user.label }}
<span class="user-job" v-if="user.user_job !== null"
> ({{ localizeString(user.user_job.label) }})</span
<span class="user-job" v-if="user.user_job !== null">
({{ localizeString(user.user_job.label) }})</span
>
<span class="main-scope" v-if="user.main_scope !== null"
> ({{ localizeString(user.main_scope.name) }})</span
<span class="main-scope" v-if="user.main_scope !== null">
({{ localizeString(user.main_scope.name) }})</span
>
<span
v-if="user.isAbsent"

2
src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav.vue
View File

@ -120,7 +120,7 @@ export default {
return pos;
},
handleScroll(event) {
handleScroll() {
let pos = this.findPos(this.stickyNav);
let top = this.heightSum + this.top - window.scrollY;
//console.log(window.scrollY);

3
src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
View File

@ -79,8 +79,9 @@
{{ $t("select_time_spent") }}
</option>
<option
v-for="time in timeSpentChoices"
v-for="(time, i) in timeSpentChoices"
:value="time.value"
:key="i"
>
{{ time.text }}
</option>

2
src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriod/SetReferrer.vue
View File

@ -39,7 +39,7 @@ export default {
};
return makeFetch("PATCH", url, body)
.then((response) => {
.then(() => {
this.$emit("referrerSet", ref);
})
.catch((error) => {

2
src/Bundle/ChillWopiBundle/src/Resources/public/module/pending/index.ts
View File

@ -1,8 +1,6 @@
import { is_object_ready } from "../../../../../../ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/helpers";
import {
StoredObject,
StoredObjectStatus,
StoredObjectStatusChange,
} from "../../../../../../ChillDocStoreBundle/Resources/public/types";
async function reload_if_needed(