- Les connecteurs sont toujours affichés, les anciens connecteurs inclus (0a1fa200) · Commits · open-source / oscar

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

+20 −1

Changes for module/Oscar/src/Oscar/Controller/OrganizationController.php: 20 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -573,8 +573,27 @@ class OrganizationController extends AbstractOscarController implements UseOrgan
		}
		}

		$connectorsConf = $this->getOrganizationService()->getConnectorsList();
		$connectorsConfEntity = $entity->getConnectors();
		$connectorsInfos = [];
		foreach ($connectorsConf as $connector) {
		$connectorsInfos[$connector] = [
		'value' => null,
		'native' => true
		];
		}
		foreach ($connectorsConfEntity as $connector=>$value) {
		if( !array_key_exists($connector, $connectorsInfos) ){
		$connectorsInfos[$connector] = [
		'native' => false
		];
		}
		$connectorsInfos[$connector]['value'] = $value;
		}


		$output = [
		'connectors' => $this->getOrganizationService()->getConnectorsList(),
		'connectors' => $connectorsInfos,
		'organization' => $this->getOrganizationService()->getOrganization($organizationId),
		'ancestors' => $this->getOrganizationService()->getAncestors($organizationId),
		'subStructures' => $this->getOrganizationService()->getSubStructure($organizationId),

module/Oscar/view/oscar/organization/show.phtml

+28 −19

Changes for module/Oscar/view/oscar/organization/show.phtml: 28 added lines, 19 removed lines.
Original line number	Diff line number	Diff line
		@@ -120,22 +120,26 @@
		<dt>Synchronisation</dt>
		<dd>
		<ul>
		<?php foreach($connectors as $connector): ?>

		<li>
		<?= $connector ?> : <strong><?= $organization->getConnectorID($connector) ?></strong>
		<?php foreach ($connectors as $connector => $connectorData): ?>
		<li class="cartouche <?= $connectorData['native'] ? 'primary' : 'danger' ?>">
		<?php if ($connectorData['native']): ?>
		<i class="icon-signal"></i>
		<strong><?= $connector ?></strong>
		<?php else: ?>
		<i class="icon-block"></i>
		<em><?= $connector ?></em>

		<?php if( $organization->getConnectorID($connector)): ?>
		<a href="<?= $this->url('connector/organization') ?>?c=<?= $connector ?>&v=<?= $organization->getConnectorID($connector) ?>"
		class="btn btn-primary btn-xs">
		<i class="icon-cw-outline"></i>
		Synchroniser
		<?php endif; ?>
		<span class="addon">
		<?= $connectorData['value'] ?: 'Non connecté' ?>
		<?php if ($connectorData['native'] && $connectorData['value']): ?>
		<a class="btn btn-light btn-sm"
		href="<?= $this->url('connector/organization') ?>?c=<?= $connector ?>&v=<?= $organization->getConnectorID($connector) ?>">
		<i class="icon-history"></i> Synchroniser
		</a>
		<?php else: ?>
		<em>Non synchronisé</em>
		<?php endif; ?>
		</span>
		</li>

		<?php endforeach; ?>
		</ul>
		</dd>
		@@ -146,15 +150,18 @@
		</div>
		<div class="bg-white text-center">
		<nav class="btn-group inline-block">
		<a href="<?= $this->url('organization/edit', array('id' => $organization->getId())) ?>" class="btn btn-light btn-sm">
		<a href="<?= $this->url('organization/edit', array('id' => $organization->getId())) ?>"
		class="btn btn-light btn-sm">
		Éditer les informations
		</a>

		<a href="<?= $this->url('organization/reindexOne', array('id' => $organization->getId())) ?>" class="btn btn-info btn-sm">
		<a href="<?= $this->url('organization/reindexOne', array('id' => $organization->getId())) ?>"
		class="btn btn-info btn-sm">
		Réindexer
		</a>

		<a href="<?= $this->url('timesheet/organization') ?>?id=<?= $organization->getId() ?>" class="btn btn-primary btn-sm">Déclarations en attente</a>
		<a href="<?= $this->url('timesheet/organization') ?>?id=<?= $organization->getId() ?>"
		class="btn btn-primary btn-sm">Déclarations en attente</a>
		</nav>
		</div>

		@@ -164,7 +171,8 @@
		<div class="col-md-6">
		<div id="oranizations">
		<h2><i class="icon-building-filled"></i>Sous-Structures</h2>
		<div id="suborganizations" data-url="<?= $this->url('organization/suborganization', ['idorganization' => $organization->getId()]) ?>"></div>
		<div id="suborganizations"
		data-url="<?= $this->url('organization/suborganization', ['idorganization' => $organization->getId()]) ?>"></div>
		<?php $this->Vite()->addJs('src/OrganizationSubOrganizations.js') ?>
		</div>
		</div>
		@@ -181,7 +189,8 @@
		)); ?>
		<?php endforeach; ?>
		<hr>
		<a href="<?= $this->url('organizationperson/new', ['idenroller' => $organization->getId()]) ?>" class="btn btn-primary">
		<a href="<?= $this->url('organizationperson/new', ['idenroller' => $organization->getId()]) ?>"
		class="btn btn-primary">
		<i class="icon-plus-circled"></i> Lier une personne
		</a>
		<?php if (count($ancestors)): ?>
		@@ -205,7 +214,6 @@
		</section>



		<!--
		<h2>Projet <span class="label <?= count($projects) > 0 ? 'label-info' : 'label-default' ?>"><?= count($projects) ?></span></h2>
		<?php foreach ($projects as $project): ?>
		@@ -219,7 +227,8 @@

		<section class="activities">
		<h2>Activités (sans projet) <span class="label <?= count($activities) > 0 ? 'label-info' : 'label-default' ?>"><?= count($activities) ?></span></h2>
		<?php $currentYear=null; foreach( $activities as $activity ):
		<?php $currentYear = null;
		foreach ($activities as $activity):

		$year = $activity->getDateCreated()->format('Y');
		if ($currentYear != $year) {