Skip to content

B
BookingMyHrManagement
Commit 837b6be0 by Your Name
Options

Update Edit type

parent ced0a0eb
Showing with 138 additions and 102 deletions
src/app/models/rooms.model.ts
export interface Room {
rId: number;
rName: string;
rType : number;
rType : string;
rPic: string;
roomLimit: number;
rDesc: string;
......@@ -9,7 +9,7 @@ export interface Room {
export class MyRoom implements Room{
rId: number;
rName: string;
rType : number;
rType : string;
rPic: string;
roomLimit: number;
rDesc: string;
......@@ -18,7 +18,7 @@ export class MyRoom implements Room{
// Object.assign(this, init);
this.rId = init?.rId!;
this.rName = init?.rName!;
this.rType = 0;
this.rType = '';
this.rPic = 'assets/img/nopic.jpg';
this.roomLimit = 0;
this.rDesc = '';
......
src/app/pages/admin-equirment/admin-equirment.component.html
......@@ -270,8 +270,11 @@
</div>
<div class=" col-md-12">
<label>ประเภท</label>
<input class=" form-control" type="text" [(ngModel)]="listRoomModelEdit.rType"
formControlName="rType">
<select class="custom-select form-control" aria-label="Default select example"
formControlName="rType" [(ngModel)]="listRoomModelEdit.rType">
<option value="1" style="color: black;">ห้อง</option>
<option value="2" style="color: black;">รถ</option>
</select>
<div style="color: red;" *ngIf="myFormRoom.controls.rType.status=='INVALID'">
กรุณากรอกประเภท.</div>
</div>
......@@ -313,10 +316,13 @@
</div>
<div class=" col-md-12">
<label>ประเภทอุปกรณ์</label>
<input class=" form-control" type="text" [(ngModel)]="listEquirmentModelEdit.eqType"
formControlName="eqType">
<select class="custom-select form-control" aria-label="Default select example"
formControlName="eqType" [(ngModel)]="listEquirmentModelEdit.eqType">
<option value="4" style="color: black;">IT</option>
<option value="5" style="color: black;">Company</option>
</select>
<div style="color: red;" *ngIf="myFormEquir.controls.eqType.status=='INVALID'">
กรุณากรอกประเภทอุปกรณ์</div>
กรุณากรอกประเภท.</div>
</div>
<div class=" col-md-12">
<label>รายละเอียดอุปกรณ์</label>
......
src/app/pages/admin-pending/admin-pending.component.html
......@@ -20,7 +20,7 @@
</div>
</div>
</div>
<div class="form-group">
<div class="form-group ml-3">
<div class="input-group">
<input class="form-control" placeholder="dd/mm/yyyy" name="d2"
#c2="ngModel" [(ngModel)]="searchroomModel.eDate" ngbDatepicker
......@@ -31,32 +31,36 @@
</div>
</div>
</div>
</form>
<div class="form-group ml-3">
<div class="input-group">
<div ngbDropdown class="d-inline-block">
<div class="form-group ml-3">
<div class="input-group">
<div ngbDropdown class="d-inline-block">
<select class="custom-select form-control"
[(ngModel)]="searchroomModel.sroomStatus"
aria-label="Default select example">
<option selected style="color: black;">----สถานะ----</option>
<option value=0 style="color: black;">จอง</option>
<option value=1 style="color: black;">ไม่อนุมัติ</option>
<option value=2 style="color: black;">ยกเลิก</option>
</select>
</div>
</div>
<div class="input-group ml-3">
<select class="custom-select form-control"
[(ngModel)]="searchroomModel.sroomStatus"
aria-label="Default select example">
<option selected style="color: black;">----สถานะ----</option>
<option value=0 style="color: black;">จอง</option>
<option value=1 style="color: black;">ไม่อนุมัติ</option>
<option value=2 style="color: black;">ยกเลิก</option>
</select>
<select class="custom-select form-control" [(ngModel)]="searchroomModel.sroomType"
[(ngModel)]="searchroomModel.sroomType"
aria-label="Default select example">
<option selected style="color: black;">----ประเภท----</option>
<option value=1 style="color: black;">ห้อง</option>
<option value=2 style="color: black;">รถ</option>
</select>
</div>
<div class="input-group ml-3">
<button class="btn btn-sm btn-outline-success" type="submit"
(click)="openSearchRoom()">Search</button>
</div>
</div>
</div>
</form>
</div>
</div>
<div class="card-body">
<table class="table table-striped">
<thead>
......@@ -111,7 +115,6 @@
</div>
</div>
</ng-template>
</li>
<li ngbNavItem>
<a ngbNavLink>การเบิก</a>
......@@ -133,7 +136,7 @@
</div>
</div>
</div>
<div class="form-group">
<div class="form-group ml-3">
<div class="input-group">
<input class="form-control" placeholder="dd/mm/yyyy" name="d2"
#c2="ngModel" [(ngModel)]="searcheqModel.eDate" ngbDatepicker
......@@ -144,30 +147,35 @@
</div>
</div>
</div>
</form>
<div class="form-group ml-3">
<div class="input-group">
<div ngbDropdown class="d-inline-block">
<select class="form-select form-control"
aria-label="Default select example"
[(ngModel)]="searcheqModel.seqStatus">
<option selected style="color: black;">----สถานะ----</option>
<option value=0 style="color: black;">รอดำเนินการ</option>
<option value=1 style="color: black;">อนุมัติ</option>
<option value=2 style="color: black;">ยกเลิก</option>
<option value=3 style="color: black;">คืนแล้ว</option>
</select>
<select class="custom-select form-control" [(ngModel)]="searcheqModel.seqType"
<div class="form-group ml-3">
<div class="input-group">
<div ngbDropdown class="d-inline-block">
<select class="form-select form-control"
aria-label="Default select example"
[(ngModel)]="searcheqModel.seqStatus">
<option selected style="color: black;">----สถานะ----</option>
<option value=0 style="color: black;">รอดำเนินการ</option>
<option value=1 style="color: black;">อนุมัติ</option>
<option value=2 style="color: black;">ยกเลิก</option>
<option value=3 style="color: black;">คืนแล้ว</option>
</select>
</div>
</div>
<div class="input-group ml-3">
<select class="custom-select form-control"
[(ngModel)]="searcheqModel.seqType"
aria-label="Default select example">
<option selected style="color: black;">----ประเภท----</option>
<option value=4 style="color: black;">IT</option>
<option value=5 style="color: black;">Company</option>
</select>
</div>
<div class="input-group ml-3">
<button class="btn btn-sm btn-outline-success" type="submit"
(click)="openSearchEq()">Search</button>
</div>
</div>
</div>
</form>
</div>
</div>
<div class="card-body">
......@@ -224,6 +232,7 @@
</div>
</div>
</div>
</ng-template>
</li>
</ul>
......
src/app/pages/home-page/home-page.component.html
<div class= "content">
<div class="content">
<ul ngbNav #nav="ngbNav" (navChange)="onNavChange($event)" class="nav-tabs">
<li ngbNavItem>
<a ngbNavLink>ปฏิทินการจอง</a>
......@@ -20,7 +20,7 @@
</div>
</div>
</div>
<div class="form-group">
<div class="form-group ml-3">
<div class="input-group">
<input class="form-control" placeholder="dd/mm/yyyy" name="d2"
#c2="ngModel" [(ngModel)]="searchroomModel.eDate" ngbDatepicker
......@@ -31,27 +31,33 @@
</div>
</div>
</div>
</form>
<div class="form-group ml-3">
<div class="input-group">
<div ngbDropdown class="d-inline-block">
<select class="custom-select form-control" [(ngModel)]="searchroomModel.sroomStatus"
aria-label="Default select example">
<option value=0 style="color: black;">จอง</option>
<option value=1 style="color: black;">ไม่อนุมัติ</option>
<option value=2 style="color: black;">ยกเลิก</option>
</select>
<select class="custom-select form-control" [(ngModel)]="searchroomModel.sroomType"
<div class="form-group ml-3">
<div class="input-group">
<div ngbDropdown class="d-inline-block">
<select class="custom-select form-control"
[(ngModel)]="searchroomModel.sroomStatus"
aria-label="Default select example">
<option value=0 style="color: black;">จอง</option>
<option value=1 style="color: black;">ไม่อนุมัติ</option>
<option value=2 style="color: black;">ยกเลิก</option>
</select>
</div>
</div>
<div class="input-group ml-3">
<select class="custom-select form-control"
[(ngModel)]="searchroomModel.sroomType"
aria-label="Default select example">
<option selected style="color: black;">----ประเภท----</option>
<option value=1 style="color: black;">ห้อง</option>
<option value=2 style="color: black;">รถ</option>
</select>
</div>
<div class="input-group ml-3">
<button class="btn btn-sm btn-outline-success" type="submit"
(click)="openSearchRoom()">Search</button>
</div>
</div>
</div>
</form>
</div>
</div>
<div class="card-body">
......@@ -83,7 +89,7 @@
</div>
</div>
</div>
<div class="form-group">
<div class="form-group ml-3">
<div class="input-group">
<input class="form-control" placeholder="dd/mm/yyyy" name="d2"
#c2="ngModel" [(ngModel)]="searcheqModel.eDate" ngbDatepicker
......@@ -94,34 +100,39 @@
</div>
</div>
</div>
</form>
<div class="form-group ml-3">
<div class="input-group">
<div ngbDropdown class="d-inline-block">
<select class="form-select form-control"
aria-label="Default select example"
[(ngModel)]="searcheqModel.seqStatus">
<option value=0 style="color: black;">รอดำเนินการ</option>
<option value=1 style="color: black;">อนุมัติ</option>
<option value=2 style="color: black;">ยกเลิก</option>
<option value=3 style="color: black;">คืนแล้ว</option>
</select>
<select class="custom-select form-control" [(ngModel)]="searcheqModel.seqType"
<div class="form-group ml-3">
<div class="input-group">
<div ngbDropdown class="d-inline-block">
<select class="form-select form-control"
aria-label="Default select example"
[(ngModel)]="searcheqModel.seqStatus">
<option value=0 style="color: black;">รอดำเนินการ</option>
<option value=1 style="color: black;">อนุมัติ</option>
<option value=2 style="color: black;">ยกเลิก</option>
<option value=3 style="color: black;">คืนแล้ว</option>
</select>
</div>
</div>
<div class="input-group ml-3">
<select class="custom-select form-control"
[(ngModel)]="searcheqModel.seqType"
aria-label="Default select example">
<option selected style="color: black;">----ประเภท----</option>
<option value=4 style="color: black;">IT</option>
<option value=5 style="color: black;">Company</option>
</select>
</div>
<div class="input-group ml-3">
<button class="btn btn-sm btn-outline-success" type="submit"
(click)="openSearchEq()">Search</button>
</div>
</div>
</div>
</form>
</div>
</div>
<div class="card-body">
<full-calendar #calenderLend [options]="calendarEquirment"
style="margin-top: 20px;" *ngIf="listItemDetail.length> 0"></full-calendar>
<full-calendar #calenderLend [options]="calendarEquirment" style="margin-top: 20px;"
*ngIf="listItemDetail.length> 0"></full-calendar>
</div>
</div>
</div>
......
src/app/pages/pending/pending.component.html
......@@ -20,7 +20,7 @@
</div>
</div>
</div>
<div class="form-group">
<div class="form-group ml-3">
<div class="input-group">
<input class="form-control" placeholder="dd/mm/yyyy" name="d2"
#c2="ngModel" [(ngModel)]="searchroomModel.eDate" ngbDatepicker
......@@ -31,28 +31,34 @@
</div>
</div>
</div>
</form>
<div class="form-group ml-3">
<div class="input-group">
<div ngbDropdown class="d-inline-block">
<select class="custom-select form-control" [(ngModel)]="searchroomModel.sroomStatus"
aria-label="Default select example">
<option selected style="color: black;">----สถานะ----</option>
<option value=0 style="color: black;">จอง</option>
<option value=1 style="color: black;">ไม่อนุมัติ</option>
<option value=2 style="color: black;">ยกเลิก</option>
</select>
<select class="custom-select form-control" [(ngModel)]="searchroomModel.sroomType"
<div class="form-group ml-3">
<div class="input-group">
<div ngbDropdown class="d-inline-block">
<select class="custom-select form-control"
[(ngModel)]="searchroomModel.sroomStatus"
aria-label="Default select example">
<option selected style="color: black;">----สถานะ----</option>
<option value=0 style="color: black;">จอง</option>
<option value=1 style="color: black;">ไม่อนุมัติ</option>
<option value=2 style="color: black;">ยกเลิก</option>
</select>
</div>
</div>
<div class="input-group ml-3">
<select class="custom-select form-control"
[(ngModel)]="searchroomModel.sroomType"
aria-label="Default select example">
<option selected style="color: black;">----ประเภท----</option>
<option value=1 style="color: black;">ห้อง</option>
<option value=2 style="color: black;">รถ</option>
</select>
</div>
<div class="input-group ml-3">
<button class="btn btn-sm btn-outline-success" type="submit"
(click)="openSearchRoom()">Search</button>
</div>
</div>
</div>
</form>
</div>
</div>
<div class="card-body">
......@@ -110,7 +116,6 @@
</div>
</div>
</ng-template>
</li>
<li ngbNavItem>
<a ngbNavLink>การเบิก</a>
......@@ -132,7 +137,7 @@
</div>
</div>
</div>
<div class="form-group">
<div class="form-group ml-3">
<div class="input-group">
<input class="form-control" placeholder="dd/mm/yyyy" name="d2"
#c2="ngModel" [(ngModel)]="searcheqModel.eDate" ngbDatepicker
......@@ -143,30 +148,35 @@
</div>
</div>
</div>
</form>
<div class="form-group ml-3">
<div class="input-group">
<div ngbDropdown class="d-inline-block">
<select class="form-select form-control"
aria-label="Default select example"
[(ngModel)]="searcheqModel.seqStatus">
<option selected style="color: black;">----สถานะ----</option>
<option value=0 style="color: black;">รอดำเนินการ</option>
<option value=1 style="color: black;">อนุมัติ</option>
<option value=2 style="color: black;">ยกเลิก</option>
<option value=3 style="color: black;">คืนแล้ว</option>
</select>
<select class="custom-select form-control" [(ngModel)]="searcheqModel.seqType"
<div class="form-group ml-3">
<div class="input-group">
<div ngbDropdown class="d-inline-block">
<select class="form-select form-control"
aria-label="Default select example"
[(ngModel)]="searcheqModel.seqStatus">
<option selected style="color: black;">----สถานะ----</option>
<option value=0 style="color: black;">รอดำเนินการ</option>
<option value=1 style="color: black;">อนุมัติ</option>
<option value=2 style="color: black;">ยกเลิก</option>
<option value=3 style="color: black;">คืนแล้ว</option>
</select>
</div>
</div>
<div class="input-group ml-3">
<select class="custom-select form-control"
[(ngModel)]="searcheqModel.seqType"
aria-label="Default select example">
<option selected style="color: black;">----ประเภท----</option>
<option value=4 style="color: black;">IT</option>
<option value=5 style="color: black;">Company</option>
</select>
</div>
<div class="input-group ml-3">
<button class="btn btn-sm btn-outline-success" type="submit"
(click)="openSearchEq()">Search</button>
</div>
</div>
</div>
</form>
</div>
</div>
<div class="card-body">
......
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