diff --git a/css/.ds.css.swp b/css/.ds.css.swp
new file mode 100644
index 0000000..857f5af
Binary files /dev/null and b/css/.ds.css.swp differ
diff --git a/css/ds.css b/css/ds.css
index 4226c38..7709632 100644
--- a/css/ds.css
+++ b/css/ds.css
@@ -1,18 +1,21 @@
+@import '../vendor/fontawesome-free/css/all.css';
+
body {
height: 100%;
}
header {
- background-image: url('http://150.145.56.132/static/img/logos/dataspace_icon.svg');
- background-position: center;
- background-repeat: no-repeat;
- background-size: contain;
- min-height: 200px;
border-bottom: 1px lightgrey solid;
+ padding-top: 10px;
+ padding-bottom: 10px;
+}
+header i,
+header a.btn,
+header span.btn
+{
+ color: #333 !important;
}
main {
- width: 75%;
- margin: 0 auto;
- padding: 2rem 0 5rem 0;
+ background-color: #ebeef0;
}
footer {
min-height: 40px;
@@ -30,6 +33,12 @@ td ul {
margin-left: 0;
padding-left: 0;
}
+.report-container {
+ width: 75%;
+ margin: 0 auto;
+ background-color: #fff;
+ padding: 1rem 1rem;
+}
.mt-2 {
margin-top: 2rem !important;
}
diff --git a/js/.ds.js.swp b/js/.ds.js.swp
new file mode 100644
index 0000000..37c9de5
Binary files /dev/null and b/js/.ds.js.swp differ
diff --git a/js/ds.js b/js/ds.js
index e53146d..d16308e 100644
--- a/js/ds.js
+++ b/js/ds.js
@@ -1,6 +1,6 @@
'use strict';
-export const BASE_URL = 'http://150.145.56.132';
+export const BASE_URL = 'http://dataspace.ispc.cnr.it';
const RES_ENDPOINT = '/resources/';
/**
@@ -57,6 +57,9 @@ export async function fetchReport(uuid)
// Arbitrary slice...
return jsonRep;
}
+export function printReport() {
+ document.querySelector('#print').onclick = window.print();
+}
/**
* Fetch file blob (CORS...)
* @todo
@@ -69,4 +72,4 @@ export async function fetchReport(uuid)
/**
* Query report links to determine
* resource instance type...
- */
\ No newline at end of file
+ */
diff --git a/js/object.json b/js/object.json
new file mode 100644
index 0000000..d6b1a3c
--- /dev/null
+++ b/js/object.json
@@ -0,0 +1,8 @@
+{
+ "name": "Object M.P. Report",
+ "component": "reports/object",
+ "defaultconfig": {},
+ "description": "Custom report for the Marmora Phrygiae Object Model.",
+ "componentname": "object",
+ "templateid": "e4e8d54f-c666-193c-1404-ab4ee0204b13"
+}
diff --git a/js/views/.report.js.swp b/js/views/.report.js.swp
new file mode 100644
index 0000000..a05a014
Binary files /dev/null and b/js/views/.report.js.swp differ
diff --git a/js/views/report.js b/js/views/report.js
index 9e617df..30833f5 100644
--- a/js/views/report.js
+++ b/js/views/report.js
@@ -2,14 +2,20 @@
import {
fetchReport,
+ printReport,
} from "../ds.js";
document.addEventListener('readystatechange', async () => {
const report = await fetchReport(location.search.replace("?id=", ''));
- const resKeys = Object.keys(report.resource);
+ const resource = report.resource;
+
+ document.querySelector('#print').addEventListener('click', () => {
+ window.print();
+ });
+
+ let resKeys = Object.keys(resource);
// Default value...
let resType = 'Object';
-
// TODO
if (!resKeys.length) {
location.href = '/404.html';
@@ -17,6 +23,8 @@ document.addEventListener('readystatechange', async () => {
}
resType = resKeys[0].split(' ')[0];
+ const coordinates = resource['Coordinates'];
+ resKeys = resKeys.filter(e => !e.includes('Coordinates'));
document.querySelector('#rep-tit')
.innerText = `${resType} ${report.displayname}`;
@@ -25,7 +33,6 @@ document.addEventListener('readystatechange', async () => {
// TODO manage files and nested objects
for (const key of resKeys) {
const row = document.createElement('tr');
- let rowspan = '';
let innerList = null;
// TODO refactor
@@ -33,9 +40,7 @@ document.addEventListener('readystatechange', async () => {
const boolValue = '@value' in report.resource[key];
innerList = document.createElement('ul');
- if (!boolValue) {
- rowspan = Object.keys(report.resource[key]).length;
-
+ if (! boolValue) {
for (const k in report.resource[key]) {
const li = document.createElement('li');
li.innerHTML =
@@ -52,16 +57,14 @@ document.addEventListener('readystatechange', async () => {
}
// TODO Pop coordinates before traversing the object
- if (!key.includes('Coordinates')) {
- let value = innerList !== null ?
- innerList.outerHTML : report.resource[key];
+ let value = innerList !== null ?
+ innerList.outerHTML : report.resource[key];
- row.innerHTML = `
- | ${key.replace(resType, '')} |
- ${value} |
- `;
- }
+ row.innerHTML = `
+ ${key.replace(resType, '')} |
+ ${value} |
+ `;
repTable.appendChild(row);
}
-})
\ No newline at end of file
+})
diff --git a/package.json b/package.json
index 5022b6c..dfac820 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,7 @@
"author": "Nicolò Paraciani",
"license": "MIT",
"dependencies": {
+ "fontawesome-free": "^1.0.4",
"spectre.css": "^0.5.9"
}
}
diff --git a/report/index.html b/report/index.html
index 384c1be..17e17d1 100644
--- a/report/index.html
+++ b/report/index.html
@@ -6,24 +6,39 @@
-
+
-
- Report Light
-
-
+
-
+
-
+
-
-
Map
-
+
+