Merge branch 'develop'

CMSTrackerDPG · Sep 30, 2022 · 77cd74b · 77cd74b
2 parents 2dedfa3 + 13fc208
commit 77cd74b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/dqmhelper/settings.py b/dqmhelper/settings.py
@@ -20,7 +20,7 @@
     messages.ERROR: "danger",
 }
 # Version to display in order to keep track of changes
-CERTHELPER_VERSION = "1.10.0"
+CERTHELPER_VERSION = "1.10.1"
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = Path(__file__).resolve().parent.parent

diff --git a/shiftleader/templates/shiftleader/day-by-day.html b/shiftleader/templates/shiftleader/day-by-day.html
@@ -42,12 +42,11 @@ <h3>Day by day notes: {{ day.name|title }}, {{ day.date|yyyymmdd_to_ddmmyyyy }}<
 			Prompt Feedback plots:
 			<ul>
 				{% for link in day.runs.prompt_feedback_plots %}
+				{% if link %}
 				<li><strong>{{ link }}</strong></li>
+				{% endif %}
 				{%endfor%}
 			</ul>
-
-
-
 		</p>
         </p>
     </div>

diff --git a/shiftleader/utilities/shiftleader_report_presentation.py b/shiftleader/utilities/shiftleader_report_presentation.py
@@ -408,7 +408,9 @@ def _configure_styles(self):
         )
         self.doc.automaticstyles.addElement(self.style_span_bad)
 
-    def _generate_list(self, list_items: list, identation_level: int = 1) -> List:
+    def _generate_list(
+        self, list_items: list, identation_level: int = 1, allow_empty: bool = False
+    ) -> List:
         stylename = f"L1-{identation_level}"
         l = List(stylename=stylename)
         for item in list_items:
@@ -419,7 +421,7 @@ def _generate_list(self, list_items: list, identation_level: int = 1) -> List:
                 li.addElement(item)
             elif isinstance(item, Element):
                 li.addElement(item)
-            else:
+            elif allow_empty or item:
                 li.addElement(P(text=item))
 
             l.addElement(li)

diff --git a/summary/templates/summary/summary.html b/summary/templates/summary/summary.html
@@ -2,7 +2,7 @@
 {% load static %}
 
 {% block style %}
-<link rel="stylesheet" href="{% static 'summary/css/summary.css' %}" type="text/css">
+<!-- <link rel="stylesheet" href="{% static 'summary/css/summary.css' %}" type="text/css"> -->
 {% endblock %}
 
 {% block content %}
@@ -148,7 +148,8 @@ <h6>Generated summary</h6>
          },
          success: function(data) {
 			 if(!data.success){
-				 alert(`Error! ${data.msg}`)
+				 console.error(`Error! ${data.msg}`);
+				 alert(`Make sure you have added the required links to prompt feedback plots!`);
 			 }
 
 		 },