Fix show reports

Author: jbarcia2019

angular/wallypop/.idea/workspace.xml

@@ -1,6 +1,6 @@
 <!-- ====== Page content ======-->
 <!-- {{>nav_side}} -->
-<section class="full-width section">
+<section class="full-width section" *ngIf="loginService.isAdmin()">
     <div class="container">
         <div class="row">
             <div class="col-xs-12 col-sm-4 col-md-3">
@@ -98,4 +98,4 @@
             </div>
         </div>
     </div>
-</section>
+</section>

angular/wallypop/src/app/components/report/reports.component.html

@@ -9,7 +9,7 @@ <h2 class="text-center text-light">INCIDENCIA</h2>
                     <a class="btn btn-info" href="/reports">&lt;</a>
                     <br>
                     <!-- {{#report}} -->
-                    <h3 class="text-info">{{report.id_REPORT}}</h3>
+                    <h3 class="text-info">ID Report: {{report.id_REPORT}}</h3>
                     <div class="form-group">
                         <label class="col-sm-3 control-label">Email</label>
                         <label class="col-sm-7">
@@ -19,7 +19,7 @@ <h3 class="text-info">{{report.id_REPORT}}</h3>
                     <div class="form-group">
                         <label class="col-sm-3 control-label">Articlo Denunciado</label>
                         <label class="col-sm-7">
-                            <a class="form-control" >Pulsa para acceder
+                            <a href="/post/{{report.article.id_ARTICLE}}" class="form-control" >Pulsa para acceder
                                 al articulo denunciado</a> <!--onclick="location.href='/showPost/{{ID_REPORT}}'"-->
                         </label>
                     </div>

angular/wallypop/src/app/components/report/showReport.component.html

@@ -10,30 +10,32 @@ import { Report } from 'src/app/models/report.model';
 export class ShowReportComponent implements OnInit{
   report:Report;
 
-  constructor(private reportService: ReportService,private activatedRoute: ActivatedRoute,private router: Router) {
+  constructor(private reportService: ReportService, private activatedRoute: ActivatedRoute, private router: Router) {
    }
 
   ngOnInit(): void {
-    const id = this.activatedRoute.snapshot.params['id'];
+    const id = this.activatedRoute.snapshot.params.id;
     this.reportService.getReport(id).subscribe(
         report => this.report = report,
         error => console.error(error)
-    );    
-  console.log(this.report);
+    );
+    console.log(this.report);
   }
 
-  rejectReport() {
+  rejectReport(): void {
         this.reportService.deleteReport(this.report).subscribe(
             _ => this.router.navigate(['/reports']),
             error => console.error(error)
         );
+        this.router.navigate(['reports']);
     }
 
-    aceptReport() {
-      this.reportService.aceptReport(this.report).subscribe(
+    aceptReport(): void {
+        this.reportService.aceptReport(this.report).subscribe(
           _ => this.router.navigate(['/reports']),
           error => console.error(error)
-      );
+        );
+        this.router.navigate(['reports']);
   }
 
    downloadProof() {
@@ -42,4 +44,4 @@ export class ShowReportComponent implements OnInit{
      );
   }
 
-}
+}

angular/wallypop/src/app/components/report/showReport.component.ts

@@ -13,7 +13,6 @@ const BASE_URL = '/api/';
 export class ReportService {
     constructor(private httpClient: HttpClient, private router: Router) {}
 
-
 	getReports(): Observable<Report[]> {
 		return this.httpClient.get(BASE_URL+"admin/reports").pipe(
 			catchError(error => this.handleError(error))
@@ -27,17 +26,15 @@ export class ReportService {
 	}
 
 	deleteReport(report: Report) {
-		this.httpClient.delete(BASE_URL +"admin/reports/"+report.id_REPORT+"/rejectReport").pipe(
+		return this.httpClient.delete(BASE_URL +"admin/reports/"+report.id_REPORT+"/rejectReport").pipe(
 			catchError(error => this.handleError(error))
 		);
-		this.router.navigate(['reports']);
 	}
 
 	aceptReport(report: Report) {
-		this.httpClient.delete(BASE_URL +"admin/reports/"+report.id_REPORT+"/aceptReport").pipe(
+		return this.httpClient.delete(BASE_URL +"admin/reports/"+report.id_REPORT+"/aceptReport").pipe(
 			catchError(error => this.handleError(error))
 		);
-		this.router.navigate(['reports']);
 	}
 
 	proof(report: Report) {
@@ -47,30 +44,30 @@ export class ReportService {
 	}
 
 
-	addReport(email:string,description:string,id:number) {        
-			this.httpClient.post(BASE_URL + "reports/"+id, {email,description})
-            .subscribe(
-                (response) => this.router.navigate(['post/'+id]),
-                (error) => alert('Ha ocurrido un error en el reporte')
-            );
-		
+	addReport(email:string,description:string,id:number) {
+		this.httpClient.post(BASE_URL + "reports/"+id, {email,description})
+			.subscribe(
+				(response) => this.router.navigate(['post/'+id]),
+				(error) => alert('Ha ocurrido un error en el reporte')
+			);
+
 	}
-	
+
 	createForm(article:Article){
-			return this.httpClient.post(BASE_URL + "reports/" +article.id_ARTICLE,article);	
+		return this.httpClient.post(BASE_URL + "reports/" +article.id_ARTICLE,article);
 	}
-    
+
 	setReportProof(report: Report, formData: FormData) {
 		return this.httpClient.post(BASE_URL +'reports/'+ report.id_REPORT + '/proof', formData)
 			.pipe(
 				catchError(error => this.handleError(error))
 			);
-	}	
+	}
 
 	private handleError(error: any): Observable<never> {
-        console.log('ERROR:');
-        console.error(error);
-        return throwError('Server error (' + error.status + '): ' + error.text());
-    }
+		console.log('ERROR:');
+		console.error(error);
+		return throwError('Server error (' + error.status + '): ' + error.text());
+	}
 }