From f3c4ac2cb63165923ada2dc5cd2315a303878917 Mon Sep 17 00:00:00 2001
From: Rowan Moss <rowan.moss@stfc.ac.uk>
Date: Tue, 25 Nov 2025 15:37:21 +0000
Subject: [PATCH 1/7] Create validator django app

- base file template for the new message validator
- makes use of django app creator startapp
---
 monitoring/settings.py                      | 1 +
 monitoring/urls.py                          | 1 +
 monitoring/validator/__init__.py            | 0
 monitoring/validator/admin.py               | 3 +++
 monitoring/validator/apps.py                | 6 ++++++
 monitoring/validator/migrations/__init__.py | 0
 monitoring/validator/models.py              | 3 +++
 monitoring/validator/tests.py               | 3 +++
 monitoring/validator/urls.py                | 8 ++++++++
 monitoring/validator/views.py               | 5 +++++
 10 files changed, 30 insertions(+)
 create mode 100644 monitoring/validator/__init__.py
 create mode 100644 monitoring/validator/admin.py
 create mode 100644 monitoring/validator/apps.py
 create mode 100644 monitoring/validator/migrations/__init__.py
 create mode 100644 monitoring/validator/models.py
 create mode 100644 monitoring/validator/tests.py
 create mode 100644 monitoring/validator/urls.py
 create mode 100644 monitoring/validator/views.py

diff --git a/monitoring/settings.py b/monitoring/settings.py
index 5714c40..e10b183 100644
--- a/monitoring/settings.py
+++ b/monitoring/settings.py
@@ -95,6 +95,7 @@
     'monitoring.availability',
     'monitoring.benchmarks',
     'monitoring.iris',
+    'monitoring.validator',
 ]
 
 REST_FRAMEWORK = {
diff --git a/monitoring/urls.py b/monitoring/urls.py
index 374a22e..185be43 100644
--- a/monitoring/urls.py
+++ b/monitoring/urls.py
@@ -10,4 +10,5 @@
     path('benchmarks/', include('monitoring.benchmarks.urls')),
     path('iris/', include('monitoring.iris.urls')),
     path('api-auth/', include('rest_framework.urls', namespace='rest_framework')),
+    path('validator/', include ('monitoring.validator.urls')),
 ]
diff --git a/monitoring/validator/__init__.py b/monitoring/validator/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/monitoring/validator/admin.py b/monitoring/validator/admin.py
new file mode 100644
index 0000000..8c38f3f
--- /dev/null
+++ b/monitoring/validator/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/monitoring/validator/apps.py b/monitoring/validator/apps.py
new file mode 100644
index 0000000..49e5efc
--- /dev/null
+++ b/monitoring/validator/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class ValidatorConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'validator'
diff --git a/monitoring/validator/migrations/__init__.py b/monitoring/validator/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/monitoring/validator/models.py b/monitoring/validator/models.py
new file mode 100644
index 0000000..71a8362
--- /dev/null
+++ b/monitoring/validator/models.py
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
diff --git a/monitoring/validator/tests.py b/monitoring/validator/tests.py
new file mode 100644
index 0000000..7ce503c
--- /dev/null
+++ b/monitoring/validator/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/monitoring/validator/urls.py b/monitoring/validator/urls.py
new file mode 100644
index 0000000..32b80d6
--- /dev/null
+++ b/monitoring/validator/urls.py
@@ -0,0 +1,8 @@
+from django.urls import path
+
+from monitoring.validator import views
+
+urlpatterns = [
+    path('', views.index, name="validator"),
+]
+
diff --git a/monitoring/validator/views.py b/monitoring/validator/views.py
new file mode 100644
index 0000000..df5b2d6
--- /dev/null
+++ b/monitoring/validator/views.py
@@ -0,0 +1,5 @@
+from django.shortcuts import render
+from django.http import HttpResponse
+
+def index(request):
+    return HttpResponse("Hello. This is validator index")

From 2b92cebcdbeafe8b61f528a880419b2e1badb6e2 Mon Sep 17 00:00:00 2001
From: Rowan Moss <rowan.moss@stfc.ac.uk>
Date: Thu, 27 Nov 2025 16:28:12 +0000
Subject: [PATCH 2/7] Update validator app config

- within apps.py
- update config to have the correct name
---
 monitoring/validator/apps.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/monitoring/validator/apps.py b/monitoring/validator/apps.py
index 49e5efc..a754311 100644
--- a/monitoring/validator/apps.py
+++ b/monitoring/validator/apps.py
@@ -2,5 +2,4 @@
 
 
 class ValidatorConfig(AppConfig):
-    default_auto_field = 'django.db.models.BigAutoField'
-    name = 'validator'
+    name = 'monitoring.validator'

