Commit 9b474451 authored by achinta's avatar achinta

fix: remove any

parent 7518dedf
......@@ -3,6 +3,7 @@ import { Component, EventEmitter, inject, Input, Output } from '@angular/core';
import { MatTableModule } from '@angular/material/table';
import { MatPaginator } from '@angular/material/paginator';
import { AuthService } from '../../auth/service/auth.service';
import { CustomTableColumn } from '../interface/custom-table-column';
@Component({
selector: 'app-custom-table',
......@@ -18,18 +19,18 @@ import { AuthService } from '../../auth/service/auth.service';
'../../style-guide/css/table-theme.scss'
]
})
export class CustomTableComponent {
export class CustomTableComponent<T> {
@Input() columns: { key: string; label: string; isVisible?: boolean }[] = []; // Define columns dynamically
@Input() data: any[] = []; // Table data
@Input() columns:CustomTableColumn[] = []; // Define columns dynamically
@Input() data: T[] = []; // Table data
@Input() count: number = 0; // Table data
@Input() pageSize: number = 0; // Table data
@Output() emitView: EventEmitter<string> = new EventEmitter<string>();
@Output() emitView: EventEmitter<T> = new EventEmitter<T>();
@Output() emitEdit: EventEmitter<string> = new EventEmitter<string>();
@Output() emitEdit: EventEmitter<T> = new EventEmitter<T>();
@Output() emitDelete: EventEmitter<string> = new EventEmitter<string>();
@Output() emitDelete: EventEmitter<T> = new EventEmitter<T>();
public authService = inject(AuthService);
......@@ -48,19 +49,19 @@ export class CustomTableComponent {
}
public view(data:any): void {
public view(data: T): void {
this.emitView.emit(data);
}
public edit(data:any): void {
public edit(data:T): void {
this.emitEdit.emit(data);
}
public delete(data:any): void {
public delete(data: T): void {
this.emitDelete.emit(data);
}
onPageChanged(event: any): void {
public onPageChanged<T>(event: T): void {
console.log("event");
console.log(event);
......
export interface CustomTableColumn {
key: string;
label: string;
isVisible?: boolean
}
\ No newline at end of file
......@@ -4,10 +4,8 @@ import { MatDialog } from '@angular/material/dialog';
import { ManageComponent } from '../manage/manage.component';
import { SquareButtonComponent } from '../../../component-library/square-button/square-button.component';
import { AssignmentTransmissionService } from '../../../raintree/transmission/assignment-transmission.service';
import { AssignmentsResponse } from '../../../raintree/interface/assignment-respons';
import { TransmissionMapperService } from '../../../mappers/transmission-mapper.service';
import { UrlConfigService } from '../../service/url-config.service';
import { Assignment } from '../interface/assignment';
import { PrepareAssignmentTableDataService } from '../service/prepare-assignment-table-data.service';
import { DataSourceService } from '../../service/data-source.service';
import { AuthService } from '../../../auth/service/auth.service';
......@@ -16,6 +14,8 @@ import { RaintreeResponse } from '../../../raintree/interface/raintree-response'
import { MatDialogConfigService } from '../../service/mat-dialog-config.service';
import { DeleteRecordTransmissionService } from '../../../raintree/transmission/delete-record-transmission.service';
import { ToasterService } from '../../../component-library/toaster/toaster.service';
import { CustomTableColumn } from '../../../component-library/interface/custom-table-column';
import { AssignmentTable } from '../interface/assignment-table';
@Component({
selector: 'app-assignment',
......@@ -40,9 +40,9 @@ export class AssignmentComponent implements OnInit {
private _toaster:ToasterService
) { }
public columns: any[] = [];
public columns: CustomTableColumn[] = [];
public data: any[] = [];
public data: AssignmentTable[] = [];
public ngOnInit(): void {
this.columns = this._prepareAssignmentTableData.prepareMatTableColumn();
......@@ -80,12 +80,12 @@ export class AssignmentComponent implements OnInit {
)
}
public emitViewFromTable(emitData: any): void {
public emitViewFromTable(emitData: AssignmentTable): void {
let docLink = emitData.document.replace('BASE_URL', TransmissionMapperService.DEV_TRANSMISSION_URL);
window.open(docLink, '_blank');
}
public emitDeleteFromTable(emitData: any): void {
public emitDeleteFromTable(emitData: AssignmentTable): void {
if (!confirm("Are you sure to delete ?")) return;
......
export interface AssignmentTable {
id:string;
subject?: string,
section_details?: string;
session_name?: string;
assigned_on?: string;
last_date: string;
document: string;
action: string[]
}
\ No newline at end of file
import { Injectable } from '@angular/core';
import { Assignment } from '../interface/assignment';
import { AssignmentTable } from '../interface/assignment-table';
import { CustomTableColumn } from '../../../component-library/interface/custom-table-column';
@Injectable({
providedIn: 'root'
......@@ -8,27 +10,25 @@ export class PrepareAssignmentTableDataService {
constructor() { }
public prepareMatTableData(data: Assignment[]): any {
public prepareMatTableData(data: Assignment[]): AssignmentTable[] {
let dataArray = data.map((assignment: Assignment) => {
return data.map((assignment: Assignment) => {
return {
['id']: assignment.id,
['subject']: assignment.subject_subject_name?.en,
['section_details']: assignment.section_details?.en,
['session_name']: assignment.session_session_name?.en,
['assigned_on']: assignment.assigned_on?.en,
['last_date']: assignment.last_submission_date['en'],
['document']: assignment.docs['en'],
['action']: ['view', 'delete']
id: assignment.id,
subject: assignment.subject_subject_name?.en,
section_details: assignment.section_details?.en,
session_name: assignment.session_session_name?.en,
assigned_on: assignment.assigned_on?.en,
last_date: assignment.last_submission_date['en'],
document: assignment.docs['en'],
action: ['view', 'delete']
}
})
return dataArray;
}
public prepareMatTableColumn(): any[] {
public prepareMatTableColumn(): CustomTableColumn[] {
let columnArray = [
{ key: 'section_details', label: 'Section' },
......
......@@ -7,13 +7,13 @@ export interface Data {
dataSourceName: string;
websiteId?: number;
type: string;
foreignKeyMapping?: any;
foreignKeyMapping?: string;
foreignKeyMap?: ForeignKeyMap;
requiredPresentationField?: string;
favourite?: boolean;
icon?: string;
dependentFields?: any;
dsType?: any;
dependentFields?: string;
dsType?: string;
[index:string]: any;
}
\ No newline at end of file
......@@ -2,10 +2,10 @@
export interface ForeignKeyListForDataSource {
fieldName: string;
foreignTableId: number;
presentationFieldPattern: any;
presenterField: any;
presentationFieldPattern: string;
presenterField: string;
isMultiSelect: boolean;
foreignUniqueField: any;
id: any;
foreignUniqueField: string;
id: string;
remotePresenterField: string;
}
\ No newline at end of file
......@@ -15,6 +15,7 @@ import { MatDialogConfigService } from '../../service/mat-dialog-config.service'
import { DeleteRecordTransmissionService } from '../../../raintree/transmission/delete-record-transmission.service';
import { ExamTable } from '../interface/exam-table';
import { ToasterService } from '../../../component-library/toaster/toaster.service';
import { CustomTableColumn } from '../../../component-library/interface/custom-table-column';
@Component({
selector: 'app-exam',
......@@ -39,9 +40,9 @@ export class ExamComponent {
public authService: AuthService
) { }
public columns: any = [];
public columns: CustomTableColumn[] = [];
public data: any = [];
public data: ExamTable[] = [];
ngOnInit(): void {
......@@ -49,13 +50,13 @@ export class ExamComponent {
this._getExamSchedule();
}
public emitViewFromTable(emitData: any) {
public emitViewFromTable(emitData: ExamTable) {
let docLink = emitData.image.replace('BASE_URL', TransmissionMapperService.DEV_TRANSMISSION_URL);
window.open(docLink, '_blank');
}
public emitDeleteFromTable(emitData: any): void {
public emitDeleteFromTable(emitData: ExamTable): void {
if(!confirm("Are you sure to delete ?")) return;
......
......@@ -36,7 +36,7 @@ import { ExamSchedules } from "../interface/exam-schedule";
export class ManageComponent {
constructor(
@Inject(MAT_DIALOG_DATA) public data: any,
// @Inject(MAT_DIALOG_DATA) public data: string ,
private _fileUpload: FileUploadTransmissionService,
private _auth: AuthService,
private _classTransmission: ClassTransmissionService,
......@@ -51,7 +51,7 @@ export class ManageComponent {
class: new FormControl("", [Validators.required]),
term: new FormControl("", [Validators.required]),
details: new FormControl("", [Validators.required]),
document: new FormControl("", [Validators.required]),
document: new FormControl(""),
});
public ngOnInit(): void {
......
import { Injectable } from '@angular/core';
import { ExamSchedule } from '../interface/exam-schedule';
import { ExamTable } from '../interface/exam-table';
import { CustomTableColumn } from '../../../component-library/interface/custom-table-column';
@Injectable({
providedIn: 'root'
......@@ -27,7 +28,7 @@ export class PrepareExamTableDataService {
}
public prepareMatTableColumn(): any[] {
public prepareMatTableColumn(): CustomTableColumn[] {
let columnArray = [
{ key: 'class_details', label: 'Class' },
......
export interface RoutineTable {
id:string;
session_session_name?: string,
class_details?: string;
section_details?: string;
routine_type: string;
schedule: string;
action: string[]
}
\ No newline at end of file
......@@ -48,7 +48,7 @@ import { ToasterService } from "../../../component-library/toaster/toaster.servi
})
export class ManageComponent {
constructor(
@Inject(MAT_DIALOG_DATA) public data: any,
// @Inject(MAT_DIALOG_DATA) public data: any,
private _classTransmission: ClassTransmissionService,
private _urlConfig: UrlConfigService,
private _routineTransmission: RoutineTransmissionService,
......
......@@ -2,7 +2,6 @@ import { Component } from '@angular/core';
import { RoutineTransmissionService } from '../../../raintree/transmission/routine-transmission.service';
import { TransmissionMapperService } from '../../../mappers/transmission-mapper.service';
import { DataSourceService } from '../../service/data-source.service';
import { RoutineResponse } from '../../../raintree/interface/routine-respons';
import { UrlConfigService } from '../../service/url-config.service';
import { CustomTableComponent } from '../../../component-library/custom-table/custom-table.component';
import { SquareButtonComponent } from '../../../component-library/square-button/square-button.component';
......@@ -15,6 +14,8 @@ import { MatDialogConfigService } from '../../service/mat-dialog-config.service'
import { RaintreeResponse } from '../../../raintree/interface/raintree-response';
import { DeleteRecordTransmissionService } from '../../../raintree/transmission/delete-record-transmission.service';
import { ToasterService } from '../../../component-library/toaster/toaster.service';
import { RoutineTable } from '../interface/routine-table';
import { CustomTableColumn } from '../../../component-library/interface/custom-table-column';
@Component({
selector: 'app-routine',
......@@ -40,9 +41,9 @@ export class RoutineComponent {
public authService: AuthService
) { }
public columns: any[] = [];
public columns: CustomTableColumn[] = [];
public data: any[] = [];
public data: RoutineTable[] = [];
ngOnInit(): void {
this.columns = this._prepareRoutineTableData.prepareMatTableColumn();
......@@ -58,12 +59,12 @@ export class RoutineComponent {
});
}
public emitViewFromTable(emitData: any) {
public emitViewFromTable(emitData: RoutineTable) {
let docLink = emitData.schedule.replace('BASE_URL', TransmissionMapperService.DEV_TRANSMISSION_URL);
window.open(docLink, '_blank');
}
public emitDeleteFromTable(emitData: any): void {
public emitDeleteFromTable(emitData: RoutineTable): void {
if(!confirm("Are you sure to delete ?")) return;
this._deleteTransmission.deleteRecord(
......
import { Injectable } from '@angular/core';
import { Routine } from '../interface/routine';
import { CustomTableColumn } from '../../../component-library/interface/custom-table-column';
import { RoutineTable } from '../interface/routine-table';
@Injectable({
providedIn: 'root'
......@@ -9,26 +11,26 @@ export class PrepareRoutineTableDataService {
constructor() { }
public prepareMatTableData(data: Routine[]): any {
public prepareMatTableData(data: Routine[]): RoutineTable[] {
let dataArray = data.map((routine: Routine) => {
return data.map((routine: Routine) => {
return {
['id']: routine.id,
['session_session_name']: routine.session_session_name?.en,
['class_details']: routine.class_details?.en,
['section_details']: routine.section_details?.en,
['routine_type']: routine.routine_type.en,
['schedule']: routine.schedule?.en,
['action']: ['view', 'delete',]
id: routine.id,
session_session_name: routine.session_session_name?.en,
class_details: routine.class_details?.en,
section_details: routine.section_details?.en,
routine_type: routine.routine_type.en,
schedule: routine.schedule.en,
action: ['view', 'delete']
}
})
return dataArray;
// return dataArray;
}
public prepareMatTableColumn(): any[] {
public prepareMatTableColumn(): CustomTableColumn[] {
let columnArray = [
{ key: 'class_details', label: 'Class' },
......
......@@ -5,8 +5,6 @@ import { Injectable } from '@angular/core';
})
export class UrlConfigService {
constructor() {}
public generateDatasourceConfigUrl(obj: any): string {
return Object.entries(obj)
.map(([key, value]) => `${key}=${encodeURIComponent(value as string | number | boolean)}`)
......
import { TestBed } from '@angular/core/testing';
import { CoaTableService } from './coa-table.service';
describe('CoaTableService', () => {
let service: CoaTableService;
beforeEach(() => {
TestBed.configureTestingModule({});
service = TestBed.inject(CoaTableService);
});
it('should be created', () => {
expect(service).toBeTruthy();
});
});
import { Injectable } from '@angular/core';
import { RaintreeResponse } from '../interface/raintree-response';
import { TransmissionService } from './transmission.service';
import { HttpClient } from '@angular/common/http';
import { HttpErrorHandlerService } from '../http-error-handler.service';
import { JWTService } from './jwt.service';
import { ErrorHandlerService } from '../error-handler.service';
import { ScheduleOfRateTypes } from '../../portal/schedule-of-rates/interface/schedule-of-rate-types';
import { ScheduleOfRateTypesResponse } from '../interface/schedule-of-rate-types-response';
import { ScheduleOfRates } from '../../portal/schedule-of-rates/interface/schedule-of-rates';
import { ScheduleOfRatesResponse } from '../interface/schedule-of-rates-response';
@Injectable({
providedIn: 'root',
})
export class CoaTableService extends TransmissionService {
constructor(
_http: HttpClient,
_httpErrorHandler: HttpErrorHandlerService,
_jwt: JWTService,
_errorHandler: ErrorHandlerService
) {
super(_http, _httpErrorHandler, _jwt, _errorHandler);
}
public getChartsOfAccount(
url: string,
onPreExecute: () => void,
onPostExecute: (response: any) => void,
onSuccess: (response: ScheduleOfRateTypes[]) => void,
onFailure: (error: string) => void,
onComplete: () => void
): void {
this.executeGetPayload<any, any>(
url,
onPreExecute,
onPostExecute,
onSuccess,
onFailure,
onComplete,
'data',
true
);
}
public getScheduleOfRates(
url: string,
onPreExecute: () => void,
onPostExecute: (response: ScheduleOfRates[]) => void,
onSuccess: (response: ScheduleOfRates[]) => void,
onFailure: (error: string) => void,
onComplete: () => void
): void {
this.executeGetPayload<ScheduleOfRatesResponse, ScheduleOfRates[]>(
url,
onPreExecute,
onPostExecute,
onSuccess,
onFailure,
onComplete,
'data',
true
);
}
public postScheduleOfRatesAdd(
url: string,
payload: ScheduleOfRates,
onPreExecute: () => void,
onPostExecute: (response: RaintreeResponse) => void,
onSuccess: (response: RaintreeResponse) => void,
onFailure: (error: string) => void,
onComplete: () => void
) {
this.executePostPayload(
url,
payload,
onPreExecute,
onPostExecute,
onSuccess,
onFailure,
onComplete,
true
);
}
}
import { Injectable } from '@angular/core';
import { TransmissionService } from './transmission.service';
import { RaintreeResponse } from '../interface/raintree-response';
@Injectable({
providedIn: 'root'
......@@ -9,8 +10,8 @@ export class RoutineTransmissionService extends TransmissionService{
public getRoutine(
url: string,
onPreExecute: () => void,
onPostExecute: (response: any) => void,
onSuccess: (response: any) => void,
onPostExecute: (response: RaintreeResponse) => void,
onSuccess: (response: RaintreeResponse) => void,
onFailure: (error: string) => void,
onComplete: () => void
): void {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment