From 3c98b6f4bb43def6eacdde6eff2993fe437ab2cf Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Fri, 1 Apr 2022 22:22:33 +0200 Subject: [PATCH] [DEBUG] Correct interface --- front/src/app/scene/season/season.html | 2 +- front/src/app/scene/type/type.ts | 8 +++++-- front/src/app/scene/video/video.ts | 6 +++--- front/src/app/service/season.ts | 6 +++--- front/src/app/service/type.ts | 30 +++++++++++++------------- 5 files changed, 28 insertions(+), 24 deletions(-) diff --git a/front/src/app/scene/season/season.html b/front/src/app/scene/season/season.html index 8300055..43ce951 100644 --- a/front/src/app/scene/season/season.html +++ b/front/src/app/scene/season/season.html @@ -22,7 +22,7 @@
Videos:
Video:
- +
diff --git a/front/src/app/scene/type/type.ts b/front/src/app/scene/type/type.ts index 3da5fa3..f146df3 100644 --- a/front/src/app/scene/type/type.ts +++ b/front/src/app/scene/type/type.ts @@ -44,12 +44,12 @@ export class TypeScene implements OnInit { this.arianeService.updateManual(this.route.snapshot.paramMap); this.typeId = this.arianeService.getTypeId(); let self = this; - console.log(`get parameter id: ${ this.typeId}`); + console.log(`get type global id: ${ this.typeId}`); this.typeService.get(this.typeId) .then((response) => { self.name = response.name; self.description = response.description; - + console.log(` ==> get answer type detail: ${JSON.stringify(response)}`); if(response.covers === undefined || response.covers === null || response.covers.length === 0) { self.cover = null; self.covers = []; @@ -67,17 +67,21 @@ export class TypeScene implements OnInit { }); this.typeService.getSubSeries(this.typeId, [ 'id', 'name' ]) .then((response) => { + console.log(` ==> get answer sub-series: ${JSON.stringify(response)}`); self.seriessError = ''; self.seriess = response; }).catch((response) => { + console.log(` ==> get answer sub-series (ERROR): ${JSON.stringify(response)}`); self.seriessError = 'Wrong e-mail/login or password'; self.seriess = []; }); this.typeService.getSubVideo(this.typeId, [ 'id', 'name' ]) .then((response) => { + console.log(` ==> get answer sub-video: ${JSON.stringify(response)}`); self.videosError = ''; self.videos = response; }).catch((response) => { + console.log(` ==> get answer sub-video (ERROR): ${JSON.stringify(response)}`); self.videosError = 'Wrong e-mail/login or password'; self.videos = []; }); diff --git a/front/src/app/scene/video/video.ts b/front/src/app/scene/video/video.ts index 293b252..53eecef 100644 --- a/front/src/app/scene/video/video.ts +++ b/front/src/app/scene/video/video.ts @@ -22,21 +22,21 @@ export class VideoScene implements OnInit { videoGlobal:any; @ViewChild('globalVideoElement') set mainDivEl(el: ElementRef) { - if(el !== null) { + if(el !== null && el !== undefined) { this.videoGlobal = el.nativeElement; } } videoPlayer: HTMLVideoElement; @ViewChild('videoPlayer') set mainVideoEl(el: ElementRef) { - if(el !== null) { + if(el !== null && el !== undefined) { this.videoPlayer = el.nativeElement; } } videoCanva: any; @ViewChild('canvascreenshoot') set mainCanvaEl(el: ElementRef) { - if(el !== null) { + if(el !== null && el !== undefined) { this.videoCanva = el.nativeElement; } } diff --git a/front/src/app/service/season.ts b/front/src/app/service/season.ts index 794185a..19fc873 100644 --- a/front/src/app/service/season.ts +++ b/front/src/app/service/season.ts @@ -43,7 +43,7 @@ export class SeasonService { self.bdd.getVideo() .then((response) => { // let data = response.getsWhere([["==", "seasonId", id]], ["id", "name", "episode"], ["episode", "name"]) - let data = response.gets_where([ [ '==', 'season_id', id ] ], undefined, [ 'episode', 'name' ]); + let data = response.getsWhere([ [ '==', 'seasonId', id ] ], undefined, [ 'episode', 'name' ]); resolve(data); }).catch((response) => { reject(response); @@ -61,8 +61,8 @@ export class SeasonService { return new Promise((resolve, reject) => { self.bdd.getVideo() .then((response) => { - // let data = response.gets_where([["==", "seasonId", _id]], ["id", "name", "episode"], ["episode", "name"]) - let data = response.gets_where([ [ '==', 'seasonId', id ] ], undefined, [ 'episode', 'name' ]); + // let data = response.getsWhere([["==", "seasonId", _id]], ["id", "name", "episode"], ["episode", "name"]) + let data = response.getsWhere([ [ '==', 'seasonId', id ] ], undefined, [ 'episode', 'name' ]); resolve(data.length); }).catch((response) => { reject(response); diff --git a/front/src/app/service/type.ts b/front/src/app/service/type.ts index 8ffbade..c1eb4e2 100644 --- a/front/src/app/service/type.ts +++ b/front/src/app/service/type.ts @@ -60,7 +60,7 @@ export class TypeService { return new Promise((resolve, reject) => { self.bdd.getVideo() .then((response) => { - let data = response.gets_where([ [ '==', 'typeId', _id ] ], undefined, undefined); + let data = response.getsWhere([ [ '==', 'typeId', _id ] ], undefined, undefined); resolve(data.length); }).catch((response) => { reject(response); @@ -74,16 +74,16 @@ export class TypeService { self.bdd.getVideo() .then((response) => { if(_select.length === 0) { - let data = response.gets_where([ [ '==', 'typeId', _id ], [ '==', 'seriesId', null ], [ '==', 'universeId', null ] ], undefined, [ 'name' ]); + let data = response.getsWhere([ [ '==', 'typeId', _id ], [ '==', 'seriesId', null ], [ '==', 'universeId', null ] ], undefined, [ 'name' ]); resolve(data); return; } if(_select[0] === '*') { - let data = response.gets_where([ [ '==', 'typeId', _id ], [ '==', 'seriesId', null ], [ '==', 'universeId', null ] ], undefined, [ 'name' ]); + let data = response.getsWhere([ [ '==', 'typeId', _id ], [ '==', 'seriesId', null ], [ '==', 'universeId', null ] ], undefined, [ 'name' ]); resolve(data); return; } - let data = response.gets_where([ [ '==', 'typeId', _id ], [ '==', 'seriesId', null ], [ '==', 'universeId', null ] ], _select, [ 'name' ]); + let data = response.getsWhere([ [ '==', 'typeId', _id ], [ '==', 'seriesId', null ], [ '==', 'universeId', null ] ], _select, [ 'name' ]); resolve(data); return; }).catch((response) => { @@ -92,14 +92,14 @@ export class TypeService { }); } - getSubSeries(_id:number, _select:Array = []):any { + getSubSeries(id:number, select:string[] = []):any { let self = this; /* return new Promise((resolve, reject) => { self.bdd.getVideo() .then(function(response) { - let data = response.gets_where([["==", "typeId", _id], ["!=", "seriesId", null], ["==", "universeId", null]], ["seriesId"], ["name"]); + let data = response.getsWhere([["==", "typeId", _id], ["!=", "seriesId", null], ["==", "universeId", null]], ["seriesId"], ["name"]); if (_select.length == 0) { resolve(data); return; @@ -107,11 +107,11 @@ export class TypeService { self.bdd.getSeries() .then(function(response2) { if (_select[0] == "*") { - let data2 = response2.gets_where([["==", "id", data]], undefined, ["name"]); + let data2 = response2.getsWhere([["==", "id", data]], undefined, ["name"]); resolve(data2); return; } - let data3 = response2.gets_where([["==", "id", data]], _select, ["name"]); + let data3 = response2.getsWhere([["==", "id", data]], _select, ["name"]); resolve(data3); return; }).catch(function(response2) { @@ -125,7 +125,7 @@ export class TypeService { return new Promise((resolve, reject) => { self.bdd.getSeries() .then((response) => { - let data = response.gets_where([ [ '==', 'parentId', _id ] ], undefined, [ 'name' ]); + let data = response.getsWhere([ [ '==', 'parentId', id ] ], undefined, [ 'name' ]); resolve(data); }).catch((response) => { reject(response); @@ -133,24 +133,24 @@ export class TypeService { }); } - getSubUniverse(_id:number, _select:Array = []):any { + getSubUniverse(id:number, select:string[] = []):any { let self = this; return new Promise((resolve, reject) => { self.bdd.getVideo() .then((response) => { - let data = response.data.gets_where([ [ '==', 'typeId', _id ], [ '==', 'seriesId', null ], [ '==', 'universeId', null ] ], [ 'universId' ], [ 'name' ]); - if(_select.length === 0) { + let data = response.data.getsWhere([ [ '==', 'typeId', id ], [ '==', 'seriesId', null ], [ '==', 'universeId', null ] ], [ 'universId' ], [ 'name' ]); + if(select.length === 0) { resolve(data); return; } self.bdd.getUniverse() .then((response2) => { - if(_select[0] === '*') { - let data2 = response2.gets_where([ [ '==', 'id', data ] ], undefined, [ 'name' ]); + if(select[0] === '*') { + let data2 = response2.getsWhere([ [ '==', 'id', data ] ], undefined, [ 'name' ]); resolve(data2); return; } - let data3 = response2.gets_where([ [ '==', 'id', data ] ], _select, [ 'name' ]); + let data3 = response2.getsWhere([ [ '==', 'id', data ] ], select, [ 'name' ]); resolve(data3); return; }).catch((response2) => {