Merge branch 'ajout_scss' into develop

develop
Jimmy Boinembalome 3 years ago
commit 5315ed8f8d
  1. 9
      angular.json
  2. 0
      src/app/app.component.scss
  3. 2
      src/app/app.component.ts
  4. 0
      src/app/demandes-formation/new-demande-formation/new-demande-formation.component.scss
  5. 2
      src/app/demandes-formation/new-demande-formation/new-demande-formation.component.ts
  6. 0
      src/app/ep/details-ep/details-ep.component.scss
  7. 2
      src/app/ep/details-ep/details-ep.component.ts
  8. 0
      src/app/ep/details-ep/ep-choix-date/ep-choix-date.component.scss
  9. 2
      src/app/ep/details-ep/ep-choix-date/ep-choix-date.component.ts
  10. 0
      src/app/ep/details-ep/ep-objectifs/ep-objectifs.component.scss
  11. 2
      src/app/ep/details-ep/ep-objectifs/ep-objectifs.component.ts
  12. 0
      src/app/formations/edit-formation/edit-formation.component.scss
  13. 2
      src/app/formations/edit-formation/edit-formation.component.ts
  14. 0
      src/app/formations/new-formation/new-formation.component.scss
  15. 2
      src/app/formations/new-formation/new-formation.component.ts
  16. 0
      src/app/home/home-assistante/home-assistante.component.scss
  17. 2
      src/app/home/home-assistante/home-assistante.component.ts
  18. 0
      src/app/shared/filter/checkbox-filter/checkbox-filter.scss
  19. 2
      src/app/shared/filter/checkbox-filter/checkbox-filter.ts
  20. 0
      src/app/shared/filter/select-filter/select-filter.scss
  21. 2
      src/app/shared/filter/select-filter/select-filter.ts
  22. 0
      src/app/shared/mat-tables/collaborateurs-table/collaborateurs.table.scss
  23. 2
      src/app/shared/mat-tables/collaborateurs-table/collaborateurs.table.ts
  24. 0
      src/app/shared/mat-tables/demandes-formation-table/demandes-formation.table.scss
  25. 0
      src/app/shared/mat-tables/engagements-table/engagements-table.scss
  26. 0
      src/app/shared/mat-tables/ep-table/ep-table.scss
  27. 0
      src/app/shared/mat-tables/formations-table/formations.table.scss
  28. 2
      src/app/shared/mat-tables/formations-table/formations.table.ts
  29. 0
      src/app/shared/mat-tables/participations-formation-table/participations-formation.table.scss
  30. 2
      src/app/shared/mat-tables/participations-formation-table/participations-formation.table.ts
  31. 0
      src/styles.scss

@ -25,7 +25,7 @@
],
"styles": [
"./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
"src/styles.css"
"src/styles.scss"
],
"scripts": []
},
@ -89,7 +89,7 @@
],
"styles": [
"./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
"src/styles.css"
"src/styles.scss"
],
"scripts": []
}
@ -122,5 +122,10 @@
}
}
},
"schematics": {
"@schematics/angular:component": {
"styleext": "scss"
}
},
"defaultProject": "EPAClient"
}

