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
42d08acf
Commit
42d08acf
authored
3 years ago
by
Chanachai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Edit บัค
parent
c2cd2e83
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
33 additions
and
17 deletions
+33
-17
admin-equirment.component.ts
src/app/pages/admin-equirment/admin-equirment.component.ts
+31
-0
admin-pending.component.html
src/app/pages/admin-pending/admin-pending.component.html
+2
-15
pending.component.html
src/app/pages/pending/pending.component.html
+0
-2
No files found.
src/app/pages/admin-equirment/admin-equirment.component.ts
View file @
42d08acf
...
...
@@ -65,6 +65,35 @@ export class AdminEquirmentComponent implements OnInit {
this
.
collectionSizeListRoom
=
this
.
listRoomModel
.
length
this
.
collectionSize
=
this
.
listEquirmentModel
.
length
console
.
log
(
"listRoom"
,
this
.
listRoomModel
)
this
.
myFormRoom
=
new
FormGroup
({
userNameForm
:
new
FormControl
(
''
,[
Validators
.
required
]),
rTelephone
:
new
FormControl
(
''
,[
Validators
.
required
]),
email
:
new
FormControl
(
''
,[
Validators
.
required
,
Validators
.
email
]),
rName
:
new
FormControl
(
''
,[
Validators
.
required
]),
rDesc
:
new
FormControl
(
''
,[
Validators
.
required
]),
rType
:
new
FormControl
(
''
,[
Validators
.
required
]),
sDate
:
new
FormControl
(
''
,[
Validators
.
required
]),
eDate
:
new
FormControl
(
''
,[
Validators
.
required
]),
sTime
:
new
FormControl
(
''
,[
Validators
.
required
]),
eTime
:
new
FormControl
(
''
,[
Validators
.
required
]),
remark
:
new
FormControl
(
''
),
allDay
:
new
FormControl
(
''
)
});
this
.
myFormEquir
=
new
FormGroup
({
userNameForm
:
new
FormControl
(
''
,[
Validators
.
required
]),
eTelephone
:
new
FormControl
(
''
,[
Validators
.
required
]),
email
:
new
FormControl
(
''
,[
Validators
.
required
,
Validators
.
email
]),
eqName
:
new
FormControl
(
''
,[
Validators
.
required
]),
eqType
:
new
FormControl
(
''
,[
Validators
.
required
]),
eqDesc
:
new
FormControl
(
''
,[
Validators
.
required
]),
sDate
:
new
FormControl
(
''
,[
Validators
.
required
]),
eDate
:
new
FormControl
(
''
),
sTime
:
new
FormControl
(
''
),
eTime
:
new
FormControl
(
''
),
Quantity
:
new
FormControl
(
''
,[
Validators
.
required
]),
remark
:
new
FormControl
(
''
),
})
}
...
...
@@ -172,6 +201,7 @@ export class AdminEquirmentComponent implements OnInit {
eqName
:
new
FormControl
(
this
.
modelEquirment
.
eqName
,[
Validators
.
required
]),
eqType
:
new
FormControl
(
this
.
modelEquirment
.
eqType
,[
Validators
.
required
]),
eqDesc
:
new
FormControl
(
this
.
modelEquirment
.
eqDesc
,[
Validators
.
required
]),
eqPic
:
new
FormControl
(
this
.
modelEquirment
.
eqPic
,[
Validators
.
required
]),
})
this
.
modalService
.
open
(
contentequirment
,
{
ariaLabelledBy
:
'modal-basic-title'
}).
result
.
then
((
result
)
=>
{
this
.
closeResult
=
`Closed with:
${
result
}
`
;
...
...
@@ -186,6 +216,7 @@ export class AdminEquirmentComponent implements OnInit {
rName
:
new
FormControl
(
this
.
modelRoom
.
rName
,[
Validators
.
required
]),
rType
:
new
FormControl
(
this
.
modelRoom
.
rType
,[
Validators
.
required
]),
rDesc
:
new
FormControl
(
this
.
modelRoom
.
rDesc
,[
Validators
.
required
]),
rPic
:
new
FormControl
(
this
.
modelRoom
.
rPic
,[
Validators
.
required
]),
})
this
.
modalService
.
open
(
contentroom
,
{
ariaLabelledBy
:
'modal-basic-title'
}).
result
.
then
((
result
)
=>
{
this
.
closeResult
=
`Closed with:
${
result
}
`
;
...
...
This diff is collapsed.
Click to expand it.
src/app/pages/admin-pending/admin-pending.component.html
View file @
42d08acf
...
...
@@ -248,20 +248,7 @@
กรุณากรอกรายละเอียดการจอง.
</div>
</div>
</div>
<div
class=
"row"
>
<div
class=
"col-12 mb-1"
>
<div
class=
" form-check"
>
<label
class=
" form-check-label"
>
<input
class=
" form-check"
type=
"checkbox"
[(
ngModel
)]="
modelRoomDetail
.
allDay
"
formControlName=
"allDay"
/>
<span
class=
" form-check-sign"
>
<span
class=
"check"
>
ทั้งวัน
</span>
</span>
</label>
</div>
</div>
</div>
<div
class=
"row"
*
ngIf=
"!modelRoomDetail.allDay"
>
<div
class=
"row"
>
<div
class=
"col-6 mb-1"
>
<label
for=
"exampleFormControlSelect1"
>
วันที่เริ่มต้น
</label>
<input
type=
"date"
class=
"form-control"
[(
ngModel
)]="
sDate
"
formControlName=
"sDate"
/>
...
...
@@ -275,7 +262,7 @@
กรุณากรอกวันที่สิ้นสุดการจอง.
</div>
</div>
</div>
<div
class=
"row"
>
<div
class=
"row"
*
ngIf=
"!modelRoomDetail.allDay"
>
<div
class=
"col-6 mb-1"
>
<label
for=
"exampleFormControlSelect1"
>
เวลาที่เริ่มต้น
</label>
<input
class=
"form-control"
type=
"time"
formControlName=
"sTime"
/>
...
...
This diff is collapsed.
Click to expand it.
src/app/pages/pending/pending.component.html
View file @
42d08acf
...
...
@@ -143,7 +143,6 @@
<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>
...
...
@@ -156,7 +155,6 @@
<td>
{{ item.equirment.eqDesc }}
</td>
<td>
{{ item.userName }}
</td>
<td>
{{ item.sDate | date : 'dd/MM/yyyy' }} {{ item.sTime }}
</td>
<td>
{{ item.eDate | date : 'dd/MM/yyyy' }} {{ item.eTime }}
</td>
<td>
{{ item.Quantity }}
</td>
<td
*
ngIf=
"item.eStatus==0"
>
รอดำเนินการ
</td>
<td
*
ngIf=
"item.eStatus==1"
>
อนุมัติ
</td>
...
...
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