Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions frontend/kaiser/src/app/service/studentsGrade.service.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';

export interface StudentsGradeDto {
name: String;
email: String;
gradeId: number;
homeGradeTeacherId: number;
}

@Injectable({
providedIn: 'root'
})
Expand Down
27 changes: 10 additions & 17 deletions frontend/kaiser/src/app/studentsGrade/studentsGrade.component.ts
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
import { Component, OnDestroy, OnInit } from '@angular/core';
import { takeUntil } from 'rxjs';
import { StudentsGradeDto, StudentsGradeService } from '../service/studentsGrade.service';
import { StudentsGradeService } from '../service/studentsGrade.service';
import { StudentGradeDto } from '../model/studentGradeModel';


@Component({
selector: 'app-studentsGrade',
templateUrl: './studentsGrade.component.html',
styleUrls: ['./studentsGrade.component.css']
})
export class StudentsGradeComponent implements OnInit {

// destroy$: Subject<boolean> = new Subject<boolean>();

studentsGradeDto: StudentsGradeDto[];
studentsGradeDto: StudentGradeDto[];

constructor(private studentsGradeService: StudentsGradeService) { }

ngOnInit(): void {
// this.studentsGradeDto = this.studentsGradeService.getStudentsDtoList();
// then(studentsGradeServiceResult => this.studentsGradeDto = studentsGradeServiceResult);
this.studentsGradeDto = [];
this.getStudentsGradeDto();
}
Expand All @@ -27,17 +24,13 @@ export class StudentsGradeComponent implements OnInit {
let stud = studentsGradeServiceResult;

studentsGradeServiceResult.forEach((element: { email: string; name: string; gradeId: number; homeGradeTeacherId: number; }) => {
let sgd = {
email: "",
name: '',
gradeId: 0,
homeGradeTeacherId: 0,
let studentGradeDtoObject = {
email: element.email,
name: element.name,
gradeId: element.gradeId,
homeGradeTeacherId: element.homeGradeTeacherId,
};
sgd.email = element.email;
sgd.name = element.name;
sgd.gradeId = element.gradeId;
sgd.homeGradeTeacherId = element.homeGradeTeacherId;
this.studentsGradeDto.push(sgd);
this.studentsGradeDto.push(studentGradeDtoObject);
});

});
Expand Down