From 68c907111b099b059c03c1dd4a76a11009f66eb2 Mon Sep 17 00:00:00 2001
From: Rowan Moss <rowan.moss@stfc.ac.uk>
Date: Tue, 9 Dec 2025 17:24:57 +0000
Subject: [PATCH 3/7] Create initial html page template and validator view

- Linked into the Apel RecordFactory
- Doesn't make use of django model
---
 monitoring/validator/models.py                |  3 --
 .../templates/validator/validator_index.html  | 38 ++++++++++++++
 monitoring/validator/views.py                 | 50 ++++++++++++++++++-
 3 files changed, 86 insertions(+), 5 deletions(-)
 create mode 100644 monitoring/validator/templates/validator/validator_index.html

diff --git a/monitoring/validator/models.py b/monitoring/validator/models.py
index 71a8362..e69de29 100644
--- a/monitoring/validator/models.py
+++ b/monitoring/validator/models.py
@@ -1,3 +0,0 @@
-from django.db import models
-
-# Create your models here.
diff --git a/monitoring/validator/templates/validator/validator_index.html b/monitoring/validator/templates/validator/validator_index.html
new file mode 100644
index 0000000..c3e679c
--- /dev/null
+++ b/monitoring/validator/templates/validator/validator_index.html
@@ -0,0 +1,38 @@
+{% load static %}
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+        <title>Record Validator</title>
+        <link href="{% static 'stylesheet.css' %}" rel="stylesheet" type="text/css" />
+        <link href="{% static 'style.css' %}" rel="stylesheet" type="text/css" />
+    </head>
+
+    <body>
+        <h2>Record Validator!</h2>
+
+        <form id="validate-form" method="post">
+          {% csrf_token %}
+          <label for="input_record">Enter Record:</label>
+          <textarea
+            id="input_record"
+            name="input_record"
+            rows="10"
+            cols="50"
+            wrap="wrap"
+            value="{{ input_record|default:'' }}"
+          ></textarea>
+          <br><br>
+          <button type="submit">Validate!</button>
+        </form>
+
+        <div id="output">
+          {% if output %}
+            <h3>Output</h3>
+            {{ output }}
+          {% endif %}
+        </div>
+    </body>
+</html>
diff --git a/monitoring/validator/views.py b/monitoring/validator/views.py
index df5b2d6..369c623 100644
--- a/monitoring/validator/views.py
+++ b/monitoring/validator/views.py
@@ -1,5 +1,51 @@
 from django.shortcuts import render
-from django.http import HttpResponse
+from django.views.decorators.http import require_http_methods
 
+from apel.db.loader.record_factory import RecordFactory
+
+
+@require_http_methods(["GET", "POST"])
 def index(request):
-    return HttpResponse("Hello. This is validator index")
+    """
+    Validates inputted records using Apel RecordFactory,
+    when html form is submitted.
+    """
+    template_name = "validator/validator_index.html"
+    input_record = ""
+    output = ""
+
+
+    def validate(record: str) -> str:
+        """
+        Validated record(s) passed in, and returns the result
+        """
+        if not record:
+            return "Please enter a record to be validated."
+
+        record = record.strip()
+
+        try:
+            recordFactory = RecordFactory()
+
+            result = recordFactory.create_records(record)
+
+            return str(result)
+
+        except Exception as e:
+            return str(e)
+
+
+    # On form submission, trigger record validation
+    if request.method == "POST":
+        input_record = request.POST.get("input_record", "")
+        try:
+            output = validate(input_record)
+        except Exception as e:
+            output = f"Error during validation: {e}"
+
+    context = {
+        "input_record": input_record,
+        "output": output,
+    }
+
+    return render(request, template_name, context)

From 2b659845d17bb21bb65f9e6e41ced9553aefa3a8 Mon Sep 17 00:00:00 2001
From: Rowan Moss <rowan.moss@stfc.ac.uk>
Date: Thu, 11 Dec 2025 14:00:24 +0000
Subject: [PATCH 4/7] Ensure textarea input value is kept on form submission
 and refresh

- also cleans up some unnecessary code (unused exception handling)
- validation output is also kept on submission and refresh
---
 .../validator/templates/validator/validator_index.html |  5 ++---
 monitoring/validator/views.py                          | 10 +++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/monitoring/validator/templates/validator/validator_index.html b/monitoring/validator/templates/validator/validator_index.html
index c3e679c..b4369e7 100644
--- a/monitoring/validator/templates/validator/validator_index.html
+++ b/monitoring/validator/templates/validator/validator_index.html
@@ -22,15 +22,14 @@ <h2>Record Validator!</h2>
             rows="10"
             cols="50"
             wrap="wrap"