@ -8,7 +8,7 @@ import { cles } from "@shared/utils/cles"
@Component({
selector: 'app-root',
templateUrl: './app.component.html',
styleUrls: ['./app.component.css']
styleUrls: ['./app.component.scss']
})
export class AppComponent implements OnInit {

@ -13,7 +13,7 @@ import { DemandesFormationService } from "@shared/api-swagger/api/api";
@Component({
selector: 'app-new-demande-formation',
templateUrl: './new-demande-formation.component.html',
styleUrls: ['./new-demande-formation.component.css']
styleUrls: ['./new-demande-formation.component.scss']
})
export class NewDemandeFormationComponent implements OnInit {

@ -12,7 +12,7 @@ import { Subscription } from "rxjs";
@Component({
selector : "details-ep",
templateUrl: "./details-ep.component.html",
styleUrls: ["./details-ep.component.css"]
styleUrls: ["./details-ep.component.scss"]
})
export class DetailsEPComponent implements OnInit {

@ -7,7 +7,7 @@ import { RDVEntretienDTO } from '@shared/api-swagger';
@Component({
selector: 'ep-choix-date',
templateUrl: './ep-choix-date.component.html',
styleUrls: ["ep-choix-date.component.css"]
styleUrls: ["ep-choix-date.component.scss"]
})
export class EpChoixDateComponent {
@Input() rdvsEntretien : Array<RDVEntretienDTO>;

@ -5,7 +5,7 @@ import { afficherStatutObjectif, EpDTO, StatutObjectif } from "@shared/api-swagg
@Component({
selector : "ep-objectifs",
templateUrl: "ep-objectifs.component.html",
styleUrls: ["ep-objectifs.component.css"]
styleUrls: ["ep-objectifs.component.scss"]
})
export class EpObjectifsComponent {

@ -19,7 +19,7 @@ import { FormationsService } from '@shared/api-swagger/api/api';
@Component({
selector: 'app-edit-formation',
templateUrl: './edit-formation.component.html',
styleUrls: ["edit-formation.component.css"]
styleUrls: ["edit-formation.component.scss"]
})
export class EditFormationComponent implements OnInit {
/**

@ -13,7 +13,7 @@ import { FormationsService } from "@shared/api-swagger/api/api";
@Component({
selector: 'app-new-formation',
templateUrl: './new-formation.component.html',
styleUrls: ['./new-formation.component.css']
styleUrls: ['./new-formation.component.scss']
})
export class NewFormationComponent implements OnInit {
/**

@ -14,7 +14,7 @@ import { epTypeRecherche } from '@shared/utils/cles';
@Component({
selector : 'home-assistante',
templateUrl : 'home-assistante.component.html',
styleUrls : [ "./home-assistante.component.css"]
styleUrls : [ "./home-assistante.component.scss"]
})
export class HomeAssistanteComponent {
displayedColumns: string[] = ["agence", "collaborateur", "referent", "datearrivee", "statutep", "typeep", "dateentretien", "datedisponibilite", "consultation"];

@ -8,7 +8,7 @@ import { SelectedElement } from "@shared/filter/selected-element";
@Component({
selector: "checkbox-filter",
templateUrl: "./checkbox-filter.html",
styleUrls: ["./checkbox-filter.css"]
styleUrls: ["./checkbox-filter.scss"]
})
export class CheckboxFilterComponent<T> implements OnInit, OnChanges {

@ -4,7 +4,7 @@ import { SelectedElement } from "@shared/filter/selected-element";
@Component({
selector: "select-filter",
templateUrl: "./select-filter.html",
styleUrls: ["./select-filter.css"]
styleUrls: ["./select-filter.scss"]
})
export class SelectFilterComponent<T> implements OnInit, OnChanges {

@ -12,7 +12,7 @@ import { cles, collaborateurTypeRecherche } from "@shared/utils/cles";
@Component({
selector: "collaborateurs-table",
templateUrl: "./collaborateurs.table.html",
styleUrls: ["./collaborateurs.table.css"]
styleUrls: ["./collaborateurs.table.scss"]
})
export class CollaborateursTableComponent implements OnInit {

@ -12,7 +12,7 @@ import { cles } from "@shared/utils/cles";
@Component({
selector: "formations-table",
templateUrl: "./formations.table.html",
styleUrls: ["./formations.table.css"]
styleUrls: ["./formations.table.scss"]
})
export class FormationsTableComponent implements OnInit {

@ -11,7 +11,7 @@ import { DatePipe } from "@angular/common";
@Component({
selector: "participations-formation-table",
templateUrl: "./participations-formation.table.html",
styleUrls: ["./participations-formation.table.css"]
styleUrls: ["./participations-formation.table.scss"]
})
export class ParticipationsFormationTableComponent implements OnInit, OnChanges, AfterViewInit {

Loading…
Cancel
Save