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
f7778f24
Commit
f7778f24
authored
3 years ago
by
Your Name
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update book lists
parent
c77efee4
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
30 additions
and
16 deletions
+30
-16
rooms.model.ts
src/app/models/rooms.model.ts
+1
-1
admin-pending.component.ts
src/app/pages/admin-pending/admin-pending.component.ts
+6
-2
equipment.component.html
src/app/pages/equipment/equipment.component.html
+1
-1
home-page.component.ts
src/app/pages/home-page/home-page.component.ts
+6
-2
pending.component.ts
src/app/pages/pending/pending.component.ts
+6
-2
equirment.service.ts
src/app/service/equirment.service.ts
+1
-1
item-detail.service.ts
src/app/service/item-detail.service.ts
+4
-3
room-detail.service.ts
src/app/service/room-detail.service.ts
+4
-3
room.service.ts
src/app/service/room.service.ts
+1
-1
No files found.
src/app/models/rooms.model.ts
View file @
f7778f24
...
...
@@ -19,10 +19,10 @@ export class MyRoom implements Room{
// Object.assign(this, init);
this
.
rId
=
init
?.
rId
!
;
this
.
rName
=
init
?.
rName
!
;
this
.
rType
=
0
;
this
.
rPic
=
'assets/img/nopic.jpg'
;
this
.
roomLimit
=
0
;
this
.
rDesc
=
''
;
this
.
rType
=
0
;
}
}
...
...
src/app/pages/admin-pending/admin-pending.component.ts
View file @
f7778f24
...
...
@@ -209,8 +209,12 @@ export class AdminPendingComponent implements OnInit {
myFormEquir
:
FormGroup
;
ngOnInit
():
void
{
this
.
listItemDetail
=
this
.
ItemDetailService
.
getListItemDetail
();
this
.
listRoomDetail
=
this
.
RoomDetailService
.
getListRoomDetail
();
this
.
ItemDetailService
.
getListItemDetail
().
subscribe
(
result
=>
{
this
.
listItemDetail
=
result
;
});
this
.
RoomDetailService
.
getListRoomDetail
().
subscribe
(
result
=>
{
this
.
listRoomDetail
=
result
;
});
this
.
collectionSizeListRoom
=
this
.
listItemDetail
.
length
;
}
...
...
src/app/pages/equipment/equipment.component.html
View file @
f7778f24
...
...
@@ -29,7 +29,7 @@
<br>
<p
class=
"text-left"
>
ชื่อ : {{item.rName}}
</p>
<p
class=
"text-left"
>
รายละเอียด : {{item.rDesc}}
</p>
<p
class=
"text-left"
>
หมวดหมู่ :
<td
*
ngIf=
"item.r
Status==1"
>
ห้อง
</td><td
*
ngIf=
"item.rStatus
==2"
>
รถ
</td></p>
<p
class=
"text-left"
>
หมวดหมู่ :
<td
*
ngIf=
"item.r
Type==1"
>
ห้อง
</td><td
*
ngIf=
"item.rType
==2"
>
รถ
</td></p>
</div>
<div
class=
"text-center"
>
...
...
src/app/pages/home-page/home-page.component.ts
View file @
f7778f24
...
...
@@ -204,8 +204,12 @@ export class HomePageComponent implements OnInit {
setTimeout
(
function
()
{
window
.
dispatchEvent
(
new
Event
(
'resize'
))
},
1
)
this
.
listItemDetail
=
this
.
ItemDetailService
.
getListItemDetail
();
this
.
listRoomDetail
=
this
.
RoomDetailService
.
getListRoomDetail
();
this
.
ItemDetailService
.
getListItemDetail
().
subscribe
(
result
=>
{
this
.
listItemDetail
=
result
;
});
this
.
RoomDetailService
.
getListRoomDetail
().
subscribe
(
result
=>
{
this
.
listRoomDetail
=
result
;
});
for
(
let
i
=
0
;
i
<
this
.
listRoomDetail
.
length
;
i
++
)
{
if
(
this
.
listRoomDetail
[
i
].
rStatus
==
0
)
{
this
.
eventRoom
.
push
({
...
...
src/app/pages/pending/pending.component.ts
View file @
f7778f24
...
...
@@ -209,8 +209,12 @@ export class PendingComponent implements OnInit {
}
ngOnInit
()
{
this
.
listItemDetail
=
this
.
ItemDetailService
.
getListItemDetail
();
this
.
listRoomDetail
=
this
.
RoomDetailService
.
getListRoomDetail
();
this
.
ItemDetailService
.
getListItemDetail
().
subscribe
(
result
=>
{
this
.
listItemDetail
=
result
;
});
this
.
RoomDetailService
.
getListRoomDetail
().
subscribe
(
result
=>
{
this
.
listRoomDetail
=
result
;
});
this
.
collectionSizeListRoom
=
this
.
listRoomDetail
.
length
;
}
...
...
src/app/service/equirment.service.ts
View file @
f7778f24
...
...
@@ -8,7 +8,7 @@ import { Observable } from 'rxjs';
export
class
EquirmentService
{
constructor
(
private
http
:
HttpClient
)
{
}
url
:
string
=
"http://
2475-49-0-64-28
.ngrok.io"
;
url
:
string
=
"http://
a3be-115-87-232-117
.ngrok.io"
;
listEquirment
:
Equirment
[]
=
[]
addEquirment
(
model
:
Equirment
)
{
...
...
src/app/service/item-detail.service.ts
View file @
f7778f24
import
{
Injectable
}
from
'@angular/core'
;
import
{
HttpClient
,
HttpHeaders
}
from
'@angular/common/http'
;
import
{
ItemDetail
,
SearchItemDetailModel
}
from
'../models/itemDetail.model'
;
import
{
Observable
}
from
'rxjs'
;
@
Injectable
({
providedIn
:
'root'
})
export
class
ItemDetailService
{
constructor
(
private
http
:
HttpClient
)
{
}
url
:
string
=
"http://
2475-49-0-64-28
.ngrok.io"
;
url
:
string
=
"http://
a3be-115-87-232-117
.ngrok.io"
;
listItemDetail
:
ItemDetail
[]
=
[]
addItemDetail
(
model
:
ItemDetail
)
{
...
...
@@ -17,8 +18,8 @@ export class ItemDetailService {
getListItemDetail
()
{
return
this
.
listItemDetail
;
getListItemDetail
()
:
Observable
<
ItemDetail
[]
>
{
return
this
.
http
.
get
<
ItemDetail
[]
>
(
this
.
url
+
"/lend/lists"
)
;
}
// getListItemDetail() {
...
...
src/app/service/room-detail.service.ts
View file @
f7778f24
import
{
Injectable
}
from
'@angular/core'
;
import
{
HttpClient
,
HttpHeaders
}
from
'@angular/common/http'
;
import
{
RoomDetail
,
SearchRoomDetailModel
}
from
'../models/RoomDetail.model'
;
import
{
Observable
}
from
'rxjs'
;
@
Injectable
({
providedIn
:
'root'
})
export
class
RoomDetailService
{
constructor
(
private
http
:
HttpClient
)
{
}
url
:
string
=
"http://
2475-49-0-64-28
.ngrok.io"
;
url
:
string
=
"http://
a3be-115-87-232-117
.ngrok.io"
;
listRoomDetail
:
RoomDetail
[]
=
[]
editRoomDetail
(
model
:
RoomDetail
)
{
...
...
@@ -35,8 +36,8 @@ export class RoomDetailService {
}
getListRoomDetail
()
{
return
this
.
listRoomDetail
;
getListRoomDetail
()
:
Observable
<
RoomDetail
[]
>
{
return
this
.
http
.
get
<
RoomDetail
[]
>
(
this
.
url
+
"/book/lists"
);
}
...
...
src/app/service/room.service.ts
View file @
f7778f24
...
...
@@ -7,7 +7,7 @@ import { RoomDetail } from '../models/RoomDetail.model';
export
class
RoomService
{
constructor
(
private
http
:
HttpClient
)
{
}
url
:
string
=
'http://2475-49-0-64-28.ngrok.io'
;
url
:
string
=
"http://a3be-115-87-232-117.ngrok.io"
;
listRoomModel
:
Room
[]
=
[]
listRoomSearch
:
Room
[]
=
[];
...
...
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