Changeset de9d697

Timestamp:

02/01/21 00:15:12 (3 years ago)

Author:

Mile Jankuloski <mile.jankuloski@…>

Branches:

master

Children:

afefe75

Parents:

28d7d35

Message:

Patch bugs, minor changes

Location:

Farmatiko/ClientApp/src/app

Files:

• dialogs/facility-dialog/facility-dialog.component.ts (modified) (1 diff)
• dialogs/pharmacy-dialog/pharmacy-dialog.component.ts (modified) (1 diff)
• login/login.component.css (modified) (1 diff)
• login/login.component.html (modified) (1 diff)
• login/login.component.ts (modified) (2 diffs)
• nav-menu/nav-menu.component.html (modified) (1 diff)
• shared/data.service.ts (modified) (1 diff)

Farmatiko/ClientApp/src/app/dialogs/facility-dialog/facility-dialog.component.ts

@@ -41 +41 @@
               iconUrl: 'assets/hospital-icon.png'
             })
-          }).bindPopup("Аптека: "+this.facility?.name);
+          }).bindPopup(this.facility?.name);
           this.options.layers.push(layer);
           this.options.center = latLng(obj[0]?.lat, obj[0]?.lon);
           this.options.zoom = 13;
         }
-      }, error => console.error(error));
-      this.mapShown = false;
-      setTimeout(() => this.mapShown = true, 300);
+      }, error => console.error(error),
+      () => {
+        this.mapShown = false;
+        setTimeout(() => this.mapShown = true, 300);
+      });
   }
-
 
   close() {

Farmatiko/ClientApp/src/app/dialogs/pharmacy-dialog/pharmacy-dialog.component.ts

@@ -46 +46 @@
           this.options.zoom = 13;
         }
-      }, error => console.error(error));
-      this.mapShown = false;
-      setTimeout(() => this.mapShown = true, 300);
+      }, error => console.error(error),
+      () => {
+        this.mapShown = false;
+        setTimeout(() => this.mapShown = true, 200);
+      });
   }
 

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

@@ -14 +14 @@
     transform: translate(-50%, -50%);
 }
+
 
 :host {

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

@@ -27 +27 @@
 </mat-card-content>
 </mat-card>
-</div>
+<br>
+  <mat-card>
+  <mat-card-header><h2>Регистрација 
+    <div class="aligner">
+    <button mat-icon-button color="accent" (click)="expandRegistration()">
+      <mat-icon>local_hospital</mat-icon>
+    </button>
+  </div></h2></mat-card-header>
+  <mat-card-content *ngIf="expanded">
+    <div class="content">
+      Модераторски профил може да има само еден<br> претставник од компанија што поседува деловен објект <br> - Аптека. За регистрација на профилот, потребно е <br> компанијата да приложи соодветен доказ со испраќање<br> на мејл до нашата е-пошта: <a href="mailto:admin@farmatiko.tk">admin@farmatiko.tk</a>
+    </div>
+  </mat-card-content>
+  </mat-card>
+  </div>

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

@@ -18 +18 @@
   password = '';
   loginError = false;
+  expanded = false;
   private subscription: Subscription;
 
@@ -67 +68 @@
     this.loginForm.reset();
   }
+
+  expandRegistration() {
+    this.expanded = !this.expanded;
+  }
 }

Farmatiko/ClientApp/src/app/nav-menu/nav-menu.component.html

@@ -24 +24 @@
           </li>
           <li class="nav-item" [routerLinkActive]="['link-active']">
-            <a class="nav-link text-dark" [routerLink]="['/koronavirus']">Коронавирус</a>
+            <a class="nav-link text-dark" [routerLink]="['/koronavirus']">Пандемии</a>
           </li>
           <li *ngIf="loggedIn">

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

@@ -178 +178 @@
                     );
     }
-    //PharmacyHead PUT
     updatePharmacyHead(head: IPharmacyHead) : Observable<IPharmacyHead> {
-        return this.http.put<IPharmacyHead>(this.basePharmacyHead + '/update', head)
-                   .pipe(
-                        map((data) => {
-                            return data;
-                        }),
-                        catchError(this.handleError)
-                    );
-    }
-    //PharmacyHead DELETE
-    deletePharmacyHead(id: string) : Observable<boolean> {
-        return this.http.delete<boolean>(this.basePharmacyHead + '/delete/' + id)
-                   .pipe(catchError(this.handleError));
+        return this.http.post<IPharmacyHead>(this.basePharmacyHead + '/update', head)
+                   .pipe(
+                        map((data) => {
+                            return data;
+                        }),
+                        catchError(this.handleError)
+                    );
+    }
+    deletePharmacyHead(id: string) : Observable<any> {
+        return this.http.post<any>(this.basePharmacyHead + '/delete/' + id, id)
+                    .pipe(
+                        map((data) => {
+                            return data;
+                        }),
+                        catchError(this.handleError)
+                    );
     }
     deleteClaimingRequest(id: string) : Observable<boolean> {
-        return this.http.delete<boolean>(this.basePharmacyHead + '/requests/' + id)
-                   .pipe(catchError(this.handleError));
+        return this.http.post<boolean>(this.basePharmacyHead + '/requests/' + id, id)
+                    .pipe(
+                        map((data) => {
+                            return data;
+                        }),
+                        catchError(this.handleError)
+                    );
     }