Commit 837b6be0 by Your Name

Update Edit type

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