Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
BookingMyHrManagement
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chanachai
BookingMyHrManagement
Commits
7fe5b3b3
Commit
7fe5b3b3
authored
Feb 08, 2022
by
Your Name
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update admin-pending real ↓ pending
parent
9c97989f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
29 deletions
+26
-29
admin-pending.component.html
src/app/pages/admin-pending/admin-pending.component.html
+2
-28
admin-pending.component.ts
src/app/pages/admin-pending/admin-pending.component.ts
+24
-1
No files found.
src/app/pages/admin-pending/admin-pending.component.html
View file @
7fe5b3b3
...
...
@@ -61,25 +61,12 @@
<button
ngbDropdownItem
>
สำเร็จแล้ว
</button>
</div>
<button
class=
"btn btn-sm btn-outline-success"
type=
"submit"
>
Search
</button>
type=
"submit"
(
click
)="
openSearchRoom
()"
>
Search
</button>
</div>
</div>
</div>
</form>
</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
class=
"card-body"
>
...
...
@@ -199,25 +186,12 @@
<button
ngbDropdownItem
>
สำเร็จแล้ว
</button>
</div>
<button
class=
"btn btn-sm btn-outline-success"
type=
"submit"
>
Search
</button>
type=
"submit"
(
click
)="
openSearchEq
()"
>
Search
</button>
</div>
</div>
</div>
</form>
</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
class=
"card-body"
>
<table
class=
"table table-striped"
>
...
...
src/app/pages/admin-pending/admin-pending.component.ts
View file @
7fe5b3b3
...
...
@@ -6,10 +6,12 @@ import { ItemDetail } from 'src/app/models/itemDetail.model';
import
{
ItemDetailService
}
from
'src/app/service/item-detail.service'
;
import
{
RoomDetail
}
from
'src/app/models/roomDetail.model'
;
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
{
RoomService
}
from
'src/app/service/room.service'
;
import
{
FormControl
,
FormGroup
,
Validators
}
from
'@angular/forms'
;
import
{
SearchEqModel
}
from
'src/app/models/searcheq.model'
;
import
{
SearchRoomModel
}
from
'src/app/models/searchroom.model'
;
@
Component
({
selector
:
'app-admin-pending'
,
...
...
@@ -69,6 +71,9 @@ export class AdminPendingComponent implements OnInit {
fromDate
:
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
,
private
equirmentService
:
EquirmentService
,
private
roomService
:
RoomService
)
{
this
.
fromDate
=
calendar
.
getToday
();
...
...
@@ -276,6 +281,24 @@ export class AdminPendingComponent implements OnInit {
this
.
modalService
.
dismissAll
();
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();
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment