connexion avec back des pages 'advertiser/manageAds' et 'admin/adList'

src/app/admin/adList/page-ad-list-admin/page-ad-list-admin.component.html

@@ -97,9 +97,9 @@
             <ng-container matColumnDef="interests">
                 <th mat-header-cell *matHeaderCellDef> Sujets </th>
                 <td mat-cell *matCellDef="let advert">
-                    <span *ngFor="let interest of advert.interests; let isLast = last;">
-                        <span *ngIf="!isLast"> {{interest}}, </span>
-                        <span *ngIf="isLast"> {{interest}} </span>
+                    <span *ngFor="let objectInterest of advert.interests; let isLast = last;">
+                        <span *ngIf="!isLast"> {{objectInterest.interest}}, </span>
+                        <span *ngIf="isLast"> {{objectInterest.interest}} </span>
                     </span>
                 </td>
             </ng-container>

src/app/admin/adList/page-ad-list-admin/page-ad-list-admin.component.ts

@@ -10,6 +10,7 @@ import {PopupDeleteAdAdminComponent} from "../popup-delete-ad-admin/popup-delete
 import {PopupVisualizeImagesAdminComponent} from "../popup-visualize-images-admin/popup-visualize-images-admin.component";
 import {FormControl} from "@angular/forms";
 import {MessageService} from "../../../utils/services/message/message.service";
+import {HttpParams} from "@angular/common/http";
 
 
 
@@ -66,8 +67,10 @@ export class PageAdListAdminComponent implements AfterViewInit
     ngAfterViewInit(): void
     {
         // Ask for ads and then for advertiser
+        let params = new HttpParams();
+        params = params.append("isActive", true);
         this.messageService
-            .get("ad/findAll")
+            .get("ad/findAll", params)
             .subscribe(ret => this.afterReceivingAds(ret), err => this.afterReceivingAds(err) );
 
         // Ask for interest
@@ -79,11 +82,8 @@ export class PageAdListAdminComponent implements AfterViewInit
 
     afterReceivingAds(retour: any): void
     {
-        console.log("afterReceivingAds");
-        console.log(retour);
-
         if(retour.status !== "success") {
-            //console.log(retour);
+            console.log(retour);
         }
         else {
             const tabAdvert = retour.data;
@@ -96,11 +96,8 @@ export class PageAdListAdminComponent implements AfterViewInit
 
     afterReceivingAdvertiser(retour: any, tabAdvert): void
     {
-        console.log("afterReceivingAdvertiser");
-        console.log(retour);
-
         if(retour.status !== "success") {
-            //console.log(retour);
+            console.log(retour);
         }
         else {
             this.tabAdvertiser = retour.data.filter(x => x.role.name === "advertiser");
@@ -113,14 +110,10 @@ export class PageAdListAdminComponent implements AfterViewInit
 
     afterReceivingInterests(retour: any): void
     {
-        console.log("afterReceivingInterests");
-        console.log(retour);
-
         if(retour.status !== "success") {
             console.log(retour);
         }
         else {
-            this.allInterests = [];
             this.allInterests = retour.data.map(x => x.interest);
             this.allInterests.sort();
         }
@@ -136,19 +129,27 @@ export class PageAdListAdminComponent implements AfterViewInit
 
     onVisualizeImages(advert: AdvertWithCountViewsAndCompany)
     {
-        const config = {
-            width: '30%',
-            height: '90%',
-            data: {
-                images: advert.images,
-                width: 300,
-                height: 800,
-            }
-        };
-        this.dialog
-            .open(PopupVisualizeImagesAdminComponent, config)
-            .afterClosed()
-            .subscribe(retour => {});
+        if(advert.images.length !== 0)
+        {
+            const config = {
+                width: '30%',
+                height: '90%',
+                data: {
+                    images: advert.images,
+                    width: 300,
+                    height: 800,
+                }
+            };
+            this.dialog
+                .open(PopupVisualizeImagesAdminComponent, config)
+                .afterClosed()
+                .subscribe(retour => {});
+        }
+        else {
+            const config = { duration: 2000, panelClass: "custom-class" };
+            const message = "Cette annonce ne contient aucune image" ;
+            this.snackBar.open( message, "", config);
+        }
     }
 
 

src/app/admin/adList/popup-delete-ad-admin/popup-delete-ad-admin.component.ts

@@ -29,7 +29,7 @@ export class PopupDeleteAdAdminComponent implements OnInit
     {
         this.messageService
             .delete("ad/delete/"+this.advert.id)
-            .subscribe(ret => this.onValidateCallback(ret), err => this.onValidateCallback(err) );
+            .subscribe(ret => this.onValidateCallback(ret), err => this.onValidateCallback(err));
     }
 
 
@@ -40,6 +40,8 @@ export class PopupDeleteAdAdminComponent implements OnInit
             this.dialogRef.close();
         }
         else {
+            console.log("suppr");
+            console.log(retour);
             this.dialogRef.close(true);
         }
     }