From fbb9efc4c7fb6a06b1868a6108f44c79cda6c925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20P?= Date: Tue, 26 Nov 2024 15:58:06 +0100 Subject: [PATCH] Update displayed data + menu --- webgis/img/icons/non_cons_menu.png | Bin 0 -> 6673 bytes webgis/index.html | 29 +++++++++++------ webgis/js/components/SiteDocuments.js | 45 +++++++++++++++----------- webgis/js/components/SiteSheet.js | 4 +++ 4 files changed, 51 insertions(+), 27 deletions(-) create mode 100644 webgis/img/icons/non_cons_menu.png diff --git a/webgis/img/icons/non_cons_menu.png b/webgis/img/icons/non_cons_menu.png new file mode 100644 index 0000000000000000000000000000000000000000..5a030fb9b2360434c29e8cab1d440cdc3f147371 GIT binary patch literal 6673 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 b=j49@(}hZS7a_j`00000NkvXXu0mjfqAJR` literal 0 HcmV?d00001 diff --git a/webgis/index.html b/webgis/index.html index 6f8ab03..47309bb 100644 --- a/webgis/index.html +++ b/webgis/index.html @@ -84,7 +84,7 @@
  • - Lo Pozzo (complesso idraulico) + Località Lo Pozzo
  • @@ -136,6 +136,9 @@

    • + + + Beni non conservati @@ -155,14 +158,22 @@

    diff --git a/webgis/js/components/SiteDocuments.js b/webgis/js/components/SiteDocuments.js index dd4aa20..3ae72e0 100644 --- a/webgis/js/components/SiteDocuments.js +++ b/webgis/js/components/SiteDocuments.js @@ -3,6 +3,8 @@ * @class SiteDocuments */ export class SiteDocuments { + documentation = []; + publications = []; /** * @param {object} data */ @@ -11,38 +13,45 @@ export class SiteDocuments { } render() { + this.documentation = this._siteData.documents + .filter(d => d.type === 'documentazione') + + this.publications = this._siteData.documents.filter(d => d.type === 'pubblicazione'); + let content = `
    - + `; - for (const doc of this._siteData.documents.filter(d => d.type === 'documentazione')) { + for (const doc of this.documentation) { content += ` - - `; - } - content += ` - - - - - - - `; - for (const doc of this._siteData.documents.filter(d => d.type === 'pubblicazione')) { - content += ` - `; } + if (this.publications.length) { + content += ` + + + + + + + `; + for (const doc of this.publications) { + content += ` + + `; + } + } content += `
    Documentazione di archivio
    TitoloAutoriDownload
    TitoloLuogo di conservazioneDownload
    ${doc.title}${doc.authors} - PDF -
    Pubblicazioni del progetto Carta Archeologica
    TitoloAutoriDownload
    ${doc.title}${doc.authors} +
    ${doc.title}${doc.conservationPlace} PDF
    Pubblicazioni del progetto Carta Archeologica
    TitoloAutoriDownload
    ${doc.title}${doc.authors} + PDF +
    diff --git a/webgis/js/components/SiteSheet.js b/webgis/js/components/SiteSheet.js index 6504875..a423ede 100644 --- a/webgis/js/components/SiteSheet.js +++ b/webgis/js/components/SiteSheet.js @@ -28,6 +28,7 @@ export class SiteSheet { Motivazione cronologia${this._siteData.motivation} Conservazione e condizione giuridica Stato di conservazione${this._siteData.conservationState} + Tecniche edilizie impiegate:${this._siteData.techniques} Ritrovamento e materiali Anno di ritrovamento${this._siteData.finding} Materiali rinvenuti${this._siteData.materials} @@ -62,6 +63,9 @@ export class SiteSheet {

    ${this._siteData.shortDescription}

    +

    + Autore scheda: ${this._siteData.author} +

    `; } } \ No newline at end of file