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
d1db3374
Commit
d1db3374
authored
3 years ago
by
Chanachai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update หน้าadminการเบิก มีปุ่มcheckbox
parent
1c5ae3b3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
34 deletions
+11
-34
itemDetail.model.ts
src/app/models/itemDetail.model.ts
+2
-0
admin-pending.component.html
src/app/pages/admin-pending/admin-pending.component.html
+0
-0
admin-pending.component.ts
src/app/pages/admin-pending/admin-pending.component.ts
+2
-1
equipment.component.html
src/app/pages/equipment/equipment.component.html
+3
-31
item-detail.service.ts
src/app/service/item-detail.service.ts
+4
-2
No files found.
src/app/models/itemDetail.model.ts
View file @
d1db3374
...
...
@@ -14,6 +14,7 @@ export class ItemDetail {
email
:
string
;
remark
:
string
;
allDay
:
boolean
;
returnItem
:
boolean
;
constructor
(
init
?:
ItemDetail
)
{
Object
.
assign
(
this
,
init
);
this
.
id
=
1
;
...
...
@@ -27,6 +28,7 @@ export class ItemDetail {
this
.
email
=
''
;
this
.
remark
=
''
;
this
.
allDay
=
true
;
this
.
returnItem
=
false
;
}
}
...
...
This diff is collapsed.
Click to expand it.
src/app/pages/admin-pending/admin-pending.component.html
View file @
d1db3374
This diff is collapsed.
Click to expand it.
src/app/pages/admin-pending/admin-pending.component.ts
View file @
d1db3374
...
...
@@ -126,7 +126,8 @@ export class AdminPendingComponent implements OnInit {
Quantity
:
new
FormControl
(
this
.
modelItemDetail
.
Quantity
,
[
Validators
.
required
]),
Remark
:
new
FormControl
(
this
.
modelItemDetail
.
remark
),
eStatus
:
new
FormControl
(
this
.
modelItemDetail
.
eStatus
),
allDay
:
new
FormControl
(
this
.
modelItemDetail
.
allDay
)
allDay
:
new
FormControl
(
this
.
modelItemDetail
.
allDay
),
returnItem
:
new
FormControl
(
this
.
modelItemDetail
.
returnItem
)
})
this
.
modalService
.
open
(
content
,
{
ariaLabelledBy
:
'modal-basic-title'
}).
result
.
then
((
result
)
=>
{
this
.
closeResult
=
`Closed with:
${
result
}
`
;
...
...
This diff is collapsed.
Click to expand it.
src/app/pages/equipment/equipment.component.html
View file @
d1db3374
...
...
@@ -359,7 +359,7 @@
</div>
<div
class=
" card-footer"
>
<button
class=
" btn btn-fill btn-danger"
[
disabled
]=""
type=
"button"
(
click
)="
saveBook
()"
>
Save
</button>
<button
class=
" btn btn-fill btn-danger"
type=
"c
lose
"
>
Cancel
</button>
<button
class=
" btn btn-fill btn-danger"
type=
"c
ancel"
(
click
)="
modal
.
dismiss
('
Cross
click
')
"
>
Cancel
</button>
</div>
</div>
</div>
...
...
@@ -424,7 +424,7 @@
</div>
</div>
<div
class=
"row"
>
<div
class=
"col-
6
mb-1"
>
<div
class=
"col-
sm-12
mb-1"
>
<label
for=
"exampleFormControlSelect1"
>
วันที่เริ่มต้น
</label>
<input
type=
"date"
class=
"form-control"
value=
""
[(
ngModel
)]="
modelItemDetail
.
sDate
"
formControlName=
"sDate"
>
...
...
@@ -432,34 +432,6 @@
กรุณากรอกวันที่เริ่มต้นการเบิก.
</div>
</div>
<div
class=
"col-6 mb-1"
>
<label
for=
"exampleFormControlSelect1"
>
วันที่สิ้นสุด
</label>
<input
type=
"date"
class=
"form-control"
value=
""
[(
ngModel
)]="
modelItemDetail
.
eDate
"
formControlName=
"eDate"
>
<div
style=
"color: red;"
*
ngIf=
"myFormEquir.controls.eDate.status=='INVALID'"
>
กรุณากรอกวันที่สิ้นสุดการเบิก.
</div>
</div>
</div>
<div
class=
"row"
>
<div
class=
"col-6 mb-1"
>
<label
for=
"exampleFormControlSelect1"
>
เวลาที่เริ่มต้น
</label>
<input
class=
"form-control"
type=
"time"
[(
ngModel
)]="
modelItemDetail
.
sTime
"
formControlName=
"sTime"
/>
<div
style=
"color: red;"
*
ngIf=
"myFormEquir.controls.sTime.status=='INVALID'"
>
กรุณากรอกเวลาที่เริ่มต้นการเบิก.
</div>
</div>
<div
class=
"col-6 mb-1"
>
<label
for=
"exampleFormControlSelect1"
>
เวลาที่สิ้นสุด
</label>
<input
class=
"form-control"
type=
"time"
[(
ngModel
)]="
modelItemDetail
.
eTime
"
formControlName=
"eTime"
/>
<div
style=
"color: red;"
*
ngIf=
"myFormEquir.controls.eTime.status=='INVALID'"
>
กรุณากรอกเวลาที่สิ้นสุดการเบิก.
</div>
</div>
</div>
<div
class=
" row"
>
<div
class=
" col-sm-6 mb-1"
>
...
...
@@ -485,7 +457,7 @@
</div>
<div
class=
" card-footer"
>
<button
class=
" btn btn-fill btn-danger"
type=
"submit"
(
click
)="
saveLend
()"
>
Save
</button>
<button
class=
" btn btn-fill btn-danger"
type=
"c
lose
"
>
Cancel
</button>
<button
class=
" btn btn-fill btn-danger"
type=
"c
ancel"
(
click
)="
modal
.
dismiss
('
Cross
click
')
"
>
Cancel
</button>
</div>
</div>
</div>
...
...
This diff is collapsed.
Click to expand it.
src/app/service/item-detail.service.ts
View file @
d1db3374
...
...
@@ -27,7 +27,8 @@ export class ItemDetailService {
eTelephone
:
'0123456789'
,
email
:
'qwerty@qwerty'
,
remark
:
'test'
,
allDay
:
false
allDay
:
false
,
returnItem
:
true
},
{
id
:
2
,
...
...
@@ -48,7 +49,8 @@ export class ItemDetailService {
eTelephone
:
'0123456789'
,
email
:
'qwerty@qwerty'
,
remark
:
'test'
,
allDay
:
false
allDay
:
false
,
returnItem
:
true
},
]
...
...
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