Commit 7fe5b3b3 by Your Name

update admin-pending real ↓ pending

parent 9c97989f
...@@ -61,25 +61,12 @@ ...@@ -61,25 +61,12 @@
<button ngbDropdownItem>สำเร็จแล้ว</button> <button ngbDropdownItem>สำเร็จแล้ว</button>
</div> </div>
<button class="btn btn-sm btn-outline-success" <button class="btn btn-sm btn-outline-success"
type="submit">Search</button> type="submit" (click)="openSearchRoom()">Search</button>
</div> </div>
</div> </div>
</div> </div>
</form> </form>
</div> </div>
<!-- <div class="col-4">
<div ngbDropdown class="d-inline-block">
<button class="btn btn-sm btn-outline-primary" id="dropdownBasic1"
ngbDropdownToggle>ประเภทการค้นหา</button>
<div ngbDropdownMenu aria-labelledby="dropdownBasic1">
<button ngbDropdownItem>รอดำเนินการ</button>
<button ngbDropdownItem>อนุมัติ</button>
<button ngbDropdownItem>ยกเลิก</button>
<button ngbDropdownItem>สำเร็จแล้ว</button>
</div>
<button class="btn btn-sm btn-outline-success" type="submit">Search</button>
</div>
</div> -->
</div> </div>
<div class="card-body"> <div class="card-body">
...@@ -199,25 +186,12 @@ ...@@ -199,25 +186,12 @@
<button ngbDropdownItem>สำเร็จแล้ว</button> <button ngbDropdownItem>สำเร็จแล้ว</button>
</div> </div>
<button class="btn btn-sm btn-outline-success" <button class="btn btn-sm btn-outline-success"
type="submit">Search</button> type="submit" (click)="openSearchEq()">Search</button>
</div> </div>
</div> </div>
</div> </div>
</form> </form>
</div> </div>
<!-- <div class="col-4">
<div ngbDropdown class="d-inline-block">
<button class="btn btn-sm btn-outline-primary" id="dropdownBasic1"
ngbDropdownToggle>ประเภทการค้นหา</button>
<div ngbDropdownMenu aria-labelledby="dropdownBasic1">
<button ngbDropdownItem>รอดำเนินการ</button>
<button ngbDropdownItem>อนุมัติ</button>
<button ngbDropdownItem>ยกเลิก</button>
<button ngbDropdownItem>สำเร็จแล้ว</button>
</div>
<button class="btn btn-sm btn-outline-success" type="submit">Search</button>
</div>
</div> -->
</div> </div>
<div class="card-body"> <div class="card-body">
<table class="table table-striped"> <table class="table table-striped">
......
...@@ -6,10 +6,12 @@ import { ItemDetail } from 'src/app/models/itemDetail.model'; ...@@ -6,10 +6,12 @@ import { ItemDetail } from 'src/app/models/itemDetail.model';
import { ItemDetailService } from 'src/app/service/item-detail.service'; import { ItemDetailService } from 'src/app/service/item-detail.service';
import { RoomDetail } from 'src/app/models/roomDetail.model'; import { RoomDetail } from 'src/app/models/roomDetail.model';
import { RoomDetailService } from 'src/app/service/room-detail.service'; import { RoomDetailService } from 'src/app/service/room-detail.service';
import { MyRoom, Room } from 'src/app/models/rooms.model'; import { MyRoom } from 'src/app/models/rooms.model';
import { EquirmentService } from 'src/app/service/equirment.service'; import { EquirmentService } from 'src/app/service/equirment.service';
import { RoomService } from 'src/app/service/room.service'; import { RoomService } from 'src/app/service/room.service';
import { FormControl, FormGroup, Validators } from '@angular/forms'; import { FormControl, FormGroup, Validators } from '@angular/forms';
import { SearchEqModel } from 'src/app/models/searcheq.model';
import { SearchRoomModel } from 'src/app/models/searchroom.model';
@Component({ @Component({
selector: 'app-admin-pending', selector: 'app-admin-pending',
...@@ -69,6 +71,9 @@ export class AdminPendingComponent implements OnInit { ...@@ -69,6 +71,9 @@ export class AdminPendingComponent implements OnInit {
fromDate: NgbDate | null; fromDate: NgbDate | null;
toDate: NgbDate | null; toDate: NgbDate | null;
searcheqModel : SearchEqModel = new SearchEqModel();
searchroomModel : SearchRoomModel = new SearchRoomModel();
constructor(private calendar: NgbCalendar, public formatter: NgbDateParserFormatter, private modalService: NgbModal, private ItemDetailService: ItemDetailService, private RoomDetailService: RoomDetailService constructor(private calendar: NgbCalendar, public formatter: NgbDateParserFormatter, private modalService: NgbModal, private ItemDetailService: ItemDetailService, private RoomDetailService: RoomDetailService
, private equirmentService: EquirmentService, private roomService: RoomService) { , private equirmentService: EquirmentService, private roomService: RoomService) {
this.fromDate = calendar.getToday(); this.fromDate = calendar.getToday();
...@@ -276,6 +281,24 @@ export class AdminPendingComponent implements OnInit { ...@@ -276,6 +281,24 @@ export class AdminPendingComponent implements OnInit {
this.modalService.dismissAll(); this.modalService.dismissAll();
this.ngOnInit(); this.ngOnInit();
} }
openSearchEq() {
console.log(this.searcheqModel)
// this.searchService.getSearchEq();
// this.modalService.dismissAll();
// this.ngOnInit();
}
openSearchRoom() {
console.log(this.searchroomModel)
// this.searchService.getSearchRoom();
// this.modalService.dismissAll();
// this.ngOnInit();
}
} }
......
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