udpate (690405ea) · Commits · open-source / emc2

module/Application/src/Application/Service/FicheMetier/FicheMetierService.php

+2 −0

Original line number	Diff line number	Diff line
		@@ -92,6 +92,8 @@ class FicheMetierService {
		->addSelect('metier')->join('ficheMetier.metier', 'metier')
		->addSelect('domaine')->join('metier.domaines', 'domaine')
		->addSelect('etat')->join('ficheMetier.etat', 'etat')
		->addSelect('reference')->leftJoin('metier.references', 'reference')
		->addSelect('referentiel')->leftJoin('reference.referentiel', 'referentiel')
		;
		return $qb;
		}

module/Application/src/Application/Service/FichePoste/FichePosteService.php

+4 −2

Original line number	Diff line number	Diff line
		@@ -108,10 +108,12 @@ class FichePosteService {


		->addSelect('poste')->leftJoin('fiche.poste', 'poste')
		// ->addSelect('fichemetier')->leftJoin('fiche.fichesMetiers', 'fichemetier')
		// ->addSelect('metier')->leftJoin('fichemetier.metier', 'metier')
		->addSelect('specificite')->leftJoin('fiche.specificite', 'specificite')
		->addSelect('externe')->leftJoin('fiche.fichesMetiers', 'externe')
		->addSelect('fichemetier')->leftJoin('externe.ficheType', 'fichemetier')
		->addSelect('metier')->leftJoin('fichemetier.metier', 'metier')
		->addSelect('reference')->leftJoin('metier.references', 'reference')
		->addSelect('referentiel')->leftJoin('reference.referentiel', 'referentiel')
		;
		return $qb;
		}

module/Application/view/application/competence/index.phtml

+72 −8

