Preview de la fiche metier dans la selection des fiches metiers dans la fiche de poste (7ad0226a) · Commits · open-source / emc2

module/Application/src/Application/Controller/FichePosteController.php

+2 −1

Changes for module/Application/src/Application/Controller/FichePosteController.php: 2 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -499,7 +499,8 @@ class FichePosteController extends AbstractActionController {
		}

		$vm = new ViewModel();
		$vm->setTemplate('application/default/default-form');
		// $vm->setTemplate('application/default/default-form');
		$vm->setTemplate('application/fiche-poste/ajouter-fiche-metier');
		$vm->setVariables([
		'title' => 'Modification d\'une fiche métier',
		'form' => $form,

+3 −4

Changes for module/Application/src/Application/Service/Poste/PosteService.php: 3 added lines, 4 removed lines.
Original line number	Diff line number	Diff line
		@@ -6,7 +6,6 @@ use Application\Entity\Db\Poste;
		use Application\Entity\Db\Structure;
		use Application\Service\Structure\StructureServiceAwareTrait;
		use Doctrine\ORM\NonUniqueResultException;
		use Doctrine\ORM\OptimisticLockException;
		use Doctrine\ORM\ORMException;
		use Doctrine\ORM\QueryBuilder;
		use UnicaenApp\Exception\RuntimeException;
		@@ -82,7 +81,7 @@ class PosteService {
		* @return Poste[]
		*/
		public function getPostes($champ = 'id', $ordre = 'ASC') {
		$qb = $this->createQueryBuilder($champ = 'id', $ordre = 'ASC');
		$qb = $this->createQueryBuilder($champ, $ordre);

		$result = $qb->getQuery()->getResult();
		return $result;
		@@ -94,7 +93,7 @@ class PosteService {
		* @return Poste[]
		*/
		public function getPostesLibres($champ = 'id', $ordre = 'ASC') {
		$qb = $this->createQueryBuilder()
		$qb = $this->createQueryBuilder($champ, $ordre)
		->andWhere('fiche IS NULL');

		$result = $qb->getQuery()->getResult();
		@@ -121,7 +120,7 @@ class PosteService {
		}

		/**
		* @param Structure $structure
		* @param Structure\|null $structure
		* @param bool $sousstructure
		* @param bool $libre
		* @return Poste[]

+32 −0

Changes for module/Application/view/application/fiche-poste/ajouter-fiche-metier.phtml: 32 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -13,8 +13,36 @@ use Application\Form\AjouterFicheMetier\AjouterFicheMetierForm;

		<?php echo $this->form($form); ?>

		<br/>
		<div id="preview-fiche-metier">Prévisulation de la fiche métier.</div>

		<script>
		function getFicheMetier() {
		let value = $('select#fiche_type').find(":selected").val();
		console.log(value);

		if (value !== undefined && value !== "")
		{
		let url = "../../fiche-metier-type/afficher/" + value;
		$.ajax({
		type: "POST",
		url: url,
		beforeSend:
		function () {
		document.getElementById('preview-fiche-metier').innerHTML = "Récupération de la fiche métier ...";
		},
		success:
		function (retour) {
		// var texte = "";
		// if (retour["value"] == 1) texte = "<span class='glyphicon glyphicon-ok text-success'></span>";
		// else var texte = "<span class='glyphicon glyphicon-remove text-danger'></span>";
		document.getElementById('preview-fiche-metier').innerHTML = retour;
		}
		});
		}
		}
		$('select').selectpicker();
		getFicheMetier();

		$('select#quotite').on ("change", function(event) {
		let value = $('select#quotite').find(":selected").val();
		@@ -25,4 +53,8 @@ use Application\Form\AjouterFicheMetier\AjouterFicheMetierForm;
		$('input#est_principale').prop('checked', false);
		}
		});

		$('select#fiche_type').on("change", function(event) {
		getFicheMetier();
		});
		</script>

+1 −1

Changes for module/Application/view/application/structure/partial/agents.phtml: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@ $canDetruireFichePoste = $this->isAllowed(FichePostePrivileges::getResource
		</span>
		</h2>

		<table class="table table-condensed">
		<table class="datatable table table-condensed">
		<thead>
		<tr>
		<th>Dénomination</th>

+1 −1

Changes for module/Application/view/application/structure/partial/missions-specifiques.phtml: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@ $canDetruireAffectation = $this->isAllowed(MissionspecifiquePrivileges::getR
		</div>
		</div>

		<table class="table table-condensed">
		<table class="datatable table table-condensed">
		<thead>
		<tr>
		<th> Agent </th>