FIX : Les organisations cloturées ont un aspect différent dans la fiche activité (0cf83762) · Commits · open-source / oscar

front/src/EntityWithRole.vue

0 → 100644

+345 −0

Original line number	Diff line number	Diff line
		<template>
		<div>

		<template>
		<div class="oscar-ajax" v-show="loading \|\| error">
		<div class="oscar-ajax-content">
		<div v-if="loading" class="loading-message">
		<i class="icon-spinner animate-spin animate"></i> {{ loading }}
		</div>
		<div v-if="error" class="error-message">
		<span @click="error = false" style="font-weight: bold; position: absolute; top: 1em; right: 1em ">x</span>
		<i class="icon-attention-1"></i> <strong>{{ error }} </strong>
		</div>

		</div>
		</div>
		</template>
		<code>{{ entityEdited }}</code>
		<div class="overlay" v-if="entityDelete">
		<div class="overlay-content">
		<i class="icon-cancel-outline overlay-closer" @click="entityDelete = null"></i>

		<h2>Supprimer le rôle <strong>{{ entityDelete.role }}</strong> de <strong>{{ entityDelete.enrolledLabel
		}}</strong> ?</h2>

		<nav class="admin-bar">
		<button class="btn btn-default button-back" @click="entityDelete = null">
		<i class="icon-angle-left"></i>
		Annuler
		</button>
		<button class="btn btn-primary" @click="performDelete">
		<i class="icon-trash"></i>
		Confirmer la suppression
		</button>
		</nav>
		</div>
		</div>

		<div class="overlay" v-if="error">
		<div class="overlay-content">
		<i class="icon-cancel-outline overlay-closer" @click="error = ''"></i>

		<h2>Erreur : <strong>{{ error }}</strong></h2>

		<nav class="admin-bar">
		<button class="btn btn-default button-back" @click="error = ''">
		<i class="icon-angle-left"></i>
		Annuler
		</button>
		</nav>
		</div>
		</div>

		<div class="overlay" v-if="entityEdited">
		<div class="overlay-content" style="overflow: visible">
		<i class="icon-cancel-outline overlay-closer" @click="entityEdited = null"></i>

		<form :action="entityEdited.urlEdit" method="post" @submit.prevent.stop="performEdit">
		<h2>
		<span v-if="entityEdited.enrolledLabel">
		Modifier <strong>{{ entityEdited.enrolledLabel }}</strong>
		en tant que <em>{{ entityEdited.role }}</em>
		</span>
		</h2>
		<input type="hidden" name="enroled" class="form-control select2" v-model="entityEdited.enrolled"/>

		<div class="row">
		<div class="col-md-6">
		<div class="form-group">
		<label class=" control-label" for="role">Rôle</label>
		<select name="role" class=" form-control" v-model="entityEdited.roleId">
		<option :value="roleId" v-for="role, roleId in roles">
		{{ role }}
		</option>
		</select>
		</div>
		</div>

		<div class="col-md-6">
		<div class="form-group">
		<label class="form-label control-label" for="dateStart">Date de début</label>
		<datepicker :moment="moment"
		:value="entityEdited.start"
		@input="value => {entityEdited.start = value}"/>
		</div>
		<div class="form-group">
		<label class="form-label control-label" for="dateEnd">Date de fin</label>
		<datepicker :moment="moment"
		:value="entityEdited.end"
		@input="value => {entityEdited.end = value}"/>
		</div>
		</div>
		</div>

		<nav class="admin-bar">
		<button class="btn btn-default button-back" @click="entityEdited = null">
		<i class="icon-angle-left"></i>
		Annuler
		</button>
		<button class="btn btn-primary" type="submit">
		<i class="icon-floppy"></i>
		Enregistrer
		</button>
		</nav>
		</form>
		</div>
		</div>

		<div class="overlay" v-if="entityNew">
		<div class="overlay-content" style="overflow: visible">
		<i class="icon-cancel-outline overlay-closer" @click="entityNew = null"></i>

		<h2>Rôle de <strong>{{ entityNew.enroledLabel }}</strong> : </h2>
		<input type="hidden" name="enroled" class="form-control select2" v-model="entityNew.enrolled"/>

		<div class="row">
		<div class="col-md-6">

		<span v-if="entityNew.enroledLabel" class="cartouche">
		{{ entityNew.enroledLabel }}
		<i class="icon-cancel-alt icon-clickable" @click="handlerCancel"></i>
		<span class="addon" v-if="entityNew.role">
		{{ roles[entityNew.role] }}
		</span>
		</span>
		<div class="form-group" v-else>
		<label class=" control-label" for="enroled">{{ title }}</label>
		<personselector @change="handlerEnrolledSelected($event)" v-if="title == 'Personne'" v-model="selectedPerson"/>
		<organizationselector @change="handlerEnrolledSelected($event)" v-else/>
		</div>

		<div class="form-group">
		<label class=" control-label" for="role">Rôle</label>
		<select name="role" class=" form-control" v-model="entityNew.role">
		<option :value="roleId" v-for="role, roleId in roles">
		{{ role }}
		</option>
		</select>
		</div>
		</div>
		<div class="col-md-6">
		<div class="form-group">
		<label class="form-label control-label" for="dateStart">Date de début</label>
		<datepicker :moment="moment"
		:value="entityNew.start"
		@input="value => {entityNew.start = value}"/>
		</div>
		<div class="form-group">
		<label class="form-label control-label" for="dateEnd">Date de fin</label>
		<datepicker :moment="moment"
		:value="entityNew.end"
		@input="value => {entityNew.end = value}"/>
		</div>
		</div>
		</div>

		<nav class="admin-bar">
		<button class="btn btn-default button-back" type="button" @click="entityNew = null">
		<i class="icon-angle-left"></i>
		Annuler
		</button>
		<button class="btn btn-primary" type="button" @click="performNew">
		<i class="icon-floppy"></i>
		Enregistrer
		</button>
		</nav>
		</div>
		</div>

		<nav class="admin-bar text-right" v-if="manage">
		<a class="oscar-link" @click="handlerNew()">
		<i class="icon-doc-add"></i>
		Nouveau
		</a>
		</nav>
		<span class="cartouche" v-for="e in entities" :class="{'primary': e.rolePrincipal, 'outofdate past': e.past }">
		<i v-if="e.context == 'activity'" class="icon-cube"></i>
		<i v-else class="icon-cubes"></i>
		<span class="text-clickable" @click="open(e.urlShow)" v-if="e.urlShow">{{ e.enrolledLabel }}</span>
		<span v-else>{{ e.enrolledLabel }}</span>
		<span class="addon">
		{{ e.roleLabel }}
		<i class="icon-pencil-1 icon-clickable" v-if="manage" @click="handlerEdit(e)"></i>
		<i class="icon-trash icon-clickable" v-if="manage" @click="handlerDelete(e)"></i>
		</span>
		</span>
		</div>
		</template>
		<script>

		/**
		node node_modules/.bin/vue-cli-service build --name EntityWithRole --dest ../public/js/oscar/dist --no-clean --formats umd,umd-min --target lib src/EntityWithRole.vue
		**/

		import OrganizationAutoCompleter from "./components/OrganizationAutoCompleter";
		import PersonAutoCompleter from "./components/PersonAutoCompleter";
		import Datepicker from "./components/Datepicker";

		export default {
		components: {
		organizationselector: OrganizationAutoCompleter,
		personselector: PersonAutoCompleter,
		datepicker: Datepicker
		},

		props: {
		url: {required: true},
		urlNew: {required: true},
		roles: {required: true},
		manage: {required: true, default: false},
		title: {required: true},
		moment: {required: true}
		},

		data() {
		return {
		selectedPerson: null,
		entities: [],
		entityEdited: null,
		entityDelete: null,
		entityNew: null,
		error: null,
		loading: false
		};
		},


		methods: {
		handlerEdit(item) {
		this.entityEdited = item;
		},

		handlerDelete(item) {
		this.entityDelete = item;
		},

		handlerNew() {
		this.entityNew = {
		end: '',
		start: '',
		role: null,
		enroled: null,
		enroledLabel: ""
		};
		},

		handlerEnrolledSelected(data) {
		console.log(data);
		this.entityNew.enroled = data.id;
		this.entityNew.enroledLabel = data.label;
		},

		handlerCancel() {
		this.entityNew.enroled = null;
		this.entityNew.enroledLabel = "";
		this.entityNew.role = null;
		},

		open(url) {
		document.location = url;
		},

		performDelete() {
		this.loading = "Suppression...";
		console.log(url, this.entityDelete);
		var url = this.entityDelete.urlDelete;
		this.entityDelete = null;

		this.$http.post(url, {}).then(ok => {
		}, ko => {
		this.error = ko.body;
		}).then(foo => {
		this.loading = false;
		this.fetch();
		})
		},

		performEdit() {
		this.loading = "Enregistrement des modifications";
		let data = new FormData();
		data.append('dateStart', this.entityEdited.start);
		data.append('dateEnd', this.entityEdited.end);
		data.append('role', this.entityEdited.roleId);
		data.append('enrolled', this.entityEdited.enrolled);
		var url = this.entityEdited.urlEdit;
		this.entityEdited = null;
		this.$http.post(url, data).then(ok => {

		}, ko => {
		this.error = "Erreur : " + ko.body;
		}).then(foo => {
		this.loading = false;
		this.fetch();
		});
		return false;
		},

		performNew() {
		let data = new FormData();
		this.loading = "Création...";
		var enroled = this.entityNew.enroled;
		data.append('dateStart', this.entityNew.start);
		data.append('dateEnd', this.entityNew.end);
		data.append('role', this.entityNew.role);
		data.append('enroled', enroled);
		this.entityNew = null;

		this.$http.post(this.urlNew + '/' + enroled, data).then(ok => {

		}, ko => {
		this.error = ko.status == 403 ? "Vous n'êtes pas authorisé à faire ça" : "Erreur : " + ko.body;
		}).then(foo => {
		this.loading = false;
		this.fetch();
		})
		},

		fetch() {
		this.loading = "Chargement...";
		this.$http.get(this.url).then(ok => {
		if (ok.body.roles) {
		this.roles = ok.body.roles;
		}
		if (ok.body.persons) {
		this.entities = ok.body.persons;
		} else if (ok.body.organizations) {
		this.entities = ok.body.organizations;
		} else {
		this.entities = ok.body;
		}

		this.loading = false;
		},
		ko => {
		this.error = "Erreur : " + ko.body;
		});
		}
		},

		mounted() {
		this.fetch();
		}
		}

		</script>
		No newline at end of file

