Merge pull request #14 from llTheBlankll/issue-13

attendance-management-angular-13 (JS-0323) Detected usage of the `any…

Author: vbatecan

src/app/authentication/auth.service.ts

@@ -2,7 +2,7 @@ import {inject, Injectable} from '@angular/core';
 import {HttpClient, HttpResponse} from "@angular/common/http";
 import {environment} from "../../environments/environment";
 import {map, Observable, of} from "rxjs";
-import {LoginDTO} from "../DTO/DTOList";
+import {LoginDTO, LoginToken} from "../DTO/DTOList";
 import {StatusMessageResponse} from "../DTO/StatusMessageResponse";
 import {ExecutionStatus} from "../enums/ExecutionStatus";
 
@@ -28,7 +28,7 @@ export class AuthService {
             // Check response body if it is valid
             if (response.body) {
               const message = response.body;
-              if (message?.status == ExecutionStatus.VALID) {
+              if (message?.status === ExecutionStatus.VALID) {
                 return of(true);
               }
             }
@@ -43,9 +43,9 @@ export class AuthService {
     return false;
   }
 
-  login(login: LoginDTO): Observable<HttpResponse<LoginDTO | StatusMessageResponse>> {
+  login(login: LoginDTO): Observable<HttpResponse<LoginToken | StatusMessageResponse>> {
     console.log("Requesting login to " + this.loginUrl);
-    return this.http.post<LoginDTO | StatusMessageResponse>(this.loginUrl, login, {
+    return this.http.post<LoginToken | StatusMessageResponse>(this.loginUrl, login, {
       responseType: 'json',
       observe: 'response'
     });

src/app/authentication/login/auth.component.ts

@@ -16,6 +16,7 @@ import {Router} from "@angular/router";
 import {TeacherService} from "../../services/teacher/teacher.service";
 import {Roles} from "../../enums/Roles";
 import {Teacher} from "../../DTO/TeacherDTO";
+import {StatusMessageResponse} from "../../DTO/StatusMessageResponse";
 
 @Component({
   selector: 'app-login',
@@ -74,10 +75,10 @@ export class AuthComponent {
       console.log("Logging in");
       // Check if status code 200
       this.loginService.login(loginData).pipe(
-        map((response: HttpResponse<any>) => {
+        map((response: HttpResponse<LoginToken | StatusMessageResponse>) => {
           console.log("Login successful");
           // Get token
-          const loginToken: LoginToken = response.body;
+          const loginToken: LoginToken = response.body as LoginToken;
 
           // Show alert message
           this.alert.open("Login successful", "Close");

src/app/components/top-header/top-header.component.ts

@@ -36,7 +36,7 @@ import {NgOptimizedImage} from "@angular/common";
 })
 export class TopHeaderComponent implements OnInit {
   @Input()
-  public sidenav: MatDrawer | any;
+  public sidenav: MatDrawer | undefined;
 
   @Output()
   public readonly sectionSelected: EventEmitter<number> = new EventEmitter<number>();

src/app/dashboard/admin/admin-dashboard/admin-dashboard.component.ts

@@ -91,7 +91,7 @@ export class AdminDashboardComponent implements OnInit {
   protected displayedColumns: string[] = ['name', 'grade', 'section', 'time', 'date', 'status'];
   protected recentActivitiesRow: RecentActivitiesRow[] = [
   ];
-  protected recentActivitiesTableDataSource: MatTableDataSource<any> = new MatTableDataSource(this.recentActivitiesRow);
+  protected recentActivitiesTableDataSource: MatTableDataSource<RecentActivitiesRow> = new MatTableDataSource(this.recentActivitiesRow);
 
 
   constructor() {

src/app/dashboard/announcements/announcements.component.ts

@@ -93,7 +93,7 @@ export class AnnouncementsComponent implements OnInit {
 
   // Mat Table data
   displayedColumns: string[] = ['title', 'status', 'viewers'];
-  announcementTableDataSource: MatTableDataSource<any> = new MatTableDataSource(this.announcements);
+  announcementTableDataSource: MatTableDataSource<{}> = new MatTableDataSource(this.announcements);
 
   // Announcement Pagination
   // Pagination info

src/app/dashboard/teacher/teacher-dashboard/teacher-dashboard.component.ts

@@ -94,7 +94,7 @@ export class TeacherDashboardComponent implements OnInit, OnChanges {
   // Recent Activities table and Data Source
   protected displayedColumns: string[] = ['name', 'grade', 'section', 'time', 'date', 'status'];
   protected recentActivitiesRow: RecentActivitiesRow[] = [];
-  protected recentActivitiesTableDataSource: MatTableDataSource<any> = new MatTableDataSource(this.recentActivitiesRow);
+  protected recentActivitiesTableDataSource: MatTableDataSource<RecentActivitiesRow> = new MatTableDataSource(this.recentActivitiesRow);
 
   // Section
   @Input()
@@ -384,9 +384,11 @@ export class TeacherDashboardComponent implements OnInit, OnChanges {
   }
 
   updateAttendanceOverviewData(label: string[], data: number[], dataset = 0) {
-    this.attendanceOverviewChart.data.labels = label;
-    this.attendanceOverviewChart.data.datasets[dataset].data = data;
-    this.attendanceOverviewChart.update();
+    if (this.attendanceOverviewChart !== undefined) {
+      this.attendanceOverviewChart.data.labels = label;
+      this.attendanceOverviewChart.data.datasets[dataset].data = data;
+      this.attendanceOverviewChart.update();
+    }
   }
 
   updateDashboardStatistics() {

src/app/dashboard/teacher/teacher-students/teacher-students.component.ts

@@ -49,7 +49,7 @@ export class TeacherStudentsComponent implements OnInit {
   // Pie Chart with Chart JS
   public pieChartLabels = ["Male", "Female"];
   public pieChartData = [512, 235];
-  public pieChart: any;
+  public pieChart: Chart<"pie", number[], string> | undefined;
 
   ngOnInit() {
     this.pieChart = new Chart('pieChart', {

src/app/services/attendance/attendance.service.ts

@@ -1,10 +1,11 @@
 import {inject, Injectable} from '@angular/core';
 import {environment} from "../../../environments/environment";
-import {HttpClient} from "@angular/common/http";
+import {HttpClient, HttpResponse} from "@angular/common/http";
 import {DateRange, Status} from "../../DTO/DTOList";
 import {Observable} from "rxjs";
 import {CountDTO} from "../../DTO/CountDTO";
 import {SortDirection} from "../../enums/SortDirection";
+import {AttendancePaging} from "../../DTO/AttendanceDTO";
 
 @Injectable({
   providedIn: 'root'
@@ -14,35 +15,32 @@ export class AttendanceService {
   apiUrl: string = environment.apiUrl + "/api/v1/attendances";
   http: HttpClient = inject(HttpClient);
 
-  constructor() {
-  }
-
-  countAttendance(dateRange: DateRange, status: Status): Observable<any> {
-    return this.http.post(this.apiUrl + `/status/${status}/date-range`, dateRange, {
+  countAttendance(dateRange: DateRange, status: Status): Observable<HttpResponse<number>> {
+    return this.http.post<number>(this.apiUrl + `/status/${status}/date-range`, dateRange, {
       observe: 'response',
       responseType: 'json'
     });
   }
 
-  countAttendanceInSectionByDateRange(sectionId: number, dateRange: DateRange, status: Status): Observable<any> {
+  countAttendanceInSectionByDateRange(sectionId: number, dateRange: DateRange, status: Status) {
     return this.http.post(this.apiUrl + `/status/${status}/section/${sectionId}/date-range`, dateRange, {
       observe: 'response',
       responseType: 'json'
     });
   }
 
-  countAttendanceInSectionByDate(sectionId: number, date: Date, status: Status): Observable<any> {
+  countAttendanceInSectionByDate(sectionId: number, date: Date, status: Status): Observable<HttpResponse<CountDTO>> {
     const formattedDate: string = date.toISOString().split('T')[0];
     return this.http.get<CountDTO>(this.apiUrl + `/status/${status}/section/${sectionId}/date?date=${formattedDate}`, {
       observe: 'response',
       responseType: 'json'
     });
   }
 
-  getAllSectionAndGradeLevelAttendanceByDate(sectionId: number, gradeLevelId: number, date: Date, page: number, size: number, sortBy = "date", orderBy: SortDirection = SortDirection.ASC): Observable<any> {
+  getAllSectionAndGradeLevelAttendanceByDate(sectionId: number, gradeLevelId: number, date: Date, page: number, size: number, sortBy = "date", orderBy: SortDirection = SortDirection.ASC): Observable<HttpResponse<AttendancePaging>> {
     const formattedDate = date.toISOString().split('T')[0];
 
-    return this.http.get(this.apiUrl + `/statistics/section/${sectionId}/grade-level/${gradeLevelId}/date`, {
+    return this.http.get<AttendancePaging>(this.apiUrl + `/statistics/section/${sectionId}/grade-level/${gradeLevelId}/date`, {
       params: {
         date: formattedDate,
         page: page,

src/app/services/charts/attendance/attendance-line-chart.service.ts

@@ -1,7 +1,7 @@
 import {inject, Injectable} from '@angular/core';
 import {environment} from "../../../../environments/environment";
-import {HttpClient} from "@angular/common/http";
-import {DateRange, Status} from "../../../DTO/DTOList";
+import {HttpClient, HttpResponse} from "@angular/common/http";
+import {DateRange, LineChartDTO, Status} from "../../../DTO/DTOList";
 import {Observable} from "rxjs";
 
 @Injectable({
@@ -12,11 +12,11 @@ export class AttendanceLineChartService {
   private baseUrl: string = environment.apiUrl;
   private http: HttpClient = inject(HttpClient);
 
-  getAttendanceLineChart(status: Status, dateRange: DateRange): Observable<any> {
-    return this.http.post(`${this.baseUrl}/api/v1/attendances/graphic-organizers/line-chart?status=${status}`, dateRange, {observe: 'response', responseType: 'json'});
+  getAttendanceLineChart(status: Status, dateRange: DateRange): Observable<HttpResponse<LineChartDTO>> {
+    return this.http.post<LineChartDTO>(`${this.baseUrl}/api/v1/attendances/graphic-organizers/line-chart?status=${status}`, dateRange, {observe: 'response', responseType: 'json'});
   }
 
-  getSectionAttendanceLineChart(sectionId: number, status: Status, dateRange: DateRange): Observable<any> {
-    return this.http.post(`${this.baseUrl}/api/v1/attendances/graphic-organizers/sections/${sectionId}/line-chart?status=${status}`, dateRange, {observe: 'response', responseType: 'json'});
+  getSectionAttendanceLineChart(sectionId: number, status: Status, dateRange: DateRange): Observable<HttpResponse<LineChartDTO>> {
+    return this.http.post<LineChartDTO>(`${this.baseUrl}/api/v1/attendances/graphic-organizers/sections/${sectionId}/line-chart?status=${status}`, dateRange, {observe: 'response', responseType: 'json'});
   }
 }

src/app/services/section/section.service.ts

@@ -1,9 +1,10 @@
 import {inject, Injectable} from '@angular/core';
 import {environment} from "../../../environments/environment";
-import {HttpClient} from "@angular/common/http";
+import {HttpClient, HttpResponse} from "@angular/common/http";
 import {Observable} from "rxjs";
 import {Section} from "../../DTO/SectionDTO";
 import {SortDirection} from "../../enums/SortDirection";
+import {StatusMessageResponse} from "../../DTO/StatusMessageResponse";
 
 @Injectable({
   providedIn: 'root'
@@ -13,27 +14,15 @@ export class SectionService {
   private apiUrl: string = environment.apiUrl + "/api/v1/sections";
   private http: HttpClient = inject(HttpClient);
 
-  public createSection(section: Section) {
-    return this.http.post(this.apiUrl + "/create", section, {responseType: 'json', observe: 'response'});
+  public createSection(section: Section): Observable<HttpResponse<StatusMessageResponse>> {
+    return this.http.post<StatusMessageResponse>(this.apiUrl + "/create", section, {responseType: 'json', observe: 'response'});
   }
 
-  public updateSection(sectionId: number, section: Section) {
-    return this.http.put(this.apiUrl + `/${sectionId}`, section, {responseType: 'json', observe: 'response'});
+  public updateSection(sectionId: number, section: Section): Observable<HttpResponse<StatusMessageResponse>> {
+    return this.http.put<StatusMessageResponse>(this.apiUrl + `/${sectionId}`, section, {responseType: 'json', observe: 'response'});
   }
-
-  public updateSectionTeacher(sectionId: number, teacherId: number) {
-    return this.http.patch(this.apiUrl + `/${sectionId}/teacher`, {
-      params: {
-        sectionId: sectionId,
-        teacherId: teacherId
-      },
-      responseType: 'json',
-      observe: 'response'
-    });
-  }
-
-  public updateSectionGradeLevel(sectionId: number, gradeLevelId: number) {
-    return this.http.patch(this.apiUrl + `/${sectionId}/grade-level`, {
+  public updateSectionGradeLevel(sectionId: number, gradeLevelId: number): Observable<StatusMessageResponse> {
+    return this.http.patch<StatusMessageResponse>(this.apiUrl + `/${sectionId}/grade-level`, {
       params: {
         gradeLevelId: gradeLevelId
       },
@@ -42,8 +31,8 @@ export class SectionService {
     });
   }
 
-  public updateSectionName(sectionId: number, name: string) {
-    return this.http.patch(this.apiUrl + `/${sectionId}/name`, null, {
+  public updateSectionName(sectionId: number, name: string): Observable<HttpResponse<StatusMessageResponse>> {
+    return this.http.patch<StatusMessageResponse>(this.apiUrl + `/${sectionId}/name`, null, {
       params: {
         name: name
       },
@@ -52,15 +41,15 @@ export class SectionService {
     });
   }
 
-  public deleteSection(sectionId: number) {
-    return this.http.delete(this.apiUrl + `/${sectionId}`, {
+  public deleteSection(sectionId: number): Observable<HttpResponse<StatusMessageResponse>> {
+    return this.http.delete<StatusMessageResponse>(this.apiUrl + `/${sectionId}`, {
         responseType: 'json',
         observe: 'response'
       }
     );
   }
 
-  public getAllSectionsNoPaging() {
+  public getAllSectionsNoPaging(): Observable<HttpResponse<Section[]>> {
     return this.http.get<Section[]>(this.apiUrl + "/all", {
       params: {
         noPaging: true
@@ -70,7 +59,7 @@ export class SectionService {
     });
   }
 
-  public getAllSections(page: number, size: number, orderBy: SortDirection = SortDirection.ASC, sortBy = "sectionName"): Observable<any> {
+  public getAllSections(page: number, size: number, orderBy: SortDirection = SortDirection.ASC, sortBy = "sectionName") {
     return this.http.get(this.apiUrl + "/all", {
       params: {
         page: page,
@@ -83,7 +72,7 @@ export class SectionService {
     });
   }
 
-  public getSectionById(sectionId: number): Observable<any> {
+  public getSectionById(sectionId: number) {
     return this.http.get(this.apiUrl + `/${sectionId}`, {responseType: 'json', observe: 'response'});
   }