Update แก้ไขข้อมูลที่หายไป

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

@@ -51,8 +51,8 @@ export class AdminPendingComponent implements OnInit {
 
   modelEquirment = new Equirment();
   modelRoom = new MyRoom();
-  modelitemDetail = new ItemDetail();
-  modelroomDetail = new RoomDetail();
+  modelItemDetail = new ItemDetail();
+  modelRoomDetail = new RoomDetail();
 
   collectionSize = this.listitemDetail.length;
   hoveredDate: NgbDate | null = null;
@@ -66,7 +66,7 @@ export class AdminPendingComponent implements OnInit {
     let timeSplit = time.split(":")
     item.hour = parseInt(timeSplit[0])
     item.minute = parseInt(timeSplit[1])
-    console.log(this.modelroomDetail)
+    console.log(this.modelRoomDetail)
   }
 
 
@@ -107,12 +107,12 @@ export class AdminPendingComponent implements OnInit {
   sDate = ""
   eDate = ""
   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
-    let SDate = this.modelitemDetail.sDate.split('/')
+    this.modelItemDetail = item ;
+    this.thStime= this.modelItemDetail.sTime.hour + ':' + this.modelItemDetail.sTime.minute 
+    this.thEtime= this.modelItemDetail.eTime.hour + ':' + this.modelItemDetail.eTime.minute
+    let SDate = this.modelItemDetail.sDate.split('/')
     this.sDate = SDate[2]+"-"+SDate[1]+"-"+SDate[0]
-    let EDate = this.modelitemDetail.eDate.split('/')
+    let EDate = this.modelItemDetail.eDate.split('/')
     this.eDate = EDate[2]+"-"+EDate[1]+"-"+EDate[0]
     this.modalService.open(content, { ariaLabelledBy: 'modal-basic-title' }).result.then((result) => {
       this.closeResult = `Closed with: ${result}`;
@@ -126,21 +126,21 @@ export class AdminPendingComponent implements OnInit {
     let dates = Dates[2]+"/"+Dates[1]+"/"+Dates[0]
     
     if(item2=="sdate"){
-      this.modelitemDetail.sDate = dates
+      this.modelItemDetail.sDate = dates
     }
     if(item2=="edate"){
-      this.modelitemDetail.eDate = dates
+      this.modelItemDetail.eDate = dates
     }
     console.log(this.sDate)
   } 
 
   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 
-    let SDate = this.modelroomDetail.sDate.split('/')
+    this.modelRoomDetail = item ;
+    this.thStime= this.modelRoomDetail.sTime.hour + ':' + this.modelRoomDetail.sTime.minute 
+    this.thEtime= this.modelRoomDetail.eTime.hour + ':' + this.modelRoomDetail.eTime.minute 
+    let SDate = this.modelRoomDetail.sDate.split('/')
     this.sDate = SDate[2]+"-"+SDate[1]+"-"+SDate[0]
-    let EDate = this.modelroomDetail.eDate.split('/')
+    let EDate = this.modelRoomDetail.eDate.split('/')
     this.eDate = EDate[2]+"-"+EDate[1]+"-"+EDate[0]
     this.modalService.open(content, { ariaLabelledBy: 'modal-basic-title' }).result.then((result) => {
       this.closeResult = `Closed with: ${result}`;

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

@@ -90,8 +90,8 @@
                                             <td>{{ item.room.rName }}</td>
                                             <td>{{ item.room.rDesc }}</td>
                                             <td>{{ item.userName }}</td>
-                                            <td>{{ item.sDate }} {{ item.sTime.hour }}:{{ item.sTime.minute }}</td>
-                                            <td>{{ item.eDate }} {{ item.eTime.hour }}:{{ item.eTime.minute }}</td>
+                                            <td>{{ item.sDate.replaceAll("/","-") }} {{ item.sTime.hour }}:{{ item.sTime.minute }}</td>
+                                            <td>{{ item.eDate.replaceAll("/","-") }} {{ 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 "
@@ -148,8 +148,8 @@
                                             <td>{{ item.equirment.eqName }}</td>
                                             <td>{{ item.equirment.eqDesc }}</td>
                                             <td>{{ item.userName }}</td>
-                                            <td>{{ item.sDate }} {{ item.sTime.hour }}:{{ item.sTime.minute }}</td>
-                                            <td>{{ item.eDate }} {{ item.eTime.hour }}:{{ item.eTime.minute }}</td>
+                                            <td>{{ item.sDate.replaceAll("/","-") }} {{ item.sTime.hour }}:{{ item.sTime.minute }}</td>
+                                            <td>{{ item.eDate.replaceAll("/","-") }} {{ item.eTime.hour }}:{{ item.eTime.minute }}</td>
                                             <td>{{ item.Quantity }}</td>
                                             <td>{{ item.eStatus }}</td>
                                             <div class="col-auto align-self-sm-center">

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

@@ -59,6 +59,15 @@ export class PendingComponent implements OnInit {
   fromDate: NgbDate | null;
   toDate: NgbDate | null;
 
+  thStime: string;
+  thEtime: string;
+  thtimeChange (time:string,item:any){
+    let timeSplit = time.split(":")
+    item.hour = parseInt(timeSplit[0])
+    item.minute = parseInt(timeSplit[1])
+    console.log(this.modelRoomDetail)
+  }
+
   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);
@@ -92,6 +101,11 @@ export class PendingComponent implements OnInit {
 
   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
+    let SDate = this.modelItemDetail.sDate.split('/')
+    this.sDate = SDate[2]+"-"+SDate[1]+"-"+SDate[0]
+    let EDate = this.modelItemDetail.eDate.split('/')
     console.log(item);
     this.modalService.open(content, { ariaLabelledBy: 'modal-basic-title' }).result.then((result) => {
       this.closeResult = `Closed with: ${result}`;
@@ -99,10 +113,20 @@ export class PendingComponent implements OnInit {
       this.closeResult = `Dismissed ${this.getDismissReason(reason)}`;
     });
   }
-
+  
+  date='10-12-2561'
+  show(a:string){
+    console.log(a)
+  }
+  sDate = ""
+  eDate = ""
   openRoomDetail(content : string ,item : RoomDetail) {
     this.modelRoomDetail = item ;
-    console.log(item);
+    this.thStime= this.modelRoomDetail.sTime.hour + ':' + this.modelRoomDetail.sTime.minute 
+    this.thEtime= this.modelRoomDetail.eTime.hour + ':' + this.modelRoomDetail.eTime.minute
+    let SDate = this.modelRoomDetail.sDate.split('/')
+    this.sDate = SDate[2]+"-"+SDate[1]+"-"+SDate[0]
+    let EDate = this.modelRoomDetail.eDate.split('/')
     this.modalService.open(content, { ariaLabelledBy: 'modal-basic-title' }).result.then((result) => {
       this.closeResult = `Closed with: ${result}`;
     }, (reason) => {
@@ -110,6 +134,19 @@ export class PendingComponent implements OnInit {
     });
   }
 
+  rDate(item: string, item2: string){
+    let Dates = item.split("-")
+    let dates = Dates[2]+"/"+Dates[1]+"/"+Dates[0]
+    
+    if(item2=="sdate"){
+      this.modelItemDetail.sDate = dates
+    }
+    if(item2=="edate"){
+      this.modelItemDetail.eDate = dates
+    }
+    console.log(this.sDate)
+  } 
+
 
   private getDismissReason(reason: any): string {
     if (reason === ModalDismissReasons.ESC) {