Original line number	Diff line number	Diff line
		@@ -89,7 +89,7 @@ $this->headTitle("Index des compétences");

		<br/>

		<table class="datatable table table-condensed" data-order='[ 1, "asc" ]'>
		<table id="<?php echo "competence_".$type->getId().""; ?>" class="datatable table table-condensed" data-order='[ 1, "asc" ]'>
		<thead>
		<tr>
		<th> Libellé </th>
		@@ -426,6 +426,7 @@ $this->headTitle("Index des compétences");
		</div>
		</div>
		</div>

		<!--$competences = $competencesArray['competences'];-->

		<style>
		@@ -438,13 +439,76 @@ $this->headTitle("Index des compétences");
		</style>

		<script>
		$(document).ready(function() {
		$('.datatable').DataTable({
		language: {
		url: '/localisation/fr_FR.json'
		}
		})
		});
		let loaded = false;
		let search ;
		let page ;
		let id = 'competence_3';

		<?php foreach ($types as $type) : ?>
		let table_<?php echo $type->getId(); ?> = $('#competence_<?php echo $type->getId(); ?>').DataTable();
		<?php endforeach; ?>


		//$(document).ready(function() {
		// let table_ = $('#' + id).DataTable();
		// // let searchParams = new URLSearchParams(window.location.search);
		// let searchParams = window.location.search.split('#')[0];
		// searchParams = new URLSearchParams(searchParams);
		// console.log(searchParams);
		// let search = searchParams.get('search')
		// let page = searchParams.get('page')
		// if (/** search !== undefined && search !== "undefined" && */ search !== null && search !== "null") {
		// table_.search(search);
		// }
		// if (/** page !== undefined && page !== "undefined" && */ page !== null && page !== "null") {
		// table_.page(parseInt(page));
		// }
		// table_.draw(false);
		// loaded = true;
		//});
		//
		<?php //foreach ($types as $type) : ?>
		// $('#competence_<?php //echo $type->getId(); ?>//').on('page.dt', function () {
		// if (loaded === true) {
		// let table_<?php //echo $type->getId(); ?>// = $('#competence_<?php //echo $type->getId(); ?>//').DataTable();
		// page = table_<?php //echo $type->getId(); ?>//.page();
		// console.log('#competence_<?php //echo $type->getId(); ?>// ' + " " + page);
		// }
		// });
		//
		// $('#competence_<?php //echo $type->getId(); ?>//').on('search.dt', function () {
		// if (loaded === true) {
		// let table_<?php //echo $type->getId(); ?>// = $('#competence_<?php //echo $type->getId(); ?>//').DataTable();
		// search = table_<?php //echo $type->getId(); ?>//.search();
		// console.log('#competence_<?php //echo $type->getId(); ?>// ' + " " + search);
		// }
		// });
		<?php //endforeach; ?>
		//
		//$(window).bind('beforeunload', function() {
		//
		// //onglets
		// let hash = $(location).attr('hash');
		// let name = hash.substr(1);
		// //parametres du tableau
		// let params = '';
		// if (search !== null && search !== undefined) {
		// params += "search=" + search;
		// }
		// if (page !== null && page !== undefined) {
		// if (params !== '') params += "&";
		// params += "page=" + page;
		// }
		// // if (params !== '') {
		// // params = "?" + params;
		// // }
		// if (hash !== '') {
		// params += "" + hash;
		// }
		// history.replaceState({}, null, '?' + params);
		//
		//});


		$(function() {
		let hash = $(location).attr('hash');

module/Application/view/application/structure/index.phtml

+75 −18

Original line number	Diff line number	Diff line
		@@ -88,14 +88,34 @@ $canAfficher = $this->isAllowed(StructurePrivileges::getResourceId(StructureP
		<?php endforeach; ?>
		</tbody>
		</table>

		<!-- <table id="temp" class="datatable table table-condensed">-->
		<!-- <thead>-->
		<!-- <tr>-->
		<!-- <th> Id </th>-->
		<!-- <th> libelle </th>-->
		<!-- </tr>-->
		<!-- </thead>-->
		<!-- <tbody>-->
		<!-- --><?php //for ($i = 1 ; $i <= 50 ; $i++) : ?>
		<!-- <tr>-->
		<!-- <td> --><?php //echo $i; ?><!-- </td>-->
		<!-- <td> --><?php //echo $i; ?><!-- </td>-->
		<!-- </tr>-->
		<!-- --><?php //endfor; ?>
		<!-- </tbody>-->
		<!-- </table>-->
		</div>


		<script>
		let loaded = false;
		let table ;
		let search ;
		let page ;

		let array = Array();

		$(window).bind('beforeunload', function() {
		let params = '';
		if (search !== null && search !== undefined) {
		@@ -105,12 +125,20 @@ $canAfficher = $this->isAllowed(StructurePrivileges::getResourceId(StructureP
		if (params !== '') params += "&";
		params += "page=" + page;
		}
		if (table !== null && table !== undefined) {
		if (params !== '') params += "&";
		params += "table=" + table;
		}
		if (params !== '') {
		console.log("params : " + params);
		history.replaceState({}, null, '?' + params);
		}
		});

		// $(document).ready(function() {
		// $('.datatable').DataTable({});
		// });

		$(document).ready(function() {
		let table = $('#structures').DataTable({});
		let searchParams = new URLSearchParams(window.location.search);
		@@ -127,30 +155,59 @@ $canAfficher = $this->isAllowed(StructurePrivileges::getResourceId(StructureP
		loaded = true;
		});

		$(document).on('#structures page.dt', function () {

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

		$.fn.historique_recherche = function() {
		this.each(function() {

		// $(document).ready(function() {
		// let searchParams = new URLSearchParams(window.location.search);
		// let search = searchParams.get('search');
		// let page = searchParams.get('page')
		// let table = searchParams.get('table')
		//
		// if (table !== null && table !== "null") {
		// let table_ = array[table];
		// console.log(table_);
		// if (search !== null && search !== "null") {
		// table_.search(search);
		// }
		// if (page !== null && page !== "null") {
		// table_.page(parseInt(page));
		// }
		// table_.draw(false);
		// }
		// });

		$(this).on('page.dt', function () {
		if (loaded === true) {
		let table = $('#structures').DataTable();
		page = table.page();
		console.log(page);
		let table_ = $(this).DataTable();
		table = $(this).attr('id');
		page = table_.page();
		console.log("PAGE: " + table + " " + page);
		}
		});

		$(document).on('#structures search.dt', function () {
		$(this).on('search.dt', function () {
		if (loaded === true) {
		let table = $('#structures').DataTable();
		search = table.search();
		console.log(search);
		let table_ = $(this).DataTable();
		table = $(this).attr('id');
		search = table_.search();
		console.log("SEARCH: " + table + " " + search);
		}
		});

		// NB : il existe aussi un event order.dt

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

		</script>
		$('table').historique_recherche();

		</script>
		No newline at end of file