FIX : PCRU, Le type de document utilisé pour la génération des données PCRU... (4526c99f) · Commits · open-source / oscar

front/src/AdministrationPcru.vue

+3 −2

Original line number	Diff line number	Diff line
		@@ -223,10 +223,10 @@ Depuis la racine OSCAR :
		cd front

		Pour compiler en temps réél :
		node node_modules/.bin/gulp administrationPcruWatch
		node node_modules/.bin/vue-cli-service build --name AdministrationPcru --dest ./../public/js/oscar/dist/ --no-clean --formats umd,umd-min --target lib ./src/AdministrationPcru.vue --watch

		Pour compiler :
		node node_modules/.bin/gulp administrationPcru
		node node_modules/.bin/vue-cli-service build --name AdministrationPcru --dest ./../public/js/oscar/dist/ --no-clean --formats umd,umd-min --target lib ./src/AdministrationPcru.vue

		*/

		@@ -271,6 +271,7 @@ export default {
		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);
		formData.append('pcru_contract_type', this.configuration.pcru_contract_type);

		this.$http.post(this.url, formData).then(ok=>{
		this.fetch();

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

+13 −13

Original line number	Diff line number	Diff line
		@@ -326,11 +326,16 @@ class AdministrationController extends AbstractOscarController implements UsePro
		$strict = $this->params()->fromPost(OscarConfigurationService::pfi_strict) == "on";
		$regex = $this->params()->fromPost(OscarConfigurationService::pfi_strict_format);
		if ($strict == true && !$regex) {
		throw new OscarException("Vous ne pouvez pas appliquer le mode strict avec une expression régulière vide");
		throw new OscarException(
		"Vous ne pouvez pas appliquer le mode strict avec une expression régulière vide"
		);
		} else {
		// Contrôler la regex
		$this->getOscarConfigurationService()->setStrict($strict);
		$this->getOscarConfigurationService()->saveEditableConfKey(OscarConfigurationService::pfi_strict_format, $regex);
		$this->getOscarConfigurationService()->saveEditableConfKey(
		OscarConfigurationService::pfi_strict_format,
		$regex
		);
		}
		return $this->redirect()->toRoute('administration/parameters');

		@@ -358,7 +363,8 @@ class AdministrationController extends AbstractOscarController implements UsePro
		'dateformat' => $this->getOscarConfigurationService()->getExportDateFormat()
		],
		'organization_leader_role' => $organization_leader_role,
		OscarConfigurationService::document_use_version_in_name => $this->getOscarConfigurationService()->getDocumentUseVersionInName(),
		OscarConfigurationService::document_use_version_in_name => $this->getOscarConfigurationService(
		)->getDocumentUseVersionInName(),
		OscarConfigurationService::pfi_strict => $this->getOscarConfigurationService()->isPfiStrict(),
		OscarConfigurationService::pfi_strict_format => $pfiFixed,
		"pfi_default_format" => $this->getOscarConfigurationService()->getConfiguration('validation.pfi'),
		@@ -1276,9 +1282,6 @@ class AdministrationController extends AbstractOscarController implements UsePro
		}

		if ($this->getHttpXMethod() == 'PUT') {



		try {
		// Données du rôle à modifier
		$id = (int)$request->getPost('id');
		@@ -1305,7 +1308,6 @@ class AdministrationController extends AbstractOscarController implements UsePro
		$this->getEntityManager()->flush();

		return $this->ajaxResponse($roleObjEdited->toArray());

		} catch (\Exception $e) {
		return $this->getResponseInternalError("Impossible de modifier le rôle : " . $e->getMessage());
		}
		@@ -1442,7 +1444,9 @@ class AdministrationController extends AbstractOscarController implements UsePro
		$this->getOscarConfigurationService()->setValidatorsRelanceJour1($validatorsRelanceJour1);
		$this->getOscarConfigurationService()->setValidatorsRelance2($validatorsRelance2);
		$this->getOscarConfigurationService()->setValidatorsRelanceJour2($validatorsRelanceJour2);
		$this->getOscarConfigurationService()->setDeclarersRelanceConflitMessage($declarersRelanceConflitMessage);
		$this->getOscarConfigurationService()->setDeclarersRelanceConflitMessage(
		$declarersRelanceConflitMessage
		);
		$this->getOscarConfigurationService()->setDeclarersRelanceConflitJour($declarersRelanceConflitJour);
		$this->getOscarConfigurationService()->setHighDelayRelance($highdelayRelance);

		@@ -1511,7 +1515,6 @@ 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);

		@@ -1582,13 +1585,12 @@ class AdministrationController extends AbstractOscarController implements UsePro
		$this->getLoggerService()->info("Enregistrement de la configuration PCRU");

		foreach ($data as $key => $value) {
		// $this->getLoggerService()->debug(" - $key : $value" );
		$this->getOscarConfigurationService()->saveEditableConfKey($key, $value);
		}
		$this->getResponseOk("Informations PCRU modifiées");
		}
		}


		return [];
		}

		@@ -1624,6 +1626,4 @@ class AdministrationController extends AbstractOscarController implements UsePro
		'datas' => $this->getProjectGrantService()->getPcruSourceFinancement()
		];
		}


		}
		No newline at end of file

