Skip to content
Snippets Groups Projects
Commit c2f04bcd authored by joriot221's avatar joriot221
Browse files

Merge branch 'FJ_Contrat_Sans_Avenant'

parents 5fcb2a80 9c09f08f
No related branches found
No related tags found
No related merge requests found
......@@ -223,4 +223,9 @@ Cordialement,
"DESCRIPTION" => "Adresse email d'expéditeur des mails via les indicateur, si vide alors l'email de l'utilisateur sera utilisé",
],
/* Contrat */
"avenant" => [
"VALEUR" => "active",
"DESCRIPTION" => "Permettre la création d'avenants au contrat",
],
];
\ No newline at end of file
......@@ -6,6 +6,7 @@ use Application\Assertion\ContratAssertion;
use Application\Entity\Db\Fichier;
use Application\Entity\Db\Intervenant;
use Application\Entity\Db\ModeleContrat;
use Application\Entity\Db\Parametre;
use Application\Entity\Db\Service;
use Application\Entity\Db\Structure;
use Application\Entity\Db\Validation;
......@@ -26,6 +27,7 @@ use Application\Service\Traits\TypeVolumeHoraireServiceAwareTrait;
use Application\Service\Traits\ContextServiceAwareTrait;
use Application\Service\Traits\WorkflowServiceAwareTrait;
use Intervenant\Service\NoteServiceAwareTrait;
use Phan\Debug;
use UnicaenApp\Controller\Plugin\Upload\UploaderPlugin;
use UnicaenApp\Util;
use UnicaenApp\View\Model\MessengerViewModel;
......@@ -134,8 +136,10 @@ class ContratController extends AbstractController
}
$services['non-contractualises'][$sid][] = $service;
}
$avenantResult = $this->getServiceParametres()->get('avenant');
$avenant = ($avenantResult == Parametre::AVENANT);
return compact('title', 'intervenant', 'contrats', 'services', 'emailIntervenant');
return compact('title', 'intervenant', 'contrats', 'services', 'emailIntervenant', 'avenant');
}
......
......@@ -16,6 +16,8 @@ class Parametre implements HistoriqueAwareInterface
const CONTRAT_FRANCHI_VALIDATION = 'validation';
const CONTRAT_FRANCHI_DATE_RETOUR = 'date-retour';
const AVENANT = 'avenant';
use HistoriqueAwareTrait;
/**
......
......@@ -565,6 +565,23 @@ class ParametresForm extends AbstractForm
'class' => 'btn btn-primary',
],
]);
$this->add([
'type' => 'Select',
'name' => 'avenant',
'options' => [
'label' => 'Possibilité de créer des avenants',
'value_options' => [
PARAMETRE::AVENANT => 'Les avenants sont disponibles',
'desactive' => 'Fonctionnalité désactivée',
],
],
'attributes' => [
'class' => 'selectpicker',
'data-size' => 20,
],
]);
}
......
<?php
use \Application\Service\Traits\ParametresServiceAwareTrait;
use Application\Provider\Privilege\Privileges;
/**
......@@ -17,7 +18,6 @@ foreach ($contrats as $contrat) {
}
$this->intervenant($intervenant)->renderTitle("Contrat/avenant");
echo $this->messenger()->addCurrentMessagesFromFlashMessenger();
if ($services['non-contractualises']) {
......@@ -46,6 +46,7 @@ $this->messenger() ?>
<?php if ($contrats || $services['non-contractualises']): ?>
<?php if ($services['non-contractualises']): ?>
<?php if (!$hasContrat || $avenant): ?>
<table class="table table-bordered table-hover">
<tr>
<th class="structure">Composante</th>
......@@ -64,11 +65,16 @@ $this->messenger() ?>
<td><?= $structure ?></td>
<td>
<?php if ($canCreer): ?>
<a class="btn btn-primary"
href="<?= $this->url('contrat/creer', ['intervenant' => $intervenant->getId(), 'structure' => $structure->getId()]); ?>">
<i class="fas fa-file"></i> Créer un
projet <?= $hasContrat ? 'd\'avenant' : 'de contrat' ?>
</a>
<?php else:
echo $this->feuilleDeRoute($intervenant)->renderWhyNonAtteignable(\Application\Entity\Db\WfEtape::CODE_CONTRAT, $structure);
endif; ?>
......@@ -88,7 +94,9 @@ $this->messenger() ?>
</td>
</tr>
<?php endforeach; ?>
<?php endif; ?>
</table>
<?php endif; ?>
<div class="well">
<h2>Contrats et avenants</h2>
......
......@@ -135,6 +135,8 @@
<li><strong>:annee :</strong> année universitaire du contrat (ex : 2019/2020)</li>
</ul>
</p>
<?= $this->formControlGroup($form->get('avenant')); ?>
</div>
</div>
</div>
......@@ -299,6 +301,7 @@
</div>
</div>
</div>
<?php
if ($canEdit) echo $this->formsubmit($form->get('submit'));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment