Lien entre la fiche est les activites (a9ff2c31) · Commits · open-source / emc2

module/Application/src/Application/Controller/FicheMetier/FicheMetierTypeController.php

+10 −2

Changes for module/Application/src/Application/Controller/FicheMetier/FicheMetierTypeController.php: 10 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -3,14 +3,12 @@
		namespace Application\Controller\FicheMetier;

		use Application\Entity\Db\Activite;
		use Application\Entity\Db\FicheMetierTypeActivite;
		use Application\Form\Activite\ActiviteForm;
		use Application\Form\FicheMetierType\ActiviteExistanteForm;
		use Application\Form\FicheMetierType\LibelleForm;
		use Application\Form\FicheMetierType\MissionsPrincipalesForm;
		use Application\Service\Activite\ActiviteServiceAwareTrait;
		use Application\Service\FicheMetier\FicheMetierServiceAwareTrait;
		use UnicaenApp\Exception\RuntimeException;
		use Zend\Http\Request;
		use Zend\Mvc\Controller\AbstractActionController;
		use Zend\View\Model\ViewModel;
		@@ -142,9 +140,19 @@ class FicheMetierTypeController extends AbstractActionController{
		// }
		}

		$activites = $this->getActiviteService()->getActivites();
		$options = [];
		foreach($activites as $activite) {
		$options[$activite->getId()] = [
		"title" => $activite->getLibelle(),
		"description" => $activite->getDescription(),
		];
		}

		return new ViewModel([
		'title' => 'Ajouter une activité existante',
		'form' => $form,
		'options' => $options,
		]);
		}

+19 −0

Changes for module/Application/src/Application/Service/Activite/ActiviteService.php: 19 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -235,4 +235,23 @@ class ActiviteService {

		$this->compacting($couple->getFiche());
		}

		public function getActiviteDisponible($fiche) {
		//select a.id, a.libelle, f.id
		//from activite a
		//left join fiche_metier_type_activite f on a.id = f.activite and f.fiche=1
		//where f.id IS NULL;

		// $qb = $this->getEntityManager()->getRepository(Activite::class)->createQueryBuilder('activite')
		// ->leftJoin('activite.id', 'fiche_activite', 'on' )

		//select *
		//from activite a
		//where a.id not in (
		//select a.id from fiche_metier_type_activite f
		//join activite a on f.activite = a.id where f.fiche = 1
		//)


		}
		}
		No newline at end of file

+7 −6

Changes for module/Application/view/application/fiche-metier-type/afficher.phtml: 7 added lines, 6 removed lines.
Original line number	Diff line number	Diff line
		@@ -105,17 +105,18 @@ $canEditer = true;


		<script>
		// Prevent bootstrap dialog from blocking focusin
		$(document).on('focusin', function(e) {
		if ($(e.target).closest(".mce-window").length) {
		e.stopImmediatePropagation();
		}
		});

		$(function() {
		$("body").on("modification", function (event) {
		event.div.modal('hide');
		window.location.reload();
		});

		$('.modal').bind('shown', function() {
		$('textarea.tinymce-modal').tinymce({
		// TinyMCE Options
		});
		});
		});

		</script>

+21 −2

Changes for module/Application/view/application/fiche-metier-type/ajouter-activite-existante.phtml: 21 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -17,10 +17,29 @@

		<br/>

		<div class="alert-info preview">
		<div id="none" class="alert-info preview">
		Aucune prévisualisation.
		</div>

		<script>
		<?php foreach ($options as $key => $infos) :?>
		<div style='display:none;' class="preview alert-info" id="<?php echo $key;?>">
		<h3><?php echo $infos["title"]; ?></h3>
		<?php echo $infos["description"]; ?>
		</div>
		<?php endforeach; ?>

		<script>
		$(function() {
		$("select#activite").change(function () {
		let text = $("select#activite option:selected").val();
		$("div.preview").hide();
		if (text.length > 0) {
		$("div#" + text).show();
		} else {

		$("div#none").show();
		}

		});
		});
		</script>

+15 −0

Changes for module/Application/view/application/fiche-metier-type/editer-missions-principales.phtml: 15 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -10,3 +10,18 @@
		<?php
		echo $this->form($form);
		?>

		<script>
		// Prevent bootstrap dialog from blocking focusin
		$(document).on('focusin', function(e) {
		if ($(e.target).closest(".mce-window").length) {
		e.stopImmediatePropagation();
		}
		});
		$('#open').click(function() {
		$("#dialog").dialog({
		width: 800,
		modal: true
		});
		});
		</script>