front/src/components/PersonAutoCompleter2.vue

+3 −2

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@ let intify = function( value ){

		export default {
		props: {
		value: { default: null },
		value: { default: '' },
		multiple: { default: false }
		},

		@@ -86,6 +86,7 @@ export default {

		computed: {
		values(){
		console.log('value:', this.value);
		if( !Array.isArray(this.value) ){
		return this.value ? intify(this.value) : [];
		} else {
		@@ -95,7 +96,7 @@ export default {
		selectable(){
		if( this.multiple ) return true;
		else {
		return this.value.length == 0;
		return !this.value \|\| this.value.length == 0;
		}

		}

module/Oscar/src/Oscar/Controller/ProjectGrantController.php

+3 −1

Original line number	Diff line number	Diff line
		@@ -2151,9 +2151,10 @@ class ProjectGrantController extends AbstractOscarController implements UseNotif
		$activity = $this->getActivityService()->getActivityById($activityId);

		$this->getOscarUserContextService()->check(
		Privileges::ACTIVITY_PERSON_SHOW,
		Privileges::ACTIVITY_ORGANIZATION_SHOW,
		$activity
		);

		$out = [];

		$editableA = $deletableA = $this->getOscarUserContextService()->hasPrivileges(
		@@ -2233,6 +2234,7 @@ class ProjectGrantController extends AbstractOscarController implements UseNotif
		// 'hash' => (string)$activityOrganization,
		'enrolled' => $activityOrganization->getOrganization()->getId(),
		'enrolledLabel' => $activityOrganization->getOrganization()->getFullName(),
		'past' => !$activityOrganization->isActive(),
		'start' => DateTimeUtils::toStr($activityOrganization->getDateStart(), 'Y-m-d'),
		'end' => DateTimeUtils::toStr($activityOrganization->getDateEnd(), 'Y-m-d')
		];

module/Oscar/src/Oscar/Entity/Activity.php

+25 −9

Original line number	Diff line number	Diff line
		@@ -2239,20 +2239,36 @@ class Activity implements ResourceInterface
		}
		$persons[$roleStr][] = (string)$personActivity->getPerson();
		}
		foreach ($persons as $role => $ps) {
		$slug = $sluger->slugify($role);
		$datas[$slug] = implode(', ', $ps);
		$datas["$slug-list"] = $ps;
		}

		$organizations = [];

		/** @var ActivityOrganization $organisationActivity */
		foreach ($this->getOrganizationsDeep() as $organisationActivity) {
		if( !$organisationActivity->getOrganization()->isClose() ){
		$roleStr = (string)$organisationActivity->getRoleObj();
		if (!array_key_exists($roleStr, $organizations)) {
		$organizations[$roleStr] = [];
		}
		$organizations[$roleStr][] = utf8_encode((string)$organisationActivity->getOrganization());
		$organizations[$roleStr][] = ((string)$organisationActivity->getOrganization());

		// Personnes dans la structure
		/** @var OrganizationPerson $personStructure */
		foreach ($organisationActivity->getOrganization()->getPersons() as $personStructure){
		$roleInStructure = (string)$personStructure->getRoleObj();
		if( !$personStructure->isOutOfDate() ){
		if (!array_key_exists($roleInStructure, $persons)) {
		$persons['in-org-'.$roleInStructure] = [];
		}
		$persons['in-org-'.$roleInStructure][] = (string)$personStructure->getPerson();
		}
		}
		}
		}

		foreach ($persons as $role => $ps) {
		$slug = $sluger->slugify($role);
		$datas[$slug] = implode(', ', $ps);
		$datas["$slug-list"] = $ps;
		}

		foreach ($organizations as $role => $ps) {

module/Oscar/src/Oscar/Entity/ActivityOrganization.php

+5 −0

Original line number	Diff line number	Diff line
		@@ -123,4 +123,9 @@ class ActivityOrganization implements ILoggable
		->setRoleObj($this->getRoleObj());
		return $new;
		}

		function isActive() :bool
		{
		return !$this->isOutOfDate() && !$this->getOrganization()->isClose();
		}
		}