diff --git a/dependencies/parsers/aptfim b/dependencies/parsers/aptfim index c0e936246972c0fb98b9b9c96a67167f1725156f..95b3874b72035d0529f7dd0cde419192dba68100 160000 --- a/dependencies/parsers/aptfim +++ b/dependencies/parsers/aptfim @@ -1 +1 @@ -Subproject commit c0e936246972c0fb98b9b9c96a67167f1725156f +Subproject commit 95b3874b72035d0529f7dd0cde419192dba68100 diff --git a/dependencies/parsers/mpes b/dependencies/parsers/mpes index ef3fe75d150b13d35abc5d9af9555708fbf3903f..e772c6d954009d7b3419200ffd370f55fd62c1a4 160000 --- a/dependencies/parsers/mpes +++ b/dependencies/parsers/mpes @@ -1 +1 @@ -Subproject commit ef3fe75d150b13d35abc5d9af9555708fbf3903f +Subproject commit e772c6d954009d7b3419200ffd370f55fd62c1a4 diff --git a/gui/src/components/domains.js b/gui/src/components/domains.js index cbcd045f0d4e4b3e32c666f18bd8c2c37d849bb5..8b03cb686b2c4a51592df14ed2b2f861990ea85b 100644 --- a/gui/src/components/domains.js +++ b/gui/src/components/domains.js @@ -141,7 +141,7 @@ class DomainProviderBase extends React.Component { }, experiment_time: { label: 'Date/Time', - render: time => new Date(time * 1000).toLocaleString() + render: time => time !== 'unavailable' ? new Date(time * 1000).toLocaleString() : time } }, /** diff --git a/gui/src/components/ems/EMSEntryOverview.js b/gui/src/components/ems/EMSEntryOverview.js index ba1b3c3e78dfd6cd14eeaf84b84a25cd10dde834..e940d92e32621720db933c8cdefb33a2cb48a251 100644 --- a/gui/src/components/ems/EMSEntryOverview.js +++ b/gui/src/components/ems/EMSEntryOverview.js @@ -26,19 +26,21 @@ export default class EMSEntryOverview extends React.Component { return ( <Quantity column> - <Quantity quantity="experiment_summary" label="summary" noWrap {...this.props} /> + <Quantity quantity="experiment_summary" label="summary" {...this.props} /> <Quantity row> <Quantity column> <Quantity row> <Quantity quantity="formula" label="sample formula" noWrap {...this.props} /> - <Quantity quantity="chemical" label="sample chemical" noWrap {...this.props} /> + {data.chemical !== 'unavailable' + ? <Quantity quantity="chemical" label="sample chemical" noWrap {...this.props} /> + : ''} </Quantity> <Quantity quantity="method" label="experimental method" noWrap {...this.props} /> <Quantity quantity="experiment_location" label="experiment location" noWrap {...this.props} /> <Quantity label="experiment time" {...this.props}> - <Typography noWrap> - {new Date(data.experiment_time * 1000).toLocaleString()} - </Typography> + <Typography noWrap>{ + data.experiment_time !== 'unavailable' ? new Date(data.experiment_time * 1000).toLocaleString() : 'unavailable' + }</Typography> </Quantity> <Quantity label="data" {...this.props}> <Typography noWrap> diff --git a/nomad/parsing/__init__.py b/nomad/parsing/__init__.py index f1252ca4f9c727ea62ad103c20ff36be7b40651d..2d6d937124abfc924290ee075935d51b72aa1b7e 100644 --- a/nomad/parsing/__init__.py +++ b/nomad/parsing/__init__.py @@ -371,6 +371,12 @@ parsers = [ parser_class_name='mpesparser.MPESParserInterface', mainfile_mime_re=r'(application/json)|(text/.*)', mainfile_name_re=(r'.*_data.meta') + ), + LegacyParser( + name='parsers/aptfim', code_name='mpes', domain='EMS', + parser_class_name='aptfimparser.APTFIMParserInterface', + mainfile_mime_re=r'(application/json)|(text/.*)', + mainfile_name_re=(r'.*.aptfim') ) ]