diff --git a/src/app/beforeConnexion/login/page-login/page-login.component.ts b/src/app/beforeConnexion/login/page-login/page-login.component.ts
index 86005af..f80cfe3 100644
--- a/src/app/beforeConnexion/login/page-login/page-login.component.ts
+++ b/src/app/beforeConnexion/login/page-login/page-login.component.ts
@@ -52,8 +52,8 @@ export class PageLoginComponent implements OnInit
onSeConnecterCallback(retour): void
{
- console.log(retour);
if(retour.status !== "success") {
+ console.log(retour);
this.errorMessage = retour.error.reason;
this.hasError = true;
}
diff --git a/src/app/user/myPlaylists/page-my-playlists/page-my-playlists.component.ts b/src/app/user/myPlaylists/page-my-playlists/page-my-playlists.component.ts
index 0fe8f36..6f76196 100644
--- a/src/app/user/myPlaylists/page-my-playlists/page-my-playlists.component.ts
+++ b/src/app/user/myPlaylists/page-my-playlists/page-my-playlists.component.ts
@@ -46,16 +46,22 @@ export class PageMyPlaylistsComponent implements OnInit
transmitPlaylistToVideoList(playlist): void
{
- this.messageService
- .get("playlist/findOne/"+playlist.id)
- .subscribe(ret => this.afterReceivingPlaylistWithVideo(ret), err => this.afterReceivingPlaylistWithVideo(err));
+ if ((playlist === null) || (playlist === undefined)) {
+ this.playlist = playlist;
+ }
+ else {
+ this.messageService
+ .get("playlist/findOne/" + playlist.id)
+ .subscribe(ret => this.afterReceivingPlaylistWithVideo(ret, playlist), err => this.afterReceivingPlaylistWithVideo(err, playlist));
+ }
}
- afterReceivingPlaylistWithVideo(retour: any): void
+ afterReceivingPlaylistWithVideo(retour: any, playlist): void
{
if(retour.status !== "success") {
console.log(retour);
+ this.playlist = playlist;
}
else {
this.playlist = retour.data;
diff --git a/src/app/user/search/page-search/page-search.component.ts b/src/app/user/search/page-search/page-search.component.ts
index 0005371..3e0ba18 100644
--- a/src/app/user/search/page-search/page-search.component.ts
+++ b/src/app/user/search/page-search/page-search.component.ts
@@ -65,7 +65,6 @@ export class PageSearchComponent implements OnInit
else if((!this.tabPlateform[0].isSelected) && this.tabPlateform[1].isSelected) sources += "dm" ;
else if(this.tabPlateform[0].isSelected && (!this.tabPlateform[1].isSelected)) sources += "yt" ;
else sources += "" ;
- console.log(sources);
params = params.append('sources', sources);
this.messageService
diff --git a/src/app/user/utils/components/popup-add-video-to-playlists/popup-add-video-to-playlists.component.html b/src/app/user/utils/components/popup-add-video-to-playlists/popup-add-video-to-playlists.component.html
index f103ce9..115b281 100644
--- a/src/app/user/utils/components/popup-add-video-to-playlists/popup-add-video-to-playlists.component.html
+++ b/src/app/user/utils/components/popup-add-video-to-playlists/popup-add-video-to-playlists.component.html
@@ -35,7 +35,8 @@
+ {{errorMessage}}
-
-
+
+
diff --git a/src/app/user/utils/components/popup-add-video-to-playlists/popup-add-video-to-playlists.component.ts b/src/app/user/utils/components/popup-add-video-to-playlists/popup-add-video-to-playlists.component.ts
index 3b158cd..6a2d58d 100644
--- a/src/app/user/utils/components/popup-add-video-to-playlists/popup-add-video-to-playlists.component.ts
+++ b/src/app/user/utils/components/popup-add-video-to-playlists/popup-add-video-to-playlists.component.ts
@@ -20,6 +20,9 @@ export class PopupAddVideoToPlaylistsComponent implements OnInit
goToCreatePlaylist = false;
newPlaylistName = "";
+ hasError: boolean = false;
+ tabNomPlaylist: string[] = [];
+ errorMessage: string = "" ;
constructor( public dialogRef: MatDialogRef,
@@ -34,83 +37,69 @@ export class PopupAddVideoToPlaylistsComponent implements OnInit
this.source = this.data.source;
this.interest = this.data.interest;
- console.log("_id: " + this._idVideo);
- console.log("videoId: " + this.videoId);
- console.log("source: " + this.source);
- console.log("interest: " + this.interest);
-
for(let playlist of this.data.playlists)
{
if(playlist.videoIds.includes(this._idVideo)) playlist["isSelected"] = true;
else playlist["isSelected"] = false;
this.tabPlaylistAndBool.push(playlist);
+ this.tabNomPlaylist.push(playlist.name);
}
}
-
onValider(): void
{
- // --- Existing playlists ---
- let listeDesPlaylistsSelected = "" ;
- let listeDesPlaylistsNotSelected = "" ;
- for(let playlist of this.tabPlaylistAndBool)
+ this.checkError();
+ if(!this.hasError)
{
- if(playlist.isSelected) listeDesPlaylistsSelected += playlist.id + "," ;
- else listeDesPlaylistsNotSelected += playlist.id + "," ;
- }
- if(listeDesPlaylistsSelected.endsWith(",")) listeDesPlaylistsSelected = listeDesPlaylistsSelected.slice(0, listeDesPlaylistsSelected.length-1);
- if(listeDesPlaylistsNotSelected.endsWith(",")) listeDesPlaylistsNotSelected = listeDesPlaylistsNotSelected.slice(0, listeDesPlaylistsNotSelected.length-1);
+ // --- Existing playlists ---
+ let listeDesPlaylistsSelected = "" ;
+ let listeDesPlaylistsNotSelected = "" ;
+ for(let playlist of this.tabPlaylistAndBool)
+ {
+ if(playlist.isSelected) listeDesPlaylistsSelected += playlist.id + "," ;
+ else listeDesPlaylistsNotSelected += playlist.id + "," ;
+ }
+ if(listeDesPlaylistsSelected.endsWith(",")) listeDesPlaylistsSelected = listeDesPlaylistsSelected.slice(0, listeDesPlaylistsSelected.length-1);
+ if(listeDesPlaylistsNotSelected.endsWith(",")) listeDesPlaylistsNotSelected = listeDesPlaylistsNotSelected.slice(0, listeDesPlaylistsNotSelected.length-1);
- if(listeDesPlaylistsSelected !== "")
- {
- const data1 = { videoId: { id: this._idVideo, action: "add" } };
- this.messageService
- .put( "playlist/update/"+listeDesPlaylistsSelected, data1)
- .subscribe( ret => this.callbackForExistingPlaylists(ret), err => this.callbackForExistingPlaylists(err));
- }
- if(listeDesPlaylistsNotSelected !== "")
- {
- const data2 = { videoId: { id: this._idVideo, action: "delete" } };
- this.messageService
- .put( "playlist/update/"+listeDesPlaylistsNotSelected, data2)
- .subscribe( ret => this.callbackForExistingPlaylists(ret), err => this.callbackForExistingPlaylists(err));
- }
+ if(listeDesPlaylistsSelected !== "")
+ {
+ const data1 = { videoId: { id: this._idVideo, action: "add" } };
+ this.messageService
+ .put( "playlist/update/"+listeDesPlaylistsSelected, data1)
+ .subscribe( ret => this.callbackForExistingPlaylists(ret), err => this.callbackForExistingPlaylists(err));
+ }
+ if(listeDesPlaylistsNotSelected !== "")
+ {
+ const data2 = { videoId: { id: this._idVideo, action: "delete" } };
+ this.messageService
+ .put( "playlist/update/"+listeDesPlaylistsNotSelected, data2)
+ .subscribe( ret => this.callbackForExistingPlaylists(ret), err => this.callbackForExistingPlaylists(err));
+ }
- // --- New playlists ---
- if(this.goToCreatePlaylist)
- {
- const data3 = {
- name: this.newPlaylistName,
- video: {videoId: this.videoId, interest: this.interest, source: this.source}
- };
- this.messageService
- .post("playlist/create", data3)
- .subscribe( ret => this.callbackForNewPlaylist(ret), err => this.callbackForNewPlaylist(err));
+ // --- New playlists ---
+ if(this.goToCreatePlaylist)
+ {
+ const data3 = {
+ name: this.newPlaylistName,
+ video: {videoId: this.videoId, interest: this.interest, source: this.source}
+ };
+ this.messageService
+ .post("playlist/create", data3)
+ .subscribe( ret => this.callbackForNewPlaylist(ret), err => this.callbackForNewPlaylist(err));
+ }
+
+
+ // --- Finalement ---
+ this.dialogRef.close("success");
}
}
-
callbackForExistingPlaylists(retour: any): void
{
- console.log("onValiderCallback");
- console.log(retour);
-
- if(retour.status !== "success") {
- //console.log(retour);
- this.dialogRef.close(null);
- }
- }
-
-
-
- callbackForNewPlaylist(retour: any): void
- {
- console.log("callbackForNewPlaylist");
- console.log(retour);
-
if(retour.status !== "success") {
console.log(retour);
this.dialogRef.close(null);
@@ -118,10 +107,35 @@ export class PopupAddVideoToPlaylistsComponent implements OnInit
}
+ callbackForNewPlaylist(retour: any): void
+ {
+ if(retour.status !== "success") {
+ console.log(retour);
+ this.dialogRef.close(null);
+ }
+ }
+
onAnnuler(): void
{
this.dialogRef.close("annulation");
}
+
+ checkError(): void
+ {
+ if(this.goToCreatePlaylist && (this.newPlaylistName === "")) {
+ this.errorMessage = "Le nom ne peut pas être vide" ;
+ this.hasError = true;
+ }
+ else if(this.goToCreatePlaylist && this.tabNomPlaylist.includes(this.newPlaylistName)){
+ this.errorMessage = "Ce nom est déjà utilisé" ;
+ this.hasError = true;
+ }
+ else {
+ this.hasError = false;
+ this.errorMessage = "" ;
+ }
+ }
+
}
diff --git a/src/app/user/utils/services/addVideoToPlaylists/add-video-to-playlists.service.ts b/src/app/user/utils/services/addVideoToPlaylists/add-video-to-playlists.service.ts
index 33b8aa6..50a5606 100644
--- a/src/app/user/utils/services/addVideoToPlaylists/add-video-to-playlists.service.ts
+++ b/src/app/user/utils/services/addVideoToPlaylists/add-video-to-playlists.service.ts
@@ -4,7 +4,6 @@ import {MatDialog} from "@angular/material/dialog";
import {PopupAddVideoToPlaylistsComponent} from "../../components/popup-add-video-to-playlists/popup-add-video-to-playlists.component";
import {MatSnackBar} from "@angular/material/snack-bar";
import {FictitiousVideosService} from "../../../../utils/services/fictitiousDatas/fictitiousVideos/fictitious-videos.service";
-import {HttpParams} from "@angular/common/http";
@@ -40,11 +39,8 @@ export class AddVideoToPlaylistsService
private afterCreatingVideo(retour: any): void
{
- console.log("afterCreatingVideo");
- console.log(retour);
-
if(retour.status !== "success") {
- //console.log(retour);
+ console.log(retour);
}
else {
this._idVideo = retour.data.id;
@@ -58,11 +54,8 @@ export class AddVideoToPlaylistsService
private afterReceivingPlaylists(retour: any): void
{
- console.log("afterReceivingPlaylists");
- console.log(retour);
-
if(retour.status !== "success") {
- //console.log(retour);
+ console.log(retour);
}
else
{