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
837b6be0
Commit
837b6be0
authored
3 years ago
by
Your Name
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update Edit type
parent
ced0a0eb
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
76 additions
and
40 deletions
+76
-40
rooms.model.ts
src/app/models/rooms.model.ts
+3
-3
admin-equirment.component.html
src/app/pages/admin-equirment/admin-equirment.component.html
+11
-5
admin-pending.component.html
src/app/pages/admin-pending/admin-pending.component.html
+19
-10
home-page.component.html
src/app/pages/home-page/home-page.component.html
+23
-12
pending.component.html
src/app/pages/pending/pending.component.html
+20
-10
No files found.
src/app/models/rooms.model.ts
View file @
837b6be0
export
interface
Room
{
rId
:
number
;
rName
:
string
;
rType
:
number
;
rType
:
string
;
rPic
:
string
;
roomLimit
:
number
;
rDesc
:
string
;
...
...
@@ -9,7 +9,7 @@ export interface Room {
export
class
MyRoom
implements
Room
{
rId
:
number
;
rName
:
string
;
rType
:
number
;
rType
:
string
;
rPic
:
string
;
roomLimit
:
number
;
rDesc
:
string
;
...
...
@@ -18,7 +18,7 @@ export class MyRoom implements Room{
// Object.assign(this, init);
this
.
rId
=
init
?.
rId
!
;
this
.
rName
=
init
?.
rName
!
;
this
.
rType
=
0
;
this
.
rType
=
''
;
this
.
rPic
=
'assets/img/nopic.jpg'
;
this
.
roomLimit
=
0
;
this
.
rDesc
=
''
;
...
...
src/app/pages/admin-equirment/admin-equirment.component.html
View file @
837b6be0
...
...
@@ -270,8 +270,11 @@
</div>
<div
class=
" col-md-12"
>
<label>
ประเภท
</label>
<input
class=
" form-control"
type=
"text"
[(
ngModel
)]="
listRoomModelEdit
.
rType
"
formControlName=
"rType"
>
<select
class=
"custom-select form-control"
aria-label=
"Default select example"
formControlName=
"rType"
[(
ngModel
)]="
listRoomModelEdit
.
rType
"
>
<option
value=
"1"
style=
"color: black;"
>
ห้อง
</option>
<option
value=
"2"
style=
"color: black;"
>
รถ
</option>
</select>
<div
style=
"color: red;"
*
ngIf=
"myFormRoom.controls.rType.status=='INVALID'"
>
กรุณากรอกประเภท.
</div>
</div>
...
...
@@ -313,10 +316,13 @@
</div>
<div
class=
" col-md-12"
>
<label>
ประเภทอุปกรณ์
</label>
<input
class=
" form-control"
type=
"text"
[(
ngModel
)]="
listEquirmentModelEdit
.
eqType
"
formControlName=
"eqType"
>
<select
class=
"custom-select form-control"
aria-label=
"Default select example"
formControlName=
"eqType"
[(
ngModel
)]="
listEquirmentModelEdit
.
eqType
"
>
<option
value=
"4"
style=
"color: black;"
>
IT
</option>
<option
value=
"5"
style=
"color: black;"
>
Company
</option>
</select>
<div
style=
"color: red;"
*
ngIf=
"myFormEquir.controls.eqType.status=='INVALID'"
>
กรุณากรอกประเภท
อุปกรณ์
</div>
กรุณากรอกประเภท
.
</div>
</div>
<div
class=
" col-md-12"
>
<label>
รายละเอียดอุปกรณ์
</label>
...
...
src/app/pages/admin-pending/admin-pending.component.html
View file @
837b6be0
...
...
@@ -20,7 +20,7 @@
</div>
</div>
</div>
<div
class=
"form-group"
>
<div
class=
"form-group
ml-3
"
>
<div
class=
"input-group"
>
<input
class=
"form-control"
placeholder=
"dd/mm/yyyy"
name=
"d2"
#
c2=
"ngModel"
[(
ngModel
)]="
searchroomModel
.
eDate
"
ngbDatepicker
...
...
@@ -31,7 +31,6 @@
</div>
</div>
</div>
</form>
<div
class=
"form-group ml-3"
>
<div
class=
"input-group"
>
<div
ngbDropdown
class=
"d-inline-block"
>
...
...
@@ -43,20 +42,25 @@
<option
value=
1
style=
"color: black;"
>
ไม่อนุมัติ
</option>
<option
value=
2
style=
"color: black;"
>
ยกเลิก
</option>
</select>
<select
class=
"custom-select form-control"
[(
ngModel
)]="
searchroomModel
.
sroomType
"
</div>
</div>
<div
class=
"input-group ml-3"
>
<select
class=
"custom-select form-control"
[(
ngModel
)]="
searchroomModel
.
sroomType
"
aria-label=
"Default select example"
>
<option
selected
style=
"color: black;"
>
----ประเภท----
</option>
<option
value=
1
style=
"color: black;"
>
ห้อง
</option>
<option
value=
2
style=
"color: black;"
>
รถ
</option>
</select>
</div>
<div
class=
"input-group ml-3"
>
<button
class=
"btn btn-sm btn-outline-success"
type=
"submit"
(
click
)="
openSearchRoom
()"
>
Search
</button>
</div>
</div>
</form>
</div>
</div>
</div>
<div
class=
"card-body"
>
<table
class=
"table table-striped"
>
<thead>
...
...
@@ -111,7 +115,6 @@
</div>
</div>
</ng-template>
</li>
<li
ngbNavItem
>
<a
ngbNavLink
>
การเบิก
</a>
...
...
@@ -133,7 +136,7 @@
</div>
</div>
</div>
<div
class=
"form-group"
>
<div
class=
"form-group
ml-3
"
>
<div
class=
"input-group"
>
<input
class=
"form-control"
placeholder=
"dd/mm/yyyy"
name=
"d2"
#
c2=
"ngModel"
[(
ngModel
)]="
searcheqModel
.
eDate
"
ngbDatepicker
...
...
@@ -144,7 +147,6 @@
</div>
</div>
</div>
</form>
<div
class=
"form-group ml-3"
>
<div
class=
"input-group"
>
<div
ngbDropdown
class=
"d-inline-block"
>
...
...
@@ -157,17 +159,23 @@
<option
value=
2
style=
"color: black;"
>
ยกเลิก
</option>
<option
value=
3
style=
"color: black;"
>
คืนแล้ว
</option>
</select>
<select
class=
"custom-select form-control"
[(
ngModel
)]="
searcheqModel
.
seqType
"
</div>
</div>
<div
class=
"input-group ml-3"
>
<select
class=
"custom-select form-control"
[(
ngModel
)]="
searcheqModel
.
seqType
"
aria-label=
"Default select example"
>
<option
selected
style=
"color: black;"
>
----ประเภท----
</option>
<option
value=
4
style=
"color: black;"
>
IT
</option>
<option
value=
5
style=
"color: black;"
>
Company
</option>
</select>
</div>
<div
class=
"input-group ml-3"
>
<button
class=
"btn btn-sm btn-outline-success"
type=
"submit"
(
click
)="
openSearchEq
()"
>
Search
</button>
</div>
</div>
</
div
>
</
form
>
</div>
</div>
<div
class=
"card-body"
>
...
...
@@ -224,6 +232,7 @@
</div>
</div>
</div>
</ng-template>
</li>
</ul>
...
...
src/app/pages/home-page/home-page.component.html
View file @
837b6be0
<div
class=
"content"
>
<div
class=
"content"
>
<ul
ngbNav
#
nav=
"ngbNav"
(
navChange
)="
onNavChange
($
event
)"
class=
"nav-tabs"
>
<li
ngbNavItem
>
<a
ngbNavLink
>
ปฏิทินการจอง
</a>
...
...
@@ -20,7 +20,7 @@
</div>
</div>
</div>
<div
class=
"form-group"
>
<div
class=
"form-group
ml-3
"
>
<div
class=
"input-group"
>
<input
class=
"form-control"
placeholder=
"dd/mm/yyyy"
name=
"d2"
#
c2=
"ngModel"
[(
ngModel
)]="
searchroomModel
.
eDate
"
ngbDatepicker
...
...
@@ -31,27 +31,33 @@
</div>
</div>
</div>
</form>
<div
class=
"form-group ml-3"
>
<div
class=
"input-group"
>
<div
ngbDropdown
class=
"d-inline-block"
>
<select
class=
"custom-select form-control"
[(
ngModel
)]="
searchroomModel
.
sroomStatus
"
<select
class=
"custom-select form-control"
[(
ngModel
)]="
searchroomModel
.
sroomStatus
"
aria-label=
"Default select example"
>
<option
value=
0
style=
"color: black;"
>
จอง
</option>
<option
value=
1
style=
"color: black;"
>
ไม่อนุมัติ
</option>
<option
value=
2
style=
"color: black;"
>
ยกเลิก
</option>
</select>
<select
class=
"custom-select form-control"
[(
ngModel
)]="
searchroomModel
.
sroomType
"
</div>
</div>
<div
class=
"input-group ml-3"
>
<select
class=
"custom-select form-control"
[(
ngModel
)]="
searchroomModel
.
sroomType
"
aria-label=
"Default select example"
>
<option
selected
style=
"color: black;"
>
----ประเภท----
</option>
<option
value=
1
style=
"color: black;"
>
ห้อง
</option>
<option
value=
2
style=
"color: black;"
>
รถ
</option>
</select>
</div>
<div
class=
"input-group ml-3"
>
<button
class=
"btn btn-sm btn-outline-success"
type=
"submit"
(
click
)="
openSearchRoom
()"
>
Search
</button>
</div>
</div>
</
div
>
</
form
>
</div>
</div>
<div
class=
"card-body"
>
...
...
@@ -83,7 +89,7 @@
</div>
</div>
</div>
<div
class=
"form-group"
>
<div
class=
"form-group
ml-3
"
>
<div
class=
"input-group"
>
<input
class=
"form-control"
placeholder=
"dd/mm/yyyy"
name=
"d2"
#
c2=
"ngModel"
[(
ngModel
)]="
searcheqModel
.
eDate
"
ngbDatepicker
...
...
@@ -94,7 +100,6 @@
</div>
</div>
</div>
</form>
<div
class=
"form-group ml-3"
>
<div
class=
"input-group"
>
<div
ngbDropdown
class=
"d-inline-block"
>
...
...
@@ -106,22 +111,28 @@
<option
value=
2
style=
"color: black;"
>
ยกเลิก
</option>
<option
value=
3
style=
"color: black;"
>
คืนแล้ว
</option>
</select>
<select
class=
"custom-select form-control"
[(
ngModel
)]="
searcheqModel
.
seqType
"
</div>
</div>
<div
class=
"input-group ml-3"
>
<select
class=
"custom-select form-control"
[(
ngModel
)]="
searcheqModel
.
seqType
"
aria-label=
"Default select example"
>
<option
selected
style=
"color: black;"
>
----ประเภท----
</option>
<option
value=
4
style=
"color: black;"
>
IT
</option>
<option
value=
5
style=
"color: black;"
>
Company
</option>
</select>
</div>
<div
class=
"input-group ml-3"
>
<button
class=
"btn btn-sm btn-outline-success"
type=
"submit"
(
click
)="
openSearchEq
()"
>
Search
</button>
</div>
</div>
</
div
>
</
form
>
</div>
</div>
<div
class=
"card-body"
>
<full-calendar
#
calenderLend
[
options
]="
calendarEquirment
"
style=
"margin-top: 20px;"
*
ngIf=
"listItemDetail.length> 0"
></full-calendar>
<full-calendar
#
calenderLend
[
options
]="
calendarEquirment
"
style=
"margin-top: 20px;"
*
ngIf=
"listItemDetail.length> 0"
></full-calendar>
</div>
</div>
</div>
...
...
src/app/pages/pending/pending.component.html
View file @
837b6be0
...
...
@@ -20,7 +20,7 @@
</div>
</div>
</div>
<div
class=
"form-group"
>
<div
class=
"form-group
ml-3
"
>
<div
class=
"input-group"
>
<input
class=
"form-control"
placeholder=
"dd/mm/yyyy"
name=
"d2"
#
c2=
"ngModel"
[(
ngModel
)]="
searchroomModel
.
eDate
"
ngbDatepicker
...
...
@@ -31,28 +31,34 @@
</div>
</div>
</div>
</form>
<div
class=
"form-group ml-3"
>
<div
class=
"input-group"
>
<div
ngbDropdown
class=
"d-inline-block"
>
<select
class=
"custom-select form-control"
[(
ngModel
)]="
searchroomModel
.
sroomStatus
"
<select
class=
"custom-select form-control"
[(
ngModel
)]="
searchroomModel
.
sroomStatus
"
aria-label=
"Default select example"
>
<option
selected
style=
"color: black;"
>
----สถานะ----
</option>
<option
value=
0
style=
"color: black;"
>
จอง
</option>
<option
value=
1
style=
"color: black;"
>
ไม่อนุมัติ
</option>
<option
value=
2
style=
"color: black;"
>
ยกเลิก
</option>
</select>
<select
class=
"custom-select form-control"
[(
ngModel
)]="
searchroomModel
.
sroomType
"
</div>
</div>
<div
class=
"input-group ml-3"
>
<select
class=
"custom-select form-control"
[(
ngModel
)]="
searchroomModel
.
sroomType
"
aria-label=
"Default select example"
>
<option
selected
style=
"color: black;"
>
----ประเภท----
</option>
<option
value=
1
style=
"color: black;"
>
ห้อง
</option>
<option
value=
2
style=
"color: black;"
>
รถ
</option>
</select>
</div>
<div
class=
"input-group ml-3"
>
<button
class=
"btn btn-sm btn-outline-success"
type=
"submit"
(
click
)="
openSearchRoom
()"
>
Search
</button>
</div>
</div>
</
div
>
</
form
>
</div>
</div>
<div
class=
"card-body"
>
...
...
@@ -110,7 +116,6 @@
</div>
</div>
</ng-template>
</li>
<li
ngbNavItem
>
<a
ngbNavLink
>
การเบิก
</a>
...
...
@@ -132,7 +137,7 @@
</div>
</div>
</div>
<div
class=
"form-group"
>
<div
class=
"form-group
ml-3
"
>
<div
class=
"input-group"
>
<input
class=
"form-control"
placeholder=
"dd/mm/yyyy"
name=
"d2"
#
c2=
"ngModel"
[(
ngModel
)]="
searcheqModel
.
eDate
"
ngbDatepicker
...
...
@@ -143,7 +148,6 @@
</div>
</div>
</div>
</form>
<div
class=
"form-group ml-3"
>
<div
class=
"input-group"
>
<div
ngbDropdown
class=
"d-inline-block"
>
...
...
@@ -156,17 +160,23 @@
<option
value=
2
style=
"color: black;"
>
ยกเลิก
</option>
<option
value=
3
style=
"color: black;"
>
คืนแล้ว
</option>
</select>
<select
class=
"custom-select form-control"
[(
ngModel
)]="
searcheqModel
.
seqType
"
</div>
</div>
<div
class=
"input-group ml-3"
>
<select
class=
"custom-select form-control"
[(
ngModel
)]="
searcheqModel
.
seqType
"
aria-label=
"Default select example"
>
<option
selected
style=
"color: black;"
>
----ประเภท----
</option>
<option
value=
4
style=
"color: black;"
>
IT
</option>
<option
value=
5
style=
"color: black;"
>
Company
</option>
</select>
</div>
<div
class=
"input-group ml-3"
>
<button
class=
"btn btn-sm btn-outline-success"
type=
"submit"
(
click
)="
openSearchEq
()"
>
Search
</button>
</div>
</div>
</
div
>
</
form
>
</div>
</div>
<div
class=
"card-body"
>
...
...
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