user, intervention add

.idea/dataSources.xml

@@ -1,56 +1,11 @@
 <?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="33b4fc0c-d17b-4c8e-a258-c5d5ef128e8a">
-    <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
       <working-dir>$ProjectFileDir$</working-dir>
     </data-source>
   </component>

assets/styles/css/intervention.css

@@ -6,16 +6,16 @@ body {
     background-color: #7D9599;
     position: absolute;
     width: 100%;
-    height: 80%;
+    height: 87%;
 }
 .background-intervention {
     background-color: #A0C2C8;
     position: absolute;
-    box-shadow: 0 0 30px 1px black;
+    box-shadow: 0 0 15px 0 black;
     border-radius: 5%;
 
-    margin: 2% 0 0 20%;
+    margin: 7% 0 0 15%;
-    width: 60%;
+    width: 70%;
     height: 70%;
 }
 
@@ -24,13 +24,61 @@ body {
     margin: 1% 0 0 5%;
     width: 5%;
 }
-
+.titre {
-h1 {
     position: absolute;
-    margin: 5% 0 0 11%;
+    margin: 2% 0 0 11%;
+    color: white;
+}
+
+#nom {
+    position: absolute;
+    margin: 2% 0 0 5%;
+    width: 45%;
+}
+#echecs {
+    position: absolute;
+    margin: 6% 0 0 5%;
+}
+#employesCompetences {
+    position: absolute;
+    margin: 10% 0 0 5%;
+}
+#piece {
+    position: absolute;
+    margin: 14% 0 0 5%;
+}
+
+#vehicule {
+    position: absolute;
+    margin: 18.5% 0 0 5%;
+}
+#vehicule1 {
+    position: absolute;
+    margin: 19% 0 0 21.5%;
+}
+#oui {
+    position: absolute;
+    margin: 18.5% 0 0 24%;
+}
+#vehicule2 {
+    position: absolute;
+    margin: 19% 0 0 30%;
+}
+#non {
+    position: absolute;
+    margin: 18.5% 0 0 33%;
+}
+
+#date {
+    position: absolute;
+    margin: 2% 0 0 70%;
+}
+#calendar {
+    position: absolute;
+    margin: 18.5% 0 0 33%;
 }
 
 .from {
     position: absolute;
-    margin: 15% 15% 15% 15%;
+    margin: 65% 15% 15% 15%;
 }

migrations/Version20241114151456.php

