Merge branch 'master' of https://mygit.myhr.co.th/chanachai.pmg.eng/BookingMyHrManagement

src/app/service/equirment.service.ts

@@ -38,112 +38,112 @@ export class EquirmentService {
       eqPic: "assets/img/keyboard.png"
     },
     {
-      eqId: 1,
+      eqId: 5,
       eqName: "จอคอมพิวเตอร์",
       eqDesc: "หน้าจอขนาด 22 นิ้ว",
       eqType: "it",
       eqPic: "assets/img/mo1.jpg"
     },
     {
-      eqId: 2,
+      eqId: 6,
       eqName: "เมาส์",
       eqDesc: "...",
       eqType: "it",
       eqPic: "assets/img/mou.jpg"
     },
     {
-      eqId: 3,
+      eqId: 7,
       eqName: "โน๊ตบุ๊ค",
       eqDesc: "หน้าจอขนาด 20 นิ้ว",
       eqType: "it",
       eqPic: "assets/img/notebook.jpg"
     },
     {
-      eqId: 4,
+      eqId: 8,
       eqName: "คีย์บอร์ด",
       eqDesc: "...",
       eqType: "it",
       eqPic: "assets/img/keyboard.png"
     },
     {
-      eqId: 1,
+      eqId: 9,
       eqName: "จอคอมพิวเตอร์",
       eqDesc: "หน้าจอขนาด 22 นิ้ว",
       eqType: "it",
       eqPic: "assets/img/mo1.jpg"
     },
     {
-      eqId: 2,
+      eqId: 10,
       eqName: "เมาส์",
       eqDesc: "...",
       eqType: "it",
       eqPic: "assets/img/mou.jpg"
     },
     {
-      eqId: 3,
+      eqId: 11,
       eqName: "โน๊ตบุ๊ค",
       eqDesc: "หน้าจอขนาด 20 นิ้ว",
       eqType: "it",
       eqPic: "assets/img/notebook.jpg"
     },
     {
-      eqId: 4,
+      eqId: 12,
       eqName: "คีย์บอร์ด",
       eqDesc: "...",
       eqType: "it",
       eqPic: "assets/img/keyboard.png"
     },
     {
-      eqId: 1,
+      eqId: 13,
       eqName: "จอคอมพิวเตอร์",
       eqDesc: "หน้าจอขนาด 22 นิ้ว",
       eqType: "it",
       eqPic: "assets/img/mo1.jpg"
     },
     {
-      eqId: 2,
+      eqId: 14,
       eqName: "เมาส์",
       eqDesc: "...",
       eqType: "it",
       eqPic: "assets/img/mou.jpg"
     },
     {
-      eqId: 3,
+      eqId: 15,
       eqName: "โน๊ตบุ๊ค",
       eqDesc: "หน้าจอขนาด 20 นิ้ว",
       eqType: "it",
       eqPic: "assets/img/notebook.jpg"
     },
     {
-      eqId: 4,
+      eqId: 16,
       eqName: "คีย์บอร์ด",
       eqDesc: "...",
       eqType: "it",
       eqPic: "assets/img/keyboard.png"
     },
     {
-      eqId: 1,
+      eqId: 17,
       eqName: "จอคอมพิวเตอร์",
       eqDesc: "หน้าจอขนาด 22 นิ้ว",
       eqType: "it",
       eqPic: "assets/img/mo1.jpg"
     },
     {
-      eqId: 2,
+      eqId: 18,
       eqName: "เมาส์",
       eqDesc: "...",
       eqType: "it",
       eqPic: "assets/img/mou.jpg"
     },
     {
-      eqId: 3,
+      eqId: 19,
       eqName: "โน๊ตบุ๊ค",
       eqDesc: "หน้าจอขนาด 20 นิ้ว",
       eqType: "it",
       eqPic: "assets/img/notebook.jpg"
     },
     {
-      eqId: 4,
+      eqId: 20,
       eqName: "คีย์บอร์ด",
       eqDesc: "...",
       eqType: "it",
@@ -206,6 +206,15 @@ export class EquirmentService {
     })
   }
 
+  updateEquirProfile(model : Equirment) {
+    this.listEquirment = this.listEquirment.filter((value, key) => {
+      if (value.eqId === model.eqId) {
+          value = model;
+      }
+      return true;
+  });
+  }
+
   EquirmentModel(eqId: string) {
 
   }

src/app/service/room.service.ts

@@ -169,7 +169,7 @@ export class RoomService {
     }
     ,
     {
-      rId: 2,
+      rId: 20,
       rName: "ห้องคู่",
       rType : "ห้อง",
       rPic: "assets/img/room.jpg",
@@ -177,7 +177,7 @@ export class RoomService {
       rDesc: "จำนวนคน 50 คน",
     },
     {
-      rId: 20,
+      rId: 21,
       rName: "ห้องรวม",
       rType : "ห้อง",
       rPic: "assets/img/room.jpg",
@@ -185,7 +185,7 @@ export class RoomService {
       rDesc: "จำนวนคน 100 คน",
     },
     {
-      rId: 21,
+      rId: 22,
       rName: "รถ",
       rType : "รถ",
       rPic: "assets/img/car.jpg",
@@ -247,6 +247,15 @@ export class RoomService {
     })
   }
 
+  updateRoomProfile(model : Room) {
+    this.listRoomModel = this.listRoomModel.filter((value, key) => {
+      if (value.rId === model.rId) {
+          value = model;
+      }
+      return true;
+  });
+  }
+
   roomModel(rId: string) {
 
   }