Skip to content

B
BookingMyHrManagement
Commit 16d16296 by DESKTOP-HF0LVOG\myhr
Options

Update Varidator หน้ารายการอนุมัติ admin

parent 12cd07db
Showing with 192 additions and 119 deletions
src/app/pages/admin-pending/admin-pending.component.html
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
<ng-template ngbPaginationPrevious>Previous</ng-template> <ng-template ngbPaginationPrevious>Previous</ng-template>
<ng-template ngbPaginationNext>Next</ng-template> <ng-template ngbPaginationNext>Next</ng-template>
</ngb-pagination> </ngb-pagination>
<select class="custom-select" style="width: auto" [(ngModel)]="pageSizeListRoom" <select class="custom-select" style="width: auto" [(ngModel)]="pageSizeListRoom"
(ngModelChange)="pageListRoom=1"> (ngModelChange)="pageListRoom=1">
<option [ngValue]="10">10 items per page</option> <option [ngValue]="10">10 items per page</option>
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
<ng-template ngbPaginationPrevious>Previous</ng-template> <ng-template ngbPaginationPrevious>Previous</ng-template>
<ng-template ngbPaginationNext>Next</ng-template> <ng-template ngbPaginationNext>Next</ng-template>
</ngb-pagination> </ngb-pagination>
<select class="custom-select" style="width: auto" [(ngModel)]="pageSizeListRoom" <select class="custom-select" style="width: auto" [(ngModel)]="pageSizeListRoom"
(ngModelChange)="pageListRoom=1"> (ngModelChange)="pageListRoom=1">
<option [ngValue]="10">10 items per page</option> <option [ngValue]="10">10 items per page</option>
...@@ -197,73 +197,110 @@ ...@@ -197,73 +197,110 @@
<h5 class=" title">การจอง</h5> <h5 class=" title">การจอง</h5>
</div> </div>
<div class=" card-body"> <div class=" card-body">
<div class=" row"> <form [formGroup]="myFormRoom" class="needs-validation">
<div class=" col-md-12"> <div class=" row">
<div class=" form-group"> <div class=" col-md-12">
<label> ชื่อผู้จอง </label> <div class=" form-group">
<input class=" form-control" placeholder="" type="text" [(ngModel)]="modelRoomDetail.userName" /> <label> ชื่อผู้จอง </label>
<input class=" form-control" placeholder="" type="text"
[(ngModel)]="modelRoomDetail.userName" formControlName="userNameForm" />
<div style="color: red;" *ngIf="myFormRoom.controls.userNameForm.status=='INVALID'">
Invalid
Username.</div>
</div>
</div> </div>
</div> </div>
</div> <div class=" row">
<div class=" row"> <div class=" col-sm-12 mb-1">
<div class=" col-sm-12 mb-1"> <div class=" form-group">
<div class=" form-group"> <label> อีเมล </label>
<label> อีเมล </label> <input class=" form-control" placeholder="" type="text"
<input class=" form-control" placeholder="" type="text" [(ngModel)]="modelRoomDetail.email" /> [(ngModel)]="modelRoomDetail.email" formControlName="email" />
<div style="color: red;" *ngIf="myFormRoom.controls.email.status=='INVALID'">
Invalid
Email.</div>
</div>
</div> </div>
</div> </div>
</div> <div class=" row">
<div class=" row"> <div class=" col-md-12">
<div class=" col-md-12"> <div class=" form-group">
<div class=" form-group"> <label> เบอร์โทร </label>
<label> เบอร์โทร </label> <input class=" form-control" placeholder="" type="text"
<input class=" form-control" placeholder="" type="text" [(ngModel)]="modelRoomDetail.room.rTelephone" /> [(ngModel)]="modelRoomDetail.room.rTelephone" formControlName="rTelephone" />
<div style="color: red;" *ngIf="myFormRoom.controls.rTelephone.status=='INVALID'">
Invalid
Telephone.</div>
</div>
</div> </div>
</div> </div>
</div> <div class="row">
<div class="row"> <div class="col-sm-12 mb-1">
<div class="col-sm-12 mb-1"> <label for="exampleFormControlSelect1">ชื่อห้อง</label>
<label for="exampleFormControlSelect1">ชื่อห้อง</label> <input class="form-control" type="text" [(ngModel)]="modelRoomDetail.room.rName"
<input class="form-control" type="text" [(ngModel)]="modelRoomDetail.room.rName"/> formControlName="rName" />
</div> <div style="color: red;" *ngIf="myFormRoom.controls.rName.status=='INVALID'">
</div> Invalid
<div class="row"> Room Name.</div>
<div class="col-sm-12 mb-1"> </div>
<label for="exampleFormControlSelect1">รายละเอียด</label>
<input class="form-control" type="text" [(ngModel)]="modelRoomDetail.room.rDesc" />
</div>
</div>
<div class="row">
<div class="col-6 mb-1">
<label for="exampleFormControlSelect1">วันที่เริ่มต้น</label>
<input type="date" class="form-control" [(ngModel)]="sDate" (ngModelChange)="rDate(sDate,'sdate')" />
</div> </div>
<div class="col-6 mb-1"> <div class="row">
<label for="exampleFormControlSelect1">วันที่สิ้นสุด</label> <div class="col-sm-12 mb-1">
<input type="date" class="form-control" [(ngModel)]="eDate" (ngModelChange)="rDate(eDate,'edate')" /> <label for="exampleFormControlSelect1">รายละเอียด</label>
<input class="form-control" type="text" [(ngModel)]="modelRoomDetail.room.rDesc"
formControlName="rDesc" />
<div style="color: red;" *ngIf="myFormRoom.controls.rDesc.status=='INVALID'">
Invalid
Desc.</div>
</div>
</div> </div>
</div> <div class="row">
<div class="row"> <div class="col-6 mb-1">
<div class="col-6 mb-1"> <label for="exampleFormControlSelect1">วันที่เริ่มต้น</label>
<label for="exampleFormControlSelect1">เวลาที่เริ่มต้น</label> <input type="date" class="form-control" [(ngModel)]="sDate"
<input class="form-control" type="time" (ngModelChange)="rDate(sDate,'sdate')" formControlName="sDate" />
[(ngModel)]="thStime" (ngModelChange)="thtimeChange(thStime,modelRoomDetail.sTime)" /> <div style="color: red;" *ngIf="myFormRoom.controls.sDate.status=='INVALID'">
Invalid
Start Date.</div>
</div>
<div class="col-6 mb-1">
<label for="exampleFormControlSelect1">วันที่สิ้นสุด</label>
<input type="date" class="form-control" [(ngModel)]="eDate"
(ngModelChange)="rDate(eDate,'edate')" formControlName="eDate" />
<div style="color: red;" *ngIf="myFormRoom.controls.eDate.status=='INVALID'">
Invalid
End Date.</div>
</div>
</div> </div>
<div class="col-6 mb-1"> <div class="row">
<label for="exampleFormControlSelect1">เวลาที่สิ้นสุด</label> <div class="col-6 mb-1">
<input class="form-control" type="time" <label for="exampleFormControlSelect1">เวลาที่เริ่มต้น</label>
[(ngModel)]="thEtime" (ngModelChange)="thtimeChange(thEtime,modelRoomDetail.eTime)" /> <input class="form-control" type="time" [(ngModel)]="thStime"
(ngModelChange)="thtimeChange(thStime,modelRoomDetail.sTime)" formControlName="sTime" />
<div style="color: red;" *ngIf="myFormRoom.controls.sTime.status=='INVALID'">
Invalid
Start Time.</div>
</div>
<div class="col-6 mb-1">
<label for="exampleFormControlSelect1">เวลาที่สิ้นสุด</label>
<input class="form-control" type="time" [(ngModel)]="thEtime"
(ngModelChange)="thtimeChange(thEtime,modelRoomDetail.eTime)" formControlName="eTime" />
<div style="color: red;" *ngIf="myFormRoom.controls.eTime.status=='INVALID'">
Invalid
End Time.</div>
</div>
</div> </div>
</div> <div class=" row">
<div class=" row"> <div class=" col-md-12">
<div class=" col-md-12"> <div class=" form-group">
<div class=" form-group"> <label> หมายเหตุ </label>
<label> หมายเหตุ </label> <textarea class="form-control" id="exampleFormControlTextarea1" rows="3"
<textarea class="form-control" id="exampleFormControlTextarea1" rows="3" placeholder="......" [(ngModel)]="modelRoomDetail.Remark"
placeholder="......" [(ngModel)]="modelRoomDetail.Remark"></textarea> formControlName="Remark"></textarea>
</div>
</div> </div>
</div> </div>
</div> </form>
<div class=" card-footer"> <div class=" card-footer">
<button class=" btn btn-fill btn-danger" type="submit" (click)="saveRoom()">อนุมัติ</button> <button class=" btn btn-fill btn-danger" type="submit" (click)="saveRoom()">อนุมัติ</button>
<button class=" btn btn-fill btn-danger" type="cancel" <button class=" btn btn-fill btn-danger" type="cancel"
...@@ -291,81 +328,117 @@ ...@@ -291,81 +328,117 @@
<h5 class=" title">การเบิก</h5> <h5 class=" title">การเบิก</h5>
</div> </div>
<div class=" card-body"> <div class=" card-body">
<div class=" row"> <form [formGroup]="myFormEquir" class="needs-validation">
<div class=" col-sm-12 mb-1"> <div class=" row">
<div class=" form-group"> <div class=" col-sm-12 mb-1">
<label> ชื่อผู้จอง </label> <div class=" form-group">
<input class=" form-control" placeholder="" type="text" <label> ชื่อผู้จอง </label>
[(ngModel)]="modelItemDetail.userName" /> <input class=" form-control" placeholder="" type="text"
[(ngModel)]="modelItemDetail.userName" formControlName="userNameForm" />
<div style="color: red;" *ngIf="myFormEquir.controls.userNameForm.status=='INVALID'">
Invalid
Name.</div>
</div>
</div> </div>
</div> </div>
</div> <div class=" row">
<div class=" row"> <div class=" col-sm-12 mb-1">
<div class=" col-sm-12 mb-1"> <div class=" form-group">
<div class=" form-group"> <label> อีเมล </label>
<label> อีเมล </label> <input class=" form-control" placeholder="" type="text"
<input class=" form-control" placeholder="" type="text" [(ngModel)]="modelItemDetail.email" /> [(ngModel)]="modelItemDetail.email" formControlName="email" />
<div style="color: red;" *ngIf="myFormEquir.controls.email.status=='INVALID'">
Invalid
Email.</div>
</div>
</div> </div>
</div> </div>
</div> <div class=" row">
<div class=" row"> <div class=" col-md-12">
<div class=" col-md-12"> <div class=" form-group">
<div class=" form-group"> <label> เบอร์โทร </label>
<label> เบอร์โทร </label> <input class=" form-control" placeholder="" type="text"
<input class=" form-control" placeholder="" type="text" [(ngModel)]="modelItemDetail.equirment.eTelephone" /> [(ngModel)]="modelItemDetail.equirment.eTelephone" formControlName="eTelephone" />
<div style="color: red;" *ngIf="myFormEquir.controls.eTelephone.status=='INVALID'">
Invalid
Telephone.</div>
</div>
</div> </div>
</div> </div>
</div> <div class="row">
<div class="row"> <div class="col-sm-12 mb-1">
<div class="col-sm-12 mb-1"> <label for="exampleFormControlSelect1">ชื่ออุปกรณ์</label>
<label for="exampleFormControlSelect1">ชื่ออุปกรณ์</label> <input class="form-control" type="text" [(ngModel)]="modelItemDetail.equirment.eqName" formControlName="eqName" />
<input class="form-control" type="text" [(ngModel)]="modelItemDetail.equirment.eqName" /> <div style="color: red;" *ngIf="myFormEquir.controls.eqName.status=='INVALID'">
</div> Invalid
</div> Equirment Name.</div>
<div class="row"> </div>
<div class="col-sm-12 mb-1">
<label for="exampleFormControlSelect1">รายละเอียดอุปกรณ์</label>
<input class="form-control" type="text" [(ngModel)]="modelItemDetail.equirment.eqDesc" />
</div>
</div>
<div class="row">
<div class="col-6 mb-1">
<label for="exampleFormControlSelect1">วันที่เริ่มต้น</label>
<input type="date" class="form-control" [(ngModel)]="sDate" (ngModelChange)="rDate(sDate,'sdate')" />
</div> </div>
<div class="col-6 mb-1"> <div class="row">
<label for="exampleFormControlSelect1">วันที่สิ้นสุด</label> <div class="col-sm-12 mb-1">
<input type="date" class="form-control" [(ngModel)]="eDate" (ngModelChange)="rDate(eDate,'edate')" /> <label for="exampleFormControlSelect1">รายละเอียดอุปกรณ์</label>
<input class="form-control" type="text" [(ngModel)]="modelItemDetail.equirment.eqDesc" formControlName="eqDesc" />
<div style="color: red;" *ngIf="myFormEquir.controls.eqDesc.status=='INVALID'">
Invalid
Equirment Desc.</div>
</div>
</div> </div>
</div> <div class="row">
<div class="row"> <div class="col-6 mb-1">
<div class="col-6 mb-1"> <label for="exampleFormControlSelect1">วันที่เริ่มต้น</label>
<label for="exampleFormControlSelect1">เวลาที่เริ่มต้น</label> <input type="date" class="form-control" [(ngModel)]="sDate"
<input class="form-control" type="time" (ngModelChange)="rDate(sDate,'sdate')" formControlName="sDate" />
[(ngModel)]="thStime" (ngModelChange)="thtimeChange(thStime,modelItemDetail.sTime)" /> <div style="color: red;" *ngIf="myFormEquir.controls.sDate.status=='INVALID'">
Invalid
Start Date.</div>
</div>
<div class="col-6 mb-1">
<label for="exampleFormControlSelect1">วันที่สิ้นสุด</label>
<input type="date" class="form-control" [(ngModel)]="eDate"
(ngModelChange)="rDate(eDate,'edate')" formControlName="eDate" />
<div style="color: red;" *ngIf="myFormEquir.controls.eDate.status=='INVALID'">
Invalid
End Date.</div>
</div>
</div> </div>
<div class="col-6 mb-1"> <div class="row">
<label for="exampleFormControlSelect1">เวลาที่สิ้นสุด</label> <div class="col-6 mb-1">
<input class="form-control" type="text" <label for="exampleFormControlSelect1">เวลาที่เริ่มต้น</label>
[(ngModel)]="thEtime" (ngModelChange)="thtimeChange(thStime,modelItemDetail.eTime)" /> <input class="form-control" type="time" [(ngModel)]="thStime"
(ngModelChange)="thtimeChange(thStime,modelItemDetail.sTime)" formControlName="sTime" />
<div style="color: red;" *ngIf="myFormEquir.controls.sTime.status=='INVALID'">
Invalid
Start Time.</div>
</div>
<div class="col-6 mb-1">
<label for="exampleFormControlSelect1">เวลาที่สิ้นสุด</label>
<input class="form-control" type="time" [(ngModel)]="thEtime"
(ngModelChange)="thtimeChange(thStime,modelItemDetail.eTime)" formControlName="eTime" />
<div style="color: red;" *ngIf="myFormEquir.controls.eTime.status=='INVALID'">
Invalid
End Time.</div>
</div>
</div> </div>
</div> <div class=" row">
<div class=" row"> <div class=" col-sm-6 mb-1">
<div class=" col-sm-6 mb-1"> <label for="changequantity">จำนวน</label>
<label for="changequantity">จำนวน</label> <input id="changequantity" type="number" class="form-control form-control-sm"
<input id="changequantity" type="number" class="form-control form-control-sm" [(ngModel)]="modelItemDetail.Quantity" formControlName="Quantity" />
[(ngModel)]="modelItemDetail.Quantity" /> <div style="color: red;" *ngIf="myFormEquir.controls.Quantity.status=='INVALID'">
Invalid
Quantity.</div>
</div>
</div> </div>
</div> <div class=" row">
<div class=" row"> <div class=" col-md-12">
<div class=" col-md-12"> <div class=" form-group">
<div class=" form-group"> <label> หมายเหตุ </label>
<label> หมายเหตุ </label> <textarea class="form-control" id="exampleFormControlTextarea1" rows="3"
<textarea class="form-control" id="exampleFormControlTextarea1" rows="3" placeholder="......" [(ngModel)]="modelItemDetail.Remark" formControlName="Remark"></textarea>
placeholder="......" [(ngModel)]="modelItemDetail.Remark"></textarea> </div>
</div> </div>
</div> </div>
</div> </form>
<div class=" card-footer"> <div class=" card-footer">
<button class=" btn btn-fill btn-danger" type="submit" (click)="saveEquirment()">อนุมัติ</button> <button class=" btn btn-fill btn-danger" type="submit" (click)="saveEquirment()">อนุมัติ</button>
<button class=" btn btn-fill btn-danger" type="cancel" <button class=" btn btn-fill btn-danger" type="cancel"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment