Gestion d'erreur de déplacement d'objet (a8108b26) · Commits · open-source / OSE

module/Application/src/Controller/PeriodeController.php

+5 −9

Changes for module/Application/src/Controller/PeriodeController.php: 5 added lines, 9 removed lines.
Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@ namespace Application\Controller;

		use Application\Form\Periode\Traits\PeriodeSaisieFormAwareTrait;
		use Application\Service\Traits\PeriodeServiceAwareTrait;
		use Cassandra\Exception\ExecutionException;
		use Laminas\View\Model\JsonModel;
		use UnicaenApp\View\Model\MessengerViewModel;
		use UnicaenApp\Service\EntityManagerAwareTrait;
		@@ -26,7 +27,7 @@ class PeriodeController extends AbstractController

		public function indexAction()
		{
		$query = $this->em()->createQuery('SELECT p FROM Application\Entity\Db\Periode p ORDER BY p.ordre');
		$query = $this->em()->createQuery('SELECT p FROM Application\Entity\Db\Periode p WHERE p.histoDestruction is null ORDER BY p.ordre');
		$periodes = $query->getResult();

		return compact('periodes');
		@@ -78,17 +79,12 @@ class PeriodeController extends AbstractController
		if ($sp) {
		$sp->setOrdre($ordre);
		$ordre++;
		try {
		throw new \Exception("coucou ça plante");
		$this->getServicePeriode()->save($sp);
		} catch (\Exception $e) {
		$this->flashMessenger()->addErrorMessage($this->translate($e));
		}

		}
		}

		$json = new JsonModel();
		$json->setVariable('msg', 'Tri des champs effectué');

		return $json;
		return new MessengerViewModel();
		}
		}
		No newline at end of file

module/Application/view/application/chargens/seuil.phtml

+1 −1

Changes for module/Application/view/application/chargens/seuil.phtml: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -98,7 +98,7 @@ $canEditcomp = $this->isAllowed(Privileges::getResourceId(Privileges::CHARGENS_S
		seuilCalcHeures();
		}).fail(function (jqXHR)
		{
		alertFlash(data, 'danger', 3000);
		alertFlash(data, 'error', 3000);
		console.log(jqXHR);
		});
		}

module/Application/view/application/formule/test-saisir.phtml

+1 −1

Changes for module/Application/view/application/formule/test-saisir.phtml: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -583,7 +583,7 @@ echo $this->tag('h1', ['class' => 'page-header'])->html($title);
		that.saving = false;
		}).fail(function (jqXHR)
		{
		alertFlash(jqXHR.responseText, 'danger', 5000);
		alertFlash(jqXHR.responseText, 'error', 5000);
		console.log(jqXHR);
		that.saving = false;
		});

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

+13 −5

Changes for module/Application/view/application/periode/index.phtml: 13 added lines, 5 removed lines.
Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ echo $this->messenger()->addCurrentMessagesFromFlashMessenger();
		<th style="text-align: center">Libellé long</th>
		<th style="text-align: center">Enseignement</th>
		<th style="text-align: center">Paiement</th>
		<th style="text-align: center">EcartMois</th>
		<th style="text-align: center" title="Ecart de mois avec le début de l'année universitaire choisie">EcartMois</th>
		<th style="text-align: center">EcartMoisPaiement</th>
		<?php if ($canEdit): ?>
		<th style="text-align: center">Actions</th>
		@@ -45,13 +45,13 @@ echo $this->messenger()->addCurrentMessagesFromFlashMessenger();
		<td style="text-align: center"><?= $periode->getLibelleLong(); ?></td>
		<td style="text-align: center"><?= affBooleen($periode->getEnseignement()); ?></td>
		<td style="text-align: center"><?= affBooleen($periode->getPaiement()); ?></td>
		<td style="text-align: center"><?= $periode->getEcartMois(); ?></td>
		<td style="text-align: center" title="Écart de mois avec le début de l'année universitaire choisie"><?= $periode->getEcartMois(); ?></td>
		<td style="text-align: center"><?= $periode->getEcartMoisPaiement(); ?></td>
		<?php if ($canEdit): ?>
		<td style="text-align: center">
		<a class="ajax-modal" data-event="periodes-edition"
		href="<?= $this->url('periodes/saisie', ['periode' => $periode->getId()], ['query' => ['tab' => 'edition']]) ?>"
		title="Modifier la periode"><span class="glyphicon glyphicon-edit"></span></a>
		title="Modifier la période"><span class="glyphicon glyphicon-edit"></span></a>
		<a class="pop-ajax" data-title="Suppression de période" data-content="Etes vous sur de supprimer" data-confirm="true"
		data-submit-reload="true"
		href="<?= $this->url('periodes/supprimer', ['periode' => $periode->getId()]) ?>"
		@@ -70,6 +70,7 @@ echo $this->messenger()->addCurrentMessagesFromFlashMessenger();
		<?php endif; ?>

		<script type="text/javascript">

		$(function () {
		$(".triables").sortable({
		handle: '.glyphicon-move',
		@@ -80,9 +81,16 @@ echo $this->messenger()->addCurrentMessagesFromFlashMessenger();
		if (champsIds != '') champsIds += ',';
		champsIds += $(this).data('id');
		});
		$.post(Url('periodes/trier'), {champsIds: champsIds}).done(function (res) {
		alertFlash(res.msg, 'success', 3000);

		$.ajax({
		type: 'POST',
		url: Url('periodes/trier'),
		data: {champsIds: champsIds},
		success: function () { alertFlash("Tri effectué", 'success', 3000); },
		});



		}
		});
		});

module/Indicateur/view/indicateur/indicateur/index.phtml

+1 −1

Changes for module/Indicateur/view/indicateur/indicateur/index.phtml: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -121,7 +121,7 @@ $noAbo = new \Indicateur\Entity\Db\NotificationIndicateur();
		}
		).fail(function (jqXHR)
		{
		alertFlash(jqXHR.responseText, 'danger', 5000);
		alertFlash(jqXHR.responseText, 'error', 5000);
		console.log(jqXHR);
		that.calculerNextType();
		});