diff --git a/css/ds.css b/css/ds.css index 13f5aeb..ba8b425 100644 --- a/css/ds.css +++ b/css/ds.css @@ -18,6 +18,9 @@ header span.btn { color: #333 !important; } +hr { + width: 100%; +} main { background-color: #ebeef0; } diff --git a/js/ds.js b/js/ds.js index 8a10e48..db139e6 100644 --- a/js/ds.js +++ b/js/ds.js @@ -190,21 +190,37 @@ DataSpace.renderAnalysisReport = async function (resource, type) } } + const rawDataLink = this.BASE_URL + resource['Analysis Spectra'][0]['Spectrum Raw Data']; + html += `
-

Spectrum - Raw Data

+

Spectrum

+ + + + + + + + + +
Technique${resource['Analysis Spectra'][0]['Spectrum Technique']}
Raw dataDownload raw data (text file)
`; - html += `
`; - // TODO plots... - const spectra = resource['Analysis Spectra'][0]; - const rawData = await this.fetchFileUrl(spectra['Spectrum Raw Data']); - const interpreted = await this.fetchFileUrl(spectra['Spectrum Interpreted Data']); + const interpLink = this.BASE_URL + resource['Analysis Spectra'][0]['Spectrum Interpreted Data']; + + html += ` +
+

Interpreted Data

+ +
+
+ `; return html; } diff --git a/js/resmap.js b/js/resmap.js index 6941eb5..06f7096 100644 --- a/js/resmap.js +++ b/js/resmap.js @@ -97,7 +97,7 @@ ANALYSIS_REPORT.set( ANALYSIS_REPORT.set( 'after-gallery', { - "Analysis Spectrum" : { + "Analysis Spectra" : { "Spectrum Raw Data" : null, "Spectrum Technique" : null, "Spectrum Interpreted Data" : null, diff --git a/report/index.html b/report/index.html index 1a1fb11..2dc3467 100644 --- a/report/index.html +++ b/report/index.html @@ -62,7 +62,7 @@
-
+