From 63f360a63202889bcdc7f2251ca06975d5bee3bd Mon Sep 17 00:00:00 2001
From: Pierre-Louis BERTRAND <plbertrand@takima.fr>
Date: Mon, 11 Sep 2023 15:30:28 +0200
Subject: [PATCH] prettier
---
.../src/app/app-routing.module.ts | 3 +-
.../src/app/app.component.ts | 10 +++---
epf-front-skeleton-main/src/app/app.module.ts | 3 +-
.../src/app/home/home.component.html | 3 +-
.../src/app/home/home.component.scss | 17 +++++++---
.../src/app/home/home.component.ts | 11 ++++---
.../major-students.component.html | 12 +++----
.../major-students.component.scss | 5 +--
.../major-students.component.ts | 7 ++--
.../major-students/major-students.resolver.ts | 4 +--
.../src/app/majors/majors.component.scss | 6 ++--
.../src/app/majors/majors.component.ts | 5 +--
.../src/app/majors/majors.resolver.ts | 6 ++--
.../src/app/models/links.model.ts | 8 ++---
.../src/app/navbar/navbar.component.html | 5 +--
.../src/app/navbar/navbar.component.scss | 15 ++++++---
.../src/app/navbar/navbar.component.ts | 4 ++-
.../src/app/services/constantsMock.service.ts | 4 ++-
.../src/app/services/course.service.ts | 3 +-
.../src/app/services/major.service.ts | 4 +--
.../src/app/services/student.service.ts | 12 +++----
.../students/research/research.component.html | 32 ++++++++++---------
.../students/research/research.component.scss | 1 +
.../students/research/research.component.ts | 9 +++---
.../student-details.component.html | 3 +-
.../student-details.component.scss | 18 ++++++++---
.../student-details.component.ts | 7 ++--
.../student-details.resolver.ts | 8 +++--
.../src/app/students/students.component.scss | 6 ++--
.../src/app/students/students.component.ts | 10 +++---
.../src/app/students/students.resolver.ts | 4 ++-
31 files changed, 148 insertions(+), 97 deletions(-)
diff --git a/epf-front-skeleton-main/src/app/app-routing.module.ts b/epf-front-skeleton-main/src/app/app-routing.module.ts
index 544f3a9..5dc7bce 100644
--- a/epf-front-skeleton-main/src/app/app-routing.module.ts
+++ b/epf-front-skeleton-main/src/app/app-routing.module.ts
@@ -46,4 +46,5 @@ const routes: Routes = [
imports: [RouterModule.forRoot(routes)],
exports: [RouterModule],
})
-export class AppRoutingModule {}
+export class AppRoutingModule {
+}
diff --git a/epf-front-skeleton-main/src/app/app.component.ts b/epf-front-skeleton-main/src/app/app.component.ts
index 3a4f571..ced496c 100644
--- a/epf-front-skeleton-main/src/app/app.component.ts
+++ b/epf-front-skeleton-main/src/app/app.component.ts
@@ -1,10 +1,10 @@
-import { Component } from '@angular/core';
+import { Component } from "@angular/core"
@Component({
- selector: 'epf-root',
- templateUrl: './app.component.html',
- styleUrls: ['./app.component.scss']
+ selector: "epf-root",
+ templateUrl: "./app.component.html",
+ styleUrls: ["./app.component.scss"],
})
export class AppComponent {
- title = 'epf-front-skeleton';
+ title = "epf-front-skeleton"
}
diff --git a/epf-front-skeleton-main/src/app/app.module.ts b/epf-front-skeleton-main/src/app/app.module.ts
index 29b78a6..56e8771 100644
--- a/epf-front-skeleton-main/src/app/app.module.ts
+++ b/epf-front-skeleton-main/src/app/app.module.ts
@@ -39,4 +39,5 @@ import { ResearchComponent } from "./students/research/research.component"
providers: [],
bootstrap: [AppComponent],
})
-export class AppModule {}
+export class AppModule {
+}
diff --git a/epf-front-skeleton-main/src/app/home/home.component.html b/epf-front-skeleton-main/src/app/home/home.component.html
index f774905..8b7b71e 100644
--- a/epf-front-skeleton-main/src/app/home/home.component.html
+++ b/epf-front-skeleton-main/src/app/home/home.component.html
@@ -24,7 +24,8 @@
</div>
</div>
</div>
- <p>Nous sommes là pour t'aider et t'accompagner pendant 4 journées de TP. N'hésite pas si tu as la moindre question ! </p>
+ <p>Nous sommes là pour t'aider et t'accompagner pendant 4 journées de TP. N'hésite pas si tu as la moindre question
+ ! </p>
</div>
<div class="right">
<img src="assets/homepage-cat.png">
diff --git a/epf-front-skeleton-main/src/app/home/home.component.scss b/epf-front-skeleton-main/src/app/home/home.component.scss
index ef32192..9da57df 100644
--- a/epf-front-skeleton-main/src/app/home/home.component.scss
+++ b/epf-front-skeleton-main/src/app/home/home.component.scss
@@ -1,7 +1,8 @@
-:host{
+:host {
display: flex;
align-items: center;
- margin : 25px ;
+ margin: 25px;
+
.title {
text-align: center;
font-family: Caveat, sans-serif;
@@ -9,16 +10,19 @@
font-weight: 700;
margin: 30px 0;
}
+
p {
text-align: center;
margin-top: 30px;
- font-size : 1.3em;
+ font-size: 1.3em;
}
+
.left {
width: 50%;
height: 100%;
display: flex;
flex-direction: column;
+
.sun {
width: 90px;
margin-left: 35px;
@@ -28,17 +32,20 @@
border: none;
display: flex;
align-items: baseline;
+
.card-text {
font-family: "Dancing Script", sans-serif;
- font-size : x-large;
- margin-top : 0
+ font-size: x-large;
+ margin-top: 0
}
}
}
+
.right {
width: 50%;
display: flex;
justify-content: center;
+
img {
width: 80%;
}
diff --git a/epf-front-skeleton-main/src/app/home/home.component.ts b/epf-front-skeleton-main/src/app/home/home.component.ts
index c577f9c..43c55fd 100644
--- a/epf-front-skeleton-main/src/app/home/home.component.ts
+++ b/epf-front-skeleton-main/src/app/home/home.component.ts
@@ -1,13 +1,14 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit } from "@angular/core"
@Component({
- selector: 'epf-home',
- templateUrl: './home.component.html',
- styleUrls: ['./home.component.scss']
+ selector: "epf-home",
+ templateUrl: "./home.component.html",
+ styleUrls: ["./home.component.scss"],
})
export class HomeComponent implements OnInit {
- constructor() { }
+ constructor() {
+ }
ngOnInit(): void {
}
diff --git a/epf-front-skeleton-main/src/app/majors/major-students/major-students.component.html b/epf-front-skeleton-main/src/app/majors/major-students/major-students.component.html
index a6eb493..803456e 100644
--- a/epf-front-skeleton-main/src/app/majors/major-students/major-students.component.html
+++ b/epf-front-skeleton-main/src/app/majors/major-students/major-students.component.html
@@ -12,12 +12,12 @@
</thead>
<tbody>
<ng-container *ngIf="studentsFromMajor$ | async; let studentsFromMajor">
- <tr *ngFor="let student of (studentsFromMajor.students)">
- <td>{{ student.firstName }}</td>
- <td>{{ student.lastName }}</td>
- <td>{{ student.birthDate | date : "dd/MM/yyyy" }}</td>
- <td>{{ student.major!!.name }}</td>
- </tr>
+ <tr *ngFor="let student of (studentsFromMajor.students)">
+ <td>{{ student.firstName }}</td>
+ <td>{{ student.lastName }}</td>
+ <td>{{ student.birthDate | date : "dd/MM/yyyy" }}</td>
+ <td>{{ student.major!!.name }}</td>
+ </tr>
</ng-container>
</tbody>
</table>
diff --git a/epf-front-skeleton-main/src/app/majors/major-students/major-students.component.scss b/epf-front-skeleton-main/src/app/majors/major-students/major-students.component.scss
index 0a06e68..4058731 100644
--- a/epf-front-skeleton-main/src/app/majors/major-students/major-students.component.scss
+++ b/epf-front-skeleton-main/src/app/majors/major-students/major-students.component.scss
@@ -3,7 +3,7 @@
:host {
display: flex;
flex-direction: column;
- padding : 30px;
+ padding: 30px;
h1 {
display: flex;
@@ -12,7 +12,8 @@
margin-right: 50px;
margin-bottom: 0;
}
- table{
+
+ table {
margin-top: 20px;
}
}
diff --git a/epf-front-skeleton-main/src/app/majors/major-students/major-students.component.ts b/epf-front-skeleton-main/src/app/majors/major-students/major-students.component.ts
index 9d0f23d..ffcb404 100644
--- a/epf-front-skeleton-main/src/app/majors/major-students/major-students.component.ts
+++ b/epf-front-skeleton-main/src/app/majors/major-students/major-students.component.ts
@@ -1,6 +1,5 @@
import { Component, OnInit } from "@angular/core"
import { map, Observable } from "rxjs"
-import { Student } from "../../models/student.model"
import { ActivatedRoute } from "@angular/router"
import { MajorStudentsDto } from "../../models/dto/MajorStudentsDto"
@@ -12,7 +11,9 @@ import { MajorStudentsDto } from "../../models/dto/MajorStudentsDto"
export class MajorStudentsComponent implements OnInit {
studentsFromMajor$: Observable<MajorStudentsDto> = this._route.data.pipe(map((data) => data["studentsFromMajor"]))
- constructor(private _route: ActivatedRoute) {}
+ constructor(private _route: ActivatedRoute) {
+ }
- ngOnInit(): void {}
+ ngOnInit(): void {
+ }
}
diff --git a/epf-front-skeleton-main/src/app/majors/major-students/major-students.resolver.ts b/epf-front-skeleton-main/src/app/majors/major-students/major-students.resolver.ts
index 758a16c..83b3bd2 100644
--- a/epf-front-skeleton-main/src/app/majors/major-students/major-students.resolver.ts
+++ b/epf-front-skeleton-main/src/app/majors/major-students/major-students.resolver.ts
@@ -1,7 +1,6 @@
import { Injectable } from "@angular/core"
import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from "@angular/router"
import { Observable } from "rxjs"
-import { Student } from "../../models/student.model"
import { MajorService } from "../../services/major.service"
import { MajorStudentsDto } from "../../models/dto/MajorStudentsDto"
@@ -9,7 +8,8 @@ import { MajorStudentsDto } from "../../models/dto/MajorStudentsDto"
providedIn: "root",
})
export class MajorStudentsResolver implements Resolve<MajorStudentsDto> {
- constructor(private majorService: MajorService) {}
+ constructor(private majorService: MajorService) {
+ }
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<MajorStudentsDto> {
return this.majorService.findStudentsFromMajor(route.params["id"])
diff --git a/epf-front-skeleton-main/src/app/majors/majors.component.scss b/epf-front-skeleton-main/src/app/majors/majors.component.scss
index 4c8c0f3..0f9d16a 100644
--- a/epf-front-skeleton-main/src/app/majors/majors.component.scss
+++ b/epf-front-skeleton-main/src/app/majors/majors.component.scss
@@ -3,7 +3,7 @@
:host {
display: flex;
flex-direction: column;
- padding : 30px;
+ padding: 30px;
h1 {
display: flex;
@@ -12,8 +12,10 @@
margin-right: 50px;
margin-bottom: 0;
}
- table{
+
+ table {
margin-top: 20px;
+
tbody {
:hover {
cursor: pointer;
diff --git a/epf-front-skeleton-main/src/app/majors/majors.component.ts b/epf-front-skeleton-main/src/app/majors/majors.component.ts
index 5b2328c..e600f84 100644
--- a/epf-front-skeleton-main/src/app/majors/majors.component.ts
+++ b/epf-front-skeleton-main/src/app/majors/majors.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from "@angular/core"
+import { Component } from "@angular/core"
import { map, Observable } from "rxjs"
import { Major } from "../models/major.model"
import { ActivatedRoute } from "@angular/router"
@@ -11,5 +11,6 @@ import { ActivatedRoute } from "@angular/router"
export class MajorsComponent {
majors$: Observable<Major[]> = this._route.data.pipe(map((data) => data["majors"]))
- constructor(private _route: ActivatedRoute) {}
+ constructor(private _route: ActivatedRoute) {
+ }
}
diff --git a/epf-front-skeleton-main/src/app/majors/majors.resolver.ts b/epf-front-skeleton-main/src/app/majors/majors.resolver.ts
index f0dd21a..dee4bef 100644
--- a/epf-front-skeleton-main/src/app/majors/majors.resolver.ts
+++ b/epf-front-skeleton-main/src/app/majors/majors.resolver.ts
@@ -1,13 +1,15 @@
import { Injectable } from "@angular/core"
-import { Resolve, RouterStateSnapshot, ActivatedRouteSnapshot } from "@angular/router"
+import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from "@angular/router"
import { Observable } from "rxjs"
import { MajorService } from "../services/major.service"
import { Major } from "../models/major.model"
+
@Injectable({
providedIn: "root",
})
export class MajorsResolver implements Resolve<Major[]> {
- constructor(private majorService: MajorService) {}
+ constructor(private majorService: MajorService) {
+ }
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<Major[]> {
return this.majorService.findAll()
diff --git a/epf-front-skeleton-main/src/app/models/links.model.ts b/epf-front-skeleton-main/src/app/models/links.model.ts
index cadd02d..2538d90 100644
--- a/epf-front-skeleton-main/src/app/models/links.model.ts
+++ b/epf-front-skeleton-main/src/app/models/links.model.ts
@@ -1,9 +1,9 @@
export class Link {
- name : string;
- href : string;
+ name: string
+ href: string
constructor(name: string, href: string) {
- this.name = name;
- this.href = href;
+ this.name = name
+ this.href = href
}
}
diff --git a/epf-front-skeleton-main/src/app/navbar/navbar.component.html b/epf-front-skeleton-main/src/app/navbar/navbar.component.html
index 96ce638..49ca134 100644
--- a/epf-front-skeleton-main/src/app/navbar/navbar.component.html
+++ b/epf-front-skeleton-main/src/app/navbar/navbar.component.html
@@ -1,8 +1,9 @@
<nav>
<div>
- <img src="assets/logo-epf.png" routerLink="" >
+ <img src="assets/logo-epf.png" routerLink="">
<mat-nav-list>
- <a mat-list-item routerLink="{{link.href}}" routerLinkActive="active" *ngFor="let link of links">{{ link.name }}</a>
+ <a mat-list-item routerLink="{{link.href}}" routerLinkActive="active"
+ *ngFor="let link of links">{{ link.name }}</a>
</mat-nav-list>
</div>
</nav>
diff --git a/epf-front-skeleton-main/src/app/navbar/navbar.component.scss b/epf-front-skeleton-main/src/app/navbar/navbar.component.scss
index 95867e7..05bfc84 100644
--- a/epf-front-skeleton-main/src/app/navbar/navbar.component.scss
+++ b/epf-front-skeleton-main/src/app/navbar/navbar.component.scss
@@ -1,4 +1,5 @@
@use "src/theme";
+
nav {
height: 80px;
background: linear-gradient(to right, theme.$common-purple, theme.$common-red);
@@ -11,10 +12,12 @@ nav {
img {
margin-left: 20px;
height: 60px;
- &:hover{
+
+ &:hover {
transform: scale(1.1);
}
}
+
.active {
text-decoration: underline;
}
@@ -23,13 +26,15 @@ nav {
.mat-nav-list {
margin-left: 50px;
- padding : 0;
+ padding: 0;
display: flex;
}
+
.mat-list-base .mat-list-item {
- font-size : large;
- color : theme.$white;
- &:hover{
+ font-size: large;
+ color: theme.$white;
+
+ &:hover {
transform: scale(1.2);
}
}
diff --git a/epf-front-skeleton-main/src/app/navbar/navbar.component.ts b/epf-front-skeleton-main/src/app/navbar/navbar.component.ts
index babf8ab..5c06bc1 100644
--- a/epf-front-skeleton-main/src/app/navbar/navbar.component.ts
+++ b/epf-front-skeleton-main/src/app/navbar/navbar.component.ts
@@ -1,5 +1,6 @@
import { Component, OnInit } from "@angular/core"
import { Link } from "../models/links.model"
+
@Component({
selector: "epf-navbar",
templateUrl: "./navbar.component.html",
@@ -13,5 +14,6 @@ export class NavbarComponent implements OnInit {
this.links.push(new Link("Majors", "majors"))
}
- ngOnInit(): void {}
+ ngOnInit(): void {
+ }
}
diff --git a/epf-front-skeleton-main/src/app/services/constantsMock.service.ts b/epf-front-skeleton-main/src/app/services/constantsMock.service.ts
index 10f77af..2341e62 100644
--- a/epf-front-skeleton-main/src/app/services/constantsMock.service.ts
+++ b/epf-front-skeleton-main/src/app/services/constantsMock.service.ts
@@ -7,7 +7,9 @@ import { Major } from "../models/major.model"
providedIn: "root",
})
export class ConstantsMockService {
- constructor() {}
+ constructor() {
+ }
+
private spanish = new Course("Spanish", 2)
private german = new Course("German", 2)
private ioT = new Course("Internet Of Things", 15)
diff --git a/epf-front-skeleton-main/src/app/services/course.service.ts b/epf-front-skeleton-main/src/app/services/course.service.ts
index 7fa6f53..23d6508 100644
--- a/epf-front-skeleton-main/src/app/services/course.service.ts
+++ b/epf-front-skeleton-main/src/app/services/course.service.ts
@@ -7,7 +7,8 @@ import { ConstantsMockService } from "./constantsMock.service"
providedIn: "root",
})
export class CourseService {
- constructor(private constantsMockService: ConstantsMockService) {}
+ constructor(private constantsMockService: ConstantsMockService) {
+ }
// FIXME : change to api call with httpclient
findAll(): Observable<Course[]> {
diff --git a/epf-front-skeleton-main/src/app/services/major.service.ts b/epf-front-skeleton-main/src/app/services/major.service.ts
index 3956021..65f1422 100644
--- a/epf-front-skeleton-main/src/app/services/major.service.ts
+++ b/epf-front-skeleton-main/src/app/services/major.service.ts
@@ -2,7 +2,6 @@ import { Injectable } from "@angular/core"
import { Observable } from "rxjs"
import { Major } from "../models/major.model"
import { MajorStudentsDto } from "../models/dto/MajorStudentsDto"
-import { Course } from "../models/course.model"
import { MajorsAndCoursesDto } from "../models/dto/majorsAndCoursesDto"
import { ConstantsMockService } from "./constantsMock.service"
@@ -10,7 +9,8 @@ import { ConstantsMockService } from "./constantsMock.service"
providedIn: "root",
})
export class MajorService {
- constructor(private constantsMockService: ConstantsMockService) {}
+ constructor(private constantsMockService: ConstantsMockService) {
+ }
findAll(): Observable<Major[]> {
return new Observable((observer) => observer.next(this.constantsMockService.majors))
diff --git a/epf-front-skeleton-main/src/app/services/student.service.ts b/epf-front-skeleton-main/src/app/services/student.service.ts
index c7536cb..e2ddfa4 100644
--- a/epf-front-skeleton-main/src/app/services/student.service.ts
+++ b/epf-front-skeleton-main/src/app/services/student.service.ts
@@ -2,15 +2,15 @@ import { Injectable } from "@angular/core"
import { Observable } from "rxjs"
import { Student } from "../models/student.model"
import { Course } from "../models/course.model"
-import { Major } from "../models/major.model"
-import {ConstantsMockService} from "./constantsMock.service";
-import {MajorsAndCoursesDto} from "../models/dto/majorsAndCoursesDto";
+import { ConstantsMockService } from "./constantsMock.service"
+import { MajorsAndCoursesDto } from "../models/dto/majorsAndCoursesDto"
@Injectable({
providedIn: "root",
})
export class StudentService {
- constructor(private constantsMockService : ConstantsMockService) {}
+ constructor(private constantsMockService: ConstantsMockService) {
+ }
// FIXME : change to api call with httpclient
findAll(): Observable<Student[]> {
@@ -56,8 +56,8 @@ export class StudentService {
}
}
- searchByMajorAndCourse(majorsAndCoursesDto: MajorsAndCoursesDto) : Observable<Student[]> {
- return new Observable((observer) => observer.next( this.constantsMockService.students.filter(s => s.major.id === majorsAndCoursesDto.majors[0].id && s.courses?.includes(majorsAndCoursesDto.courses[0]))))
+ searchByMajorAndCourse(majorsAndCoursesDto: MajorsAndCoursesDto): Observable<Student[]> {
+ return new Observable((observer) => observer.next(this.constantsMockService.students.filter(s => s.major.id === majorsAndCoursesDto.majors[0].id && s.courses?.includes(majorsAndCoursesDto.courses[0]))))
}
}
diff --git a/epf-front-skeleton-main/src/app/students/research/research.component.html b/epf-front-skeleton-main/src/app/students/research/research.component.html
index ae91133..af983b0 100644
--- a/epf-front-skeleton-main/src/app/students/research/research.component.html
+++ b/epf-front-skeleton-main/src/app/students/research/research.component.html
@@ -1,17 +1,19 @@
<ng-container *ngIf="majorsAndCourses$ | async; let majorAndCourse">
-<form (ngSubmit)="search()" #researchForm="ngForm" class="d-flex">
- <div class="form-group">
- <select id="major" [(ngModel)]="majorModel" name="major" class="form-control">
- <option [ngValue]="null" [disabled]="true">Select a major</option>
- <option *ngFor="let major of majorAndCourse.majors" [ngValue]="major">{{major.name}}</option>
- </select>
- </div>
- <div class="form-group">
- <select id="course" [(ngModel)]="courseModel" name="course" class="form-control">
- <option [ngValue]="null" [disabled]="true">Select a course</option>
- <option *ngFor="let course of majorAndCourse.courses" [ngValue]="course">{{course.name}}</option>
- </select>
- </div>
- <button type="submit" mat-raised-button color="primary" [disabled]="majorModel == null || courseModel == null">Search</button>
-</form>
+ <form (ngSubmit)="search()" #researchForm="ngForm" class="d-flex">
+ <div class="form-group">
+ <select id="major" [(ngModel)]="majorModel" name="major" class="form-control">
+ <option [ngValue]="null" [disabled]="true">Select a major</option>
+ <option *ngFor="let major of majorAndCourse.majors" [ngValue]="major">{{major.name}}</option>
+ </select>
+ </div>
+ <div class="form-group">
+ <select id="course" [(ngModel)]="courseModel" name="course" class="form-control">
+ <option [ngValue]="null" [disabled]="true">Select a course</option>
+ <option *ngFor="let course of majorAndCourse.courses" [ngValue]="course">{{course.name}}</option>
+ </select>
+ </div>
+ <button type="submit" mat-raised-button color="primary" [disabled]="majorModel == null || courseModel == null">
+ Search
+ </button>
+ </form>
</ng-container>
diff --git a/epf-front-skeleton-main/src/app/students/research/research.component.scss b/epf-front-skeleton-main/src/app/students/research/research.component.scss
index 8af74b6..069b30c 100644
--- a/epf-front-skeleton-main/src/app/students/research/research.component.scss
+++ b/epf-front-skeleton-main/src/app/students/research/research.component.scss
@@ -1,6 +1,7 @@
:host {
margin-left: 100px;
display: flex;
+
.form-group {
margin-right: 10px;
}
diff --git a/epf-front-skeleton-main/src/app/students/research/research.component.ts b/epf-front-skeleton-main/src/app/students/research/research.component.ts
index f7a377f..8302163 100644
--- a/epf-front-skeleton-main/src/app/students/research/research.component.ts
+++ b/epf-front-skeleton-main/src/app/students/research/research.component.ts
@@ -1,11 +1,11 @@
-import {Component, EventEmitter, OnInit, Output} from "@angular/core"
+import { Component, EventEmitter, OnInit, Output } from "@angular/core"
import { Observable } from "rxjs"
import { MajorsAndCoursesDto } from "../../models/dto/majorsAndCoursesDto"
import { Major } from "../../models/major.model"
import { MajorService } from "../../services/major.service"
import { Course } from "../../models/course.model"
import { StudentService } from "../../services/student.service"
-import {Student} from "../../models/student.model";
+import { Student } from "../../models/student.model"
@Component({
selector: "epf-research",
@@ -16,9 +16,10 @@ export class ResearchComponent implements OnInit {
majorsAndCourses$: Observable<MajorsAndCoursesDto> | undefined
majorModel: Major | null = null
courseModel: Course | null = null
- @Output() searchEvent = new EventEmitter<Observable<Student[]>>();
+ @Output() searchEvent = new EventEmitter<Observable<Student[]>>()
- constructor(private majorService: MajorService, private studentService: StudentService) {}
+ constructor(private majorService: MajorService, private studentService: StudentService) {
+ }
ngOnInit(): void {
this.majorsAndCourses$ = this.majorService.findAllMajorsAndAllCourses()
diff --git a/epf-front-skeleton-main/src/app/students/student-details/student-details.component.html b/epf-front-skeleton-main/src/app/students/student-details/student-details.component.html
index 48ca113..1be7142 100644
--- a/epf-front-skeleton-main/src/app/students/student-details/student-details.component.html
+++ b/epf-front-skeleton-main/src/app/students/student-details/student-details.component.html
@@ -61,7 +61,8 @@
<div *ngIf="notSelectedCourse" class="alert alert-danger">
Course is required
</div>
- <button type="button" [disabled]="courseSelectModel==null" (click)="addCourseToStudent(student)" mat-raised-button
+ <button type="button" [disabled]="courseSelectModel==null" (click)="addCourseToStudent(student)"
+ mat-raised-button
color="primary">Add course
</button>
</div>
diff --git a/epf-front-skeleton-main/src/app/students/student-details/student-details.component.scss b/epf-front-skeleton-main/src/app/students/student-details/student-details.component.scss
index 0ed5e73..d9bf7ed 100644
--- a/epf-front-skeleton-main/src/app/students/student-details/student-details.component.scss
+++ b/epf-front-skeleton-main/src/app/students/student-details/student-details.component.scss
@@ -1,30 +1,36 @@
@use "src/theme";
+
:host {
display: flex;
flex-direction: column;
padding: 30px;
- color: theme.$white
- h1 {
+ color: theme.$white h1 {
color: theme.$common-purple;
font-size: xx-large;
}
+
label {
font-size: large;
margin: 10px 0;
}
+
button {
margin: 10px 0;
}
+
.student-courses {
.courses-title {
font-size: large;
margin: 10px 10px 10px 0;
}
+
table {
- border : 1px solid lightgray;
+ border: 1px solid lightgray;
font-size: medium;
+
tr {
display: flex;
+
td {
width: 33%;
display: flex;
@@ -33,14 +39,16 @@
}
}
}
+
.new-course-div {
:hover {
cursor: pointer;
}
- .new-course-icon{
+
+ .new-course-icon {
margin-left: 10px;
- color: green ;
+ color: green;
}
}
}
diff --git a/epf-front-skeleton-main/src/app/students/student-details/student-details.component.ts b/epf-front-skeleton-main/src/app/students/student-details/student-details.component.ts
index cdab378..d4637b3 100644
--- a/epf-front-skeleton-main/src/app/students/student-details/student-details.component.ts
+++ b/epf-front-skeleton-main/src/app/students/student-details/student-details.component.ts
@@ -1,8 +1,7 @@
-import { Component, OnInit } from "@angular/core"
+import { Component } from "@angular/core"
import { map, Observable } from "rxjs"
import { Student } from "../../models/student.model"
import { ActivatedRoute, Router } from "@angular/router"
-import { FormControl } from "@angular/forms"
import { Course } from "../../models/course.model"
import { CourseService } from "../../services/course.service"
import { StudentService } from "../../services/student.service"
@@ -18,12 +17,14 @@ export class StudentDetailsComponent {
courseSelectModel: Course | null = null
notSelectedCourse: boolean | undefined
today = new Date(Date.now())
+
constructor(
private _route: ActivatedRoute,
private courseService: CourseService,
private studentService: StudentService,
private router: Router,
- ) {}
+ ) {
+ }
courseClick() {
this.allCourses$ = this.courseService.findAll()
diff --git a/epf-front-skeleton-main/src/app/students/student-details/student-details.resolver.ts b/epf-front-skeleton-main/src/app/students/student-details/student-details.resolver.ts
index 0cdd27e..0388f40 100644
--- a/epf-front-skeleton-main/src/app/students/student-details/student-details.resolver.ts
+++ b/epf-front-skeleton-main/src/app/students/student-details/student-details.resolver.ts
@@ -1,6 +1,6 @@
import { Injectable } from "@angular/core"
-import { Router, Resolve, RouterStateSnapshot, ActivatedRouteSnapshot } from "@angular/router"
-import { first, mergeMap, Observable, of } from "rxjs"
+import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from "@angular/router"
+import { Observable } from "rxjs"
import { StudentService } from "../../services/student.service"
import { Student } from "../../models/student.model"
import { Major } from "../../models/major.model"
@@ -9,7 +9,9 @@ import { Major } from "../../models/major.model"
providedIn: "root",
})
export class StudentDetailsResolver implements Resolve<Student> {
- constructor(private studentService: StudentService) {}
+ constructor(private studentService: StudentService) {
+ }
+
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<Student> {
if (route.params["id"] == "new") {
return new Observable((observer) => observer.next(new Student("", "", new Major("", ""))))
diff --git a/epf-front-skeleton-main/src/app/students/students.component.scss b/epf-front-skeleton-main/src/app/students/students.component.scss
index a16aff5..a560190 100644
--- a/epf-front-skeleton-main/src/app/students/students.component.scss
+++ b/epf-front-skeleton-main/src/app/students/students.component.scss
@@ -3,7 +3,7 @@
:host {
display: flex;
flex-direction: column;
- padding : 30px;
+ padding: 30px;
h1 {
display: flex;
@@ -12,9 +12,11 @@
margin-right: 100px;
margin-bottom: 0;
}
- table{
+
+ table {
margin-top: 20px;
vertical-align: center;
+
tbody {
:hover {
cursor: pointer;
diff --git a/epf-front-skeleton-main/src/app/students/students.component.ts b/epf-front-skeleton-main/src/app/students/students.component.ts
index 3c091c2..5e5fd68 100644
--- a/epf-front-skeleton-main/src/app/students/students.component.ts
+++ b/epf-front-skeleton-main/src/app/students/students.component.ts
@@ -1,7 +1,7 @@
-import { Component, OnInit } from "@angular/core"
+import { Component } from "@angular/core"
import { map, Observable } from "rxjs"
import { Student } from "../models/student.model"
-import { ActivatedRoute, Router } from "@angular/router"
+import { ActivatedRoute } from "@angular/router"
import { StudentService } from "../services/student.service"
@Component({
@@ -11,13 +11,15 @@ import { StudentService } from "../services/student.service"
})
export class StudentsComponent {
students$: Observable<Student[]> = this._route.data.pipe(map((data) => data["students"]))
- constructor(private _route: ActivatedRoute, private studentService: StudentService) {}
+
+ constructor(private _route: ActivatedRoute, private studentService: StudentService) {
+ }
deleteStudent(student: Student) {
this.studentService.delete(student)
}
searchByMajorAndCourse($event: Observable<Student[]>) {
- this.students$ = $event;
+ this.students$ = $event
}
}
diff --git a/epf-front-skeleton-main/src/app/students/students.resolver.ts b/epf-front-skeleton-main/src/app/students/students.resolver.ts
index 9ed89a6..ce3c123 100644
--- a/epf-front-skeleton-main/src/app/students/students.resolver.ts
+++ b/epf-front-skeleton-main/src/app/students/students.resolver.ts
@@ -8,7 +8,9 @@ import { StudentService } from "../services/student.service"
providedIn: "root",
})
export class StudentsResolver implements Resolve<Student[]> {
- constructor(private studentService: StudentService) {}
+ constructor(private studentService: StudentService) {
+ }
+
resolve(): Observable<Student[]> {
return this.studentService.findAll()
}
--
GitLab