Update code

src/app/app.module.ts

@@ -23,7 +23,6 @@ import { AdminPendingComponent } from './pages/admin-pending/admin-pending.compo
 import { PendingComponent } from './pages/pending/pending.component';
 import { AdminEquirmentComponent } from './pages/admin-equirment/admin-equirment.component';
 
-import { ReactiveFormsModule } from '@angular/forms';
 
 FullCalendarModule.registerPlugins([ // register FullCalendar plugins
   dayGridPlugin,

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

@@ -94,7 +94,7 @@
                                                 item.sTime.minute }}</td>
                                             <td>{{ item.eDate.replaceAll("/","-") }} {{ item.eTime.hour }}:{{
                                                 item.eTime.minute }}</td>
-                                            <td>{{ item.eStatus }}</td>
+                                            <td>{{ item.rStatus }}</td>
                                             <div class="text-center">
                                                 <button type="button" class="btn btn-info btn-sm btn-circle "
                                                     style="line-height: 0px" (click)="openRoomDetail(Room,item)"><i

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

@@ -2,11 +2,11 @@ import { Component, OnInit } from '@angular/core';
 import { NgbDate, NgbCalendar, NgbDateParserFormatter } from '@ng-bootstrap/ng-bootstrap';
 import { NgbModal, ModalDismissReasons } from '@ng-bootstrap/ng-bootstrap';
 import { Equirment } from 'src/app/models/equirment.model';
-import { itemDetail } from 'src/app/models/itemDetail.model';
-import { itemDetailService } from 'src/app/service/item-detail.service';
-import { roomDetail } from 'src/app/models/roomDetail.model';
-import { roomDetailService } from 'src/app/service/room-detail.service';
-import { Room } from 'src/app/models/rooms.model';
+import { ItemDetail } from 'src/app/models/itemDetail.model';
+import { ItemDetailService } from 'src/app/service/item-detail.service';
+import { RoomDetail } from 'src/app/models/roomDetail.model';
+import { RoomDetailService } from 'src/app/service/room-detail.service';
+import { MyRoom, Room } from 'src/app/models/rooms.model';
 
 @Component({
   selector: 'app-admin-pending',
@@ -46,13 +46,13 @@ export class AdminPendingComponent implements OnInit {
 
   closeResult = '';
 
-  listitemDetail : itemDetail[] = [];
-  listroomDetail : roomDetail[] = [];
+  listitemDetail : ItemDetail[] = [];
+  listroomDetail : RoomDetail[] = [];
 
   modelEquirment = new Equirment();
-  modelRoom = new Room();
-  modelitemDetail = new itemDetail();
-  modelroomDetail = new roomDetail();
+  modelRoom = new MyRoom();
+  modelitemDetail = new ItemDetail();
+  modelroomDetail = new RoomDetail();
 
   collectionSize = this.listitemDetail.length;
   hoveredDate: NgbDate | null = null;
@@ -70,7 +70,7 @@ export class AdminPendingComponent implements OnInit {
   }
 
 
-  constructor(private calendar: NgbCalendar, public formatter: NgbDateParserFormatter, private modalService: NgbModal, private itemDetailService: itemDetailService, private roomDetailService: roomDetailService) {
+  constructor(private calendar: NgbCalendar, public formatter: NgbDateParserFormatter, private modalService: NgbModal, private ItemDetailService: ItemDetailService, private RoomDetailService: RoomDetailService) {
     this.fromDate = calendar.getToday();
     this.toDate = calendar.getNext(calendar.getToday(), 'd', 10);
     this.refreshitemDetail();
@@ -106,7 +106,7 @@ export class AdminPendingComponent implements OnInit {
   }
   sDate = ""
   eDate = ""
-  openItemDetail(content : string ,item : itemDetail) {
+  openItemDetail(content : string ,item : ItemDetail) {
     this.modelitemDetail = item ;
     this.thStime= this.modelitemDetail.sTime.hour + ':' + this.modelitemDetail.sTime.minute 
     this.thEtime= this.modelitemDetail.eTime.hour + ':' + this.modelitemDetail.eTime.minute
@@ -134,7 +134,7 @@ export class AdminPendingComponent implements OnInit {
     console.log(this.sDate)
   } 
 
-  openRoomDetail(content : string ,item : roomDetail) {
+  openRoomDetail(content : string ,item : RoomDetail) {
     this.modelroomDetail = item ;
     this.thStime= this.modelroomDetail.sTime.hour + ':' + this.modelroomDetail.sTime.minute 
     this.thEtime= this.modelroomDetail.eTime.hour + ':' + this.modelroomDetail.eTime.minute 
@@ -177,8 +177,8 @@ export class AdminPendingComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    this.listitemDetail = this.itemDetailService.getListitemDetail();
-    this.listroomDetail = this.roomDetailService.getListroomDetail();
+    this.listitemDetail = this.ItemDetailService.getListItemDetail();
+    this.listroomDetail = this.RoomDetailService.getListRoomDetail();
     console.log(this.listitemDetail);
   }
 

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

@@ -90,9 +90,9 @@
                                             <td>{{ item.room.rName }}</td>
                                             <td>{{ item.room.rDesc }}</td>
                                             <td>{{ item.userName }}</td>
-                                            <td>{{ item.sDate | date:'dd-MM-yyyy' }} {{ item.sTime.hour }}:{{ item.sTime.minute }}</td>
-                                            <td>{{ item.eDate | date:'dd-MM-yyyy' }} {{ item.eTime.hour }}:{{ item.eTime.minute }}</td>
-                                            <td>{{ item.eStatus }}</td>
+                                            <td>{{ item.sDate }} {{ item.sTime.hour }}:{{ item.sTime.minute }}</td>
+                                            <td>{{ item.eDate }} {{ item.eTime.hour }}:{{ item.eTime.minute }}</td>
+                                            <td>{{ item.rStatus }}</td>
                                             <div class="col-auto align-self-sm-center">
                                                 <button type="button" class="btn btn-info btn-sm btn-circle "
                                                     style="line-height: 0px" (click)="openRoomDetail(Room,item)"><i class="fa fa-search"></i> </button>
@@ -148,8 +148,8 @@
                                             <td>{{ item.equirment.eqName }}</td>
                                             <td>{{ item.equirment.eqDesc }}</td>
                                             <td>{{ item.userName }}</td>
-                                            <td>{{ item.sDate | date:'dd-MM-yyyy' }} {{ item.sTime.hour }}:{{ item.sTime.minute }}</td>
-                                            <td>{{ item.eDate | date:'dd-MM-yyyy' }} {{ item.eTime.hour }}:{{ item.eTime.minute }}</td>
+                                            <td>{{ item.sDate }} {{ item.sTime.hour }}:{{ item.sTime.minute }}</td>
+                                            <td>{{ item.eDate }} {{ item.eTime.hour }}:{{ item.eTime.minute }}</td>
                                             <td>{{ item.Quantity }}</td>
                                             <td>{{ item.eStatus }}</td>
                                             <div class="col-auto align-self-sm-center">