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
37cab6c1
Commit
37cab6c1
authored
3 years ago
by
Chanachai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add ปุ่มอนุมัติได้
parent
c709d9e1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
126 additions
and
87 deletions
+126
-87
admin-pending.component.html
src/app/pages/admin-pending/admin-pending.component.html
+77
-74
admin-pending.component.ts
src/app/pages/admin-pending/admin-pending.component.ts
+40
-4
equipment.component.ts
src/app/pages/equipment/equipment.component.ts
+1
-1
pending.component.html
src/app/pages/pending/pending.component.html
+8
-8
No files found.
src/app/pages/admin-pending/admin-pending.component.html
View file @
37cab6c1
...
...
@@ -63,6 +63,7 @@
</div>
</div>
<ul
ngbNav
#
nav=
"ngbNav"
class=
"nav-tabs"
>
<li
ngbNavItem
>
<a
ngbNavLink
>
การจอง
</a>
...
...
@@ -75,29 +76,28 @@
<thead>
<tr>
<th
scope=
"col"
>
#
</th>
<th
scope=
"col"
>
หมวดหมู่
</th>
<th
scope=
"col"
>
ประเภท
</th>
<th
scope=
"col"
>
ชื่อห้อง
</th>
<th
scope=
"col"
>
รายละเอียด
</th>
<th
scope=
"col"
>
ชื่อ
</th>
<th
scope=
"col"
>
ชื่อ
ผู้เบิก
</th>
<th
scope=
"col"
>
วันที่เริ่มต้น
</th>
<th
scope=
"col"
>
วันที่สิ้นสุด
</th>
<th
scope=
"col"
>
สถานะ
</th>
</tr>
</thead>
<tbody>
<tr
*
ngFor=
"let
country of countries
"
>
<th
scope=
"row"
>
{{
country.i
d }}
</th>
<td>
{{
country.catagory
}}
</td>
<td>
{{
country.type
}}
</td>
<td>
{{
country.detail
}}
</td>
<td>
{{
country.name }}
</td>
<td>
{{ country.sdate | date:'dd-MM-yyyy' }} {{ country.stim
e }}
</td>
<td>
{{
country.edate | date:'dd-MM-yyyy' }} {{ country.etime }}
</td>
<td>
{{ country.status
}}
</td>
<
div
class=
"col-auto align-self-sm-center"
>
<button
type=
"button"
class=
"btn btn-info btn-sm btn-circle "
style=
"line-height: 0px"
(
click
)="
open
(
Room
)"
><i
class=
"fa fa-search"
></i>
</button>
<tr
*
ngFor=
"let
item of listroomDetail
"
>
<th
scope=
"row"
>
{{
item.I
d }}
</th>
<td>
{{
item.room.rName
}}
</td>
<td>
{{
item.room.rDesc
}}
</td>
<td>
{{
item.userName
}}
</td>
<td>
{{
item.sDate | date:'dd-MM-yyyy' }} {{ item.sTime.hour }}:{{
item.sTime.minut
e }}
</td>
<td>
{{
item.eDate | date:'dd-MM-yyyy' }} {{ item.eTime.hour }}:{{
item.eTime.minute
}}
</td>
<
td>
{{ item.eStatus }}
</td
>
<div
class=
"text-center"
>
<button
type=
"button"
class=
"btn btn-info btn-sm btn-circle "
style=
"line-height: 0px"
(
click
)="
openRoomDetail
(
Room
,
item
)"
><i
class=
"fa fa-search"
></i>
</button>
</div>
</tr>
</tbody>
...
...
@@ -115,12 +115,12 @@
<option
[
ngValue
]="
100
"
>
100 items per page
</option>
</select>
</div>
</div>
</div>
</div>
</div>
</ng-template>
</li>
<li
ngbNavItem
>
<a
ngbNavLink
>
การเบิก
</a>
...
...
@@ -137,27 +137,28 @@
<th
scope=
"col"
>
ประเภท
</th>
<th
scope=
"col"
>
รายละเอียด
</th>
<th
scope=
"col"
>
ชื่อ
</th>
<th
scope=
"col"
>
วันที่เริ่ม
ต้น
</th>
<th
scope=
"col"
>
วันที่เริ่ม
ใช้
</th>
<th
scope=
"col"
>
วันที่สิ้นสุด
</th>
<th
scope=
"col"
>
จำนวน
</th>
<th
scope=
"col"
>
สถานะ
</th>
</tr>
</thead>
<tbody>
<tr
*
ngFor=
"let country of countries"
>
<th
scope=
"row"
>
{{ country.id }}
</th>
<td>
{{ country.catagory }}
</td>
<td>
{{ country.type }}
</td>
<td>
{{ country.detail }}
</td>
<td>
{{ country.name }}
</td>
<td>
{{ country.sdate | date:'dd-MM-yyyy' }} {{ country.stime }}
</td>
<td>
{{ country.edate | date:'dd-MM-yyyy' }} {{ country.etime }}
</td>
<td>
{{ country.quantity }}
</td>
<td>
{{ country.status }}
</td>
<div
class=
"col-auto align-self-sm-center"
>
<button
type=
"button"
class=
"btn btn-info btn-sm btn-circle "
style=
"line-height: 0px"
(
click
)="
open
(
lend
)"
><i
class=
"fa fa-search"
></i>
</button>
<tr
*
ngFor=
"let item of listitemDetail"
>
<th
scope=
"row"
>
{{ item.Id }}
</th>
<td>
{{ item.equirment.eqType }}
</td>
<td>
{{ item.equirment.eqName }}
</td>
<td>
{{ item.equirment.eqDesc }}
</td>
<td>
{{ item.userName }}
</td>
<td>
{{ item.sDate | date:'dd-MM-yyyy' }} {{ item.sTime.hour }}:{{
item.sTime.minute }}
</td>
<td>
{{ item.eDate | date:'dd-MM-yyyy' }} {{ item.eTime.hour }}:{{
item.eTime.minute }}
</td>
<td>
{{ item.Quantity }}
</td>
<td>
{{ item.eStatus }}
</td>
<div
class=
"text-center"
>
<button
type=
"button"
class=
"btn btn-info btn-sm btn-circle "
style=
"line-height: 0px"
(
click
)="
openRoomDetail
(
Room
,
item
)"
><i
class=
"fa fa-search"
></i>
</button>
</div>
</tr>
</tbody>
...
...
@@ -175,7 +176,6 @@
<option
[
ngValue
]="
100
"
>
100 items per page
</option>
</select>
</div>
</div>
</div>
</div>
...
...
@@ -184,15 +184,11 @@
</li>
</ul>
<div
[
ngbNavOutlet
]="
nav
"
></div>
</div>
<ng-template
#
Room
let-modal
style=
"padding: 0; "
>
<div
class=
" col-md-12"
>
<div
class=
"card"
>
<ng-template
#
Room
let-modal
>
<div
class=
" col-md-12"
style=
"padding: 0;"
>
<div
class=
"card"
style=
"margin: 0; "
>
<div
class=
" card-header"
>
<h5
class=
" title"
>
การจอง
</h5>
</div>
...
...
@@ -202,7 +198,8 @@
<div
class=
" col-md-12"
>
<div
class=
" form-group"
>
<label>
ชื่อผู้จอง
</label>
<input
readonly
class=
" form-control"
placeholder=
""
type=
"text"
value=
""
/>
<input
readonly
class=
" form-control"
placeholder=
""
type=
"text"
value=
"{{modelroomDetail.userName}}"
/>
</div>
</div>
</div>
...
...
@@ -210,64 +207,68 @@
<div
class=
" col-md-12"
>
<div
class=
" form-group"
>
<label>
เบอร์โทร
</label>
<input
class=
" form-control"
placeholder=
""
type=
"text"
value=
""
/>
<input
readonly
class=
" form-control"
placeholder=
""
type=
"text"
value=
""
/>
</div>
</div>
</div>
<div
class=
"row"
>
<div
class=
"col-sm-12 mb-1"
>
<label
for=
"exampleFormControlSelect1"
>
ชื่อห้อง
</label>
<input
class=
"form-control"
type=
"text"
value=
"{{item.rn
ame}}"
>
<input
readonly
class=
"form-control"
type=
"text"
value=
"{{modelroomDetail.room.rN
ame}}"
>
</div>
</div>
<div
class=
"row"
>
<div
class=
"col-sm-12 mb-1"
>
<label
for=
"exampleFormControlSelect1"
>
รายละเอียด
</label>
<input
class=
"form-control"
type=
"text"
value=
"{{item.rdecs
}}"
>
<input
readonly
class=
"form-control"
type=
"text"
value=
"{{modelroomDetail.room.rDesc
}}"
>
</div>
</div>
<div
class=
"row"
>
<div
class=
"col-6 mb-1"
>
<label
for=
"exampleFormControlSelect1"
>
วันที่เริ่มต้น
</label>
<input
type=
"date"
class=
"form-control"
value=
""
>
<input
readonly
type=
"text"
class=
"form-control"
value=
"{{modelroomDetail.sDate | date:'dd-MM-yyyy'}}"
>
</div>
<div
class=
"col-6 mb-1"
>
<label
for=
"exampleFormControlSelect1"
>
วันที่สิ้นสุด
</label>
<input
type=
"date"
class=
"form-control"
value=
""
>
<input
readonly
type=
"text"
class=
"form-control"
value=
"{{modelroomDetail.eDate | date:'dd-MM-yyyy'}}"
>
</div>
</div>
<div
class=
"row"
>
<div
class=
"col-6 mb-1"
>
<label
for=
"exampleFormControlSelect1"
>
เวลาที่เริ่มต้น
</label>
<ngb-timepicker
[(
ngModel
)]="
time
"
></ngb-timepicker>
<input
readonly
class=
"form-control"
type=
"text"
value=
"{{modelroomDetail.sTime.hour}} {{modelroomDetail.sTime.minute}}"
>
</div>
<div
class=
"col-6 mb-1"
>
<label
for=
"exampleFormControlSelect1"
>
เวลาที่สิ้นสุด
</label>
<ngb-timepicker
[(
ngModel
)]="
time
"
></ngb-timepicker>
<label
[
readonly
]
for=
"exampleFormControlSelect1"
>
เวลาที่สิ้นสุด
</label>
<input
readonly
class=
"form-control"
type=
"text"
value=
"{{modelroomDetail.eTime.hour}} {{modelroomDetail.eTime.minute}}"
>
</div>
</div>
<div
class=
" row"
>
<div
class=
" col-md-12"
>
<div
class=
" form-group"
>
<label>
หมายเหตุ
</label>
<textarea
class=
"form-control"
id=
"exampleFormControlTextarea1"
rows=
"3"
placeholder=
"......"
></textarea>
<textarea
readonly
class=
"form-control"
id=
"exampleFormControlTextarea1"
rows=
"3"
placeholder=
"......"
value=
"{{modelroomDetail.Remark}}"
></textarea>
</div>
</div>
</div>
<div
class=
" card-footer"
>
<button
class=
" btn btn-fill btn-danger"
type=
"submit"
(
click
)="
saveEquirment
()"
>
อนุมัติ
</button>
<button
class=
" btn btn-fill btn-danger"
type=
"cancel"
(
click
)="
modal
.
dismiss
('
Cross
click
')"
>
ยกเลิก
</button>
</div>
</form>
</div>
<div
class=
" card-footer"
>
<button
class=
" btn btn-fill btn-danger"
type=
"submit"
>
อนุมัติ
</button>
<button
class=
" btn btn-fill btn-danger"
type=
"close"
>
ยกเลิก
</button>
</div>
</div>
</div>
</ng-template>
<ng-template
#
lend
let-modal
style=
"padding: 0; "
>
<div
class=
" col-md-12"
>
<div
class=
"card"
>
<ng-template
#
lend
let-modal
>
<div
class=
" col-md-12"
style=
"padding: 0; "
>
<div
class=
"card"
style=
"margin: 0; "
>
<div
class=
" card-header"
>
<h5
class=
" title"
>
Lend Equirment
</h5>
</div>
...
...
@@ -277,7 +278,8 @@
<div
class=
" col-sm-12 mb-1"
>
<div
class=
" form-group"
>
<label>
ชื่อผู้จอง
</label>
<input
class=
" form-control"
placeholder=
""
type=
"text"
value=
""
/>
<input
readonly
class=
" form-control"
placeholder=
""
type=
"text"
value=
"{{modelitemDetail.userName}}"
/>
</div>
</div>
</div>
...
...
@@ -285,47 +287,53 @@
<div
class=
" col-md-12"
>
<div
class=
" form-group"
>
<label>
เบอร์โทร
</label>
<input
class=
" form-control"
placeholder=
""
type=
"text"
value=
""
/>
<input
readonly
class=
" form-control"
placeholder=
""
type=
"text"
value=
""
/>
</div>
</div>
</div>
<div
class=
"row"
>
<div
class=
"col-sm-12 mb-1"
>
<label
for=
"exampleFormControlSelect1"
>
ชื่ออุปกรณ์
</label>
<input
class=
"form-control"
type=
"text"
value=
"{{item.rname}}"
>
<input
readonly
class=
"form-control"
type=
"text"
value=
"{{modelitemDetail.equirment.eqName}}"
>
</div>
</div>
<div
class=
"row"
>
<div
class=
"col-sm-12 mb-1"
>
<label
for=
"exampleFormControlSelect1"
>
รายละเอียดอุปกรณ์
</label>
<input
class=
"form-control"
type=
"text"
value=
"{{item.rdecs}}"
>
<input
readonly
class=
"form-control"
type=
"text"
value=
"{{modelitemDetail.equirment.eqDesc}}"
>
</div>
</div>
<div
class=
"row"
>
<div
class=
"col-6 mb-1"
>
<label
for=
"exampleFormControlSelect1"
>
วันที่เริ่มต้น
</label>
<input
type=
"date"
class=
"form-control"
value=
""
>
<input
readonly
type=
"text"
class=
"form-control"
value=
"{{modelitemDetail.sDate | date:'dd-MM-yyyy'}}"
>
</div>
<div
class=
"col-6 mb-1"
>
<label
for=
"exampleFormControlSelect1"
>
วันที่สิ้นสุด
</label>
<input
type=
"date"
class=
"form-control"
value=
""
>
<input
readonly
type=
"text"
class=
"form-control"
value=
"{{modelitemDetail.eDate | date:'dd-MM-yyyy'}}"
>
</div>
</div>
<div
class=
"row"
>
<div
class=
"col-6 mb-1"
>
<label
for=
"exampleFormControlSelect1"
>
เวลาที่เริ่มต้น
</label>
<ngb-timepicker
[(
ngModel
)]="
time
"
></ngb-timepicker>
<input
readonly
class=
"form-control"
type=
"text"
value=
"{{modelitemDetail.sTime.hour}} {{modelitemDetail.sTime.minute}}"
>
</div>
<div
class=
"col-6 mb-1"
>
<label
for=
"exampleFormControlSelect1"
>
เวลาที่สิ้นสุด
</label>
<ngb-timepicker
[(
ngModel
)]="
time
"
></ngb-timepicker>
<input
readonly
class=
"form-control"
type=
"text"
value=
"{{modelitemDetail.eTime.hour}} {{modelitemDetail.eTime.minute}}"
>
</div>
</div>
<div
class=
" row"
>
<div
class=
" col-sm-6 mb-1"
>
<label
for=
"changequantity"
>
จำนวน
</label>
<input
id=
"changequantity"
type=
"number"
class=
"form-control form-control-sm"
[(
ngModel
)]="
quantity
"
/>
<input
readonly
id=
"changequantity"
type=
"number"
class=
"form-control form-control-sm"
value=
"{{modelitemDetail.Quantity}}
"
/>
</div>
</div>
<div
class=
" row"
>
...
...
@@ -333,16 +341,12 @@
<div
class=
" form-group"
>
<label>
หมายเหตุ
</label>
<textarea
readonly
class=
"form-control"
id=
"exampleFormControlTextarea1"
rows=
"3"
placeholder=
"......"
></textarea>
placeholder=
"......"
value=
"{{modelitemDetail.Remark}}"
></textarea>
</div>
</div>
</div>
</form>
</div>
<div
class=
" card-footer"
>
<button
class=
" btn btn-fill btn-danger"
type=
"submit"
>
อนุมัติ
</button>
<button
class=
" btn btn-fill btn-danger"
type=
"close"
>
ยกเลิก
</button>
</div>
</div>
</div>
</ng-template>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/app/pages/admin-pending/admin-pending.component.ts
View file @
37cab6c1
import
{
Component
,
OnInit
}
from
'@angular/core'
;
import
{
NgbDate
,
NgbCalendar
,
NgbDateParserFormatter
}
from
'@ng-bootstrap/ng-bootstrap'
;
import
{
NgbModal
,
ModalDismissReasons
}
from
'@ng-bootstrap/ng-bootstrap'
;
import
{
Equirment
}
from
'src/app/models/equirment.model'
;
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
{
Room
}
from
'src/app/models/rooms.model'
;
@
Component
({
selector
:
'app-admin-pending'
,
...
...
@@ -41,21 +46,28 @@ export class AdminPendingComponent implements OnInit {
closeResult
=
''
;
item
:
itemDetail
[]
=
[];
listitemDetail
:
itemDetail
[]
=
[];
listroomDetail
:
roomDetail
[]
=
[];
collectionSize
=
this
.
item
.
length
;
modelEquirment
=
new
Equirment
();
modelRoom
=
new
Room
();
modelitemDetail
=
new
itemDetail
();
modelroomDetail
=
new
roomDetail
();
collectionSize
=
this
.
listitemDetail
.
length
;
hoveredDate
:
NgbDate
|
null
=
null
;
fromDate
:
NgbDate
|
null
;
toDate
:
NgbDate
|
null
;
constructor
(
private
calendar
:
NgbCalendar
,
public
formatter
:
NgbDateParserFormatter
,
private
modalService
:
NgbModal
)
{
constructor
(
private
calendar
:
NgbCalendar
,
public
formatter
:
NgbDateParserFormatter
,
private
modalService
:
NgbModal
,
private
itemDetailService
:
itemDetailService
,
private
roomDetailService
:
roomDetailService
)
{
this
.
fromDate
=
calendar
.
getToday
();
this
.
toDate
=
calendar
.
getNext
(
calendar
.
getToday
(),
'd'
,
10
);
this
.
refreshitemDetail
();
}
refreshitemDetail
()
{
this
.
item
=
this
.
item
this
.
listitemDetail
=
this
.
listitemDetail
.
map
((
country
,
i
)
=>
({
id
:
i
+
1
,
...
country
}))
.
slice
((
this
.
page
-
1
)
*
this
.
pageSize
,
(
this
.
page
-
1
)
*
this
.
pageSize
+
this
.
pageSize
);
}
...
...
@@ -79,6 +91,26 @@ export class AdminPendingComponent implements OnInit {
});
}
openItemDetail
(
content
:
string
,
item
:
itemDetail
)
{
this
.
modelitemDetail
=
item
;
console
.
log
(
item
);
this
.
modalService
.
open
(
content
,
{
ariaLabelledBy
:
'modal-basic-title'
}).
result
.
then
((
result
)
=>
{
this
.
closeResult
=
`Closed with:
${
result
}
`
;
},
(
reason
)
=>
{
this
.
closeResult
=
`Dismissed
${
this
.
getDismissReason
(
reason
)}
`
;
});
}
openRoomDetail
(
content
:
string
,
item
:
roomDetail
)
{
this
.
modelroomDetail
=
item
;
console
.
log
(
item
);
this
.
modalService
.
open
(
content
,
{
ariaLabelledBy
:
'modal-basic-title'
}).
result
.
then
((
result
)
=>
{
this
.
closeResult
=
`Closed with:
${
result
}
`
;
},
(
reason
)
=>
{
this
.
closeResult
=
`Dismissed
${
this
.
getDismissReason
(
reason
)}
`
;
});
}
private
getDismissReason
(
reason
:
any
):
string
{
if
(
reason
===
ModalDismissReasons
.
ESC
)
{
return
'by pressing ESC'
;
...
...
@@ -107,8 +139,12 @@ export class AdminPendingComponent implements OnInit {
}
ngOnInit
():
void
{
this
.
listitemDetail
=
this
.
itemDetailService
.
getListitemDetail
();
this
.
listroomDetail
=
this
.
roomDetailService
.
getListroomDetail
();
console
.
log
(
this
.
listitemDetail
);
}
}
export
class
NgbdDropdownBasic
{
...
...
This diff is collapsed.
Click to expand it.
src/app/pages/equipment/equipment.component.ts
View file @
37cab6c1
...
...
@@ -120,7 +120,7 @@ export class EquipmentComponent implements OnInit {
this
.
roomService
.
addRoom
(
this
.
modelRoom
);
this
.
modalService
.
dismissAll
();
this
.
ngOnInit
();
}
saveLend
()
{
...
...
This diff is collapsed.
Click to expand it.
src/app/pages/pending/pending.component.html
View file @
37cab6c1
...
...
@@ -182,9 +182,9 @@
<div
[
ngbNavOutlet
]="
nav
"
></div>
</div>
<ng-template
#
Room
let-modal
style=
"padding: 0; "
>
<div
class=
" col-md-12"
>
<div
class=
"card"
>
<ng-template
#
Room
let-modal
>
<div
class=
" col-md-12"
style=
"padding: 0; "
>
<div
class=
"card"
style=
"margin: 0; "
>
<div
class=
" card-header"
>
<h5
class=
" title"
>
การจอง
</h5>
</div>
...
...
@@ -253,9 +253,9 @@
</div>
</ng-template>
<ng-template
#
lend
let-modal
style=
"padding: 0; "
>
<div
class=
" col-md-12"
>
<div
class=
"card"
>
<ng-template
#
lend
let-modal
>
<div
class=
" col-md-12"
style=
"padding: 0; "
>
<div
class=
"card"
style=
"margin: 0; "
>
<div
class=
" card-header"
>
<h5
class=
" title"
>
Lend Equirment
</h5>
</div>
...
...
@@ -328,4 +328,5 @@
</div>
</div>
</div>
</ng-template>
\ No newline at end of file
</ng-template>
This diff is collapsed.
Click to expand it.
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