Compare commits

..

No commits in common. "665589a395b5f69195d3ba27f46526c5c0081fbe" and "eae27fc563867bbbe01809191bc06e9b43dec4df" have entirely different histories.

7 changed files with 72 additions and 39 deletions

65
.idea/dataSources.xml generated Normal file
View File

@ -0,0 +1,65 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DataSourceManagerImpl" format="xml" multifile-model="true">
<<<<<<< HEAD
<data-source source="LOCAL" name="HegreEtConfort@172.20.96.1" uuid="df0d05c3-5fc7-46c8-a0dc-7e45756a28ce">
<driver-ref>postgresql</driver-ref>
<synchronize>true</synchronize>
<jdbc-driver>org.postgresql.Driver</jdbc-driver>
<jdbc-url>jdbc:postgresql://172.20.96.1:5432/HegreEtConfort</jdbc-url>
=======
<<<<<<< HEAD
<data-source source="LOCAL" name="HegreEtConfort@172.20.96.1" uuid="7dfccb0e-433e-4f42-b6ce-6362f7e2187a">
<driver-ref>postgresql</driver-ref>
<synchronize>true</synchronize>
<jdbc-driver>org.postgresql.Driver</jdbc-driver>
<jdbc-url>jdbc:postgresql://172.20.96.1:5432/HegreEtConfort</jdbc-url>
=======
<<<<<<< HEAD
<<<<<<< HEAD
<data-source source="LOCAL" name="chauffageproj@172.20.96.1" uuid="633df7e7-7b9a-4298-8a3c-3075313a1153">
=======
<<<<<<< HEAD
<data-source source="LOCAL" name="@172.20.96.1" uuid="76621fd2-6622-4f8e-a632-d7b7602e0afe">
<driver-ref>postgresql</driver-ref>
<synchronize>true</synchronize>
<jdbc-driver>org.postgresql.Driver</jdbc-driver>
<jdbc-url>jdbc:postgresql://172.20.96.1:5432/</jdbc-url>
<working-dir>$ProjectFileDir$</working-dir>
</data-source>
<data-source source="LOCAL" name="hegreconfort@127.0.0.1" uuid="a0219ca4-02a7-456a-bf02-9b3234ed346b">
<driver-ref>mariadb</driver-ref>
<synchronize>true</synchronize>
<jdbc-driver>org.mariadb.jdbc.Driver</jdbc-driver>
<jdbc-url>jdbc:mariadb://127.0.0.1:3306/hegreconfort</jdbc-url>
=======
<data-source source="LOCAL" name="chauffageproj@172.20.96.1" uuid="6554e332-842b-41d7-a021-08782c7b72bb">
<driver-ref>postgresql</driver-ref>
<synchronize>true</synchronize>
<jdbc-driver>org.postgresql.Driver</jdbc-driver>
<jdbc-url>jdbc:postgresql://172.20.96.1:5432/chauffageproj</jdbc-url>
<working-dir>$ProjectFileDir$</working-dir>
</data-source>
<data-source source="LOCAL" name="chauffageproj@172.20.96.1 [2]" uuid="a446f2ca-1dfc-459a-97f5-eda71fd74aa2">
>>>>>>> 6532d4d88b86c321a212cdc0ca43b2e4770db117
<driver-ref>postgresql</driver-ref>
<synchronize>true</synchronize>
<jdbc-driver>org.postgresql.Driver</jdbc-driver>
<jdbc-url>jdbc:postgresql://172.20.96.1:5432/chauffageproj</jdbc-url>
>>>>>>> ee236ff74aaac1882a825817d5ce8f692d3bdd0f
=======
<data-source source="LOCAL" name="HegreConfort@localhost" uuid="755cf5bd-875b-416d-8bc2-76a5b9ba2d4d">
<driver-ref>mariadb</driver-ref>
<synchronize>true</synchronize>
<jdbc-driver>org.mariadb.jdbc.Driver</jdbc-driver>
<jdbc-url>jdbc:mariadb://localhost:3306/HegreConfort</jdbc-url>
<jdbc-additional-properties>
<property name="database.introspection.mysql.dbe5060" value="true" />
</jdbc-additional-properties>
>>>>>>> cc65343635c8771e56e2a3304b42ec32f4f91b97
>>>>>>> d7375d330251cab10a2296bbb292fcdb7cd6e847
>>>>>>> 05b64fc2b1e17491a87ea32353e6987b0e97bf50
<working-dir>$ProjectFileDir$</working-dir>
</data-source>
</component>
</project>

View File

@ -16,9 +16,6 @@ class Fault
#[ORM\Column(length: 255)] #[ORM\Column(length: 255)]
private ?string $Wording = null; private ?string $Wording = null;
#[ORM\Column(length: 255)]
private ?string $Description = null;
public function getId(): ?int public function getId(): ?int
{ {
return $this->id; return $this->id;
@ -35,16 +32,4 @@ class Fault
return $this; return $this;
} }
public function getDescription(): ?string
{
return $this->Description;
}
public function setDescription(string $Description): static
{
$this->Description = $Description;
return $this;
}
} }

View File

@ -19,9 +19,6 @@ class Vehicle
#[ORM\Column(length: 255)] #[ORM\Column(length: 255)]
private ?string $Brand = null; private ?string $Brand = null;
#[ORM\Column(length: 255)]
private ?string $Model = null;
public function getId(): ?int public function getId(): ?int
{ {
return $this->id; return $this->id;
@ -50,14 +47,4 @@ class Vehicle
return $this; return $this;
} }
public function getModel(): ?string
{
return $this->Model;
}
public function setModel(?string $Model): void
{
$this->Model = $Model;
}
} }

View File

@ -3,8 +3,8 @@
namespace App\Form; namespace App\Form;
use App\Entity\Skill; use App\Entity\Skill;
use Doctrine\DBAL\Types\TextType;
use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\OptionsResolver\OptionsResolver;

View File

@ -3,9 +3,9 @@
namespace App\Form; namespace App\Form;
use App\Entity\Stock; use App\Entity\Stock;
use Doctrine\DBAL\Types\IntegerType;
use Doctrine\DBAL\Types\TextType;
use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\IntegerType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\OptionsResolver\OptionsResolver;

View File

@ -3,10 +3,8 @@
namespace App\Form; namespace App\Form;
use App\Entity\User; use App\Entity\User;
use Doctrine\DBAL\Types\TextType;
use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\Extension\Core\Type\DateType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\OptionsResolver\OptionsResolver;
@ -18,13 +16,11 @@ class UserType extends AbstractType
->add('email', TextType::class) ->add('email', TextType::class)
->add('FirstName', TextType::class) ->add('FirstName', TextType::class)
->add('LastName', TextType::class) ->add('LastName', TextType::class)
->add('BirthDate', DateType::class, [ ->add('BirthDate', \DateTime::class, [
'widget' => 'single_text', 'widget' => 'single_text',
]) ])
->add('Phone', TextType::class) ->add('Phone', TextType::class)
->add('roles', ChoiceType::class, [ ->add('roles', TextType::class)
'multiple' => true,
])
->add('password', TextType::class) ->add('password', TextType::class)
; ;
} }

View File

@ -3,8 +3,8 @@
namespace App\Form; namespace App\Form;
use App\Entity\Vehicle; use App\Entity\Vehicle;
use Doctrine\DBAL\Types\TextType;
use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\OptionsResolver\OptionsResolver;