Commit 84e72ce4 authored by Arko Dey Bhowmick's avatar Arko Dey Bhowmick

fix: export interface issue in exam module

parent e9839860
...@@ -10,6 +10,8 @@ import { UrlConfigService } from '../../service/url-config.service'; ...@@ -10,6 +10,8 @@ import { UrlConfigService } from '../../service/url-config.service';
import { DataSourceService } from '../../service/data-source.service'; import { DataSourceService } from '../../service/data-source.service';
import { ExamScheduleResponse } from '../../../raintree/interface/exam-schedule-respons'; import { ExamScheduleResponse } from '../../../raintree/interface/exam-schedule-respons';
import { PrepareExamTableDataService } from '../service/prepare-exam-table-data.service'; import { PrepareExamTableDataService } from '../service/prepare-exam-table-data.service';
import { ExamSchedules, ExamSchedulesResponse } from '../interface/exam-schedule';
import { RaintreeResponse } from '../../../raintree/interface/raintree-response';
@Component({ @Component({
selector: 'app-exam', selector: 'app-exam',
...@@ -34,40 +36,49 @@ export class ExamComponent { ...@@ -34,40 +36,49 @@ export class ExamComponent {
public data: any = []; public data: any = [];
ngOnInit(): void{ ngOnInit(): void {
this.columns = this._prepareExamTableData.prepareMatTableColumn(); this.columns = this._prepareExamTableData.prepareMatTableColumn();
this._getExamSchedule(); this._getExamSchedule();
} }
public emitViewFromTable(emitData: any) { public emitViewFromTable(emitData: any) {
let docLink = emitData.image.replace('BASE_URL', TransmissionMapperService.DEV_TRANSMISSION_URL); let docLink = emitData.image.replace('BASE_URL', TransmissionMapperService.DEV_TRANSMISSION_URL);
window.open(docLink, '_blank'); window.open(docLink, '_blank');
} }
public emitEditFromTable(emitData: string): void { private matModalConfig = {
let dialogRef = this._dialog.open(ManageComponent, {
data: emitData,
width: '98vw', width: '98vw',
height: 'auto', height: 'auto',
maxWidth: '70vw', maxWidth: '70vw',
maxHeight: '70vh', maxHeight: '70vh',
}
public emitEditFromTable(emitData: string): void {
this._dialog.open(ManageComponent, {
data: emitData,
...this.matModalConfig
}); });
} }
public addExam(): void { public addExam(): void {
let dialogRef = this._dialog.open(ManageComponent, {
this._dialog.open(ManageComponent, {
data: '', data: '',
width: '98vw', ...this.matModalConfig
height: 'auto',
maxWidth: '70vw',
maxHeight: '70vh',
}); });
} }
private _getExamSchedule(): void { private _getExamSchedule(): void {
this._examSchedule.getExamSchedule( this._examSchedule.getExamSchedule(
TransmissionMapperService.GET_TRANSMISSION_URL + this._urlConfig.generateDatasourceConfigUrl({ TransmissionMapperService.GET_TRANSMISSION_URL + this._urlConfig.generateDatasourceConfigUrl({
aggregationOnUniqueFld: false, aggregationOnUniqueFld: false,
datasourceId: DataSourceService.EXAM_SCHEDULE_DATA_SOURCE_ID, datasourceId: DataSourceService.EXAM_SCHEDULE_DATA_SOURCE_ID,
dontIncludeForeignKey: false, dontIncludeForeignKey: false,
...@@ -81,9 +92,9 @@ export class ExamComponent { ...@@ -81,9 +92,9 @@ export class ExamComponent {
}), }),
() => { }, () => { },
(response) => { }, (response) => { },
(response: ExamScheduleResponse) => { (response: RaintreeResponse) => {
this.data = this._prepareExamTableData.prepareMatTableData(response.data.themeDataSourceFields); this.data = this._prepareExamTableData.prepareMatTableData(response['data'].themeDataSourceFields);
}, },
(error) => { (error) => {
console.log(error); console.log(error);
......
import { RaintreeResponse } from "../../../raintree/interface/raintree-response";
import { Data } from "../../data-source/interface/data"; import { Data } from "../../data-source/interface/data";
import { LocalizedField } from "../../data-source/interface/localizedField"; import { LocalizedField } from "../../data-source/interface/localizedField";
// ThemeDataSourceField Interface // ThemeDataSourceField Interface
export interface ExamSchedulesResponse extends RaintreeResponse {
data: ExamSchedules
}
export interface ExamSchedules extends Data { export interface ExamSchedules extends Data {
themeDataSourceFields: ExamSchedule[]; themeDataSourceFields: ExamSchedule[];
} }
......
...@@ -26,6 +26,7 @@ import { RoutineTransmissionService } from "../../../raintree/transmission/routi ...@@ -26,6 +26,7 @@ import { RoutineTransmissionService } from "../../../raintree/transmission/routi
import { AuthService } from "../../../auth/service/auth.service"; import { AuthService } from "../../../auth/service/auth.service";
import { RaintreeResponse } from "../../../raintree/interface/raintree-response"; import { RaintreeResponse } from "../../../raintree/interface/raintree-response";
import { Routines } from "../interface/routine"; import { Routines } from "../interface/routine";
import { ForeignKeyMap } from "../../data-source/interface/foreignKeyMap";
@Component({ @Component({
selector: "app-manage", selector: "app-manage",
...@@ -72,7 +73,10 @@ export class ManageComponent { ...@@ -72,7 +73,10 @@ export class ManageComponent {
public submitRoutine(): void { public submitRoutine(): void {
// alert("Submit Clicked!!"); // alert("Submit Clicked!!");
console.log(this.routineFormPayload); // console.log(this.routineFormPayload);
console.log(
this.routineForm.value
)
// this._routineTransmission.submitRoutine( // this._routineTransmission.submitRoutine(
...@@ -249,5 +253,14 @@ export class ManageComponent { ...@@ -249,5 +253,14 @@ export class ManageComponent {
}, },
}, },
], ],
count:10,
websiteId: 1,
foreignKeyMapping: {},
foreignKeyMap: {} as ForeignKeyMap,
requiredPresentationField: "",
favourite: true,
icon: "",
dependentFields: {},
dsType: {}
}; };
} }
...@@ -15,9 +15,9 @@ export class PrepareRoutineTableDataService { ...@@ -15,9 +15,9 @@ export class PrepareRoutineTableDataService {
return { return {
['id']: routine.id, ['id']: routine.id,
['session_session_name']: routine.session_session_name['en'], ['session_session_name']: routine.session_session_name?['en']:'',
['class_details']: routine.class_details['en'], ['class_details']: routine.class_details?['en']:'',
['section_details']: routine.section_details['en'], ['section_details']: routine.section_details?['en']:'',
['schedule']: routine.schedule['en'], ['schedule']: routine.schedule['en'],
['action']: ['view', 'edit'] ['action']: ['view', 'edit']
} }
......
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { TransmissionService } from './transmission.service'; import { TransmissionService } from './transmission.service';
import { ExamScheduleResponse } from '../interface/exam-schedule-respons';
import { ExamSchedules } from '../../portal/exam/interface/exam-schedule';
import { RaintreeResponse } from '../interface/raintree-response';
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
...@@ -9,8 +12,8 @@ export class ExamScheduleService extends TransmissionService { ...@@ -9,8 +12,8 @@ export class ExamScheduleService extends TransmissionService {
public getExamSchedule( public getExamSchedule(
url: string, url: string,
onPreExecute: () => void, onPreExecute: () => void,
onPostExecute: (response: any) => void, onPostExecute: (response: RaintreeResponse) => void,
onSuccess: (response: any) => void, onSuccess: (response: RaintreeResponse) => void,
onFailure: (error: string) => void, onFailure: (error: string) => void,
onComplete: () => void onComplete: () => void
): 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