X-Git-Url: https://git.rapsys.eu/.gitweb.cgi/airbundle/blobdiff_plain/273c5c79b2d7c885c531a9a2ad2ea7ae48c31cab..f7265e7a07fe3e7ac3a1df26328700c7f45c1755:/Form/SessionEditType.php

diff --git a/Form/SessionEditType.php b/Form/SessionEditType.php
index 24a1544..7841e70 100644
--- a/Form/SessionEditType.php
+++ b/Form/SessionEditType.php
@@ -19,25 +19,25 @@ class SessionEditType extends AbstractType {
 	//Doctrine instance
 	private $doctrine;
 
-	//Translator instance
-	protected $translator;
-
 	/**
 	 * {@inheritdoc}
 	 */
-	public function __construct(RegistryInterface $doctrine, TranslatorInterface $translator) {
+	public function __construct(RegistryInterface $doctrine) {
 		$this->doctrine = $doctrine;
-		$this->translator = $translator;
 	}
 
 	/**
 	 * {@inheritdoc}
 	 */
 	public function buildForm(FormBuilderInterface $builder, array $options) {
-		//Is admin or rainfall >= 2
+		//Is admin or user with rainfall >= 2
 		if (!empty($options['raincancel'])) {
 			//Add raincancel item
 			$builder->add('raincancel', SubmitType::class, ['label' => 'Rain cancel', 'attr' => ['class' => 'submit']]);
+		//Is admin
+		} elseif (!empty($options['admin'])) {
+			//Add forcecancel item
+			$builder->add('forcecancel', SubmitType::class, ['label' => 'Force cancel', 'attr' => ['class' => 'submit']]);
 		}
 
 		//Is admin or owner
@@ -55,13 +55,10 @@ class SessionEditType extends AbstractType {
 			$builder->add('cancel', SubmitType::class, ['label' => 'Cancel', 'attr' => ['class' => 'submit']]);
 		}
 
-		//Is admin or session not finished
-		#if (!empty($options['admin']) || $options['stop'] > new \DateTime('now')) {
-
 		//Is admin or senior owner
 		if (!empty($options['move'])) {
 			//Load locations
-			$locations = $this->doctrine->getRepository(Location::class)->findComplementBySessionId($this->translator, $options['session']);
+			$locations = $this->doctrine->getRepository(Location::class)->findComplementBySessionId($options['session']);
 			$builder
 				//TODO: class senior en orange ???
 				->add('location', ChoiceType::class, ['attr' => ['placeholder' => 'Your location'], 'constraints' => [new NotBlank(['message' => 'Please provide your location'])], 'choices' => $locations, 'choice_translation_domain' => true])
@@ -76,9 +73,15 @@ class SessionEditType extends AbstractType {
 			$builder
 				//TODO: class admin en rouge ???
 				->add('user', ChoiceType::class, ['attr' => ['placeholder' => 'Your user'], 'constraints' => [new NotBlank(['message' => 'Please provide your user'])], 'choices' => $users, 'data' => $options['user'], 'choice_translation_domain' => false])
-				->add('attribute', SubmitType::class, ['label' => 'Attribute', 'attr' => ['class' => 'submit']])
-				->add('autoattribute', SubmitType::class, ['label' => 'Auto attribute', 'attr' => ['class' => 'submit']])
 				->add('lock', SubmitType::class, ['label' => 'Lock', 'attr' => ['class' => 'submit']]);
+
+			//Is admin and locked === null
+			if (!empty($options['attribute'])) {
+				//Add attribute fields
+				$builder
+					->add('attribute', SubmitType::class, ['label' => 'Attribute', 'attr' => ['class' => 'submit']])
+					->add('autoattribute', SubmitType::class, ['label' => 'Auto attribute', 'attr' => ['class' => 'submit']]);
+			}
 		}
 
 		//Return form
@@ -89,7 +92,7 @@ class SessionEditType extends AbstractType {
 	 * {@inheritdoc}
 	 */
 	public function configureOptions(OptionsResolver $resolver) {
-		$resolver->setDefaults(['error_bubbling' => true, 'admin' => false, 'begin' => null, 'length' => null, 'cancel' => false, 'raincancel' => false, 'modify' => false, 'move' => false, 'user' => null, 'session' => null]);
+		$resolver->setDefaults(['error_bubbling' => true, 'admin' => false, 'begin' => null, 'length' => null, 'cancel' => false, 'raincancel' => false, 'modify' => false, 'move' => false, 'attribute' => false, 'user' => null, 'session' => null]);
 		$resolver->setAllowedTypes('admin', 'boolean');
 		#TODO: voir si c'est le bon type
 		$resolver->setAllowedTypes('begin', 'datetime');
@@ -98,6 +101,7 @@ class SessionEditType extends AbstractType {
 		$resolver->setAllowedTypes('raincancel', 'boolean');
 		$resolver->setAllowedTypes('modify', 'boolean');
 		$resolver->setAllowedTypes('move', 'boolean');
+		$resolver->setAllowedTypes('attribute', 'boolean');
 		$resolver->setAllowedTypes('user', 'integer');
 		$resolver->setAllowedTypes('session', 'integer');
 	}