diff --git a/src/app/admin-view/admin-comm.service.ts b/src/app/admin-view/admin-comm.service.ts index f26804b..775dddf 100644 --- a/src/app/admin-view/admin-comm.service.ts +++ b/src/app/admin-view/admin-comm.service.ts @@ -252,7 +252,7 @@ export class AdminCommService { return this.http.post(environment.apiEndpoint+`/admin/clean/attendence/${room}`, attendence, {withCredentials: true}) }, getSummary: () => { - return this.http.get<{room: string, hours: string[], notes: string}[]>(environment.apiEndpoint+`/admin/clean/attendenceSummary`, {withCredentials: true}) + return this.http.get<{room: string, hours: string[], notes: string, auto: boolean}[]>(environment.apiEndpoint+`/admin/clean/attendenceSummary`, {withCredentials: true}) }, deleteRoom: (room: string) => { return this.http.delete(environment.apiEndpoint+`/admin/clean/attendence/${room}`, {withCredentials: true}) diff --git a/src/app/admin-view/grades/attendence-summary/attendence-summary.component.html b/src/app/admin-view/grades/attendence-summary/attendence-summary.component.html index 760c99b..7d08dbf 100644 --- a/src/app/admin-view/grades/attendence-summary/attendence-summary.component.html +++ b/src/app/admin-view/grades/attendence-summary/attendence-summary.component.html @@ -18,7 +18,7 @@
Usuń - +
diff --git a/src/app/admin-view/grades/attendence-summary/attendence-summary.component.ts b/src/app/admin-view/grades/attendence-summary/attendence-summary.component.ts index ccb30a4..c2d5e25 100644 --- a/src/app/admin-view/grades/attendence-summary/attendence-summary.component.ts +++ b/src/app/admin-view/grades/attendence-summary/attendence-summary.component.ts @@ -11,7 +11,7 @@ import { AdminCommService } from '../../admin-comm.service'; }) export class AttendenceSummaryComponent implements OnInit { - data: MatTableDataSource<{room: string, hours: string[], notes: string}> = new MatTableDataSource<{room: string, hours: string[], notes: string}>(); + data: MatTableDataSource<{room: string, hours: string[], notes: string, auto: boolean}> = new MatTableDataSource<{room: string, hours: string[], notes: string, auto: boolean}>(); collumns = ['room', 'hours', 'actions'] constructor (private toolbar: ToolbarService, private router: Router, private route: ActivatedRoute, private ac: AdminCommService) { diff --git a/src/app/admin-view/grades/grades.component.ts b/src/app/admin-view/grades/grades.component.ts index de2a2d2..24078f9 100644 --- a/src/app/admin-view/grades/grades.component.ts +++ b/src/app/admin-view/grades/grades.component.ts @@ -49,8 +49,8 @@ export class GradesComponent implements OnInit, OnDestroy { if (!this.filter(this.date)) this.date.isoWeekday(8); this.toolbar.comp = this this.toolbar.menu = [ + { title: "Pokoje do sprawdzenia", check: true, fn: "attendenceSummary", icon: "overview"}, { title: "Podsumowanie", check: true, fn: "summary", icon: "analytics" }, - { title: "Obecność", check: true, fn: "attendenceSummary", icon: "overview"} ] this.form.valueChanges.subscribe((v) => { this.calculate()