PCRU : Configuration des paramêtres d'extraction des données depuis... (3270c340) · Commits · open-source / oscar

doc/config-pcru.md

+4 −1

Original line number	Diff line number	Diff line
		@@ -38,3 +38,6 @@ Pensez à activer les privilèges idoines aux rôles habilités à gérer les do
		## Envoi des données PCRU

		La communication des donnèes vers PCRU se fait via FTP, l'accès au serveur PCRU peut être configuré depuis l'interface d'administration.


		## Configuration avancées
		No newline at end of file

front/src/AdministrationPcru.vue

+185 −52

Original line number	Diff line number	Diff line
		<template>
		<section style="position: relative; min-height: 100px">
		<div v-if="configuration" class="container">

		<div class="overlay" v-if="loading">
		<div class="overlay-content" :class="{ 'text-success bold': success}">
		<i class="animate-spin icon-spinner"></i>
		{{ loading }}
		</div>
		</div>


		<form action="" method="post">
		<div class="row">
		<div class="col-md-3">
		@@ -15,13 +24,20 @@
		</div>

		<section :class="configuration.pcru_enabled ? 'enabled' : 'disabled'">

		<div class="row">
		<div class="col-md-12">
		<h2>Accès FTP</h2>
		<div class="col-md-6">
		<h2>
		<i class="icon-upload"></i>
		Accès FTP</h2>

		<div class="alert alert-info">
		<i class="icon-info-circled"></i>
		Le transfert FTP n'est pas encore activé dans cette version
		</div>

		<div class="row">
		<div class="col-md-5 col-md-push-1">
		<div class="col-md-8 col-md-push-1">
		<div class="form-group">
		<label class="sr-only" for="host"></label>
		<div class="input-group input-lg">
		@@ -35,7 +51,7 @@
		</div>

		<div class="row">
		<div class="col-md-5 col-md-push-1">
		<div class="col-md-8 col-md-push-1">
		<div class="form-group">
		<label class="sr-only" for="port"></label>
		<div class="input-group input-lg">
		@@ -49,7 +65,7 @@
		</div>

		<div class="row">
		<div class="col-md-5 col-md-push-1">
		<div class="col-md-8 col-md-push-1">
		<div class="form-group">
		<label class="sr-only" for="user"></label>
		<div class="input-group input-lg">
		@@ -63,7 +79,7 @@
		</div>

		<div class="row">
		<div class="col-md-5 col-md-push-1">
		<div class="col-md-8 col-md-push-1">
		<password-field :value="configuration.pcru_pass"
		:name="'pass'"
		:text="'Mot de passe'"
		@@ -72,7 +88,7 @@
		</div>

		<div class="row">
		<div class="col-md-5 col-md-push-1">
		<div class="col-md-8 col-md-push-1">
		<div class="form-group">
		<label class="sr-only" for="ssh"></label>
		<div class="input-group input-lg">
		@@ -85,14 +101,116 @@
		</div>
		</div>

		</div>

		<div class="col-md-6">
		<h2>
		<i class="icon-cog"></i>
		Options</h2>

		<div class="row">
		<div class="col-md-10 col-md-push-1">
		<div class="form-group">
		<label class="sr-only" for="user"></label>

		<div class="input-group input-lg">
		<div class="input-group-addon">
		<i class="glyphicon icon-user"></i>
		<strong>Type pour le contrat signé</strong>
		</div>

		<select name="" id="" class="form-control" v-model="configuration.pcru_contract_type">
		<option
		:value="type" v-for="type in configuration.contract_types"
		:key="type">{{ type }}
		</option>
		</select>
		</div>
		<p class="alert alert-info">
		<i class="icon-info-circled"></i>
		Le type de contrat <strong>{{ configuration.pcru_contract_type }}</strong> sera utilisé par oscar pour selectionner le document à utiliser pour les données PCRU</p>
		</div>
		<hr>

		<div class="form-group">
		<label class="sr-only" for="user"></label>

		<div class="input-group input-lg">
		<div class="input-group-addon">
		<i class="glyphicon icon-user"></i>
		<strong>Responsable scientifique</strong>
		</div>

		<select name="" id="" class="form-control" v-model="configuration.pcru_incharge_role">
		<option
		:value="role" v-for="role in configuration.incharge_roles"
		:key="role">{{ role }}
		</option>
		</select>
		</div>
		<p class="alert alert-info">
		<i class="icon-info-circled"></i>
		Oscar selectionnera les personnes avec le rôle <strong>{{ configuration.pcru_incharge_role }}</strong> de la fiche activité pour extraire le <em>Responsable scientifique côté PCRU</em>.</p>
		</div>
		<hr>

		<div class="form-group">
		<label class="sr-only" for="user"></label>
		<div class="input-group input-lg">
		<div class="input-group-addon">
		<i class="glyphicon icon-user"></i>
		<strong>Partenaire(s)</strong>
		</div>

		<div class="form-check" v-for="role,index in configuration.partner_roles">
		<input type="checkbox"
		:value="role"
		v-model="configuration.pcru_partner_roles"
		:id="'partner_role_option_' + index"
		/>
		<label :for="'partner_role_option_' + index" class="form-check-label">{{ role }}</label>
		</div>
		</div>
		<p class="alert alert-info">
		<i class="icon-info-circled"></i>
		Oscar utilisera le(s) rôle(s) <strong>{{ configuration.pcru_partner_roles.join(", ") }}</strong> des oragnisations de la fiche activité pour extraire le(s) partenaire(s) (les codes SIRET/EN doivent être renseignés).</p>
		</div>

		<hr>

		<div class="form-group">
		<label class="sr-only" for="user"></label>
		<div class="input-group input-lg">
		<div class="input-group-addon">
		<i class="glyphicon icon-user"></i>
		<strong>Unité(s)</strong>
		</div>

		<div class="form-check" v-for="role,index in configuration.unit_roles">
		<input type="checkbox"
		:value="role"
		v-model="configuration.pcru_unit_roles"
		:id="'unit_role_option_' + index"
		/>
		<label :for="'unit_role_option_' + index" class="form-check-label">{{ role }}</label>
		</div>
		</div>
		</div>
		<p class="alert alert-info">
		<i class="icon-info-circled"></i>
		Oscar utilisera le(s) rôle(s) <strong>{{ configuration.pcru_unit_roles.join(", ") }}</strong> des oragnisations de la fiche activité pour extraire le code URM.</p>
		</div>
		</div>
		</div>

		</div>
		</section>
		<nav class="buttons text-center">
		<button type="button" class="btn btn-primary" @click="performEdit">
		<i class="icon-floppy"></i>
		Enregistrer
		</button>
		</div>
		</div>
		</section>
		</nav>
		</form>
		</div>
		</section>
		@@ -130,7 +248,9 @@ export default {
		data() {
		return {
		formData: null,
		configuration: null
		configuration: null,
		loading: null,
		success: false
		}
		},

		@@ -139,6 +259,8 @@ export default {

		performEdit() {

		this.loading = "Enregistrement de la configuration";

		let formData = new FormData();
		formData.append('pcru_enabled', this.configuration.pcru_enabled);
		formData.append('host', this.configuration.pcru_host);
		@@ -146,6 +268,9 @@ export default {
		formData.append('user', this.configuration.pcru_user);
		formData.append('pass', this.configuration.pcru_pass);
		formData.append('ssh', this.configuration.pcru_ssh);
		formData.append('pcru_partner_roles', this.configuration.pcru_partner_roles);
		formData.append('pcru_unit_roles', this.configuration.pcru_unit_roles);
		formData.append('pcru_incharge_role', this.configuration.pcru_incharge_role);

		this.$http.post(this.url, formData).then(ok=>{
		this.fetch();
		@@ -158,11 +283,19 @@ export default {
		},

		fetch() {
		this.success = "";
		this.loading = "Chargement de la configuration";
		this.$http.get(this.url).then(
		ok => {
		this.handlerSuccess(ok)
		}
		)
		).then(foo => {
		this.success = true;
		this.loading = "Chargement terminé";
		setInterval(function(){
		this.loading = "";
		}.bind(this), 1000)
		})
		}
		},

module/Oscar/src/Oscar/Command/OscarCommandDevTestCommand.php

0 → 100644

+40 −0

Original line number	Diff line number	Diff line
		<?php
		/**
		* Created by PhpStorm.
		* User: bouvry
		* Date: 04/10/19
		* Time: 11:49
		*/

		namespace Oscar\Command;


		use Oscar\Formatter\OscarFormatterConst;
		use Oscar\Service\OscarConfigurationService;
		use Symfony\Component\Console\Command\Command;
		use Symfony\Component\Console\Input\InputArgument;
		use Symfony\Component\Console\Input\InputInterface;
		use Symfony\Component\Console\Output\OutputInterface;
		use Zend\ServiceManager\ServiceManager;

		class OscarCommandDevTestCommand extends OscarAdvancedCommandAbstract
		{
		protected static $defaultName = 'dev:test';

		protected function configure()
		{
		$this
		->setDescription("Test pour le développement")
		;
		}

		protected function execute(InputInterface $input, OutputInterface $output): int
		{
		parent::execute($input, $output); // TODO: Change the autogenerated stub
		foreach ($this->getPersonService()->getAvailableRolesPersonActivity(OscarFormatterConst::FORMAT_ARRAY_ID_OBJECT) as $key=> $value){
		echo "$key => " . $value->getRoleId() . "\n";
		}
		return 0;
		}

		}
		No newline at end of file

module/Oscar/src/Oscar/Controller/AdministrationController.php

+44 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ use Oscar\Entity\Privilege;
		use Oscar\Entity\Role;
		use Oscar\Entity\TVA;
		use Oscar\Exception\OscarException;
		use Oscar\Formatter\OscarFormatterConst;
		use Oscar\Provider\Privileges;
		use Oscar\Service\ConfigurationParser;
		use Oscar\Service\ConnectorService;
		@@ -1470,9 +1471,25 @@ class AdministrationController extends AbstractOscarController implements UsePro
		$this->getOscarUserContextService()->check(Privileges::MAINTENANCE_PARAMETERS_MANAGE);

		if ($this->isAjax()) {

		$partnerRoles = $this->getProjectGrantService()->getOrganizationService()
		->getAvailableRolesOrganisationActivity(OscarFormatterConst::FORMAT_ARRAY_FLAT);

		$inchargeRoles = $this->getProjectGrantService()->getPersonService()
		->getAvailableRolesPersonActivity(OscarFormatterConst::FORMAT_ARRAY_FLAT);

		$unitRoles = $this->getProjectGrantService()->getOrganizationService()
		->getAvailableRolesOrganisationActivity(OscarFormatterConst::FORMAT_ARRAY_FLAT);

		$contractTypes = $this->getProjectGrantService()
		->getAvailableDocumentTypes(OscarFormatterConst::FORMAT_ARRAY_FLAT);


		if ($this->getRequest()->isGet()) {
		$response = $this->baseJsonResponse();
		$response['configuration_pcru'] = [

		// FTP
		'pcru_enabled' => $this->getOscarConfigurationService()->getPcruEnabled(),
		'pcru_host' => $this->getOscarConfigurationService()->getEditableConfKey(
		'pcru_host',
		@@ -1482,6 +1499,20 @@ class AdministrationController extends AbstractOscarController implements UsePro
		'pcru_pass' => $this->getOscarConfigurationService()->getEditableConfKey('pcru_pass', ''),
		'pcru_ssh' => $this->getOscarConfigurationService()->getEditableConfKey('pcru_ssh', ''),
		'pcru_port' => $this->getOscarConfigurationService()->getEditableConfKey('pcru_port', 31000),

		// Conf
		'pcru_incharge_role' => $this->getOscarConfigurationService()->getPcruInChargeRole(),
		'pcru_partner_roles' => $this->getOscarConfigurationService()->getPcruPartnerRoles(),
		'pcru_unit_roles' => $this->getOscarConfigurationService()->getPcruUnitRoles(),
		'pcru_contract_type' => $this->getOscarConfigurationService()->getPcruContractType(),

		//
		'incharge_roles' => $inchargeRoles,
		'partner_roles' => $partnerRoles,
		'unit_roles' => $unitRoles,
		'contract_types' => $contractTypes,


		];
		return $this->ajaxResponse($response);
		}
		@@ -1497,6 +1528,19 @@ class AdministrationController extends AbstractOscarController implements UsePro
		'pcru_ssh' => $this->params()->fromPost('ssh'),
		];

		$partnerRolesPosted = $this->params()->fromPost('pcru_partner_roles', []);
		$unitRolesPosted = $this->params()->fromPost('pcru_unit_roles', []);
		$inchargeRolePosted = $this->params()->fromPost('pcru_incharge_role', '');
		$contractType = $this->params()->fromPost('pcru_contract_type', '');

		$data['pcru_partner_roles'] = explode(',', $partnerRolesPosted);
		$data['pcru_unit_roles'] = explode(',', $unitRolesPosted);
		$data['pcru_incharge_role'] = $inchargeRolePosted;
		$data['pcru_incharge_role'] = $inchargeRolePosted;
		$data['pcru_contract_type'] = $contractType;

		$this->getLoggerService()->info("Enregistrement de la configuration PCRU" );

		foreach ($data as $key => $value) {
		$this->getOscarConfigurationService()->saveEditableConfKey($key, $value);
		}

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

+21 −1

Original line number	Diff line number	Diff line
		@@ -1690,7 +1690,12 @@ class Activity implements ResourceInterface
		* @param bool $deep
		* @return bool
		*/
		public function hasPerson( Person $person, ?Role $role = null, ?\DateTime $dateStart = null, ?\DateTime $dateEnd = null, bool $deep = true
		public function hasPerson(
		Person $person,
		?Role $role = null,
		?\DateTime $dateStart = null,
		?\DateTime $dateEnd = null,
		bool $deep = true
		) {
		$found = false;
		/** @var ActivityPerson $activityPerson */
		@@ -1771,6 +1776,21 @@ class Activity implements ResourceInterface

		private $_cacheOrganizationsByRole;

		public function getOrganizationsWithOneRole(array $roleIds): array
		{
		$structures = [];
		/** @var ActivityOrganization $organizationRel */
		foreach ($this->getOrganizationsDeep() as $organizationRel) {
		$organization = $organizationRel->getOrganization();
		$role = $organizationRel->getRoleObj()->getRoleId();
		$organizationId = $organization->getId();
		if (!array_key_exists($organizationId, $structures) && in_array($role, $roleIds)) {
		$structures[$organizationId] = $organization;
		}
		}
		return $structures;
		}

		public function getOrganizationsWithRole($role, $deep = true)
		{
		if ($this->_cacheOrganizationsByRole === null) {