Changeset ee137aa for Farmatiko/ClientApp/src/app/admin

Timestamp:

08/07/20 10:59:56 (4 years ago)

Author:

Mile Jankuloski <mile.jankuloski@…>

Branches:

master

Children:

63d885e

Parents:

c73269d

Message:

Added DataService and dialogs, all bindings needed implemented

Location:

Farmatiko/ClientApp/src/app/admin

Files:

• admin.component.css (modified) (1 diff)
• admin.component.html (modified) (6 diffs)
• admin.component.ts (modified) (2 diffs)

Farmatiko/ClientApp/src/app/admin/admin.component.css

@@ -11 +11 @@
     width: 30vh;
 }
+
+h2 {
+    text-align: center;
+    padding: 50px;
+}

Farmatiko/ClientApp/src/app/admin/admin.component.html

@@ -22 +22 @@
         <div class="wrapper">
           <div>
-            <table class='table table-striped table-bordered table-sm' cellspacing="0" width="100%" aria-labelledby="tableLabel" *ngIf="true">
+            <table class='table table-striped table-bordered table-sm' cellspacing="0" width="100%" aria-labelledby="tableLabel" *ngIf="requests">
               <thead>
                 <tr>
@@ -31 +31 @@
               </thead>
               <tbody>
-                <tr *ngFor="let head of heads">
-                  <td>{{head.Name}} | {{head.Email}}</td>
-                  <td>{{head.Pharmacy[0].name}}</td>
-                  <td><a (click)="Approve()">Approve</a> | <a (click)="Reject()">Reject</a></td>
+                <tr *ngFor="let request of requests">
+                  <td>{{request.PharmacyHead.Name}} | {{request.PharmacyHead.Email}}</td>
+                  <td><a (click)="openPharmacyDialog(request.Pharmacy)">{{request.Pharmacy.name}}</a></td>
+                  <td><a (click)="approveRequest(request)">Approve</a> | <a (click)="rejectRequest(request)">Reject</a></td>
                 </tr>
               </tbody>
@@ -44 +44 @@
         <div class="wrapper">
           <div>
-            <table class='table table-striped table-bordered table-sm' cellspacing="0" width="100%" aria-labelledby="tableLabel" *ngIf="true">
+            <table class='table table-striped table-bordered table-sm' cellspacing="0" width="100%" aria-labelledby="tableLabel" *ngIf="heads">
               <thead>
                 <tr>
@@ -53 +53 @@
               <tbody>
                 <tr *ngFor="let head of heads">
-                  <td>{{head.Name}} | {{head.Email}}</td>
-                  <td><a (click)="Del(head)">Delete</a> | <a (click)="ChangeDialog(head)">Change</a></td>
+                  <td><a (click)="openPharmacyHeadDialog(head)">{{head.Name}}</a> | {{head.Email}}</td>
+                  <td><a (click)="deletePharmacyHead(head)">Delete</a> | <a (click)="openEditPharmacyHeadDialog(head)">Change</a></td>
                 </tr>
               </tbody>
@@ -62 +62 @@
       </mat-tab>
         <mat-tab label="Create new account">
-          <div class="createform">
+          <h2 *ngIf="!this.head">Loading form...</h2>
+          <div class="createform" *ngIf="this.head">
           <mat-form-field appearance="fill">
             <mat-label>Name</mat-label>
-            <input matInput [(ngModel)]="head.Name">
+            <input matInput [(ngModel)]="this.head.Name">
           </mat-form-field><br>
           <mat-form-field appearance="fill">
             <mat-label>Email</mat-label>
-            <input matInput [(ngModel)]="head.Email">
+            <input matInput [(ngModel)]="this.head.Email">
           </mat-form-field><br>
           <mat-form-field appearance="fill">
             <mat-label>Password</mat-label>
-            <input matInput [(ngModel)]="head.Passwd">
+            <input matInput [(ngModel)]="this.head.Passwd">
           </mat-form-field><br>
             <button onclick="createHead()" mat-raised-button color="primary">Create</button>
@@ -79 +80 @@
         </mat-tab>
 </mat-tab-group>
-
-<div class="status">{{status}}</div>

Farmatiko/ClientApp/src/app/admin/admin.component.ts

@@ -1 @@
-import { Component, OnInit, Inject, Output, EventEmitter } from '@angular/core';
-import { Pharmacy } from '../models/Pharmacy';
-import { HttpClient } from '@angular/common/http';
+import { Component, OnInit } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material/snack-bar';
-import { Router, RouterModule } from '@angular/router';
-import { PharmacyHead } from '../models/PharmacyHead';
-import { FormControl } from '@angular/forms';
+import { Router } from '@angular/router';
+import { IPharmacyHead, IPharmacyHeadRequest, IPharmacy } from '../shared/interfaces';
+import { DataService } from '../shared/data.service';
+import { EditPharmacyHeadDialogComponent } from '../dialogs/edit-pharmacy-head-dialog/edit-pharmacy-head-dialog.component';
+import { PharmacyDialogComponent } from '../dialogs/pharmacy-dialog/pharmacy-dialog.component';
+import { PharmacyHeadDialogComponent } from '../nav-menu/dialogs/pharmacy-head-dialog/pharmacy-head-dialog.component';
 
 
@@ -15 +16 @@
 })
 export class AdminComponent implements OnInit {
-  public heads: PharmacyHead[];
-  public head: PharmacyHead;
-  public status: string;
+  public heads: IPharmacyHead[] = [];
+  public requests: IPharmacyHeadRequest[] = [];
+  public head: IPharmacyHead;
 
-  constructor(http: HttpClient, @Inject('BASE_URL') baseUrl: string, private dialog: MatDialog, private _snackBar: MatSnackBar, private router: Router) {
-    http.get<PharmacyHead[]>(baseUrl + 'PharmacyHead/Get?').subscribe(result => {
-      this.heads = result;
-      console.log(this.heads);
-    }, error => console.error(error));
+  constructor(private dataService: DataService, private dialog: MatDialog, private snackBar: MatSnackBar, private router: Router) {
+
   }
 
   ngOnInit(): void {
-    this.head = new PharmacyHead();
+    this.dataService.getPharmacyHeads()
+        .subscribe((pHeads: IPharmacyHead[]) => {
+          this.heads = pHeads;
+        },
+        (err: any) => console.log(err),
+        () => console.log("PharmacyHead data retrieved"));
+
+    this.dataService.getClaimingRequests()
+    .subscribe((pRequests: IPharmacyHeadRequest[]) => {
+      this.requests = pRequests;
+    },
+    (err: any) => console.log(err),
+    () => console.log("PharmacyHead data retrieved"));
   }
 
   createHead() {
-    console.log(this.head);
-    // post request vo prodolzenie
-
-    this.status="Status bar createHead";
-    //window.location.reload();
+    this.dataService.insertPharmacyHead(this.head)
+        .subscribe((cHead: IPharmacyHead) => {
+          if(cHead) {
+            this.heads.push(cHead);
+            this.openSnackBar("New head created!","OK");
+          }
+        },
+        (err: any) => console.log(err),
+        () => console.log("PharmacyHead inserted"));
+    this.head = null;
   }
 
-  Del(head: PharmacyHead) {
-    console.log(this.head);
-    // post request vo prodolzenie
-
-    this.status="Status bar Del";
+  deletePharmacyHead(dHead: IPharmacyHead) {
+    this.dataService.deletePharmacyHead(dHead.id)
+        .subscribe((status: boolean) => {
+          if(status) {
+            this.openSnackBar("Head deleted!","OK");
+          }
+        },
+        (err: any) => console.log(err),
+        () => console.log("PharmacyHead deleted"));
   }
 
-  ChangeDialog(head: PharmacyHead) {
-    console.log(this.head);
-
+  openEditPharmacyHeadDialog(eHead: IPharmacyHead) {
+    let dialogRef = this.dialog.open(EditPharmacyHeadDialogComponent, {
+      width: '450px',
+      data: eHead
+    });
+    dialogRef.afterClosed().subscribe((editedHead: IPharmacyHead) => {
+      if(editedHead){
+        this.heads = this.heads.filter(x => x !== eHead);
+        this.heads.push(editedHead);
+        this.dataService.updatePharmacyHead(editedHead)
+            .subscribe((hd: IPharmacyHead) => {
+              if(hd) {
+                this.openSnackBar("Success! PharmacyHead edited", "OK").onAction().subscribe(() => {
+                  window.location.reload();
+                });
+              }
+              else {
+                this.openSnackBar("PharmacyHead edit failed", "Try again");
+              }
+            },
+            (err: any) => console.log(err),
+            () => console.log('PharmacyHead data updated'));
+      }
+    });
   }
 
-  Reject() {
-    console.log('Rejected');
-    // post request vo prodolzenie
-
+  openPharmacyDialog(pharmacy: IPharmacy): void {
+    this.dialog.open(PharmacyDialogComponent, {
+      width: '450px',
+      data: pharmacy
+    });
   }
 
-  Approve() {
-    console.log('Approved');
-    // post request vo prodolzenie
+  openPharmacyHeadDialog(hd: IPharmacyHead): void {
+    this.dialog.open(PharmacyHeadDialogComponent, {
+      width: '450px',
+      data: hd
+    });
+  }
 
+  rejectRequest(req: IPharmacyHeadRequest) {
+    this.dataService.deleteClaimingRequest(req.id)
+        .subscribe((status: boolean) => {
+          if(status) {
+            this.openSnackBar("Request rejected!","OK");
+          }
+          else {
+            this.openSnackBar("Something went wrong","Try again");
+          }
+        },
+        (err: any) => console.log(err),
+        () => console.log("PharmacyHeadRequest deleted"));
+  }
+
+  approveRequest(req: IPharmacyHeadRequest) {
+    if(req) {
+    req.PharmacyHead.Pharmacy.push(req.Pharmacy);
+    this.dataService.updatePharmacyHead(req.PharmacyHead)
+        .subscribe(() => {
+          
+        },
+        (err: any) => console.log(err),
+        () => console.log("PharmacyHead updated"))
+    }
+  }
+
+  openSnackBar(message: string, action: string) : MatSnackBarRef<SimpleSnackBar> {
+    return this.snackBar.open(message, action, {
+      duration: 5000,
+    });
   }