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
e8f906c9
Commit
e8f906c9
authored
3 years ago
by
Chanachai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update code
parent
a1386f08
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
22 deletions
+21
-22
app.module.ts
src/app/app.module.ts
+0
-1
admin-pending.component.html
src/app/pages/admin-pending/admin-pending.component.html
+1
-1
admin-pending.component.ts
src/app/pages/admin-pending/admin-pending.component.ts
+15
-15
pending.component.html
src/app/pages/pending/pending.component.html
+5
-5
No files found.
src/app/app.module.ts
View file @
e8f906c9
...
...
@@ -23,7 +23,6 @@ import { AdminPendingComponent } from './pages/admin-pending/admin-pending.compo
import
{
PendingComponent
}
from
'./pages/pending/pending.component'
;
import
{
AdminEquirmentComponent
}
from
'./pages/admin-equirment/admin-equirment.component'
;
import
{
ReactiveFormsModule
}
from
'@angular/forms'
;
FullCalendarModule
.
registerPlugins
([
// register FullCalendar plugins
dayGridPlugin
,
...
...
This diff is collapsed.
Click to expand it.
src/app/pages/admin-pending/admin-pending.component.html
View file @
e8f906c9
...
...
@@ -94,7 +94,7 @@
item.sTime.minute }}
</td>
<td>
{{ item.eDate.replaceAll("/","-") }} {{ item.eTime.hour }}:{{
item.eTime.minute }}
</td>
<td>
{{ item.
e
Status }}
</td>
<td>
{{ item.
r
Status }}
</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
...
...
This diff is collapsed.
Click to expand it.
src/app/pages/admin-pending/admin-pending.component.ts
View file @
e8f906c9
...
...
@@ -2,11 +2,11 @@ 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
{
i
temDetail
}
from
'src/app/models/itemDetail.model'
;
import
{
i
temDetailService
}
from
'src/app/service/item-detail.service'
;
import
{
r
oomDetail
}
from
'src/app/models/roomDetail.model'
;
import
{
r
oomDetailService
}
from
'src/app/service/room-detail.service'
;
import
{
Room
}
from
'src/app/models/rooms.model'
;
import
{
I
temDetail
}
from
'src/app/models/itemDetail.model'
;
import
{
I
temDetailService
}
from
'src/app/service/item-detail.service'
;
import
{
R
oomDetail
}
from
'src/app/models/roomDetail.model'
;
import
{
R
oomDetailService
}
from
'src/app/service/room-detail.service'
;
import
{
MyRoom
,
Room
}
from
'src/app/models/rooms.model'
;
@
Component
({
selector
:
'app-admin-pending'
,
...
...
@@ -46,13 +46,13 @@ export class AdminPendingComponent implements OnInit {
closeResult
=
''
;
listitemDetail
:
i
temDetail
[]
=
[];
listroomDetail
:
r
oomDetail
[]
=
[];
listitemDetail
:
I
temDetail
[]
=
[];
listroomDetail
:
R
oomDetail
[]
=
[];
modelEquirment
=
new
Equirment
();
modelRoom
=
new
Room
();
modelitemDetail
=
new
i
temDetail
();
modelroomDetail
=
new
r
oomDetail
();
modelRoom
=
new
My
Room
();
modelitemDetail
=
new
I
temDetail
();
modelroomDetail
=
new
R
oomDetail
();
collectionSize
=
this
.
listitemDetail
.
length
;
hoveredDate
:
NgbDate
|
null
=
null
;
...
...
@@ -70,7 +70,7 @@ export class AdminPendingComponent implements OnInit {
}
constructor
(
private
calendar
:
NgbCalendar
,
public
formatter
:
NgbDateParserFormatter
,
private
modalService
:
NgbModal
,
private
itemDetailService
:
itemDetailService
,
private
roomDetailService
:
r
oomDetailService
)
{
constructor
(
private
calendar
:
NgbCalendar
,
public
formatter
:
NgbDateParserFormatter
,
private
modalService
:
NgbModal
,
private
ItemDetailService
:
ItemDetailService
,
private
RoomDetailService
:
R
oomDetailService
)
{
this
.
fromDate
=
calendar
.
getToday
();
this
.
toDate
=
calendar
.
getNext
(
calendar
.
getToday
(),
'd'
,
10
);
this
.
refreshitemDetail
();
...
...
@@ -106,7 +106,7 @@ export class AdminPendingComponent implements OnInit {
}
sDate
=
""
eDate
=
""
openItemDetail
(
content
:
string
,
item
:
i
temDetail
)
{
openItemDetail
(
content
:
string
,
item
:
I
temDetail
)
{
this
.
modelitemDetail
=
item
;
this
.
thStime
=
this
.
modelitemDetail
.
sTime
.
hour
+
':'
+
this
.
modelitemDetail
.
sTime
.
minute
this
.
thEtime
=
this
.
modelitemDetail
.
eTime
.
hour
+
':'
+
this
.
modelitemDetail
.
eTime
.
minute
...
...
@@ -134,7 +134,7 @@ export class AdminPendingComponent implements OnInit {
console
.
log
(
this
.
sDate
)
}
openRoomDetail
(
content
:
string
,
item
:
r
oomDetail
)
{
openRoomDetail
(
content
:
string
,
item
:
R
oomDetail
)
{
this
.
modelroomDetail
=
item
;
this
.
thStime
=
this
.
modelroomDetail
.
sTime
.
hour
+
':'
+
this
.
modelroomDetail
.
sTime
.
minute
this
.
thEtime
=
this
.
modelroomDetail
.
eTime
.
hour
+
':'
+
this
.
modelroomDetail
.
eTime
.
minute
...
...
@@ -177,8 +177,8 @@ export class AdminPendingComponent implements OnInit {
}
ngOnInit
():
void
{
this
.
listitemDetail
=
this
.
itemDetailService
.
getListi
temDetail
();
this
.
listroomDetail
=
this
.
roomDetailService
.
getListr
oomDetail
();
this
.
listitemDetail
=
this
.
ItemDetailService
.
getListI
temDetail
();
this
.
listroomDetail
=
this
.
RoomDetailService
.
getListR
oomDetail
();
console
.
log
(
this
.
listitemDetail
);
}
...
...
This diff is collapsed.
Click to expand it.
src/app/pages/pending/pending.component.html
View file @
e8f906c9
...
...
@@ -90,9 +90,9 @@
<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.minute }}
</td>
<td>
{{ item.eDate
| date:'dd-MM-yyyy'
}} {{ item.eTime.hour }}:{{ item.eTime.minute }}
</td>
<td>
{{ item.
e
Status }}
</td>
<td>
{{ item.sDate }} {{ item.sTime.hour }}:{{ item.sTime.minute }}
</td>
<td>
{{ item.eDate }} {{ item.eTime.hour }}:{{ item.eTime.minute }}
</td>
<td>
{{ item.
r
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
)="
openRoomDetail
(
Room
,
item
)"
><i
class=
"fa fa-search"
></i>
</button>
...
...
@@ -148,8 +148,8 @@
<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.sDate }} {{ item.sTime.hour }}:{{ item.sTime.minute }}
</td>
<td>
{{ item.eDate }} {{ item.eTime.hour }}:{{ item.eTime.minute }}
</td>
<td>
{{ item.Quantity }}
</td>
<td>
{{ item.eStatus }}
</td>
<div
class=
"col-auto align-self-sm-center"
>
...
...
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