Changeset 1db5673 for Farmatiko/ClientApp/src/app

Timestamp:

11/14/20 12:27:30 (3 years ago)

Author:

DimitarSlezenkovski <dslezenkovski@…>

Branches:

master

Children:

68454c6

Parents:

ad60966

Message:

Fix bugs, add some more

Location:

Farmatiko/ClientApp/src/app

Files:

• admin/admin.component.html (modified) (1 diff)
• dashboard/dashboard.component.ts (modified) (1 diff)
• login/login.component.ts (modified) (1 diff)
• shared/data.service.ts (modified) (2 diffs)
• shared/interfaces.ts (modified) (1 diff)
• shared/services/auth.service.ts (modified) (4 diffs)

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

@@ -76 +76 @@
             <input matInput [(ngModel)]="this.head.Passwd">
           </mat-form-field><br>
-            <button onclick="createHead()" mat-raised-button color="primary">Create</button>
+            <button (click)="createHead()" mat-raised-button color="primary">Create</button>
           </div>
         </mat-tab>

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

@@ -43 +43 @@
   
   claimPharmacy(pharmacy: IPharmacy) {
-    if(pharmacy && !this.head.Pharmacy.find(x => x === pharmacy)) {
-      this.request = null;
-      this.request.Pharmacy = pharmacy;
-      this.request.PharmacyHead = this.head;
-      this.dataService.claimPharmacy(this.request)
-          .subscribe((req: IPharmacyHeadRequest) => {
-            if(req) {
-              this.openSnackBar("Claiming request sent!", "OK");
-            }
-            else {
-              this.openSnackBar("Unable to send a request", "Try again");
-            }
-          },
-          (err: any) => console.log(err),
-          () => console.log('Claiming request sent!'));
+    if(this.head.Pharmacy != null) {
+      if(pharmacy && !this.head.Pharmacy.find(x => x === pharmacy)) {
+        this.request = {};
+        this.request.Pharmacy = pharmacy;
+        this.request.PharmacyHead = this.head;
+        this.dataService.claimPharmacy(this.request)
+            .subscribe((req) => {
+              if(req) {
+                this.openSnackBar("Claiming request sent!", "OK");
+              }
+              else {
+                this.openSnackBar("Unable to send a request", "Try again");
+              }
+            },
+            (err: any) => console.log(err),
+            () => console.log('Claiming request sent!'));
+      }
+    }
+    else {
+      if(pharmacy) {
+        this.request = {};
+        this.request.Pharmacy = pharmacy;
+        this.request.PharmacyHead = this.head;
+        this.dataService.claimPharmacy(this.request)
+            .subscribe((req) => {
+              if(req) {
+                this.openSnackBar("Claiming request sent!", "OK");
+              }
+              else {
+                this.openSnackBar("Unable to send a request", "Try again");
+              }
+            },
+            (err: any) => console.log(err),
+            () => console.log('Claiming request sent!'));
+      }
     }
   }

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

@@ -54 +54 @@
       .subscribe(
         (data) => {
-          if(data.role == 'Admin') {
+          if(data.role === 'Admin') {
             this.router.navigate(['/admin']);
           }

Farmatiko/ClientApp/src/app/shared/data.service.ts

@@ -6 +6 @@
 
 import { IHealthFacilities, IHealthcareWorkers, IMedicine, IPandemic, IPharmacy, IPharmacyHead, IPharmacyHeadRequest } from './interfaces';
+import { environment } from '../../environments/environment';
 
 @Injectable()
 export class DataService {
-    baseFacilitiesUrl: string = '/api/facilities';
-    baseWorkersUrl: string = '/api/workers';
-    baseMedicineUrl: string = '/api/medicines';
-    basePandemicUrl: string = '/api/pandemic';
-    basePharmacyUrl: string = '/api/pharmacy';
-    basePharmacyHead: string = '/api/pharmacyhead';
+    baseFacilitiesUrl: string = `${environment.baseApiUrl}api/facilities`;
+    baseWorkersUrl: string = `${environment.baseApiUrl}api/workers`;
+    baseMedicineUrl: string = `${environment.baseApiUrl}api/medicines`;
+    basePandemicUrl: string = `${environment.baseApiUrl}api/pandemic`;
+    basePharmacyUrl: string = `${environment.baseApiUrl}api/pharmacy`;
+    basePharmacyHead: string = `${environment.baseApiUrl}api/pharmacyhead`;
 
     constructor(private http: HttpClient) {
@@ -179 +180 @@
     //PharmacyHead PUT
     updatePharmacyHead(head: IPharmacyHead) : Observable<IPharmacyHead> {
-        return this.http.put<IPharmacyHead>(this.basePharmacyHead + '/' + head.id, head)
+        return this.http.put<IPharmacyHead>(this.basePharmacyHead, head)
                    .pipe(
                         map((data) => {

Farmatiko/ClientApp/src/app/shared/interfaces.ts

@@ -57 +57 @@
     originalUserName?: string;
     Role?: string;
-}  
-
+} 
 export interface IPharmacyHeadRequest {
     id?: string;

Farmatiko/ClientApp/src/app/shared/services/auth.service.ts

@@ -9 +9 @@
 
 interface LoginResult {
-  username: string;
+  userName: string;
   role: string;
   originalUserName?: string;
@@ -36 +36 @@
         this.http.get<LoginResult>(`${this.apiUrl}/user`).subscribe((x) => {
           this._user.next({
-            Email: x.username,
+            Email: x.userName,
             Passwd: x.head.Passwd,
             Role: x.role,
@@ -64 +64 @@
         map((x) => {
           this._user.next({
-            Email: x.username,
+            Email: x.userName,
             Passwd: x.head.Passwd,
             Role: x.role,
@@ -105 +105 @@
         map((x) => {
           this._user.next({
-            Email: x.username,
+            Email: x.userName,
             Passwd: x.head.Passwd,
             Role: x.role,