Skip to content
Snippets Groups Projects
Commit 00370a57 authored by Alexis Thinardon's avatar Alexis Thinardon
Browse files

Merge branch 'develop' into 'master'

Develop

See merge request !176
parents 8ec753e2 ba052e6b
No related branches found
No related tags found
2 merge requests!216Merge branch 'release/1.8' into 'develop',!176Develop
Pipeline #11264 passed
CHANGELOG CHANGELOG
========= =========
## [1.7.9] - 2020-01-06
### Changement
- Ajout des liens pour accéder à la vue de consultation depuis la vue la liste d'un sous-traitant et d'une violation
## [1.7.8] - 2020-09-30
### Changement
- Correction sur le dashboard utilisateur et correction des placeholders sur la liste des collectivités.
## [1.7.7] - 2020-09-21 ## [1.7.7] - 2020-09-21
### Ajout ### Ajout
- Ajout du Lot 4 - Ajout du Lot 4
......
parameters: parameters:
app.version: 1.7.7 app.version: 1.7.9
framework: framework:
secret: '%env(APP_SECRET)%' secret: '%env(APP_SECRET)%'
......
...@@ -209,8 +209,12 @@ class ContractorController extends CRUDController ...@@ -209,8 +209,12 @@ class ContractorController extends CRUDController
/** @var Model\Contractor $contractor */ /** @var Model\Contractor $contractor */
foreach ($contractors as $contractor) { foreach ($contractors as $contractor) {
$contractorLink = '<a href="' . $this->router->generate('registry_contractor_show', ['id' => $contractor->getId()->toString()]) . '">
' . $contractor->getName() . '
</a>';
$reponse['data'][] = [ $reponse['data'][] = [
'nom' => $contractor->getName(), 'nom' => $contractorLink,
'collectivite' => $contractor->getCollectivity()->getName(), 'collectivite' => $contractor->getCollectivity()->getName(),
'clauses_contractuelles' => $contractor->isContractualClausesVerified() ? $yes : $no, 'clauses_contractuelles' => $contractor->isContractualClausesVerified() ? $yes : $no,
'element_securite' => $contractor->isAdoptedSecurityFeatures() ? $yes : $no, 'element_securite' => $contractor->isAdoptedSecurityFeatures() ? $yes : $no,
......
...@@ -170,9 +170,13 @@ class ViolationController extends CRUDController ...@@ -170,9 +170,13 @@ class ViolationController extends CRUDController
/** @var Model\Violation $violation */ /** @var Model\Violation $violation */
foreach ($users as $violation) { foreach ($users as $violation) {
$violationLink = '<a href="' . $this->router->generate('registry_violation_show', ['id' => $violation->getId()->toString()]) . '">
' . \date_format($violation->getDate(), 'd/m/Y') . '
</a>';
$reponse['data'][] = [ $reponse['data'][] = [
'collectivite' => $violation->getCollectivity()->getName(), 'collectivite' => $violation->getCollectivity()->getName(),
'date' => \date_format($violation->getDate(), 'd/m/Y'), 'date' => $violationLink,
'nature' => !\is_null($violation->getViolationNature()) ? ViolationNatureDictionary::getNatures()[$violation->getViolationNature()] : null, 'nature' => !\is_null($violation->getViolationNature()) ? ViolationNatureDictionary::getNatures()[$violation->getViolationNature()] : null,
'cause' => !\is_null($violation->getCause()) ? ViolationCauseDictionary::getNatures()[$violation->getCause()] : null, 'cause' => !\is_null($violation->getCause()) ? ViolationCauseDictionary::getNatures()[$violation->getCause()] : null,
'gravity' => !\is_null($violation->getGravity()) ? ViolationGravityDictionary::getGravities()[$violation->getGravity()] : null, 'gravity' => !\is_null($violation->getGravity()) ? ViolationGravityDictionary::getGravities()[$violation->getGravity()] : null,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment