From a49d17d0331cf1ec1c8f7ced3a1d6248d6dddcf2 Mon Sep 17 00:00:00 2001 From: mrlemaire Date: Fri, 28 Jun 2024 18:43:34 +0000 Subject: [PATCH] formulaires etablissement-classe --- src/app/etablissement/classes/classes.component.html | 111 ++++++++++++++++++++++----------------------------------------------------------------------------------------- src/app/etablissement/etablissement.component.html | 29 +++++------------------------ src/app/etablissement/etablissement.component.scss | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/app/etablissement/view-etablissement/dialog-etablissement/dialog-etablissement.component.html | 215 +++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------- src/app/etablissement/view-etablissement/dialog-etablissement/dialog-etablissement.component.ts | 59 ++++++++++++++++++++++++++++++++++++++++++++--------------- src/app/etablissement/view-etablissement/view-etablissement.component.html | 1 + src/app/etablissement/view-etablissement/view-etablissement.component.scss | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ src/app/etablissement/view-etablissement/view-etablissement.component.ts | 2 +- src/app/tpe/ajout-tpe/ajout-tpe.component.scss | 7 ------- src/app/tpe/create-tpe/create-tpe.component.html | 27 ++++++++++++++++++--------- src/app/tpe/create-tpe/create-tpe.component.ts | 2 +- src/app/tpe/gerer-mes-tpe/gerer-mes-tpe.component.html | 4 +++- src/app/utilisateurs/view-user/view-user.component.html | 16 ++-------------- src/styles.scss | 11 ++++++++--- 14 files changed, 263 insertions(+), 334 deletions(-) diff --git a/src/app/etablissement/classes/classes.component.html b/src/app/etablissement/classes/classes.component.html index 723ca80..1c25343 100644 --- a/src/app/etablissement/classes/classes.component.html +++ b/src/app/etablissement/classes/classes.component.html @@ -1,78 +1,3 @@ -
-
-
-
- -
-
-
- - - - -
@@ -127,18 +52,29 @@
+ - +
-
-
+
+
+
+
+
+ +
+
+
+
-
@@ -151,21 +87,21 @@
+ style="margin-top: 40px; overflow-x: hidden"> - Filtrer + Filter - + class="mat-elevation-z8" + style="width: 100%"> more_vert -
+ showFirstLastButtons> +
diff --git a/src/app/etablissement/etablissement.component.html b/src/app/etablissement/etablissement.component.html index 00bcc87..eb9b696 100644 --- a/src/app/etablissement/etablissement.component.html +++ b/src/app/etablissement/etablissement.component.html @@ -1,24 +1,5 @@ - - - - - + + + + + diff --git a/src/app/etablissement/etablissement.component.scss b/src/app/etablissement/etablissement.component.scss index e69de29..8d489c0 100644 --- a/src/app/etablissement/etablissement.component.scss +++ b/src/app/etablissement/etablissement.component.scss @@ -0,0 +1,61 @@ +.card { + + border-radius:0 !important; + background-color: #ffffff61; + +} + + .text { + color:black; + font-weight: bold; + font-size: 16px; /* Ajustez la taille de la police selon vos besoins */ +} + + + +.bold-text { + color:rgb(0, 0, 0); + font-weight: bold; + font-size: 16px; /* Ajustez la taille de la police selon vos besoins */ +} + + + + .col-md-2 { + flex: 0 0 auto; + width: 33% !important; + } + + + button ,a { + border-radius: 0px !important; +} + + +.example-form { + width: 500%; + max-width: 1000px; + margin: auto; +} + +.example-full-width { + width: 100%; +} + +.form-group-width { + max-width: 800px; +} + + +.group-width{ + max-width: 400px; + +} + + +.card-body{ + background-color: #edeff7; + height: 50px; + align-content: center; + margin-right: 10px !important; +} \ No newline at end of file diff --git a/src/app/etablissement/view-etablissement/dialog-etablissement/dialog-etablissement.component.html b/src/app/etablissement/view-etablissement/dialog-etablissement/dialog-etablissement.component.html index c7d5484..37129e6 100644 --- a/src/app/etablissement/view-etablissement/dialog-etablissement/dialog-etablissement.component.html +++ b/src/app/etablissement/view-etablissement/dialog-etablissement/dialog-etablissement.component.html @@ -1,19 +1,27 @@ - - -
- - -

Ajouter un TPE

- - - -
-
-
- - Nom de l'établissement - - - Nom de l'établissement est obligatoire - - -
- -
- - Site internet - - - Site internet est obligatoire - - -
-
- - Numéro de téléphone - - - Numéro de téléphone est obligatoire - - -
- -
+
- Pays - - {{ - country - }} + Business + + + {{ business.viewValue }} + - - Pays est obligatoire - - -
-
- -
-
- - Ville - - - Ville est obligatoire - - -
-
- - Localisation - - - Localisation obligatoire -
-
-
- - Statut -
-
- - @@ -273,14 +148,14 @@ type="button" class="btn btn-danger" (click)="onCancel()"> - Annuler cancel + Cancel cancel diff --git a/src/app/etablissement/view-etablissement/dialog-etablissement/dialog-etablissement.component.ts b/src/app/etablissement/view-etablissement/dialog-etablissement/dialog-etablissement.component.ts index 80c342c..caebddf 100644 --- a/src/app/etablissement/view-etablissement/dialog-etablissement/dialog-etablissement.component.ts +++ b/src/app/etablissement/view-etablissement/dialog-etablissement/dialog-etablissement.component.ts @@ -5,6 +5,7 @@ import { FormGroup, FormsModule, ReactiveFormsModule, + Validators, } from '@angular/forms'; import { MatButtonModule } from '@angular/material/button'; import { MatCardModule } from '@angular/material/card'; @@ -49,12 +50,42 @@ import { AuthService } from 'src/app/_helpers/services/auth.service'; styleUrl: './dialog-etablissement.component.scss', }) export class DialogEtablissementComponent { - form: FormGroup; + onSubmit() { + throw new Error('Method not implemented.'); + } + onCancel() { + throw new Error('Method not implemented.'); + } + establishmentForm: FormGroup; countries = [ { value: 'CI', viewValue: "Cote d'ivoire" }, { value: 'SN', viewValue: 'Senegal' }, - // Ajoutez les autres pays ici + { value: 'ML', viewValue: 'Mali' }, + { value: 'GN', viewValue: 'Guinée' }, + { value: 'BF', viewValue: 'Burkina Faso' }, + { value: 'NE', viewValue: 'Niger' }, + { value: 'TG', viewValue: 'Togo' }, + { value: 'BJ', viewValue: 'Bénin' }, + { value: 'CM', viewValue: 'Cameroun' }, + { value: 'CD', viewValue: 'Congo RDC CDF' }, + { value: 'KM', viewValue: 'Comores' }, + { value: 'FR', viewValue: 'France' }, + ]; + + business = [ + { value: 'CI', viewValue: "Cote d'ivoire" }, + { value: 'SN', viewValue: 'Senegal' }, + { value: 'ML', viewValue: 'Mali' }, + { value: 'GN', viewValue: 'Guinée' }, + { value: 'BF', viewValue: 'Burkina Faso' }, + { value: 'NE', viewValue: 'Niger' }, + { value: 'TG', viewValue: 'Togo' }, + { value: 'BJ', viewValue: 'Bénin' }, + { value: 'CM', viewValue: 'Cameroun' }, + { value: 'CD', viewValue: 'Congo RDC CDF' }, + { value: 'KM', viewValue: 'Comores' }, + { value: 'FR', viewValue: 'France' }, ]; hide = true; @@ -64,7 +95,7 @@ export class DialogEtablissementComponent { fonctions: any; services: any; groupes: any; - isChecked: any; + isChecked!: boolean; country: any; constructor( @@ -73,24 +104,22 @@ export class DialogEtablissementComponent { private dialogRef: MatDialogRef, private router: Router ) { - this.form = this.fb.group({ - nom: [''], + this.establishmentForm = this.fb.group({ + name: ['', Validators.required], website: [''], logo: [''], phone: [''], - country: [''], + country: ['', Validators.required], city: [''], - address: [''], + address: ['', Validators.required], business: [false], businessSelect: [''], + schoolLevels: this.fb.group({ + maternelle: this.fb.array([]), + primaire: this.fb.array([]), + college: this.fb.array([]), + lycee: this.fb.array([]), + }), }); } - - onSubmit() { - throw new Error('Method not implemented.'); - } - businessOptions: any; - onCancel() { - throw new Error('Method not implemented.'); - } } diff --git a/src/app/etablissement/view-etablissement/view-etablissement.component.html b/src/app/etablissement/view-etablissement/view-etablissement.component.html index f5a6d33..32c4c74 100644 --- a/src/app/etablissement/view-etablissement/view-etablissement.component.html +++ b/src/app/etablissement/view-etablissement/view-etablissement.component.html @@ -1,3 +1,4 @@ +
diff --git a/src/app/etablissement/view-etablissement/view-etablissement.component.scss b/src/app/etablissement/view-etablissement/view-etablissement.component.scss index eb2357a..92d3c4a 100644 --- a/src/app/etablissement/view-etablissement/view-etablissement.component.scss +++ b/src/app/etablissement/view-etablissement/view-etablissement.component.scss @@ -1,6 +1,58 @@ + +.card { + + border-radius:0 !important; + background-color: #ffffff61; + +} + + .text { + color:black; + font-weight: bold; + font-size: 16px; /* Ajustez la taille de la police selon vos besoins */ +} + + + .bold-text { color:rgb(0, 0, 0); font-weight: bold; font-size: 16px; /* Ajustez la taille de la police selon vos besoins */ } + + + + .col-md-2 { + flex: 0 0 auto; + width: 33% !important; + } + + + button ,a { + border-radius: 0px !important; +} + + +.example-form { + width: 500%; + max-width: 1000px; + margin: auto; +} + +.example-full-width { + width: 100%; +} + +.form-group-width { + max-width: 800px; +} + + +.group-width{ + max-width: 400px; + +} + + + diff --git a/src/app/etablissement/view-etablissement/view-etablissement.component.ts b/src/app/etablissement/view-etablissement/view-etablissement.component.ts index 89a34ab..d228bb2 100644 --- a/src/app/etablissement/view-etablissement/view-etablissement.component.ts +++ b/src/app/etablissement/view-etablissement/view-etablissement.component.ts @@ -163,7 +163,7 @@ export class ViewEtablissementComponent { public openDialog() { // eslint-disable-next-line @typescript-eslint/no-unused-vars const dialogRef = this.dialog.open(DialogEtablissementComponent, { - width: '800px', + width: '1000px', height: '1000px', }); } diff --git a/src/app/tpe/ajout-tpe/ajout-tpe.component.scss b/src/app/tpe/ajout-tpe/ajout-tpe.component.scss index 5bf6122..4532ae9 100644 --- a/src/app/tpe/ajout-tpe/ajout-tpe.component.scss +++ b/src/app/tpe/ajout-tpe/ajout-tpe.component.scss @@ -14,10 +14,3 @@ button{ border-radius:0px !important } - -// .mat-mdc-dialog-container .mdc-dialog__surface { -// width: 0px !important; -// height: 0px !important; -// } - -//div. \ No newline at end of file diff --git a/src/app/tpe/create-tpe/create-tpe.component.html b/src/app/tpe/create-tpe/create-tpe.component.html index 30b5974..146259b 100644 --- a/src/app/tpe/create-tpe/create-tpe.component.html +++ b/src/app/tpe/create-tpe/create-tpe.component.html @@ -7,7 +7,7 @@
-
+
Groupe @@ -24,7 +24,10 @@
-
+
+ +
+
Service @@ -44,7 +47,7 @@
-
+
Nom @@ -56,7 +59,10 @@
-
+
+ +
+
Fonction @@ -76,7 +82,7 @@
-
+
Activite @@ -93,7 +99,10 @@
-
+
+ +
+
Solde
-
+
- Statut + Statut +
diff --git a/src/app/tpe/create-tpe/create-tpe.component.ts b/src/app/tpe/create-tpe/create-tpe.component.ts index 7f7ef9c..3a2f769 100644 --- a/src/app/tpe/create-tpe/create-tpe.component.ts +++ b/src/app/tpe/create-tpe/create-tpe.component.ts @@ -70,7 +70,7 @@ export class CreateTpeComponent { } hide = true; - public myForm!: FormGroup; + public myForm!: FormGroup; constructor( private fb: FormBuilder, diff --git a/src/app/tpe/gerer-mes-tpe/gerer-mes-tpe.component.html b/src/app/tpe/gerer-mes-tpe/gerer-mes-tpe.component.html index 97afd1f..4e82c35 100644 --- a/src/app/tpe/gerer-mes-tpe/gerer-mes-tpe.component.html +++ b/src/app/tpe/gerer-mes-tpe/gerer-mes-tpe.component.html @@ -71,8 +71,10 @@ Exporter
+
{{ user.email }} - Actions - +
- + diff --git a/src/styles.scss b/src/styles.scss index f13e62e..697b82c 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -441,8 +441,10 @@ tr.mat-mdc-row { border-radius: 0px !important; width: auto !important; height: auto !important; - margin-top: -500px !important; - margin-left: -300px !important; + margin: auto !important; // koffi sayni + position: absolute !important; + // margin-top: 50px !important; + // margin-left: -300px !important; } @@ -749,4 +751,7 @@ bgui-loader[bgui-loader] { mat-row:hover { background-color: #f5f5f5 !important; /* Couleur de fond lors du survol */ cursor: pointer !important; /* Changer le curseur pour indiquer que la ligne est interactable */ -} \ No newline at end of file +} + + + -- libgit2 0.27.1