-            value="{{ input_record|default:'' }}"
-          ></textarea>
+          >{{ input_record|default:''|escape }}</textarea>
           <br><br>
           <button type="submit">Validate!</button>
         </form>
 
         <div id="output">
           {% if output %}
-            <h3>Output</h3>
+            <h3>Validation Output</h3>
             {{ output }}
           {% endif %}
         </div>
diff --git a/monitoring/validator/views.py b/monitoring/validator/views.py
index 369c623..201d9b9 100644
--- a/monitoring/validator/views.py
+++ b/monitoring/validator/views.py
@@ -29,7 +29,10 @@ def validate(record: str) -> str:
 
             result = recordFactory.create_records(record)
 
-            return str(result)
+            if "Record object at" in str(result):
+                return "Record(s) valid!"
+            else:
+                return str(result)
 
         except Exception as e:
             return str(e)
@@ -38,10 +41,7 @@ def validate(record: str) -> str:
     # On form submission, trigger record validation
     if request.method == "POST":
         input_record = request.POST.get("input_record", "")
-        try:
-            output = validate(input_record)
-        except Exception as e:
-            output = f"Error during validation: {e}"
+        output = validate(input_record)
 
     context = {
         "input_record": input_record,

From d641cac274286ab45c607cc92c561b00a21e0867 Mon Sep 17 00:00:00 2001
From: Rowan Moss <rowan.moss@stfc.ac.uk>
Date: Thu, 11 Dec 2025 17:43:54 +0000
Subject: [PATCH 5/7] Add dropdown selection for record type

- has to import the apel record type classes
- has an option for all, which uses the record header instead
---
 .../templates/validator/validator_index.html  | 20 +++++++++++
 monitoring/validator/views.py                 | 34 +++++++++++++++++--
 2 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/monitoring/validator/templates/validator/validator_index.html b/monitoring/validator/templates/validator/validator_index.html
index b4369e7..533e1c0 100644
--- a/monitoring/validator/templates/validator/validator_index.html
+++ b/monitoring/validator/templates/validator/validator_index.html
@@ -15,6 +15,21 @@ <h2>Record Validator!</h2>
 
         <form id="validate-form" method="post">
           {% csrf_token %}
+          <label for="record_type">Record Type:</label>
+          <select name="record_type" id="record_type">
+            <option value="All">All</option>
+            <option value="CloudRecord">Cloud Record</option>
+            <option value="CloudSummaryRecord">Cloud Summary Record</option>
+            <option value="JobRecord">Job Record</option>
+            <option value="JobRecord04">Job Record v0.4</option>
+            <option value="NormalisedSummaryRecord">Normalised Summary Record</option>
+            <option value="NormalisedSummaryRecord04">Normalised Summary Record v0.4</option>
+            <option value="SummaryRecord">Summary Record</option>
+            <option value="SummaryRecord04">Summary Record v0.4</option>
+            <option value="SyncRecord">Sync Record</option>
+          </select>
+          <p>Selecting 'All' will mean the type is determined by the record header.</p>
+          <br><br>
           <label for="input_record">Enter Record:</label>
           <textarea
             id="input_record"
@@ -27,6 +42,11 @@ <h2>Record Validator!</h2>
           <button type="submit">Validate!</button>
         </form>
 
+        <script>
+          // Setting select option back to what was selected (as it gets reset on form submission)
+          document.getElementById("record_type").value = "{{ record_type }}";
+        </script>
+
         <div id="output">
           {% if output %}
             <h3>Validation Output</h3>
diff --git a/monitoring/validator/views.py b/monitoring/validator/views.py
index 201d9b9..27f2f47 100644
--- a/monitoring/validator/views.py
+++ b/monitoring/validator/views.py
@@ -3,6 +3,14 @@
 
 from apel.db.loader.record_factory import RecordFactory
 
+# Apel record class imports
+from apel.db.records.job import JobRecord, JobRecord04
+from apel.db.records.summary import SummaryRecord, SummaryRecord04
+from apel.db.records.normalised_summary import NormalisedSummaryRecord, NormalisedSummaryRecord04
+from apel.db.records.sync import SyncRecord
+from apel.db.records.cloud import CloudRecord
+from apel.db.records.cloud_summary import CloudSummaryRecord
+
 
 @require_http_methods(["GET", "POST"])
 def index(request):
@@ -12,10 +20,24 @@ def index(request):
     """
     template_name = "validator/validator_index.html"
     input_record = ""
+    record_type = "All"
     output = ""
 
+    # Map record_type string to record_type class
+    record_map = {
+        "JobRecord": JobRecord,
+        "JobRecord04": JobRecord04,
+        "SummaryRecord": SummaryRecord,
+        "SummaryRecord04": SummaryRecord04,
+        "NormalisedSummaryRecord": NormalisedSummaryRecord,
+        "NormalisedSummaryRecord04": NormalisedSummaryRecord04,
+        "SyncRecord": SyncRecord,
+        "CloudRecord": CloudRecord,
+        "CloudSummaryRecord": CloudSummaryRecord,
+    }
+
 
-    def validate(record: str) -> str:
+    def validate(record: str, record_type: str) -> str:
         """
         Validated record(s) passed in, and returns the result
         """
@@ -27,7 +49,11 @@ def validate(record: str) -> str:
         try:
             recordFactory = RecordFactory()
 
-            result = recordFactory.create_records(record)
+            if record_type == "All":
+                result = recordFactory.create_records(record)
+            else:
+                record_class = record_map[record_type]
+                result = recordFactory._create_record_objects(record, record_class)
 
             if "Record object at" in str(result):
                 return "Record(s) valid!"
@@ -41,10 +67,12 @@ def validate(record: str) -> str:
     # On form submission, trigger record validation
     if request.method == "POST":
         input_record = request.POST.get("input_record", "")
-        output = validate(input_record)
+        record_type = request.POST.get("record_type", "")
+        output = validate(input_record, record_type)
 
     context = {
         "input_record": input_record,
+        "record_type": record_type,
         "output": output,
     }
 

From 994ff5d2b8e61bab698ee0b79ee726f602e7a07d Mon Sep 17 00:00:00 2001
From: Rowan Moss <rowan.moss@stfc.ac.uk>
Date: Thu, 18 Dec 2025 15:11:44 +0000
Subject: [PATCH 6/7] Add improvement changes, including refactoring and
 improved styling

- adds more comments
- reworks exception handling
- adds apel packages to requirements
- adds styling
- adds link to validator page onto home monitoring page
---
 monitoring/templates/home.html                |   7 +
 .../templates/validator/validator_index.html  |  13 +-
 monitoring/validator/views.py                 |  27 ++-
 requirements.txt                              |   1 +
 static/stylesheet.css                         | 200 ++++++++++++++++++
 5 files changed, 235 insertions(+), 13 deletions(-)
 create mode 100644 static/stylesheet.css

diff --git a/monitoring/templates/home.html b/monitoring/templates/home.html
index a5be5f3..d0a6dfd 100644
--- a/monitoring/templates/home.html
+++ b/monitoring/templates/home.html
@@ -42,5 +42,12 @@ <h2>Return format</h2>
     For example: <a href="{% url 'gridsitesync-detail' 'RAL-LCG2' %}?format=json">{% url 'gridsitesync-detail' 'RAL-LCG2' %}?format=json</a>
 </p>
 
+<h2>Record Validator</h2>
+<p><ul><li>
+    <a href="{% url 'validator' %}">{% url 'validator' %}</a> - A validating tool to check Apel records are
+    correctly formatted. Records can be validated against a specific record type, or the type can be inferred from
+    a record header.
+</li></ul></p>
+
 </body>
 </html>
diff --git a/monitoring/validator/templates/validator/validator_index.html b/monitoring/validator/templates/validator/validator_index.html
index 533e1c0..748741a 100644
--- a/monitoring/validator/templates/validator/validator_index.html
+++ b/monitoring/validator/templates/validator/validator_index.html
@@ -11,7 +11,7 @@
     </head>
 
     <body>
-        <h2>Record Validator!</h2>
+        <h1>Record Validator</h2>
 
         <form id="validate-form" method="post">
           {% csrf_token %}
@@ -28,18 +28,21 @@ <h2>Record Validator!</h2>
             <option value="SummaryRecord04">Summary Record v0.4</option>
             <option value="SyncRecord">Sync Record</option>
           </select>
-          <p>Selecting 'All' will mean the type is determined by the record header.</p>
-          <br><br>
+          <p>Selecting 'All' means the type is determined by the record header.</p>
+          <p>If you select a specific record type, the header will need to be removed from the record input.</p>
+          <p>v0.4 records are the newer record type - they require dictionary fields for benchmark data.</p>
+          <br>
           <label for="input_record">Enter Record:</label>
           <textarea
             id="input_record"
             name="input_record"
-            rows="10"
+            rows="15"
             cols="50"
             wrap="wrap"
           >{{ input_record|default:''|escape }}</textarea>
           <br><br>
-          <button type="submit">Validate!</button>
+          <button type="submit" id="validate-button">Validate!</button>
+          <br><br>
         </form>
 
         <script>
diff --git a/monitoring/validator/views.py b/monitoring/validator/views.py
index 27f2f47..b1eb2c2 100644
--- a/monitoring/validator/views.py
+++ b/monitoring/validator/views.py
@@ -1,9 +1,11 @@
 from django.shortcuts import render
 from django.views.decorators.http import require_http_methods
 
-from apel.db.loader.record_factory import RecordFactory
+# Apel record-checking class imports
+from apel.db.loader.record_factory import RecordFactory, RecordFactoryException
+from apel.db.records.record import InvalidRecordException
 
-# Apel record class imports
+# Apel record-type class imports
 from apel.db.records.job import JobRecord, JobRecord04
 from apel.db.records.summary import SummaryRecord, SummaryRecord04
 from apel.db.records.normalised_summary import NormalisedSummaryRecord, NormalisedSummaryRecord04
@@ -15,8 +17,11 @@
 @require_http_methods(["GET", "POST"])
 def index(request):
     """
-    Validates inputted records using Apel RecordFactory,
-    when html form is submitted.
+    Validates inputted records using the Apel record validation methods.
+    It either validates a record against a specific type or against all types, depending on what record_type
+        option was chosen on the html template. The default is `All`.
+    The input record, record type and validation output are then returned to the html template as context on get
+        request, so that the html page retains its information/context when refreshing the page or submitting the form.
     """
     template_name = "validator/validator_index.html"
     input_record = ""
@@ -24,6 +29,7 @@ def index(request):
     output = ""
 
     # Map record_type string to record_type class
+    # String is always exact as determined through html form selection option
     record_map = {
         "JobRecord": JobRecord,
         "JobRecord04": JobRecord04,
@@ -39,7 +45,12 @@ def index(request):
 
     def validate(record: str, record_type: str) -> str:
         """
-        Validated record(s) passed in, and returns the result
+        Validated record(s) and record_type passed in from the html page template.
+        If record type is all, make use of the create_records apel method (expects a record header).
+        Else, make use of the _create_record_objects apel method (expects there to be no record header).
+        If the record is valid, return a "valid record" string.
+        If the record is invalid, an InvalidRecordException or RecordFactoryException is raised by the Apel methods.
+        Catch these exceptions and return the exception information.
         """
         if not record:
             return "Please enter a record to be validated."
@@ -57,10 +68,10 @@ def validate(record: str, record_type: str) -> str:
 
             if "Record object at" in str(result):
                 return "Record(s) valid!"
-            else:
-                return str(result)
 
-        except Exception as e:
+            return str(result)
+
+        except (InvalidRecordException, RecordFactoryException) as e:
             return str(e)
 
 
diff --git a/requirements.txt b/requirements.txt
index 69f5922..b8bae58 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,5 @@
 # Pin packages to support and work with py3.6.
+apel
 Django==3.2.25
 djangorestframework==3.15.1
 pytz==2025.2
diff --git a/static/stylesheet.css b/static/stylesheet.css
new file mode 100644
index 0000000..603c628
--- /dev/null
+++ b/static/stylesheet.css
@@ -0,0 +1,200 @@
+h12 {
+        font-size: 22px;
+        color: #336699;
+        background-color: #FFFFFF;
+        font-family: Arial, Helvetica, sans-serif;
+        font-weight: bold
+}
+h1 {
+        font-size: 1.2em;
+        color: #336699;
+        background-color: #FFFFFF;
+        font-family: Arial, Helvetica, sans-serif;
+}
+h2 {
+        font-size: 1em;
+}
+
+
+h6 {
+    align: right;
+        font-size: 0.6em;
+}
+body {
+        font-family: Arial, Helvetica, sans-serif;
+        background-color: #FFFFFF;
+        color: #000000;
+        font-size: .5px;
+        font-size: 14px;
+}
+th {
+        font-family: Arial, Helvetica, sans-serif;
+        font-size: 12px;
+        color: #009999;
+    background-color: #FFFFFF;
+        font-weight: bold;
+    align: left;
+}
+a:link {
+        text-decoration: none;
+        color: #336699;
+        font-weight: bold;
+}
+a:active {
+        text-decoration: none;
+        color: #336699;
+        font-weight: bold;
+    background-color: #FFFFFF;
+}
+a:visited {
+        text-decoration: none;
+        color: #996699;
+        font-weight: bold;
+}
+a:hover {
+        color : #666666;
+        background-color: #CCCCCC;
+        font-weight: bold;
+}
+hr      {
+        color: #666666;
+    background-color: #FFFFFF;
+}
+.outlined {
+        border: 1px solid #000000;
+}
+.navbar-title {
+        font-family: Arial, Helvetica, sans-serif;
+        font-size: 1em;
+        color: #FFFFFF;
+        font-weight: bold;
+
+
+}
+.navbar {
+        font-family: Arial, Helvetica, sans-serif;
+        font-size: 0.6em;
+        background-color: #FFFFFF;
+
+}
+p {
+        font-family: Arial, Helvetica, sans-serif;
+        color: #000000;
+        font-size: 14px;
+        font-weight: normal;
+}
+li {
+        font-family: Arial, Helvetica, sans-serif;
+        font-size: 1em;
+        color: #111111;
+        list-style-type: square;
+        font-weight: normal;
+}
+.sidebar-orange {
+        background-color: #ffe5b2;
+        background-image: url(images/orange-globe.jpg);
+        background-position: right center;
+        background-repeat: no-repeat;
+
+}
+.sidebar-green {
+        background-image: url(images/green-pulse.jpg);
+        background-repeat: repeat-x;
+        background-position: center bottom;
+        background-color: #dcf6de;
+}
+.sidebar-blue {
+        background-color: #dcf4f6;
+        background-image: url(images/blue-bars.jpg);
+        background-repeat: no-repeat;
+        background-position: right bottom;
+}
+.sidebar-pink {
+        background-color: #efdcf6;
+        background-image: url(images/pink-news.jpg);
+        background-repeat: no-repeat;
+        background-position: left bottom;
+}
+.note {
+        background-color: #E4E4E4;
+        border: 1px dotted #000000;
+        padding: 5px;
+}
+.tabletext {
+        font-family: Arial, Helvetica, sans-serif;
+        font-size: 1em;
+        color: #000000;
+        background-color: #DDDDDD;
+}
+.tabletextwarning {
+        font-family: Arial, Helvetica, sans-serif;
+        font-size: 1em;
+        color: #000000;
+        background-color: #FFFF00;
+}
+.tabletextok {
+        font-family: Arial, Helvetica, sans-serif;
+        font-size: 1em;
+        color: #000000;
+        background-color: #00FF00;
+}
+.tabletexterror {
+        font-family: Arial, Helvetica, sans-serif;
+        font-size: 1em;
+        color: #000000;
+        background-color: #FF0000;
+}
+.tabletextinfo {
+        font-family: Arial, Helvetica, sans-serif;
+        font-size: 1em;
+        color: #000000;
+        background-color: #00CCFF;
+}
+.tableheader {
+        font-family: Arial, Helvetica, sans-serif;
+        font-size: 1em;
+        color: #FFFFFF;
+        background-color: #000000;
+        font-weight: bold;
+        text-align: center;
+}
+.navbar-heading {
+        font-family: Arial, Helvetica, sans-serif;
+        font-size: 1em;
+        background-color: #FFFFFF;
+        font-weight: bold;
+        color: #000000;
+}
+.feintoutlined {
+        border: 1px dotted #CCCCCC;
+}
+.newsHeader {
+        font-family: Arial, Helvetica, sans-serif;
+        font-size: 0.9em;
+        background-color: #97A6CD;
+        font-weight: bold;
+}
+.newsBody {
+        font-family: Arial, Helvetica, sans-serif;
+        font-size: 0.7em;
+        background-color: #ACBBDA;
+}
+.invisibleBorder {
+        border: thin dashed #EEEEEE;
+}
+.highlight-row {
+        background-color: #8D8D8D;
+        color: white;
+}
+
+textarea {
+        vertical-align: top;
+}
+
+button#validate-button {
+        background-color: #e0e0e0;
+        border-color: #b0b0b0;
+        cursor: pointer;
+        font-weight: bold;
+        padding: 5px 10px;
+}

From 89a3c26569e7051ee300bd444f60f3371cd15169 Mon Sep 17 00:00:00 2001
From: Rowan Moss <rowan.moss@stfc.ac.uk>
Date: Thu, 18 Dec 2025 16:37:37 +0000
Subject: [PATCH 7/7] Address code review comments on stylesheet and function
 location

- move function definition out of other function
- sort out stylesheet location error
- fix APEL typo
---
 monitoring/publishing/static/stylesheet.css |  12 ++
 monitoring/templates/home.html              |   2 +-
 monitoring/validator/views.py               |  83 ++++----
 static/stylesheet.css                       | 200 --------------------
 4 files changed, 54 insertions(+), 243 deletions(-)
 delete mode 100644 static/stylesheet.css

diff --git a/monitoring/publishing/static/stylesheet.css b/monitoring/publishing/static/stylesheet.css
index a651e07..603c628 100644
--- a/monitoring/publishing/static/stylesheet.css
+++ b/monitoring/publishing/static/stylesheet.css
@@ -186,3 +186,15 @@ li {
         background-color: #8D8D8D;
         color: white;
 }
+
+textarea {
+        vertical-align: top;
+}
+
+button#validate-button {
+        background-color: #e0e0e0;
+        border-color: #b0b0b0;
+        cursor: pointer;
+        font-weight: bold;
+        padding: 5px 10px;
+}
diff --git a/monitoring/templates/home.html b/monitoring/templates/home.html
index d0a6dfd..1d8c481 100644
--- a/monitoring/templates/home.html
+++ b/monitoring/templates/home.html
@@ -44,7 +44,7 @@ <h2>Return format</h2>
 
 <h2>Record Validator</h2>
 <p><ul><li>
-    <a href="{% url 'validator' %}">{% url 'validator' %}</a> - A validating tool to check Apel records are
+    <a href="{% url 'validator' %}">{% url 'validator' %}</a> - A validating tool to check APEL records are
     correctly formatted. Records can be validated against a specific record type, or the type can be inferred from
     a record header.
 </li></ul></p>
diff --git a/monitoring/validator/views.py b/monitoring/validator/views.py
index b1eb2c2..1490d8a 100644
--- a/monitoring/validator/views.py
+++ b/monitoring/validator/views.py
@@ -28,6 +28,35 @@ def index(request):
     record_type = "All"
     output = ""
 
+    # On form submission, trigger record validation
+    if request.method == "POST":
+        input_record = request.POST.get("input_record", "")
+        record_type = request.POST.get("record_type", "")
+        output = validate(input_record, record_type)
+
+    context = {
+        "input_record": input_record,
+        "record_type": record_type,
+        "output": output,
+    }
+
+    return render(request, template_name, context)
+
+
+def validate(record: str, record_type: str) -> str:
+    """
+    Validated record(s) and record_type passed in from the html page template.
+    If record type is all, make use of the create_records apel method (expects a record header).
+    Else, make use of the _create_record_objects apel method (expects there to be no record header).
+    If the record is valid, return a "valid record" string.
+    If the record is invalid, an InvalidRecordException or RecordFactoryException is raised by the Apel methods.
+    Catch these exceptions and return the exception information.
+    """
+    if not record:
+        return "Please enter a record to be validated."
+
+    record = record.strip()
+
     # Map record_type string to record_type class
     # String is always exact as determined through html form selection option
     record_map = {
@@ -42,49 +71,19 @@ def index(request):
         "CloudSummaryRecord": CloudSummaryRecord,
     }
 
+    try:
+        recordFactory = RecordFactory()
 
-    def validate(record: str, record_type: str) -> str:
-        """
-        Validated record(s) and record_type passed in from the html page template.
-        If record type is all, make use of the create_records apel method (expects a record header).
-        Else, make use of the _create_record_objects apel method (expects there to be no record header).
-        If the record is valid, return a "valid record" string.
-        If the record is invalid, an InvalidRecordException or RecordFactoryException is raised by the Apel methods.
-        Catch these exceptions and return the exception information.
-        """
-        if not record:
-            return "Please enter a record to be validated."
+        if record_type == "All":
+            result = recordFactory.create_records(record)
+        else:
+            record_class = record_map[record_type]
+            result = recordFactory._create_record_objects(record, record_class)
 
-        record = record.strip()
+        if "Record object at" in str(result):
+            return "Record(s) valid!"
 
-        try:
-            recordFactory = RecordFactory()
+        return str(result)
 
-            if record_type == "All":
-                result = recordFactory.create_records(record)
-            else:
-                record_class = record_map[record_type]
-                result = recordFactory._create_record_objects(record, record_class)
-
-            if "Record object at" in str(result):
-                return "Record(s) valid!"
-
-            return str(result)
-
-        except (InvalidRecordException, RecordFactoryException) as e:
-            return str(e)
-
-
-    # On form submission, trigger record validation
-    if request.method == "POST":
-        input_record = request.POST.get("input_record", "")
-        record_type = request.POST.get("record_type", "")
-        output = validate(input_record, record_type)
-
-    context = {
-        "input_record": input_record,
-        "record_type": record_type,
-        "output": output,
-    }
-
-    return render(request, template_name, context)
+    except (InvalidRecordException, RecordFactoryException) as e:
+        return str(e)
diff --git a/static/stylesheet.css b/static/stylesheet.css
deleted file mode 100644
index 603c628..0000000
--- a/static/stylesheet.css
+++ /dev/null
@@ -1,200 +0,0 @@
-h12 {
-        font-size: 22px;
-        color: #336699;
-        background-color: #FFFFFF;
-        font-family: Arial, Helvetica, sans-serif;
-        font-weight: bold
-}
-h1 {
-        font-size: 1.2em;
-        color: #336699;
-        background-color: #FFFFFF;
-        font-family: Arial, Helvetica, sans-serif;
-}
-h2 {
-        font-size: 1em;
-}
-
-
-h6 {
-    align: right;
-        font-size: 0.6em;
-}
-body {
-        font-family: Arial, Helvetica, sans-serif;
-        background-color: #FFFFFF;
-        color: #000000;
-        font-size: .5px;
-        font-size: 14px;
-}
-th {
-        font-family: Arial, Helvetica, sans-serif;
-        font-size: 12px;
-        color: #009999;
-    background-color: #FFFFFF;
-        font-weight: bold;
-    align: left;
-}
-a:link {
-        text-decoration: none;
-        color: #336699;
-        font-weight: bold;
-}
-a:active {
-        text-decoration: none;
-        color: #336699;
-        font-weight: bold;
-    background-color: #FFFFFF;
-}
-a:visited {
-        text-decoration: none;
-        color: #996699;
-        font-weight: bold;
-}
-a:hover {
-        color : #666666;
-        background-color: #CCCCCC;
-        font-weight: bold;
-}
-hr      {
-        color: #666666;
-    background-color: #FFFFFF;
-}
-.outlined {
-        border: 1px solid #000000;
-}
-.navbar-title {
-        font-family: Arial, Helvetica, sans-serif;
-        font-size: 1em;
-        color: #FFFFFF;
-        font-weight: bold;
-
-
-}
-.navbar {
-        font-family: Arial, Helvetica, sans-serif;
-        font-size: 0.6em;
-        background-color: #FFFFFF;
-
-}
-p {
-        font-family: Arial, Helvetica, sans-serif;
-        color: #000000;
-        font-size: 14px;
-        font-weight: normal;
-}
-li {
-        font-family: Arial, Helvetica, sans-serif;
-        font-size: 1em;
-        color: #111111;
-        list-style-type: square;
-        font-weight: normal;
-}
-.sidebar-orange {
-        background-color: #ffe5b2;
-        background-image: url(images/orange-globe.jpg);
-        background-position: right center;
-        background-repeat: no-repeat;
-
-}
-.sidebar-green {
-        background-image: url(images/green-pulse.jpg);
-        background-repeat: repeat-x;
-        background-position: center bottom;
-        background-color: #dcf6de;
-}
-.sidebar-blue {
-        background-color: #dcf4f6;
-        background-image: url(images/blue-bars.jpg);
-        background-repeat: no-repeat;
-        background-position: right bottom;
-}
-.sidebar-pink {
-        background-color: #efdcf6;
-        background-image: url(images/pink-news.jpg);
-        background-repeat: no-repeat;
-        background-position: left bottom;
-}
-.note {
-        background-color: #E4E4E4;
-        border: 1px dotted #000000;
-        padding: 5px;
-}
-.tabletext {
-        font-family: Arial, Helvetica, sans-serif;
-        font-size: 1em;
-        color: #000000;
-        background-color: #DDDDDD;
-}
-.tabletextwarning {
-        font-family: Arial, Helvetica, sans-serif;
-        font-size: 1em;
-        color: #000000;
-        background-color: #FFFF00;
-}
-.tabletextok {
-        font-family: Arial, Helvetica, sans-serif;
-        font-size: 1em;
-        color: #000000;
-        background-color: #00FF00;
-}
-.tabletexterror {
-        font-family: Arial, Helvetica, sans-serif;
-        font-size: 1em;
-        color: #000000;
-        background-color: #FF0000;
-}
-.tabletextinfo {
-        font-family: Arial, Helvetica, sans-serif;
-        font-size: 1em;
-        color: #000000;
-        background-color: #00CCFF;
-}
-.tableheader {
-        font-family: Arial, Helvetica, sans-serif;
-        font-size: 1em;
-        color: #FFFFFF;
-        background-color: #000000;
-        font-weight: bold;
-        text-align: center;
-}
-.navbar-heading {
-        font-family: Arial, Helvetica, sans-serif;
-        font-size: 1em;
-        background-color: #FFFFFF;
-        font-weight: bold;
-        color: #000000;
-}
-.feintoutlined {
-        border: 1px dotted #CCCCCC;
-}
-.newsHeader {
-        font-family: Arial, Helvetica, sans-serif;
-        font-size: 0.9em;
-        background-color: #97A6CD;
-        font-weight: bold;
-}
-.newsBody {
-        font-family: Arial, Helvetica, sans-serif;
-        font-size: 0.7em;
-        background-color: #ACBBDA;
-}
-.invisibleBorder {
-        border: thin dashed #EEEEEE;
-}
-.highlight-row {
-        background-color: #8D8D8D;
-        color: white;
-}
-
-textarea {
-        vertical-align: top;
-}
-
-button#validate-button {
-        background-color: #e0e0e0;
-        border-color: #b0b0b0;
-        cursor: pointer;
-        font-weight: bold;
-        padding: 5px 10px;
-}