Backup (00358aab) · Commits · open-source / oscar

front/src/TestOrganisationSelector.vue

0 → 100644

+48 −0

Original line number	Diff line number	Diff line
		<template>
		<div>
		<pre>
		SELECTED : {{ selected }}
		</pre>
		<organizationselector v-model="selected" />
		</div>
		</template>
		<script>

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

		import OrganizationAutoCompleter2 from "./components/OrganizationAutoCompleter2";

		export default {
		components: {
		organizationselector: OrganizationAutoCompleter2,
		},

		props: {

		},

		data() {
		return {
		selected: null,
		};
		},

		computed: {

		},

		methods: {

		handlerEnrolledSelected(data) {
		console.log(data);
		}
		},

		mounted() {

		}
		}

		</script>
		No newline at end of file

front/src/components/OrganizationAutoCompleter2.vue

0 → 100644

+310 −0

Original line number	Diff line number	Diff line
		<template>
		<div class="oscar-selector organization-selector"
		@click="handlerClick"
		@mouseleave="handlerMouseLeave"
		@mouseenter="handlerMouseEnter">
		<div class="input-group" style="position: relative;">
		<div v-if="error" class="displayed-value text-danger" style="">
		<i class="icon-attention-1" />
		{{ error }}
		<i @click="error = ''" class="icon-cancel-circled-outline button-cancel-value"></i>
		</div>
		<div v-if="displayValue" class="displayed-value" style="">
		{{ selectedLabel }}
		<i v-if="selectedValue" @click="handlerUnselect" class="icon-cancel-circled-outline button-cancel-value"></i>
		</div>
		<span class="input-group-addon">
		<i v-show="loading" class="icon-spinner animate-spin"></i>
		<i v-show="!loading" class="icon-building-filled"></i>
		</span>
		<input type="text" v-model="searchFor" @keyup="handlerKeyUp"
		placeholder="Rechercher une organisation..."
		class="form-control"/>
		</div>
		<div class="options" v-show="showSelector && options.length">
		<header>Résultat(s) : {{ options.length }}</header>
		<div class="option" v-for="o, i in options"
		@mouseover="highlightedIndex = i"
		@click.prevent.stop="handlerSelectIndex(i)"
		:id="'item_'+i"
		:class="{
		'active': i == highlightedIndex,
		'selected': o.id == selectedValue
		}">
		<div class="option-title">
		<code>
		[{{ i }}]{{ o.code }}
		</code>
		<strong>
		{{ o.shortname }}
		</strong>
		<em>
		{{ o.longname }}
		</em>
		</div>
		<div class="option-infos">
		<i class="icon-location"></i>
		{{ o.city }} - {{ o.country }}
		</div>
		</div>
		</div>
		</div>
		</template>
		<script>

		export default {

		props: {
		value: {default: null}
		},
		emits: ['update:value'],

		components: {

		},

		data() {
		return {
		// Liste des structures
		options: [],

		lastUpdatedSearch: 0,
		delay: null,
		preloadedValue: false,
		selectedValue: null,
		selectedLabel : "",
		displayClosed: false,
		showSelector: false,
		searchFor: "",
		latency: null,
		highlightedIndex: null,
		loading: false,
		inside: false,
		displayValue: false,
		error: ""
		}
		},

		computed: {
		filteredOptions(){
		let opts = [];
		if( this.displayClosed ){
		return this.options;
		} else {
		this.options.forEach(item => {
		if( !item.closed ){
		opts.push(item);
		}
		});
		return opts;
		}

		}
		},

		mounted() {
		// Détection d'un valeur initiale

		document.addEventListener('click', this.handlerGlobalClick, true);

		if (this.value) {
		// this.selectedValue = this.value;
		// this.options.push({
		// id: this.value,
		// label: "Waiting for data"
		// })
		// this.value = null;
		// this.searchOrganization(null, 'id:' + this.selectedValue);
		// } else {
		// this.preloadedValue = true;
		}
		},

		// todo : unmount

		methods: {
		handlerGlobalClick(evt){
		if( !this.inside ){
		this.showSelector = false;
		this.displayValue = true;
		} else {
		this.displayValue = false;
		this.showSelector = true;
		}
		},

		handlerMouseLeave(){
		console.log("LEAVE");
		this.inside = false;
		},

		handlerMouseEnter(){
		console.log("ENTER");
		this.inside = true;
		},

		handlerClick(e){
		console.log("CLICK");
		this.displayValue = false;
		},

		handlerUnselect(){
		this.selectedValue = null;
		this.selectedLabel = "";
		this.showSelector = false;
		this.displayValue = false;
		},

		handlerSelectIndex(index){
		console.log("SELECT");
		this.selectedValue = this.options[index].id;
		this.selectedLabel = this.options[index].label;
		this.showSelector = false;
		this.displayValue = true;
		this.$emit('change', this.selectedValue);
		this.$emit('update:value', this.selectedValue);
		this.$emit('input', this.selectedValue);
		},

		handlerSelectPrev( scroll = false ){
		if( this.highlightedIndex == 0 ){
		this.showSelector = false;
		}
		if( this.highlightedIndex > 0 ){
		if(!this.showSelector) this.showSelector = true;
		this.highlightedIndex--;
		}
		if( scroll == true ){
		let itemId = '#item_' + this.highlightedIndex;
		let item = this.$el.querySelector(itemId);
		let el = this.$el.querySelectorAll('.options')[0];
		el.scrollTop = item.offsetTop;
		console.log("SCROLL", el.scrollTop);
		console.log("ITEM", itemId, item);
		}
		},

		handlerSelectNext( scroll = false ){
		if(!this.showSelector) {
		this.showSelector = true;
		} else {
		if( this.highlightedIndex < this.options.length - 1 ){
		this.highlightedIndex++;
		}
		}
		if( scroll == true ){
		let itemId = '#item_' + this.highlightedIndex;
		let item = this.$el.querySelector(itemId);
		let el = this.$el.querySelectorAll('.options')[0];
		el.scrollTop = item.offsetTop;
		console.log("SCROLL", el.scrollTop);
		console.log("ITEM", itemId, item);
		}
		},

		handlerKeyUp(e){
		switch(e.code){
		case "ArrowUp":
		this.handlerSelectPrev(true);
		console.log("ArrowUp");
		break;
		case "ArrowDown":
		this.handlerSelectNext(true);
		console.log("ArrowDown");
		break;
		case "ArrowLeft":
		case "ArrowRight":
		break;

		case "Enter":
		e.preventDefault();
		this.handlerSelectIndex(this.highlightedIndex);
		break;

		default:
		console.log(e.code);
		if( this.searchFor && this.searchFor.length > 1 ){
		this.handlerChange();
		}
		}
		},

		handlerChange(e){
		console.log("Changement ", this.searchFor);
		// Système de retardement Eco+
		if (this.latency != null) {
		clearTimeout(this.latency);
		}
		let delayFunction = function () {
		console.log("delayFunction");
		this.search();
		clearTimeout(this.latency);
		}.bind(this);
		this.latency = setTimeout(delayFunction, 1000);
		},

		search(){
		console.log("Recherche lancée")
		this.loading = true;
		this.showSelector = false;
		this.$http.get('/organization?l=m&q=' + encodeURI(this.searchFor)).then(
		ok => {
		this.options = ok.data.datas;
		if( this.options.length > 0 ){
		this.highlightedIndex = 0;
		this.showSelector = true;
		}
		},
		ko => {
		console.log(ko);
		switch(ko.status){
		case 401:
		case 403:
		this.error = "Vous avez été déconnecté (actualisé votre page pour vous reconnecter)";
		break;
		case 500:
		this.error = "La recherche a provoqué une erreur";
		break;
		default:
		this.error = "Un problème inconnu est survenu";
		}
		}
		).then(foo => {
		this.loading = false;
		})
		},

		/**
		* Selection d'une option.
		*
		* @param selected
		*/
		setSelected(selected) {
		this.value = selected;
		this.$emit('change', this.value);
		this.$emit('input', this.value);
		},

		/**
		* Déclenchement de la recherche (à la saisie).
		*
		* @param search
		* @param loading
		*/
		handlerSearchOrganisation(search, loading) {
		if (search.length) {
		loading(true);
		// Système de retardement Eco+
		let delayFunction = function () {
		this.searchOrganization(loading, search, this);
		this.delay = null;
		}.bind(this);
		if (this.delay != null) {
		clearTimeout(this.delay);
		}
		this.delay = setTimeout(delayFunction, 1000);
		}
		}
		}
		}
		</script>
		No newline at end of file