@@ -1,43 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20241114151456 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('CREATE TABLE fault (id INT AUTO_INCREMENT NOT NULL, wording VARCHAR(255) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
-        $this->addSql('CREATE TABLE intervention (id INT AUTO_INCREMENT NOT NULL, wording VARCHAR(255) NOT NULL, timestamp DATETIME NOT NULL, description VARCHAR(255) NOT NULL, address VARCHAR(255) NOT NULL, status VARCHAR(255) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
-        $this->addSql('CREATE TABLE skill (id INT AUTO_INCREMENT NOT NULL, wording VARCHAR(255) NOT NULL, description VARCHAR(255) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
-        $this->addSql('CREATE TABLE stock (id INT AUTO_INCREMENT NOT NULL, wording VARCHAR(255) NOT NULL, description VARCHAR(255) NOT NULL, quantity VARCHAR(255) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
-        $this->addSql('CREATE TABLE `user` (id INT AUTO_INCREMENT NOT NULL, first_name VARCHAR(255) NOT NULL, last_name VARCHAR(255) NOT NULL, birth_date DATE NOT NULL, email VARCHAR(255) NOT NULL, phone VARCHAR(255) NOT NULL, type VARCHAR(255) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
-        $this->addSql('CREATE TABLE vehicle (id INT AUTO_INCREMENT NOT NULL, license_plate VARCHAR(255) NOT NULL, brand VARCHAR(255) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
-        $this->addSql('CREATE TABLE messenger_messages (id BIGINT AUTO_INCREMENT NOT NULL, body LONGTEXT NOT NULL, headers LONGTEXT NOT NULL, queue_name VARCHAR(190) NOT NULL, created_at DATETIME NOT NULL COMMENT \'(DC2Type:datetime_immutable)\', available_at DATETIME NOT NULL COMMENT \'(DC2Type:datetime_immutable)\', delivered_at DATETIME DEFAULT NULL COMMENT \'(DC2Type:datetime_immutable)\', INDEX IDX_75EA56E0FB7336F0 (queue_name), INDEX IDX_75EA56E0E3BD61CE (available_at), INDEX IDX_75EA56E016BA31DB (delivered_at), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('DROP TABLE fault');
-        $this->addSql('DROP TABLE intervention');
-        $this->addSql('DROP TABLE skill');
-        $this->addSql('DROP TABLE stock');
-        $this->addSql('DROP TABLE `user`');
-        $this->addSql('DROP TABLE vehicle');
-        $this->addSql('DROP TABLE messenger_messages');
-    }
-}

migrations/Version20241128141518.php

@@ -1,31 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20241128141518 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('CREATE SCHEMA public');
-    }
-}

migrations/Version20241205162005.php

@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20241205162005 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('CREATE SEQUENCE fault_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE SEQUENCE intervention_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE SEQUENCE skill_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE SEQUENCE stock_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE SEQUENCE user_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE SEQUENCE vehicle_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('ALTER TABLE "user" ADD roles JSON NOT NULL');
+        $this->addSql('ALTER TABLE "user" ALTER email TYPE VARCHAR(180)');
+        $this->addSql('ALTER TABLE "user" RENAME COLUMN type TO password');
+        $this->addSql('CREATE UNIQUE INDEX UNIQ_IDENTIFIER_EMAIL ON "user" (email)');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('CREATE SCHEMA public');
+        $this->addSql('DROP SEQUENCE fault_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE intervention_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE skill_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE stock_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE user_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE vehicle_id_seq CASCADE');
+        $this->addSql('DROP INDEX UNIQ_IDENTIFIER_EMAIL');
+        $this->addSql('ALTER TABLE "user" DROP roles');
+        $this->addSql('ALTER TABLE "user" ALTER email TYPE VARCHAR(255)');
+        $this->addSql('ALTER TABLE "user" RENAME COLUMN password TO type');
+    }
+}

src/Entity/User.php

@@ -18,7 +18,7 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
     private ?int $id = null;
 
     #[ORM\Column(length: 180)]
-    private ?string $email = null;
+    private string $email;
 
     #[ORM\Column(length: 255)]
     private ?string $FirstName = null;
@@ -29,9 +29,6 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
     #[ORM\Column(type: Types::DATE_MUTABLE)]
     private ?\DateTimeInterface $BirthDate = null;
 
-    #[ORM\Column(length: 255)]
-    private ?string $Email = null;
-
     #[ORM\Column(length: 255)]
     private ?string $Phone = null;
     /**

templates/intervention/add.html.twig

@@ -17,9 +17,22 @@
 <body>
     <div class="background"></div>
     <img class="logoCalendar" src="{{ asset('styles/image/calendar.png') }}" alt="Logo Calendrier">
-    <h1>Créer Une Intervention</h1>
+    <h1 class="titre">Créer Une Intervention</h1>
 
     <div class="background-intervention">
+        <input required id="nom" placeholder="Nom de l'intervention">
+        <input required id="echecs" placeholder="Liste des échecs">
+        <input required id="employesCompetences" placeholder="Liste des employés et de leurs compétences">
+        <input id="piece" placeholder="Pièce affecter">
+        <p id="vehicule">Véhicule nécessaire</p>
+            <input type="checkbox" name="vehicule1" id="vehicule1">
+                <label for=”vehicule1” id="oui"> Oui </label>
+            <input type="checkbox" name="vehicule2" id="vehicule2">
+                <label for=”vehicule2” id="non"> Non </label>
+        <p id="date">Jour de l'intervention</p>
+        <input type="date" id="calendar">
+
+
         <div class="from"> {{ form(form) }} </div>
     </div>
 </body>