From 185d952ae7855b5efdd0d1c6a8ce631fe519cf1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Prunayre?= Date: Tue, 2 Sep 2014 09:11:27 +0200 Subject: [PATCH 01/11] Harvester results are not saved #626. --- .../fao/geonet/kernel/harvest/harvester/AbstractHarvester.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/AbstractHarvester.java b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/AbstractHarvester.java index 13f4913424c..1b20b20b273 100644 --- a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/AbstractHarvester.java +++ b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/AbstractHarvester.java @@ -562,7 +562,8 @@ private void logHarvest(String logfile, Logger logger, String nodeName, String l .setHarvesterUuid(getParams().uuid) .setElapsedTime((int) elapsedTime) .setHarvestDate(new ISODate(lastRun)) - .setParams(getParams().node); + .setParams(getParams().node) + .setInfo(result); historyRepository.save(history); From 0e3c13c42b9ad31a356b5bd7055335dd35af8570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Prunayre?= Date: Tue, 2 Sep 2014 09:41:17 +0200 Subject: [PATCH 02/11] Harvester / Display vertical timeline for history. Improve layout in case of errors. Restore link to log file. --- .../resources/catalog/locales/en-admin.json | 3 +- .../resources/catalog/locales/fr-admin.json | 2 + .../resources/catalog/style/gn_admin.less | 1 + .../resources/catalog/style/timeline.less | 206 ++++++++++++ .../templates/admin/harvest/harvest.html | 318 ++++++++++-------- 5 files changed, 382 insertions(+), 148 deletions(-) create mode 100644 web-ui/src/main/resources/catalog/style/timeline.less diff --git a/web-ui/src/main/resources/catalog/locales/en-admin.json b/web-ui/src/main/resources/catalog/locales/en-admin.json index 726f152ecbc..c7644aa3e7c 100644 --- a/web-ui/src/main/resources/catalog/locales/en-admin.json +++ b/web-ui/src/main/resources/catalog/locales/en-admin.json @@ -18,7 +18,8 @@ "cron-0 0/5 14 * * ?": "Fire every 5 minutes starting at 2pm and ending at 2:55pm, every day", "cron-0 15 10 ? * MON-FRI": "Fire at 10:15am every Monday, Tuesday, Wednesday, Thursday and Friday", "cron-0 15 10 15 * ?": "Fire at 10:15am on the 15th day of every month", - + "recordsHarvestedIn": " record(s) harvested in ", + "seconds": "seconds", "totalNumberOfRecords": "records in the catalog", "totalNumberOfRecordsHelp": "Total number of records visible to you.", diff --git a/web-ui/src/main/resources/catalog/locales/fr-admin.json b/web-ui/src/main/resources/catalog/locales/fr-admin.json index 404e4294a62..42546f3d89e 100644 --- a/web-ui/src/main/resources/catalog/locales/fr-admin.json +++ b/web-ui/src/main/resources/catalog/locales/fr-admin.json @@ -16,6 +16,8 @@ "tools": "Outils", "totalNumberOfRecords": " fiches dans le catalogue", "totalNumberOfRecordsHelp": "Nombre totale de fiches que vous pouvez consulter.", + "recordsHarvestedIn": " fiche(s) moissonnée(s) en", + "seconds": "secondes", "status": "Statut", "information": "Information", "dbUrl": "Base de données", diff --git a/web-ui/src/main/resources/catalog/style/gn_admin.less b/web-ui/src/main/resources/catalog/style/gn_admin.less index 9d186a5451a..1b4ec4fba36 100644 --- a/web-ui/src/main/resources/catalog/style/gn_admin.less +++ b/web-ui/src/main/resources/catalog/style/gn_admin.less @@ -1,4 +1,5 @@ @import "gn.less"; +@import "timeline.less"; .gn-chart{ height:500px; diff --git a/web-ui/src/main/resources/catalog/style/timeline.less b/web-ui/src/main/resources/catalog/style/timeline.less new file mode 100644 index 00000000000..2b668f4666d --- /dev/null +++ b/web-ui/src/main/resources/catalog/style/timeline.less @@ -0,0 +1,206 @@ +.timeline { + list-style: none; + padding: 20px 0 20px; + position: relative; +} + +.timeline-1-col { + :before { + left: 2%; + } + + li > .timeline-badge { + left: 2%; + } + li > .timeline-panel { + width: 92%; + } +} +.timeline-2-col { + :before { + left: 50%; + } + li > .timeline-badge { + left: 50%; + } + li > .timeline-panel { + width: 46%; + } +} + +.timeline:before { + top: 0; + bottom: 0; + position: absolute; + content: " "; + width: 3px; + background-color: #eeeeee; + margin-left: -1.5px; +} + +.timeline > li { + margin-bottom: 20px; + position: relative; +} + +.timeline > li:before, +.timeline > li:after { + content: " "; + display: table; +} + +.timeline > li:after { + clear: both; +} + +.timeline > li:before, +.timeline > li:after { + content: " "; + display: table; +} + +.timeline > li:after { + clear: both; +} + +.timeline > li > .timeline-panel { +// width: 46%; + float: left; + border: 1px solid #d4d4d4; + border-radius: 2px; + padding: 20px; + position: relative; + -webkit-box-shadow: 0 1px 6px rgba(0, 0, 0, 0.175); + box-shadow: 0 1px 6px rgba(0, 0, 0, 0.175); +} + +.timeline > li > .timeline-panel:before { + position: absolute; + top: 26px; + right: -15px; + display: inline-block; + border-top: 15px solid transparent; + border-left: 15px solid #ccc; + border-right: 0 solid #ccc; + border-bottom: 15px solid transparent; + content: " "; +} + +.timeline > li > .timeline-panel:after { + position: absolute; + top: 27px; + right: -14px; + display: inline-block; + border-top: 14px solid transparent; + border-left: 14px solid #fff; + border-right: 0 solid #fff; + border-bottom: 14px solid transparent; + content: " "; +} + +.timeline > li > .timeline-badge { + color: #fff; + width: 50px; + height: 50px; + line-height: 50px; + padding-top: 15px; + font-size: 1.4em; + text-align: center; + position: absolute; + top: 16px; + margin-left: -25px; + background-color: #999999; + z-index: 100; + border-top-right-radius: 50%; + border-top-left-radius: 50%; + border-bottom-right-radius: 50%; + border-bottom-left-radius: 50%; +} + +.timeline > li.timeline-inverted > .timeline-panel { + float: right; +} + +.timeline > li.timeline-inverted > .timeline-panel:before { + border-left-width: 0; + border-right-width: 15px; + left: -15px; + right: auto; +} + +.timeline > li.timeline-inverted > .timeline-panel:after { + border-left-width: 0; + border-right-width: 14px; + left: -14px; + right: auto; +} + +.timeline-badge.primary { + background-color: #2e6da4 !important; +} + +.timeline-badge.success { + background-color: #3f903f !important; +} + +.timeline-badge.warning { + background-color: #f0ad4e !important; +} + +.timeline-badge.danger { + background-color: #d9534f !important; +} + +.timeline-badge.info { + background-color: #5bc0de !important; +} + +.timeline-title { + margin-top: 0; + color: inherit; +} + +.timeline-body > p, +.timeline-body > ul { + margin-bottom: 0; +} + +.timeline-body > p + p { + margin-top: 5px; +} + +@media (max-width: 767px) { + ul.timeline:before { + left: 40px; + } + + ul.timeline > li > .timeline-panel { + width: calc(100% - 90px); + width: -moz-calc(100% - 90px); + width: -webkit-calc(100% - 90px); + } + + ul.timeline > li > .timeline-badge { + left: 15px; + margin-left: 0; + top: 16px; + } + + ul.timeline > li > .timeline-panel { + float: right; + } + + ul.timeline > li > .timeline-panel:before { + border-left-width: 0; + border-right-width: 15px; + left: -15px; + right: auto; + } + + ul.timeline > li > .timeline-panel:after { + border-left-width: 0; + border-right-width: 14px; + left: -14px; + right: auto; + } +} \ No newline at end of file diff --git a/web-ui/src/main/resources/catalog/templates/admin/harvest/harvest.html b/web-ui/src/main/resources/catalog/templates/admin/harvest/harvest.html index f7e488a95ac..dfd1c0dbbbb 100644 --- a/web-ui/src/main/resources/catalog/templates/admin/harvest/harvest.html +++ b/web-ui/src/main/resources/catalog/templates/admin/harvest/harvest.html @@ -1,179 +1,203 @@
-
-
-
harvester
- -
- -
- - - - {{h.site.name}} - ({{('harvester-' + h['@type']) | translate}}) {{h.info.result.total}} -