Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
enasequence
webin-portal
Commits
301bc560
Commit
301bc560
authored
Jun 10, 2021
by
Rajkumar-D
Browse files
ENA-4404, ENA-4396 Bug fixing
parent
df9f72eb
Pipeline
#278390
passed with stages
in 5 minutes and 1 second
Changes
7
Pipelines
4
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
60 additions
and
9 deletions
+60
-9
src/app/read-submission/read-submission.component.css
src/app/read-submission/read-submission.component.css
+19
-1
src/app/read-submission/read-submission.component.html
src/app/read-submission/read-submission.component.html
+1
-1
src/app/report/report.component.html
src/app/report/report.component.html
+2
-1
src/app/study-management/study-management.component.html
src/app/study-management/study-management.component.html
+2
-2
src/app/study-management/study-management.component.ts
src/app/study-management/study-management.component.ts
+18
-1
src/app/umbrella-management/umbrella-management.component.html
...pp/umbrella-management/umbrella-management.component.html
+2
-2
src/app/umbrella-management/umbrella-management.component.ts
src/app/umbrella-management/umbrella-management.component.ts
+16
-1
No files found.
src/app/read-submission/read-submission.component.css
View file @
301bc560
...
...
@@ -22,4 +22,22 @@
position
:
fixed
;
/* or absolute */
top
:
50%
;
left
:
50%
;
}
\ No newline at end of file
}
::ng-deep
.mat-select-panel
::-webkit-scrollbar
{
-webkit-appearance
:
none
;
}
::ng-deep
.mat-select-panel
::-webkit-scrollbar:vertical
{
width
:
11px
;
}
::ng-deep
.mat-select-panel
::-webkit-scrollbar:horizontal
{
height
:
11px
;
}
::ng-deep
.mat-select-panel
::-webkit-scrollbar-thumb
{
border-radius
:
8px
;
border
:
2px
solid
white
;
/* should match background, can't be transparent */
background-color
:
rgba
(
0
,
0
,
0
,
.5
);
}
\ No newline at end of file
src/app/read-submission/read-submission.component.html
View file @
301bc560
...
...
@@ -76,7 +76,7 @@
<mat-select
class=
"checklist-restriction"
placeholder=
"Permitted values"
>
<mat-option
*ngFor=
"let PermitedValues of field.value_choice"
[value]=
"
field.value_choic
e"
>
[value]=
"
PermitedValues"
[disabled]=
"tru
e"
>
{{ PermitedValues }}
</mat-option>
</mat-select>
...
...
src/app/report/report.component.html
View file @
301bc560
...
...
@@ -238,7 +238,8 @@
<div>
{{getElementValue(element, col)}}
<span
class=
edit-icon-span
*ngIf=
"!isEga() && !embeded"
>
<mat-icon
class=
"edit-icon"
*ngIf=
"element.report.releaseStatus=='PRIVATE'"
<mat-icon
class=
"edit-icon"
*ngIf=
"element.report.releaseStatus==='PRIVATE' || element.report.releaseStatus==='TEMPORARY_SUPPRESSED'"
(click)=
"updateReleaseDate(element)"
>
edit
</mat-icon>
</span>
</div>
...
...
src/app/study-management/study-management.component.html
View file @
301bc560
...
...
@@ -12,7 +12,7 @@
<mat-form-field
class=
"app-field-padding"
*ngIf=
"action==='Edit'"
>
<input
matInput
placeholder=
"Project Id"
required
[(ngModel)]=
"id"
name=
"id"
readonly
>
</mat-form-field>
<mat-form-field
appearance=
"fill"
*ngIf=
"
!
is
Ega
()"
>
<mat-form-field
appearance=
"fill"
*ngIf=
"
d
is
playReleaseDate
()"
>
<mat-label>
Release date [ This is when your study will be made public. ]
</mat-label>
<input
matInput
[matDatepicker]=
"picker"
[readonly]=
"true"
required
[(ngModel)]=
"releaseDate"
[min]=
"today"
[max]=
"maxDate"
name=
"releaseDate"
>
...
...
@@ -25,7 +25,7 @@
<mat-checkbox
matInput
name=
"provideGenomeAnnotation"
(click)=
"setGenomeAnotation($event)"
[(ngModel)]=
"provideGenomeAnnotation"
>
Will you provide functional genome annotation ?
</mat-checkbox>
</div>
<div
class=
"column"
*ngIf=
"!editMode"
>
<div
class=
"column"
>
<mat-form-field
class=
"app-field-padding"
>
<input
matInput
placeholder=
"Short descriptive study title"
required
[(ngModel)]=
"studyTitle"
name=
"studyTitle"
>
...
...
src/app/study-management/study-management.component.ts
View file @
301bc560
...
...
@@ -213,7 +213,9 @@ export class StudyManagementComponent implements OnInit {
}
setPageValuesfromReport
(
data
)
{
this
.
releaseDate
=
new
Date
(
data
[
"
holdDate
"
]);
if
(
data
[
"
holdDate
"
])
{
this
.
releaseDate
=
new
Date
(
data
[
"
holdDate
"
]);
}
this
.
releaseStatus
=
data
[
"
releaseStatus
"
];
}
...
...
@@ -348,6 +350,21 @@ export class StudyManagementComponent implements OnInit {
}
}
displayReleaseDate
()
{
// Show release_date if the action is not edit
if
(
!
this
.
isEga
()
&&
this
.
action
!=
'
Edit
'
)
{
return
true
;
}
// While study edit show release_ate field only if the study status is PRIVATE or TEMPORARY_SUPPRESSED
if
(
!
this
.
isEga
()
&&
this
.
action
===
'
Edit
'
&&
(
this
.
releaseStatus
===
'
PRIVATE
'
||
this
.
releaseStatus
===
'
TEMPORARY_SUPPRESSED
'
))
{
return
true
;
}
return
false
;
}
isEga
():
boolean
{
return
this
.
_webinAuthenticationService
.
ega
;
}
...
...
src/app/umbrella-management/umbrella-management.component.html
View file @
301bc560
...
...
@@ -12,7 +12,7 @@
<mat-form-field
class=
"app-field-padding"
*ngIf=
"action==='Edit'"
>
<input
matInput
placeholder=
"Project Id"
required
[(ngModel)]=
"id"
name=
"id"
readonly
>
</mat-form-field>
<mat-form-field
appearance=
"fill"
*ngIf=
"
!
is
Ega
()"
>
<mat-form-field
appearance=
"fill"
*ngIf=
"
d
is
playReleaseDate
()"
>
<mat-label>
Release date [ This is when your study will be made public. ]
</mat-label>
<input
matInput
[matDatepicker]=
"picker"
[readonly]=
"true"
required
[(ngModel)]=
"releaseDate"
[min]=
"today"
[max]=
"maxDate"
name=
"releaseDate"
>
...
...
@@ -23,7 +23,7 @@
<input
matInput
placeholder=
"Study Name"
[(ngModel)]=
"studyName"
name=
"studyName"
>
</mat-form-field>
</div>
<div
class=
"column"
*ngIf=
"!editMode"
>
<div
class=
"column"
>
<mat-form-field
class=
"app-field-padding"
>
<input
matInput
placeholder=
"Short descriptive study title"
required
[(ngModel)]=
"studyTitle"
name=
"studyTitle"
>
...
...
src/app/umbrella-management/umbrella-management.component.ts
View file @
301bc560
...
...
@@ -305,7 +305,9 @@ export class UmbrellaManagementComponent implements OnInit {
}
setPageValuesfromReport
(
data
)
{
this
.
releaseDate
=
new
Date
(
data
[
"
holdDate
"
]);
if
(
data
[
"
holdDate
"
])
{
this
.
releaseDate
=
new
Date
(
data
[
"
holdDate
"
]);
}
this
.
releaseStatus
=
data
[
"
releaseStatus
"
];
}
...
...
@@ -556,6 +558,19 @@ export class UmbrellaManagementComponent implements OnInit {
this
.
childProjectDatasource
=
new
MatTableDataSource
<
any
>
(
this
.
childProjectDatasource
.
data
);
}
displayReleaseDate
()
{
// Show release_date if the action is not edit
if
(
!
this
.
isEga
()
&&
this
.
action
!=
'
Edit
'
)
{
return
true
;
}
// While umbrella edit show release_ate field only if the study status is PRIVATE or TEMPORARY_SUPPRESSED
if
(
!
this
.
isEga
()
&&
this
.
action
===
'
Edit
'
&&
(
this
.
releaseStatus
===
'
PRIVATE
'
||
this
.
releaseStatus
===
'
TEMPORARY_SUPPRESSED
'
))
{
return
true
;
}
return
false
;
}
isEga
():
boolean
{
return
this
.
_webinAuthenticationService
.
ega
;
...
...
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