update eqment lend detail

src/app/models/rooms.model.ts

-import { RoomDetail } from "./RoomDetail.model"
 export interface Room {
     rId: number;
     rName: string;

src/app/pages/admin-pending/admin-pending.component.html

@@ -88,8 +88,8 @@
                                     <tbody>
                                         <tr *ngFor="let item of listRoomDetail">
                                             <th scope="row" style="color: rgb(255, 255, 255);">{{ item.id }}</th>
-                                            <td *ngIf="item.rStatus==1">ห้อง</td>
-                                            <td *ngIf="item.rStatus==2">รถ</td>
+                                            <td *ngIf="item.room.rType==1">ห้อง</td>
+                                            <td *ngIf="item.room.rType==2">รถ</td>
                                             <td>{{ item.room.rName }}</td>
                                             <td>{{ item.room.rDesc }}</td>
                                             <td>{{ item.userName }}</td>
@@ -150,10 +150,10 @@
                                     <tbody>
                                         <tr *ngFor="let item of listItemDetail">
                                             <th scope="row" style="color: rgb(255, 255, 255);">{{ item.id }}</th>
-                                            <td *ngIf="item.equirment.eqType==4">IT</td>
-                                            <td *ngIf="item.equirment.eqType==5">Company</td>
-                                            <td>{{ item.equirment.eqName }}</td>
-                                            <td>{{ item.equirment.eqDesc }}</td>
+                                            <td *ngIf="item.equirments.eqType==4">IT</td>
+                                            <td *ngIf="item.equirments.eqType==5">Company</td>
+                                            <td>{{ item.equirments.eqName }}</td>
+                                            <td>{{ item.equirments.eqDesc }}</td>
                                             <td>{{ item.userName }}</td>
                                             <td>{{ item.sDate | date : 'dd/MM/yyyy' }}</td>
                                             <td>{{ item.Quantity }}</td>

src/app/pages/pending/pending.component.html

@@ -88,7 +88,8 @@
                                     <tbody>
                                         <tr *ngFor="let item of listRoomDetail">
                                             <th scope="row" style="color: rgb(255, 255, 255);">{{ item.id }}</th>
-                                            <td>{{ item.room.rType }}</td>
+                                            <td *ngIf="item.room.rType==1">ห้อง</td>
+                                            <td *ngIf="item.room.rType==2">รถ</td>
                                             <td>{{ item.room.rName }}</td>
                                             <td>{{ item.room.rDesc }}</td>
                                             <td>{{ item.userName }}</td>
@@ -150,9 +151,10 @@
                                     <tbody>
                                         <tr *ngFor="let item of listItemDetail">
                                             <th scope="row" style="color: rgb(255, 255, 255);">{{ item.id }}</th>
-                                            <td>{{ item.equirment.eqType }}</td>
-                                            <td>{{ item.equirment.eqName }}</td>
-                                            <td>{{ item.equirment.eqDesc }}</td>
+                                            <td *ngIf="item.equirments.eqType==4">IT</td>
+                                            <td *ngIf="item.equirments.eqType==5">Company</td>
+                                            <td>{{ item.equirments.eqName }}</td>
+                                            <td>{{ item.equirments.eqDesc }}</td>
                                             <td>{{ item.userName }}</td>
                                             <td>{{ item.sDate | date : 'dd/MM/yyyy' }} {{ item.sTime }}</td>
                                             <td>{{ item.Quantity }}</td>

src/app/service/equirment.service.ts

@@ -8,7 +8,7 @@ import { Observable } from 'rxjs';
 export class EquirmentService {
 
   constructor(private http: HttpClient) { }
-  url: string = "http://a3be-115-87-232-117.ngrok.io";
+  url: string = "http://915e-49-0-64-28.ngrok.io";
   listEquirment: Equirment[] = []
 
   addEquirment(model: Equirment) {

src/app/service/item-detail.service.ts

@@ -7,7 +7,7 @@ import { Observable } from 'rxjs';
 export class ItemDetailService {
 
   constructor(private http: HttpClient) { }
-  url: string = "http://a3be-115-87-232-117.ngrok.io";
+  url: string = "http://915e-49-0-64-28.ngrok.io";
   listItemDetail: ItemDetail[] = []
 
   addItemDetail(model: ItemDetail) {

src/app/service/room-detail.service.ts

@@ -8,7 +8,7 @@ import { Observable } from 'rxjs';
 export class RoomDetailService {
 
     constructor(private http: HttpClient) { }
-    url: string = "http://a3be-115-87-232-117.ngrok.io";
+    url: string = "http://915e-49-0-64-28.ngrok.io";
     listRoomDetail: RoomDetail[] = []
 
     editRoomDetail(model: RoomDetail) {

src/app/service/room.service.ts

@@ -7,7 +7,7 @@ import { RoomDetail } from '../models/RoomDetail.model';
 export class RoomService {
 
   constructor(private http: HttpClient) { }
-  url: string = "http://a3be-115-87-232-117.ngrok.io";
+  url: string = "http://915e-49-0-64-28.ngrok.io";
   listRoomModel: Room[] = []
   listRoomSearch: Room[] = [];