Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ICAT
Datahub
Commits
2e63d4b8
Commit
2e63d4b8
authored
Aug 25, 2020
by
Axel Bocciarelli
Browse files
Merge branch 'col-order' into 'master'
Change order of start date column Closes
#391
See merge request
!417
parents
3ad36c21
f145b4dd
Pipeline
#31885
passed with stages
in 7 minutes and 24 seconds
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
src/components/Investigation/InvestigationTable.js
View file @
2e63d4b8
...
...
@@ -104,22 +104,23 @@ class InvestigationTable extends React.Component {
);
if
(
datasetCount
&&
datasetCount
.
value
&&
datasetCount
.
value
!==
0
)
{
return
(
<
div
>
<>
<
span
style
=
{{
width
:
40
,
textAlign
:
'
right
'
,
float
:
'
left
'
}}
>
{
datasetCount
.
value
}
<
/span
>
<
span
style
=
{{
width
:
8
0
,
width
:
7
0
,
marginLeft
:
5
,
float
:
'
left
'
,
fontStyle
:
'
italic
'
,
color
:
'
#999
'
,
fontSize
:
12
,
}}
>
({
extraData
.
volumeFormatter
(
cell
,
investigation
,
extraData
)})
<
/span
>
<
/
div
>
<
/
>
);
}
}
...
...
@@ -194,10 +195,17 @@ class InvestigationTable extends React.Component {
responsiveHeaderStyle
:
{
xs
:
{
hidden
:
true
},
sm
:
{
hidden
:
true
},
md
:
{
width
:
1
4
0
,
textAlign
:
'
center
'
},
lg
:
{
width
:
1
4
0
,
textAlign
:
'
center
'
},
md
:
{
width
:
1
1
0
,
textAlign
:
'
center
'
},
lg
:
{
width
:
1
1
0
,
textAlign
:
'
center
'
},
},
},
{
text
:
'
Start Date
'
,
dataField
:
'
startDate
'
,
formatter
:
dateFormatter
,
sort
:
true
,
responsiveHeaderStyle
:
getLgHeaderStyle
(
110
,
false
),
},
{
text
:
'
Title
'
,
dataField
:
'
summary
'
,
...
...
@@ -213,7 +221,7 @@ class InvestigationTable extends React.Component {
formatter
:
this
.
datasetCountFormatter
,
formatExtraData
:
this
,
responsiveHeaderStyle
:
getLgHeaderStyle
(
1
5
0
,
1
3
0
,
!
this
.
props
.
showInvestigationStats
),
},
...
...
@@ -229,14 +237,6 @@ class InvestigationTable extends React.Component {
!
this
.
props
.
showInvestigationStats
),
},
{
text
:
'
Start Date
'
,
dataField
:
'
startDate
'
,
formatter
:
dateFormatter
,
sort
:
true
,
responsiveHeaderStyle
:
getLgHeaderStyle
(
110
,
false
),
},
{
text
:
'
Release
'
,
dataField
:
'
releaseDate
'
,
...
...
@@ -249,7 +249,7 @@ class InvestigationTable extends React.Component {
dataField
:
'
doi
'
,
formatter
:
(
doi
)
=>
<
DOIBadge
doi
=
{
doi
}
/>
,
sort
:
true
,
responsiveHeaderStyle
:
getLgHeaderStyle
(
30
0
,
false
),
responsiveHeaderStyle
:
getLgHeaderStyle
(
26
0
,
false
),
},
];
}
...
...
Write
Preview
Supports
Markdown
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