module/Oscar/src/Oscar/Controller/OrganizationController.php

+1 −0

Original line number	Diff line number	Diff line
		@@ -153,6 +153,7 @@ class OrganizationController extends AbstractOscarController implements UseOrgan


		if ($this->getRequest()->isXmlHttpRequest() \|\| $this->params()->fromQuery('f') === 'json') {
		// test : return $this->getResponseUnauthorized("nop");
		$result = [ 'datas' => []];
		foreach ($organizations as $data) {
		$result['datas'][] = $data->toArray();

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -2276,7 +2276,7 @@ class ProjectGrantController extends AbstractOscarController implements UseNotif
		$out[] = [
		'id' => $activityOrganization->getId(),
		'roleId' => $roleId,
		'role' => $role,
		'role' => $rolelabel,
		'roleLabel' => $rolelabel,
		'rolePrincipal' => $roleprincipal,
		'urlDelete' => $urlDelete,

module/Oscar/src/Oscar/Service/TimesheetService.php

+1 −0

Original line number	Diff line number	Diff line
		@@ -4805,6 +4805,7 @@ class TimesheetService implements UseOscarUserContextService, UseOscarConfigurat
		'person' => (string)$person,
		'active' => $active,
		'commentaires' => $commentaires,
		'activities' => $activities,
		'totalGroup' => $totalGroup,
		'organizations' => $organizationsPrimary,
		'num' => implode(', ', $num),