Update หน้าจองเบิก

src/app/models/equirment.model.ts

-import { CategoryModel } from "./ItemDetail.model";
+import { CategoryModel } from "./itemDetail.model";
 
 export class Equirment {
     eqId: number;

src/app/models/roomDetail.model.ts

@@ -17,7 +17,8 @@ export class RoomDetail {
         second: number;
     };
     rStatus: string;
-    rTelephone: number;
+    rTelephone: string;
+    email: undefined;
     Remark: string;
     constructor(init?: RoomDetail) {
         Object.assign(this, init);
@@ -28,6 +29,7 @@ export class RoomDetail {
         this.eDate = '';
         this.rStatus = '';
         this.rTelephone = undefined;
+        this.email = undefined;
         this.Remark = '';
     }
 }

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

 import { Component, OnInit } from '@angular/core';
 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 { ItemDetail } from 'src/app/models/itemDetail.model';
 import { RoomDetail } from 'src/app/models/RoomDetail.model';
 import { MyRoom, Room } from 'src/app/models/rooms.model';
 import { EquirmentService } from 'src/app/service/equirment.service';

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

@@ -7,6 +7,7 @@ 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';
+import { FormControl, Validators } from '@angular/forms';
 
 @Component({
   selector: 'app-admin-pending',
@@ -62,6 +63,9 @@ export class AdminPendingComponent implements OnInit {
 
   thStime: string;
   thEtime: string;
+
+
+
   thtimeChange (time:string,item:any){
     let timeSplit = time.split(":")
     item.hour = parseInt(timeSplit[0])
@@ -70,6 +74,8 @@ export class AdminPendingComponent implements OnInit {
   }
 
 
+
+
   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);

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

 import { Component, OnInit } from '@angular/core';
 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 { ItemDetail } from 'src/app/models/itemDetail.model';
 import { RoomDetail } from 'src/app/models/RoomDetail.model';
 import { MyRoom, Room } from 'src/app/models/rooms.model';
 import { EquirmentService } from 'src/app/service/equirment.service';
 import { ItemDetailService } from 'src/app/service/item-detail.service';
 import { RoomService } from 'src/app/service/room.service';
 import { RoomDetailService } from 'src/app/service/room-detail.service';
+import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
 
 
 @Component({
@@ -31,13 +32,54 @@ export class EquipmentComponent implements OnInit {
   modelItemDetail = new ItemDetail();
   modelRoomDetail = new RoomDetail();
 
-  constructor(private modalService: NgbModal, private equirmentService: EquirmentService, private roomService: RoomService, private ItemDetailService : ItemDetailService, private RoomDetailService : RoomDetailService) {
+  myFormRoom: FormGroup;
+  myFormEquir: FormGroup;
 
+  constructor(private modalService: NgbModal, private equirmentService: EquirmentService, private roomService: RoomService, private ItemDetailService : ItemDetailService, private RoomDetailService : RoomDetailService
+    ,private fb: FormBuilder) {
+    
+    
+  }
+
+  validate(){
+    console.log(this.myFormRoom.controls.userNameForm.status)
+    console.log(this.myFormRoom)
+    // var form = document.getElementsByClassName('needs-validation')[0] as HTMLFormElement;
+    // if (form.checkValidity() === false) {
+    //   event.preventDefault();
+    //   event.stopPropagation();
+    // }
+    // form.classList.add('was-validated');
   }
 
   ngOnInit() {
     this.listEquirmentModel = this.equirmentService.getListEquirment();
     this.listRoomModel = this.roomService.getListRoom();
+    this.myFormRoom = new FormGroup({
+      userNameForm : new FormControl('',[Validators.required]),
+      rTelephone : new FormControl('',[Validators.required]),
+      email : new FormControl('',[Validators.required, Validators.email]),
+      rName : new FormControl(),
+      rDesc : new FormControl(),
+      sDate : new FormControl('',[Validators.required]),
+      eDate : new FormControl('',[Validators.required]),
+      sTime : new FormControl('',[Validators.required]),
+      eTime : new FormControl('',[Validators.required]),
+      Remark : new FormControl()
+    });
+    this.myFormEquir = new FormGroup({
+      userNameForm : new FormControl('',[Validators.required]),
+      eTelephone : new FormControl('',[Validators.required]),
+      email : new FormControl('',[Validators.required, Validators.email]),
+      eqName : new FormControl('',[Validators.required]),
+      eqDesc : new FormControl('',[Validators.required]),
+      sDate : new FormControl('',[Validators.required]),
+      eDate : new FormControl('',[Validators.required]),
+      sTime : new FormControl('',[Validators.required]),
+      eTime : new FormControl('',[Validators.required]),
+      Quantity : new FormControl('',[Validators.required]),
+      Remark : new FormControl('',[Validators.required]),
+    })
   }
 
 

src/app/pages/lend-page/lend-page.component.ts

 import { Component, OnInit } from '@angular/core';
-import { ItemDetail } from 'src/app/models/ItemDetail.model';
+import { ItemDetail } from 'src/app/models/itemDetail.model';
 
 @Component({
   selector: 'app-lend-page',

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

 import { Component, OnInit } from '@angular/core';
 import { NgbDate, NgbCalendar, NgbDateParserFormatter } from '@ng-bootstrap/ng-bootstrap';
 import { NgbModal, ModalDismissReasons } from '@ng-bootstrap/ng-bootstrap';
-import { ItemDetail } from 'src/app/models/ItemDetail.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';

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

 import { Injectable } from '@angular/core';
 import { HttpClient, HttpHeaders } from '@angular/common/http';
-import { ItemDetail, SearchItemDetailModel } from '../models/ItemDetail.model';
+import { ItemDetail, SearchItemDetailModel } from '../models/itemDetail.model';
 
 @Injectable({ providedIn: 'root' })
 export class ItemDetailService {

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

@@ -33,6 +33,7 @@ export class RoomDetailService {
             },
             rStatus: 'รอการอนุมัติ',
             rTelephone: undefined,
+            email: undefined,
             Remark: 'test',
         },
         {
@@ -60,6 +61,7 @@ export class RoomDetailService {
             },
             rStatus: 'รอการอนุมัติ',
             rTelephone: undefined,
+            email: undefined,
             Remark: 'test',
         },