Update หน้าต่างการจองเปลี่ยนภาษา

src/app/models/itemDetail.model.ts

@@ -30,8 +30,8 @@ export class ItemDetail {
         this.eDate = '';
         this.eStatus = '';
         this.Quantity = '';
-        this.eTelephone = undefined;
-        this.email = undefined;
+        this.eTelephone = '';
+        this.email = '';
         this.Remark = '';
     }
 }

src/app/models/roomDetail.model.ts

@@ -28,8 +28,8 @@ export class RoomDetail {
         this.sDate = '';
         this.eDate = '';
         this.rStatus = '';
-        this.rTelephone = undefined;
-        this.email = undefined;
+        this.rTelephone = '';
+        this.email = '';
         this.Remark = '';
     }
 }

src/app/pages/equipment/equipment.component.ts

@@ -120,6 +120,7 @@ export class EquipmentComponent implements OnInit {
     }, (reason) => {
       this.closeResult = `Dismissed ${this.getDismissReason(reason)}`;
     });
+
   }
 
   Ropen(contentroom) {

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

@@ -306,7 +306,7 @@
                         <div class=" form-group">
                             <label> เบอร์โทร </label>
                             <input readonly class=" form-control" placeholder="" type="text"
-                                [(ngModel)]="modelItemDetail.rTelephone" />
+                                [(ngModel)]="modelItemDetail.eTelephone" />
                         </div>
                     </div>
                 </div>

src/app/service/equirment.service.ts

 import { Injectable } from '@angular/core';
 import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Equirment, SearchEquirmentModel } from '../models/equirment.model';
+import { ItemDetail } from '../models/itemDetail.model';
 
 @Injectable({ providedIn: 'root' })
 export class EquirmentService {
@@ -40,9 +41,12 @@ export class EquirmentService {
 
   addEquirment(model: Equirment) {
     this.listEquirment.push(model);
-
   }
 
+  // bookEquirment(models: ItemDetail){
+  //   this.listEquirment.push(models);
+  // }
+
   getListEquirment() {
     return this.listEquirment;
   }

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

@@ -32,8 +32,8 @@ export class ItemDetailService {
       },
       eStatus: 'รอการอนุมัติ',
       Quantity: '1',
-      eTelephone: undefined,
-      email: undefined,
+      eTelephone: '0123456789',
+      email: 'qwerty@qwerty',
       Remark: 'test',
     },
     {
@@ -46,8 +46,8 @@ export class ItemDetailService {
         eqPic: "assets/img/notebook.jpg"
       },
       userName: 'แป๊ะ',
-      sDate: '',
-      eDate: '',
+      sDate: '13/12/2560',
+      eDate: '13/12/2561',
       sTime: {
         hour: 22,
         minute: 30,
@@ -60,8 +60,8 @@ export class ItemDetailService {
       },
       eStatus: 'รอการอนุมัติ',
       Quantity: '1',
-      eTelephone: undefined,
-      email: undefined,
+      eTelephone: '0123456789',
+      email: 'qwerty@qwerty',
       Remark: 'test',
     },
 

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

@@ -32,8 +32,8 @@ export class RoomDetailService {
                 second: 0
             },
             rStatus: 'รอการอนุมัติ',
-            rTelephone: undefined,
-            email: undefined,
+            rTelephone: '0123456789',
+            email: 'qwerty@qwerty',
             Remark: 'test',
         },
         {
@@ -60,8 +60,8 @@ export class RoomDetailService {
                 second: 0
             },
             rStatus: 'รอการอนุมัติ',
-            rTelephone: undefined,
-            email: undefined,
+            rTelephone: '0123456789',
+            email: 'qwerty@qwerty',
             Remark: 'test',
         },