Skip to content

B
BookingMyHrManagement
Commit ced0a0eb by Your Name
Options

update search type status

parent 3d6c8fdd
Showing with 101 additions and 49 deletions
src/app/pages/admin-pending/admin-pending.component.html
...@@ -35,13 +35,20 @@ ...@@ -35,13 +35,20 @@
<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">
<button class="btn btn-sm btn-outline-primary" id="dropdownBasic1" <select class="custom-select form-control"
ngbDropdownToggle>ประเภทการค้นหา</button> [(ngModel)]="searchroomModel.sroomStatus"
<div ngbDropdownMenu aria-labelledby="dropdownBasic1"> aria-label="Default select example">
<button ngbDropdownItem>จอง</button> <option selected style="color: black;">----สถานะ----</option>
<button ngbDropdownItem>ไม่อนุมัติ</button> <option value=0 style="color: black;">จอง</option>
<button ngbDropdownItem>ยกเลิก</button> <option value=1 style="color: black;">ไม่อนุมัติ</option>
</div> <option value=2 style="color: black;">ยกเลิก</option>
</select>
<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>
<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>
...@@ -141,14 +148,21 @@ ...@@ -141,14 +148,21 @@
<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">
<button class="btn btn-sm btn-outline-primary" id="dropdownBasic1" <select class="form-select form-control"
ngbDropdownToggle>ประเภทการค้นหา</button> aria-label="Default select example"
<div ngbDropdownMenu aria-labelledby="dropdownBasic1"> [(ngModel)]="searcheqModel.seqStatus">
<button ngbDropdownItem>รอดำเนินการ</button> <option selected style="color: black;">----สถานะ----</option>
<button ngbDropdownItem>อนุมัติ</button> <option value=0 style="color: black;">รอดำเนินการ</option>
<button ngbDropdownItem>ยกเลิก</button> <option value=1 style="color: black;">อนุมัติ</option>
<button ngbDropdownItem>สำเร็จแล้ว</button> <option value=2 style="color: black;">ยกเลิก</option>
</div> <option value=3 style="color: black;">คืนแล้ว</option>
</select>
<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>
<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>
......
src/app/pages/admin-pending/admin-pending.component.scss
::ng-deep .btn-light {
color: #212529;
}
\ No newline at end of file
src/app/pages/home-page/home-page.component.html
...@@ -35,13 +35,18 @@ ...@@ -35,13 +35,18 @@
<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">
<button class="btn btn-sm btn-outline-primary" id="dropdownBasic1" <select class="custom-select form-control" [(ngModel)]="searchroomModel.sroomStatus"
ngbDropdownToggle >ประเภทการค้นหา</button> aria-label="Default select example">
<div ngbDropdownMenu aria-labelledby="dropdownBasic1"> <option value=0 style="color: black;">จอง</option>
<button ngbDropdownItem>จอง</button> <option value=1 style="color: black;">ไม่อนุมัติ</option>
<button ngbDropdownItem>ไม่อนุมัติ</button> <option value=2 style="color: black;">ยกเลิก</option>
<button ngbDropdownItem>ยกเลิก</button> </select>
</div> <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>
<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>
...@@ -93,14 +98,20 @@ ...@@ -93,14 +98,20 @@
<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">
<button class="btn btn-sm btn-outline-primary" id="dropdownBasic1" <select class="form-select form-control"
ngbDropdownToggle>ประเภทการค้นหา</button> aria-label="Default select example"
<div ngbDropdownMenu aria-labelledby="dropdownBasic1"> [(ngModel)]="searcheqModel.seqStatus">
<button ngbDropdownItem>รอดำเนินการ</button> <option value=0 style="color: black;">รอดำเนินการ</option>
<button ngbDropdownItem>อนุมัติ</button> <option value=1 style="color: black;">อนุมัติ</option>
<button ngbDropdownItem>ยกเลิก</button> <option value=2 style="color: black;">ยกเลิก</option>
<button ngbDropdownItem>สำเร็จแล้ว</button> <option value=3 style="color: black;">คืนแล้ว</option>
</div> </select>
<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>
<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>
......
src/app/pages/home-page/home-page.component.scss
...@@ -10,4 +10,8 @@ ...@@ -10,4 +10,8 @@
::ng-deep .fc-direction-ltr .fc-daygrid-event.fc-event-end, .fc-direction-rtl .fc-daygrid-event.fc-event-start { ::ng-deep .fc-direction-ltr .fc-daygrid-event.fc-event-end, .fc-direction-rtl .fc-daygrid-event.fc-event-start {
margin-right: 2px; margin-right: 2px;
background-color: blueviolet; background-color: blueviolet;
}
::ng-deep .btn-light {
color: #212529;
} }
\ No newline at end of file
src/app/pages/pending/pending.component.html
...@@ -35,11 +35,18 @@ ...@@ -35,11 +35,18 @@
<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"
aria-label="Default select example" formControlName="rStatus"> aria-label="Default select example">
<option value="0" selected style="color: black;">จอง</option> <option selected style="color: black;">----สถานะ----</option>
<option value="1" style="color: black;">ไม่อนุมัติ</option> <option value=0 style="color: black;">จอง</option>
<option value="2" 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">
<option selected style="color: black;">----ประเภท----</option>
<option value=1 style="color: black;">ห้อง</option>
<option value=2 style="color: black;">รถ</option>
</select> </select>
<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>
...@@ -140,14 +147,21 @@ ...@@ -140,14 +147,21 @@
<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">
<button class="btn btn-sm btn-outline-primary" id="dropdownBasic1" <select class="form-select form-control"
ngbDropdownToggle>ประเภทการค้นหา</button> aria-label="Default select example"
<div ngbDropdownMenu aria-labelledby="dropdownBasic1"> [(ngModel)]="searcheqModel.seqStatus">
<button ngbDropdownItem>รอดำเนินการ</button> <option selected style="color: black;">----สถานะ----</option>
<button ngbDropdownItem>อนุมัติ</button> <option value=0 style="color: black;">รอดำเนินการ</option>
<button ngbDropdownItem>ยกเลิก</button> <option value=1 style="color: black;">อนุมัติ</option>
<button ngbDropdownItem>สำเร็จแล้ว</button> <option value=2 style="color: black;">ยกเลิก</option>
</div> <option value=3 style="color: black;">คืนแล้ว</option>
</select>
<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>
<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>
......
src/app/pages/pending/pending.component.scss
::ng-deep .btn-light {
color: #212529;
}
\ No newline at end of file
src/app/service/equirment.service.ts
...@@ -9,7 +9,7 @@ import { Type } from '../models/type.model'; ...@@ -9,7 +9,7 @@ import { Type } from '../models/type.model';
export class EquirmentService { export class EquirmentService {
constructor(private http: HttpClient) { } constructor(private http: HttpClient) { }
url: string = "http://2839-110-169-220-190.ngrok.io"; url: string = "http://0eb9-110-169-220-190.ngrok.io";
listEquirment: Equirment[] = [] listEquirment: Equirment[] = []
addEquirment(model: Equirment) { addEquirment(model: Equirment) {
......
src/app/service/item-detail.service.ts
...@@ -7,7 +7,7 @@ import { Observable } from 'rxjs'; ...@@ -7,7 +7,7 @@ import { Observable } from 'rxjs';
export class ItemDetailService { export class ItemDetailService {
constructor(private http: HttpClient) { } constructor(private http: HttpClient) { }
url: string = "http://2839-110-169-220-190.ngrok.io"; url: string = "http://0eb9-110-169-220-190.ngrok.io";
listItemDetail: ItemDetail[] = [] listItemDetail: ItemDetail[] = []
addItemDetail(model: ItemDetail) { addItemDetail(model: ItemDetail) {
......
src/app/service/room-detail.service.ts
...@@ -11,7 +11,7 @@ export class RoomDetailService { ...@@ -11,7 +11,7 @@ export class RoomDetailService {
} }
constructor(private http: HttpClient) { } constructor(private http: HttpClient) { }
url: string = "http://2839-110-169-220-190.ngrok.io"; url: string = "http://0eb9-110-169-220-190.ngrok.io";
listRoomDetail: RoomDetail[] = [] listRoomDetail: RoomDetail[] = []
editRoomDetail(model: RoomDetail) { editRoomDetail(model: RoomDetail) {
......
src/app/service/room.service.ts
...@@ -8,7 +8,7 @@ import { SearchRoomModel } from '../models/searchroom.model'; ...@@ -8,7 +8,7 @@ import { SearchRoomModel } from '../models/searchroom.model';
export class RoomService { export class RoomService {
constructor(private http: HttpClient) { } constructor(private http: HttpClient) { }
url: string = "http://2839-110-169-220-190.ngrok.io"; url: string = "http://0eb9-110-169-220-190.ngrok.io";
listRoomModel: Room[] = [] listRoomModel: Room[] = []
listRoomSearch: Room[] = []; listRoomSearch: Room[] = [];
......
src/app/service/search.service.ts
...@@ -7,7 +7,7 @@ import { SearchEqModel } from '../models/searcheq.model'; ...@@ -7,7 +7,7 @@ import { SearchEqModel } from '../models/searcheq.model';
export class SearchService { export class SearchService {
constructor(private http: HttpClient) {} constructor(private http: HttpClient) {}
url: string = "http://2839-110-169-220-190.ngrok.io"; url: string = "http://0eb9-110-169-220-190.ngrok.io";
listSearchEq: SearchEqModel[] = [] listSearchEq: SearchEqModel[] = []
getSearchEq(model: SearchEqModel){ getSearchEq(model: SearchEqModel){
......
src/app/service/type.service.ts
...@@ -10,7 +10,7 @@ export class TypeService { ...@@ -10,7 +10,7 @@ export class TypeService {
// } // }
constructor(private http: HttpClient) { } constructor(private http: HttpClient) { }
url: string = "http://2839-110-169-220-190.ngrok.io"; url: string = "http://0eb9-110-169-220-190.ngrok.io";
listType: Type[] = [] listType: Type[] = []
addType(model: Type) { addType(model: Type) {
......
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