module/Oscar/src/Oscar/Service/OscarConfigurationService.php

+1 −1

Original line number	Diff line number	Diff line
		@@ -579,7 +579,7 @@ class OscarConfigurationService implements ServiceLocatorAwareInterface
		public function getPcruContractType(): string
		{
		//->getOptionalConfiguration('pcru_contrat_type', "Contrat Version Définitive Signée");
		return $roleRSToFind = $this->getEditableConfKey('pcru_contrat_type', "Contrat Version Définitive Signée");
		return $roleRSToFind = $this->getEditableConfKey('pcru_contract_type', "Contrat Version Définitive Signée");
		}

		/**

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

+18 −2

Original line number	Diff line number	Diff line
		@@ -1034,13 +1034,26 @@ class TimesheetService implements UseOscarUserContextService, UseOscarConfigurat

		// Déclarations sur des activités
		if ($period->getObject() == 'activity') {
		try {
		/** @var Activity $activity */
		$activity = $this->getEntityManager()->getRepository(Activity::class)->find($period->getObjectId());
		$msg = "";

		if( !$activity ){
		$msg = sprintf(
		"Une procédure de validation semble correspondre à une activité de recherche supprimée (activity ID : %s)",
		$period->getObjectId());
		$this->getLoggerService()->error($msg);
		throw new OscarException($msg);
		}
		$activityDatas = [
		'label' => $activity->getFullLabel(),
		'workpackages' => [],
		'comment' => $period->getComment()
		];
		} catch (\Exception $e) {
		throw new OscarException($e->getMessage());
		}

		/** @var WorkPackage $workpackage */
		foreach ($activity->getWorkPackages() as $workpackage) {
		@@ -2977,7 +2990,11 @@ class TimesheetService implements UseOscarUserContextService, UseOscarConfigurat
		public function getPeriodsValidator(Person $validator): array
		{
		$qb = $this->getEntityManager()->createQuery(
		"SELECT DISTINCT vp.id, vp.year, vp.month, vp.object,
		"SELECT DISTINCT
		vp.id,
		vp.year,
		vp.month,
		vp.object,
		vp.validationActivityById,
		vp.validationSciById,
		vp.validationAdmById
		@@ -3530,7 +3547,6 @@ class TimesheetService implements UseOscarUserContextService, UseOscarConfigurat
		$this->getEntityManager()->detach($recallSend);
		$result['recall_info'] = "Erreur d'envoi de mail : " . $e->getMessage();
		}

		}
		}

public/js/oscar/dist/AdministrationPcru.umd.js

+630 −141

File changed.

Preview size limit exceeded, changes collapsed.