Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
PSManagementUI
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
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
hasan.bahjat
PSManagementUI
Commits
ba87b117
Commit
ba87b117
authored
Sep 04, 2024
by
hasan khaddour
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix s
parent
2a9661cd
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
29 additions
and
3 deletions
+29
-3
plan-controll.component.html
...oject-controll/plan-controll/plan-controll.component.html
+1
-1
plan-controll.component.ts
...project-controll/plan-controll/plan-controll.component.ts
+12
-0
track-controll.component.html
...ect-controll/track-controll/track-controll.component.html
+1
-1
track-controll.component.ts
...oject-controll/track-controll/track-controll.component.ts
+13
-0
step-list.component.ts
src/app/projects/pages/step-list/step-list.component.ts
+2
-1
No files found.
src/app/projects/components/project-controll/plan-controll/plan-controll.component.html
View file @
ba87b117
...
@@ -57,7 +57,7 @@
...
@@ -57,7 +57,7 @@
</div>
<!-- .row -->
</div>
<!-- .row -->
<div
class=
"col-md-6 col-lg-4"
(
click
)="
onMoveToProgress
()"
>
<div
class=
"col-md-6 col-lg-4"
*
ngIf=
"canSee()"
(
click
)="
onMoveToProgress
()"
>
<div
class=
"card shadow mb-4"
>
<div
class=
"card shadow mb-4"
>
<div
class=
"card-body file-list"
>
<div
class=
"card-body file-list"
>
<div
class=
"d-flex align-items-center"
>
<div
class=
"d-flex align-items-center"
>
...
...
src/app/projects/components/project-controll/plan-controll/plan-controll.component.ts
View file @
ba87b117
import
{
Component
,
EventEmitter
,
Input
,
Output
}
from
'@angular/core'
;
import
{
Component
,
EventEmitter
,
Input
,
Output
}
from
'@angular/core'
;
import
{
Project
}
from
'../../../models/responses/project'
;
import
{
Project
}
from
'../../../models/responses/project'
;
import
{
UserService
}
from
'../../../../core/services/authentication/user.service'
;
import
{
ROLES
}
from
'../../../../core/constants/roles'
;
@
Component
({
@
Component
({
selector
:
'plan-controll'
,
selector
:
'plan-controll'
,
...
@@ -10,8 +12,18 @@ export class PlanControllComponent {
...
@@ -10,8 +12,18 @@ export class PlanControllComponent {
@
Input
()
project
:
Project
@
Input
()
project
:
Project
@
Output
()
toProgress
=
new
EventEmitter
<
void
>
()
@
Output
()
toProgress
=
new
EventEmitter
<
void
>
()
constructor
(
private
userService
:
UserService
){}
onMoveToProgress
()
{
onMoveToProgress
()
{
this
.
toProgress
.
emit
();
this
.
toProgress
.
emit
();
}
}
canSee
():
boolean
{
return
this
.
userService
.
hasRole
(
ROLES
.
SCIENTIFIC_DEPUTY
)
}
}
}
src/app/projects/components/project-controll/track-controll/track-controll.component.html
View file @
ba87b117
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
</div>
<!-- .card-body -->
</div>
<!-- .card-body -->
</div>
<!-- .card -->
</div>
<!-- .card -->
</div>
</div>
<div
class=
"col-md-6 col-lg-4"
(
click
)="
onReplan
()"
>
<div
class=
"col-md-6 col-lg-4"
*
ngIf=
"canSee()"
(
click
)="
onReplan
()"
>
<div
class=
"card shadow mb-4"
>
<div
class=
"card shadow mb-4"
>
<div
class=
"card-body file-list"
>
<div
class=
"card-body file-list"
>
<div
class=
"d-flex align-items-center"
>
<div
class=
"d-flex align-items-center"
>
...
...
src/app/projects/components/project-controll/track-controll/track-controll.component.ts
View file @
ba87b117
import
{
Component
,
EventEmitter
,
Input
,
Output
}
from
'@angular/core'
;
import
{
Component
,
EventEmitter
,
Input
,
Output
}
from
'@angular/core'
;
import
{
Project
}
from
'../../../models/responses/project'
;
import
{
Project
}
from
'../../../models/responses/project'
;
import
{
UserService
}
from
'../../../../core/services/authentication/user.service'
;
import
{
ROLES
}
from
'../../../../core/constants/roles'
;
@
Component
({
@
Component
({
selector
:
'track-controll'
,
selector
:
'track-controll'
,
...
@@ -13,6 +15,11 @@ export class TrackControllComponent {
...
@@ -13,6 +15,11 @@ export class TrackControllComponent {
@
Output
()
replan
=
new
EventEmitter
();
@
Output
()
replan
=
new
EventEmitter
();
constructor
(
private
userService
:
UserService
){}
onComplete
(){
onComplete
(){
this
.
complete
.
emit
();
this
.
complete
.
emit
();
}
}
...
@@ -21,4 +28,10 @@ export class TrackControllComponent {
...
@@ -21,4 +28,10 @@ export class TrackControllComponent {
this
.
replan
.
emit
();
this
.
replan
.
emit
();
}
}
canSee
():
boolean
{
return
this
.
userService
.
hasRole
(
ROLES
.
SCIENTIFIC_DEPUTY
)
}
}
}
src/app/projects/pages/step-list/step-list.component.ts
View file @
ba87b117
...
@@ -80,7 +80,8 @@ export class StepListComponent {
...
@@ -80,7 +80,8 @@ export class StepListComponent {
modalRef
.
result
.
then
((
result
)
=>
{
modalRef
.
result
.
then
((
result
)
=>
{
if
(
result
)
{
if
(
result
)
{
// Add the new project to the list
// Add the new project to the list
step
.
weight
=
result
.
weight
step
.
weight
=
result
this
.
selectedItem
=
{...
step
}
}
}
},
(
reason
)
=>
{
},
(
reason
)
=>
{
...
...
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