Skip to content
Snippets Groups Projects
Commit d2ba0a31 authored by esikkala's avatar esikkala
Browse files

Manuscripts table: handle open-ended timespans

parent a27075f9
No related branches found
No related tags found
No related merge requests found
import React from 'react'; import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { sortBy, orderBy, has } from 'lodash'; import { orderBy, has } from 'lodash';
import TableCell from '@material-ui/core/TableCell'; import TableCell from '@material-ui/core/TableCell';
import { withStyles } from '@material-ui/core/styles'; import { withStyles } from '@material-ui/core/styles';
import Collapse from '@material-ui/core/Collapse'; import Collapse from '@material-ui/core/Collapse';
...@@ -34,9 +34,6 @@ const ResultTableCell = props => { ...@@ -34,9 +34,6 @@ const ResultTableCell = props => {
month = parseInt(str.substring(6,7)); month = parseInt(str.substring(6,7));
day = parseInt(str.substring(9,10)); day = parseInt(str.substring(9,10));
} }
// console.log(year)
// console.log(month)
// console.log(day)
return new Date(year, month, day); return new Date(year, month, day);
}; };
...@@ -64,8 +61,8 @@ const ResultTableCell = props => { ...@@ -64,8 +61,8 @@ const ResultTableCell = props => {
if (props.columnId == 'productionTimespan') { if (props.columnId == 'productionTimespan') {
cell = sortValues cell = sortValues
? cell.sort((a,b) => { ? cell.sort((a,b) => {
a = ISOStringToDate(a.start); a = has(a, 'start') ? ISOStringToDate(a.start) : ISOStringToDate(a.end);
b = ISOStringToDate(b.start); b = has(b, 'start') ? ISOStringToDate(b.start) : ISOStringToDate(b.end);
// arrange from the most recent to the oldest // arrange from the most recent to the oldest
return a > b ? 1 : a < b ? -1 : 0; return a > b ? 1 : a < b ? -1 : 0;
}) })
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment