Merge branch 'dev' into rc, version 1.5.8rc4.

Author: jirikadlec2

docker/docker-compose.eea.yml

@@ -2,7 +2,7 @@ version: '3'
 
 services:
   frontend:
-    image: eeacms/copernicus-qctool-frontend:1.5.8rc3
+    image: eeacms/copernicus-qctool-frontend:1.5.8rc4
     ports:
       - 8000:8000
     environment:
@@ -22,7 +22,7 @@ services:
       - qc_tool_frontend:/mnt/qc_tool_frontend
 
   worker:
-    image: eeacms/copernicus-qctool-worker:1.5.8rc3
+    image: eeacms/copernicus-qctool-worker:1.5.8rc4
     environment:
       - PRODUCT_DIRS
       - BOUNDARY_DIR=/mnt/qc_tool_boundary/boundaries

docker/docker-compose.service_provider.yml

@@ -2,7 +2,7 @@ version: '3'
 
 services:
   frontend:
-    image: eeacms/copernicus-qctool-frontend:1.5.8rc3
+    image: eeacms/copernicus-qctool-frontend:1.5.8rc4
     ports:
       - 8000:8000
     environment:
@@ -18,7 +18,7 @@ services:
       - qc_tool_volume:/mnt/qc_tool_volume
 
   worker:
-    image: eeacms/copernicus-qctool-worker:1.5.8rc3
+    image: eeacms/copernicus-qctool-worker:1.5.8rc4
     environment:
       - PRODUCT_DIRS
       - BOUNDARY_DIR=/mnt/qc_tool_volume/boundaries

src/qc_tool/worker/report.py

@@ -1,6 +1,6 @@
+#!/usr/bin/env python3
 
 
-import json
 from datetime import datetime
 from os.path import normpath
 from pathlib import Path
@@ -27,6 +27,19 @@
 from qc_tool.common import CONFIG
 
 
+MAX_WORD_LENGTH = 40
+
+
+def truncate_long_words(sentence, max_length):
+    words = sentence.split()
+    for word in words:
+        if len(word) > max_length:
+            for i in range(0, len(word), max_length):
+                yield word[i:i+max_length]
+        else:
+            yield word
+
+
 def generate_pdf_report(job_report_filepath, job_uuid):
     job_report = compile_job_report_data(job_uuid)
 
@@ -86,7 +99,8 @@ def footer(canvas, doc):
         # Add summary table
         text.append(Paragraph("", styles["Heading1"]))
         text.append(Paragraph("Report summary", styles["Heading2"]))
-        status_file = ["File name", job_report["filename"]]
+        wrapped_filename = "\n".join(truncate_long_words(job_report["filename"], MAX_WORD_LENGTH))
+        status_file = ["File name", wrapped_filename]
         status_product = ["Product", job_report["description"]]
         display_date = datetime.strptime(job_report["job_finish_date"], TIME_FORMAT).strftime("%Y-%m-%d %H:%M:%S")
         status_date = ["Checked on", display_date]
@@ -162,7 +176,9 @@ def footer(canvas, doc):
                 messages = []
             display_messages = []
             for message in messages:
-                display_messages.append(Paragraph(message, style_body))
+                # Split long words in a message
+                wrapped_message = " ".join(truncate_long_words(message, MAX_WORD_LENGTH))
+                display_messages.append(Paragraph(wrapped_message, style_body))
 
             check_info = [display_ident,
                           display_layers,