From 203c4cccac4a1f8b7617e6bfe3dbc709f86274ea Mon Sep 17 00:00:00 2001
From: silversword411 <github.com@datmail.com>
Date: Thu, 1 Jan 2026 01:03:56 -0500
Subject: [PATCH 1/6] Update testing configuration and add Markdown format to
 valid formats

---
 .vscode/settings.json | 2 +-
 test_index.py         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 5d543c8..3e99ede 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -2,6 +2,6 @@
     "python.testing.pytestArgs": [
         "."
     ],
-    "python.testing.unittestEnabled": true,
+    "python.testing.unittestEnabled": false,
     "python.testing.pytestEnabled": true
 }
\ No newline at end of file
diff --git a/test_index.py b/test_index.py
index 59ff9f5..397f5b1 100644
--- a/test_index.py
+++ b/test_index.py
@@ -32,7 +32,7 @@ class ReportNamingConvention:
     
     # Update VALID_SCOPES to include base scopes, validation will extract base scope
     VALID_SCOPES = {"Client", "Site", "Agent", "Device", "Software Name", "ClientThenSite"}
-    VALID_FORMATS = {"csv", "pdf", "html"}
+    VALID_FORMATS = {"csv", "pdf", "html", "md"}
     VERSION_PATTERN = r"^v\d+(?:\.\d+)*$"
 
     @classmethod

From c50ade9953738127bc1cb146a21376b87d6cd8bd Mon Sep 17 00:00:00 2001
From: silversword411 <github.com@datmail.com>
Date: Thu, 1 Jan 2026 01:14:12 -0500
Subject: [PATCH 2/6] Adding (md) to appropriate report names

---
 index.json                                    | 56 +++++++++----------
 ...on => Agent List_By Client (md) v1.3.json} |  2 +-
 ...Agent Specs.json => Agent Specs (md).json} |  2 +-
 ....json => Agents_Filtered by RAM (md).json} |  2 +-
 ...n => Agents_Pending Reboot (md) v1.2.json} |  2 +-
 ....json => Custom Fields Example1 (md).json} |  2 +-
 ...> Software Report Full_By Agent (md).json} |  2 +-
 ... Software Report Full_By Client (md).json} |  2 +-
 ...are Report Starts With_By Agent (md).json} |  2 +-
 ...son => Software Report_By Agent (md).json} |  2 +-
 ...Updates Not Installed_By Client (md).json} |  2 +-
 11 files changed, 38 insertions(+), 38 deletions(-)
 rename templates/{Agent List_By Client v1.3.json => Agent List_By Client (md) v1.3.json} (99%)
 rename templates/{Agent Specs.json => Agent Specs (md).json} (98%)
 rename templates/{Agents_Filtered by RAM.json => Agents_Filtered by RAM (md).json} (97%)
 rename templates/{Agents_Pending Reboot v1.2.json => Agents_Pending Reboot (md) v1.2.json} (99%)
 rename templates/{Custom Fields Example1.json => Custom Fields Example1 (md).json} (97%)
 rename templates/{Software Report Full_By Agent.json => Software Report Full_By Agent (md).json} (96%)
 rename templates/{Software Report Full_By Client.json => Software Report Full_By Client (md).json} (97%)
 rename templates/{Software Report Starts With_By Agent.json => Software Report Starts With_By Agent (md).json} (97%)
 rename templates/{Software Report_By Agent.json => Software Report_By Agent (md).json} (98%)
 rename templates/{Windows Updates Not Installed_By Client.json => Windows Updates Not Installed_By Client (md).json} (96%)

diff --git a/index.json b/index.json
index 5b309ef..dae30d6 100644
--- a/index.json
+++ b/index.json
@@ -4,20 +4,20 @@
     "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Agent%20List_By%20Client%20%28csv%29.json"
   },
   {
-    "name": "Agent List_By Client (pdf)",
-    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Agent%20List_By%20Client%20%28pdf%29.json"
+    "name": "Agent List_By Client (md) v1.3",
+    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Agent%20List_By%20Client%20%28md%29%20v1.3.json"
   },
   {
-    "name": "Agent List_By Client v1.3",
-    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Agent%20List_By%20Client%20v1.3.json"
+    "name": "Agent List_By Client (pdf)",
+    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Agent%20List_By%20Client%20%28pdf%29.json"
   },
   {
     "name": "Agent List_By Client with Specs (pdf) v1.3",
     "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Agent%20List_By%20Client%20with%20Specs%20%28pdf%29%20v1.3.json"
   },
   {
-    "name": "Agent Specs",
-    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Agent%20Specs.json"
+    "name": "Agent Specs (md)",
+    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Agent%20Specs%20%28md%29.json"
   },
   {
     "name": "Agent TRMM Install date_descending v1.6",
@@ -35,17 +35,17 @@
     "name": "Agent_ListClientThenSite-alt (csv)",
     "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Agent_ListClientThenSite-alt%20%28csv%29.json"
   },
-  {
-    "name": "Agents_Filtered by RAM",
-    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Agents_Filtered%20by%20RAM.json"
-  },
   {
     "name": "Agents_Filtered by RAM (csv)",
     "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Agents_Filtered%20by%20RAM%20%28csv%29.json"
   },
   {
-    "name": "Agents_Pending Reboot v1.2",
-    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Agents_Pending%20Reboot%20v1.2.json"
+    "name": "Agents_Filtered by RAM (md)",
+    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Agents_Filtered%20by%20RAM%20%28md%29.json"
+  },
+  {
+    "name": "Agents_Pending Reboot (md) v1.2",
+    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Agents_Pending%20Reboot%20%28md%29%20v1.2.json"
   },
   {
     "name": "Alerts - Interactive Dashboard (html) v1.6",
@@ -156,8 +156,8 @@
     "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Comprehensive%20Report_by%20Client%20%28html%29%20v1.12.json"
   },
   {
-    "name": "Custom Fields Example1",
-    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Custom%20Fields%20Example1.json"
+    "name": "Custom Fields Example1 (md)",
+    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Custom%20Fields%20Example1%20%28md%29.json"
   },
   {
     "name": "Custom Fields Example2",
@@ -195,29 +195,29 @@
     "name": "Software Report - Advanced DataTables",
     "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Software%20Report%20-%20Advanced%20DataTables.json"
   },
-  {
-    "name": "Software Report Full_By Agent",
-    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Software%20Report%20Full_By%20Agent.json"
-  },
   {
     "name": "Software Report Full_By Agent (csv)",
     "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Software%20Report%20Full_By%20Agent%20%28csv%29.json"
   },
   {
-    "name": "Software Report Full_By Client",
-    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Software%20Report%20Full_By%20Client.json"
+    "name": "Software Report Full_By Agent (md)",
+    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Software%20Report%20Full_By%20Agent%20%28md%29.json"
   },
   {
     "name": "Software Report Full_By Client (csv)",
     "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Software%20Report%20Full_By%20Client%20%28csv%29.json"
   },
   {
-    "name": "Software Report Starts With_By Agent",
-    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Software%20Report%20Starts%20With_By%20Agent.json"
+    "name": "Software Report Full_By Client (md)",
+    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Software%20Report%20Full_By%20Client%20%28md%29.json"
+  },
+  {
+    "name": "Software Report Starts With_By Agent (md)",
+    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Software%20Report%20Starts%20With_By%20Agent%20%28md%29.json"
   },
   {
-    "name": "Software Report_By Agent",
-    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Software%20Report_By%20Agent.json"
+    "name": "Software Report_By Agent (md)",
+    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Software%20Report_By%20Agent%20%28md%29.json"
   },
   {
     "name": "WIP-Dashboard Demo",
@@ -231,14 +231,14 @@
     "name": "Windows 11 Compatible List_By Client (html) v1.9",
     "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Windows%2011%20Compatible%20List_By%20Client%20%28html%29%20v1.9.json"
   },
-  {
-    "name": "Windows Updates Not Installed_By Client",
-    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Windows%20Updates%20Not%20Installed_By%20Client.json"
-  },
   {
     "name": "Windows Updates Not Installed_By Client (csv)",
     "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Windows%20Updates%20Not%20Installed_By%20Client%20%28csv%29.json"
   },
+  {
+    "name": "Windows Updates Not Installed_By Client (md)",
+    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Windows%20Updates%20Not%20Installed_By%20Client%20%28md%29.json"
+  },
   {
     "name": "Windows Updates_By Device (csv)",
     "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Windows%20Updates_By%20Device%20%28csv%29.json"
diff --git a/templates/Agent List_By Client v1.3.json b/templates/Agent List_By Client (md) v1.3.json
similarity index 99%
rename from templates/Agent List_By Client v1.3.json
rename to templates/Agent List_By Client (md) v1.3.json
index 827ca16..0520383 100644
--- a/templates/Agent List_By Client v1.3.json	
+++ b/templates/Agent List_By Client (md) v1.3.json	
@@ -4,7 +4,7 @@
     "html": "<html>\n\n<head>\n    <style>\n        /* —— PDF page settings —— */\n        @page {\n            margin: 0.5in;\n            size: letter portrait;\n        }\n\n        /* —— Color palette (theme) —— */\n        :root {\n            --header-bg: #2c3e50;\n            --header-text: #ffffff;\n            --border-color: #dddddd;\n            --table-header-bg: #f2f2f2;\n            --status-ready-bg: #eaf7ec;\n            --status-ready-badge: #28a745;\n            --status-not-ready-bg: #fbebee;\n            --status-not-ready-badge: #dc3545;\n            --status-unknown-bg: #fff9e6;\n            --status-unknown-badge: #ffc107;\n            --badge-already-bg: #17a2b8;\n        }\n\n        /* —— Typography & utilities (structure) —— */\n        body {\n            font-family: sans-serif;\n            color: #333;\n            font-size: 12px;\n        }\n\n        .section {\n            margin-top: 20px;\n        }\n\n        .text-danger {\n            color: #a94442;\n            font-weight: bold;\n        }\n\n        /* —— Header layout (structure) —— */\n        .report-header {\n            background-color: var(--header-bg);\n            color: var(--header-text);\n            padding: 20px;\n            border-radius: 8px;\n            display: flex;\n            align-items: center;\n        }\n\n        .header-logo {\n            width: 80px;\n            margin-right: 25px;\n            flex-shrink: 0;\n        }\n\n        .header-date {\n            margin-left: auto;\n            text-align: right;\n            white-space: nowrap;\n        }\n\n        .report-header h1 {\n            font-size: 24px;\n            margin: 0 0 5px;\n        }\n\n        .report-header h2 {\n            font-size: 16px;\n            margin: 0;\n            opacity: 0.9;\n        }\n\n        /* —— Standardized Table Styles (structure) —— */\n        .report-table {\n            border-collapse: collapse;\n            width: 100%;\n        }\n\n        .report-table th,\n        .report-table td {\n            border: 1px solid var(--border-color);\n            padding: 6px 8px;\n            text-align: left;\n            vertical-align: top;\n        }\n\n        .report-table thead th {\n            background-color: var(--table-header-bg);\n            font-weight: bold;\n            cursor: pointer;\n            user-select: none;\n        }\n\n        /* Header label + sort indicators */\n        .th-topline {\n            display: flex;\n            align-items: center;\n            justify-content: space-between;\n            gap: .4rem;\n        }\n\n        .th-label {\n            position: relative;\n            cursor: pointer;\n            user-select: none;\n        }\n\n        /* These are the specific rules that make the indicator visible */\n        th.sorted.asc .th-label::after {\n            content: \"▲\";\n            padding-left: .4rem;\n            color: #333;\n            font-size: .9em;\n        }\n\n        th.sorted.desc .th-label::after {\n            content: \"▼\";\n            padding-left: .4rem;\n            color: #333;\n            font-size: .9em;\n        }\n\n        .report-table thead th select {\n            width: 100%;\n            margin-top: 5px;\n            padding: 4px;\n            border-radius: 4px;\n            border: 1px solid #ccc;\n            font-weight: normal;\n            background: #fff;\n        }\n\n        /* —— Badge shape (structure) —— */\n        .status-badge {\n            display: inline-block;\n            padding: 4px 10px;\n            border-radius: 12px;\n            color: #fff;\n            font-weight: bold;\n            font-size: 11px;\n            text-align: center;\n            white-space: nowrap;\n        }\n\n        /* —— Stub classes for per‑report overrides —— */\n        .status-ready {}\n\n        .status-not-ready {}\n\n        .status-unknown {}\n\n        .badge-ready {}\n\n        .badge-not-ready {}\n\n        .badge-unknown {}\n\n        .badge-already {}\n    </style>\n</head>\n\n<body>\n    {% block content %}{% endblock %}\n</body>\n\n</html>"
   },
   "template": {
-    "name": "Agent List_By Client v1.3",
+    "name": "Agent List_By Client (md) v1.3",
     "template_css": "",
     "template_md": "{% block content %}\r\n<style>\r\n  /* This report works well in landscape mode to fit all columns */\r\n  @page { margin: 0.5in; size: letter landscape; }\r\n  /* Basic styling for demonstration */\r\n</style>\r\n\r\n<div class=\"report-header\">\r\n  <div class=\"header-logo\">\r\n    <img src=\"https://github.com/amidaware/reporting-templates/blob/master/assets/gbtnavy%20(256).png?raw=true\" alt=\"Amidaware Logo\" style=\"width: 80px; height: auto;\">\r\n  </div>\r\n  <div class=\"header-titles\">\r\n    <h1>Agent Information Report</h1>\r\n    <h2 id=\"report-subtitle\">Client: All | Site: All</h2>\r\n    <div class=\"row-count\" aria-live=\"polite\">\r\n        Filtered Row Count: <strong><span id=\"visibleCount\">0</span></strong> of <span id=\"totalCount\">{{ data_sources.agentsList | length }}</span>\r\n    </div>\r\n  </div>\r\n  <div class=\"header-date\">\r\n    <h2>Report Date:<br>{{ report_run_timestamp.strftime('%B %d, %Y') }}</h2>\r\n  </div>\r\n</div>\r\n\r\n{% set clients = data_sources.agentsList | map(attribute='site__client__name') | unique | sort %}\r\n{% set sites = data_sources.agentsList | map(attribute='site__name') | unique | sort %}\r\n\r\n<table id=\"reportTable\" class=\"report-table\" aria-describedby=\"report-subtitle\">\r\n  <thead>\r\n    <tr>\r\n      <!-- Client (col 0) -->\r\n      <th data-col=\"client\">\r\n        <div class=\"th-topline\">\r\n          <span class=\"th-label\">Client</span>\r\n          <span class=\"sort-indicator\" data-for-col=\"0\"></span>\r\n        </div>\r\n        <select id=\"clientFilterH\" aria-label=\"Client filter\">\r\n          <option value=\"all\">All Clients</option>\r\n          {% for client_name in clients %}\r\n          <option value=\"{{ client_name }}\">{{ client_name }}</option>\r\n          {% endfor %}\r\n        </select>\r\n      </th>\r\n\r\n      <!-- Site (col 1) -->\r\n      <th data-col=\"site\">\r\n        <div class=\"th-topline\">\r\n          <span class=\"th-label\">Site</span>\r\n          <span class=\"sort-indicator\" data-for-col=\"1\"></span>\r\n        </div>\r\n        <select id=\"siteFilterH\" aria-label=\"Site filter\">\r\n          <option value=\"all\">All Sites</option>\r\n          {% for site_name in sites %}\r\n          <option value=\"{{ site_name }}\">{{ site_name }}</option>\r\n          {% endfor %}\r\n        </select>\r\n      </th>\r\n\r\n      <!-- Device Name (col 2) -->\r\n      <th data-col=\"device\">\r\n        <div class=\"th-topline\">\r\n          <span class=\"th-label\">Device Name</span>\r\n          <span class=\"sort-indicator\" data-for-col=\"2\"></span>\r\n        </div>\r\n      </th>\r\n\r\n      <!-- User (col 3) -->\r\n      <th data-col=\"user\">\r\n        <div class=\"th-topline\">\r\n          <span class=\"th-label\">Last Logged In User</span>\r\n          <span class=\"sort-indicator\" data-for-col=\"3\"></span>\r\n        </div>\r\n      </th>\r\n\r\n      <!-- OS (col 4) -->\r\n      <th data-col=\"os\">\r\n        <div class=\"th-topline\">\r\n          <span class=\"th-label\">Operating System</span>\r\n          <span class=\"sort-indicator\" data-for-col=\"4\"></span>\r\n        </div>\r\n      </th>\r\n    </tr>\r\n  </thead>\r\n\r\n  <tbody id=\"report-table-body\">\r\n    {% for item in data_sources.agentsList %}\r\n    <tr>\r\n      <td class=\"cell-client\">{{ item.site__client__name }}</td>\r\n      <td class=\"cell-site\">{{ item.site__name }}</td>\r\n      <td class=\"cell-device\" data-sort-value=\"{{ item.hostname }}\">\r\n        <b class=\"device-name\">{{ item.hostname }}</b><br>\r\n        {% if item.last_seen %}\r\n        <small class=\"last-seen {% if (report_run_timestamp - item.last_seen).days > 30 %}text-danger{% endif %}\" data-sort-value=\"{{ item.last_seen.isoformat() }}\">\r\n          Last Seen: {{ item.last_seen.astimezone(ZoneInfo('America/New_York')).strftime('%Y-%m-%d %H:%M:%S') }}\r\n        </small>\r\n        {% else %}\r\n        <small class=\"last-seen\" data-sort-value=\"N/A\">&nbsp;</small>\r\n        {% endif %}\r\n      </td>\r\n      <td class=\"cell-user\">{{ item.last_logged_in_user }}</td>\r\n      <td class=\"cell-os break-word\">{{ item.operating_system }}</td>\r\n    </tr>\r\n    {% endfor %}\r\n  </tbody>\r\n</table>\r\n\r\n<script>\r\n(function() {\r\n  const $  = s => document.querySelector(s);\r\n  const $$ = s => Array.from(document.querySelectorAll(s));\r\n  const tbody = $('#report-table-body');\r\n\r\n  const selects = {\r\n    client: $('#clientFilterH'),\r\n    site:   $('#siteFilterH')\r\n  };\r\n\r\n  let currentSort = { colIndex: 0, dirAsc: true };\r\n\r\n  function getCellText(row, selector, fallbackIndex=null) {\r\n    const el = row.querySelector(selector);\r\n    if (el) return el.textContent.trim();\r\n    if (fallbackIndex !== null) return row.cells[fallbackIndex].textContent.trim();\r\n    return '';\r\n  }\r\n\r\n  function filterTable() {\r\n    const clientVal = selects.client?.value || 'all';\r\n    const siteVal   = selects.site?.value   || 'all';\r\n\r\n    let visible = 0;\r\n    $$('#reportTable tbody tr').forEach(row => {\r\n      const client = getCellText(row, '.cell-client', 0);\r\n      const site   = getCellText(row, '.cell-site', 1);\r\n\r\n      const show = (clientVal === 'all' || client === clientVal)\r\n                && (siteVal   === 'all' || site   === siteVal);\r\n\r\n      row.style.display = show ? '' : 'none';\r\n      if (show) visible++;\r\n    });\r\n\r\n    const clientName = selects.client.value === 'all' ? 'All' : selects.client.value;\r\n    const siteName = selects.site.value === 'all' ? 'All' : selects.site.value;\r\n    $('#report-subtitle').textContent = `Client: ${clientName} | Site: ${siteName}`;\r\n    $('#visibleCount').textContent = String(visible);\r\n\r\n    if (currentSort.colIndex !== null) sortTable(currentSort.colIndex, currentSort.dirAsc, false);\r\n  }\r\n\r\n  function setSortIndicator(colIndex, dirAscOrNull) {\r\n    $$('.sort-indicator').forEach(s => s.textContent = '');\r\n    if (dirAscOrNull === null) return;\r\n    const el = $(`.sort-indicator[data-for-col=\"${colIndex}\"]`);\r\n    if (el) el.textContent = dirAscOrNull ? '▲' : '▼';\r\n  }\r\n\r\n  function sortTable(colIndex, dirAsc = true, toggle = true) {\r\n    const rows = Array.from(tbody.rows);\r\n    const visibleRows = rows.filter(r => r.style.display !== 'none');\r\n\r\n    if (toggle) {\r\n      if (currentSort.colIndex === colIndex) currentSort.dirAsc = !currentSort.dirAsc;\r\n      else { currentSort.colIndex = colIndex; currentSort.dirAsc = true; }\r\n    } else {\r\n      currentSort.colIndex = colIndex; currentSort.dirAsc = dirAsc;\r\n    }\r\n\r\n    setSortIndicator(currentSort.colIndex, currentSort.dirAsc);\r\n    \r\n    const getVal = (row, idx) => (row.cells[idx].getAttribute('data-sort-value') || row.cells[idx].textContent.trim());\r\n\r\n    visibleRows.sort((a, b) => {\r\n      let cmp = 0;\r\n      // Primary Sort\r\n      const vA = getVal(a, colIndex);\r\n      const vB = getVal(b, colIndex);\r\n      if (!isNaN(vA) && !isNaN(vB) && vA !== '' && vB !== '') cmp = parseFloat(vA) - parseFloat(vB);\r\n      else cmp = String(vA).localeCompare(String(vB), undefined, { numeric: true, sensitivity: 'base' });\r\n\r\n      // Tie-breaker Sort: Client > Site\r\n      if (cmp === 0 && colIndex !== 0) {\r\n        cmp = String(getVal(a, 0)).localeCompare(String(getVal(b, 0)), undefined, { numeric: true, sensitivity: 'base' });\r\n      }\r\n      if (cmp === 0 && colIndex !== 1) {\r\n        cmp = String(getVal(a, 1)).localeCompare(String(getVal(b, 1)), undefined, { numeric: true, sensitivity: 'base' });\r\n      }\r\n\r\n      return currentSort.dirAsc ? cmp : -cmp;\r\n    });\r\n\r\n    tbody.innerHTML = '';\r\n    visibleRows.forEach(r => tbody.appendChild(r));\r\n    rows.filter(r => r.style.display === 'none').forEach(r => tbody.appendChild(r));\r\n  }\r\n\r\n  $$('#reportTable thead th').forEach((th, idx) => {\r\n    th.addEventListener('click', (e) => {\r\n      if (e.target.tagName.toLowerCase() === 'select') return;\r\n      sortTable(idx, true, true);\r\n    });\r\n  });\r\n\r\n  [selects.client, selects.site].filter(Boolean).forEach(sel => sel.addEventListener('change', filterTable));\r\n\r\n  function init() {\r\n    filterTable();\r\n    sortTable(0, true, false); // Default sort by Client\r\n  }\r\n  document.addEventListener('DOMContentLoaded', init);\r\n})();\r\n</script>\r\n{% endblock %}",
     "type": "markdown",
diff --git a/templates/Agent Specs.json b/templates/Agent Specs (md).json
similarity index 98%
rename from templates/Agent Specs.json
rename to templates/Agent Specs (md).json
index 28bf340..4fe708c 100644
--- a/templates/Agent Specs.json	
+++ b/templates/Agent Specs (md).json	
@@ -4,7 +4,7 @@
         "html": "<html lang=\"en\">\n\n<head>\n    <script src=\"https://cdn.tailwindcss.com\"></script>\n</head>\n\n<body class=\"bg-gray-100 text-gray-800 font-sans leading-normal tracking-normal\">\n\n        {% block content %}        \n        {% endblock %}\n\n\n</body>\n\n</html>"
     },
     "template": {
-        "name": "Agent Specs",
+        "name": "Agent Specs (md)",
         "template_css": "",
         "template_md": "{% block content %}\r\n    <div class=\"container mx-auto mt-10 p-4 bg-white rounded shadow-lg\">\r\n# ![Company Logo](https://github.com/amidaware/reporting-templates/blob/master/assets/gbtnavy%20(256).png?raw=true)\r\n\r\n</br>\r\n---    \r\n<h1 class=\"text-4xl mb-6 text-center font-semibold\">{{ client.name }}</h1>\r\n\r\n</div>\r\n---\r\n<h1 class=\"text-4xl mb-6 text-center font-semibold\">Agent List</h1>\r\n\r\n</div>\r\n    <div class=\"container mx-auto mt-10 p-4 bg-white rounded shadow-lg\">\r\n<table>\r\n  <thead>\r\n    <tr>\r\n\t<th>Device Name</th>\r\n\t<th>User</th>\r\n\t<th>Device OS</th>\r\n\t<th>Device Platform</th>\r\n\t<th>Device Ram</th>\r\n\t<th>Drive Info</th>\r\n  <th></th>\r\n    </tr>\r\n  </thead>\r\n  <tbody>\r\n    {% for item in data_sources.agentsList %}\r\n    <tr>\r\n\t<td>{{ item.hostname }}</td>\r\n  <td>{{ item.last_logged_in_user }}</td>\r\n  <td>{{ item.operating_system }}</td>\r\n\t<td>{{item.wmi_detail.cpu[0][0].Name if item.wmi_detail and item.wmi_detail.cpu and item.wmi_detail.cpu[0][0].Name else 'N/A'}} </td>\r\n  <td>{{ item.total_ram }}GB</td>\r\n  <td>{{item.disks[0].device if item.disks and item.disks[0].device else 'N/A'}} {{item.disks[0].total if item.disks and item.disks[0].total else 'N/A'}}</td>\r\n\r\n    </tr>\r\n    {% endfor %}\r\n  </tbody>\r\n</table>\r\n</div>\r\n{% endblock %}",
         "type": "markdown",
diff --git a/templates/Agents_Filtered by RAM.json b/templates/Agents_Filtered by RAM (md).json
similarity index 97%
rename from templates/Agents_Filtered by RAM.json
rename to templates/Agents_Filtered by RAM (md).json
index 8759a0d..7b5c6c0 100644
--- a/templates/Agents_Filtered by RAM.json	
+++ b/templates/Agents_Filtered by RAM (md).json	
@@ -4,7 +4,7 @@
         "html": "<!doctype html>\n<html lang=\"en\">\n    <head>\n        <style>\n            {{css}}\n        </style>\n        <link href=\"https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css\" rel=\"stylesheet\" integrity=\"sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC\" crossorigin=\"anonymous\">\n    </head>\n    <body>\n        {% block content %}{% endblock %}\n        {% block header %}{% endblock %}\n    </body>\n</html>"
     },
     "template": {
-        "name": "Agents_Filtered by RAM",
+        "name": "Agents_Filtered by RAM (md)",
         "template_css": "",
         "template_md": "{% block content %}\r\n<h1>Agents Filtered by less than {{low_ram}} GB RAM</h1>\r\n\r\n<table>\r\n  <thead>\r\n    <tr>\r\n\t<th>Device Name</th>\r\n\t<th>User</th>\r\n\t<th>Device OS</th>\r\n\t<th>CPU</th>\r\n\t<th>RAM</th>\r\n\t<th>HDD</th>\r\n    </tr>\r\n  </thead>\r\n  <tbody>\r\n    {% set filtered_agents = data_sources.agents|selectattr('total_ram', 'defined')|selectattr('total_ram', 'lt', low_ram|int)|list %}{% for item in filtered_agents %}    <tr>\r\n\t<td>{{item.hostname if item.hostname else 'N/A'}}</td>\r\n\t<td>{{item.last_logged_in_user if item.last_logged_in_user else 'N/A'}}</td>\r\n\t<td>{{item.operating_system|replace(\",\", \"\") if item.operating_system else 'N/A'}}</td>\r\n\t<td>{{item.wmi_detail.cpu[0][0].Name if item.wmi_detail and item.wmi_detail.cpu and item.wmi_detail.cpu[0][0].Name else 'N/A'}}</td>\r\n\t<td>{{item.total_ram if item.total_ram else 'N/A'}}GB</td>\r\n\t<td>{% for disk in item.disks %}{% if not loop.previtem or loop.previtem.device != disk.device %}{{disk.device}} {{disk.total}},{% endif %}{% else %}N/A,{% endfor %}</td>\r\n    \r\n    </tr>\r\n    {% endfor %}\r\n  </tbody>\r\n</table>\r\n\r\n\r\n{% endblock %}",
         "type": "markdown",
diff --git a/templates/Agents_Pending Reboot v1.2.json b/templates/Agents_Pending Reboot (md) v1.2.json
similarity index 99%
rename from templates/Agents_Pending Reboot v1.2.json
rename to templates/Agents_Pending Reboot (md) v1.2.json
index 34547a3..b44e62d 100644
--- a/templates/Agents_Pending Reboot v1.2.json	
+++ b/templates/Agents_Pending Reboot (md) v1.2.json	
@@ -4,7 +4,7 @@
     "html": "<html>\n\n<head>\n    <style>\n        /* —— PDF page settings —— */\n        @page {\n            margin: 0.5in;\n            size: letter portrait;\n        }\n\n        /* —— Color palette (theme) —— */\n        :root {\n            --header-bg: #2c3e50;\n            --header-text: #ffffff;\n            --border-color: #dddddd;\n            --table-header-bg: #f2f2f2;\n            --status-ready-bg: #eaf7ec;\n            --status-ready-badge: #28a745;\n            --status-not-ready-bg: #fbebee;\n            --status-not-ready-badge: #dc3545;\n            --status-unknown-bg: #fff9e6;\n            --status-unknown-badge: #ffc107;\n            --badge-already-bg: #17a2b8;\n        }\n\n        /* —— Typography & utilities (structure) —— */\n        body {\n            font-family: sans-serif;\n            color: #333;\n            font-size: 12px;\n        }\n\n        .section {\n            margin-top: 20px;\n        }\n\n        .text-danger {\n            color: #a94442;\n            font-weight: bold;\n        }\n\n        /* —— Header layout (structure) —— */\n        .report-header {\n            background-color: var(--header-bg);\n            color: var(--header-text);\n            padding: 20px;\n            border-radius: 8px;\n            display: flex;\n            align-items: center;\n        }\n\n        .header-logo {\n            width: 80px;\n            margin-right: 25px;\n            flex-shrink: 0;\n        }\n\n        .header-date {\n            margin-left: auto;\n            text-align: right;\n            white-space: nowrap;\n        }\n\n        .report-header h1 {\n            font-size: 24px;\n            margin: 0 0 5px;\n        }\n\n        .report-header h2 {\n            font-size: 16px;\n            margin: 0;\n            opacity: 0.9;\n        }\n\n        /* —— Standardized Table Styles (structure) —— */\n        .report-table {\n            border-collapse: collapse;\n            width: 100%;\n        }\n\n        .report-table th,\n        .report-table td {\n            border: 1px solid var(--border-color);\n            padding: 6px 8px;\n            text-align: left;\n            vertical-align: top;\n        }\n\n        .report-table thead th {\n            background-color: var(--table-header-bg);\n            font-weight: bold;\n            cursor: pointer;\n            user-select: none;\n        }\n\n        /* Header label + sort indicators */\n        .th-topline {\n            display: flex;\n            align-items: center;\n            justify-content: space-between;\n            gap: .4rem;\n        }\n\n        .th-label {\n            position: relative;\n            cursor: pointer;\n            user-select: none;\n        }\n\n        /* These are the specific rules that make the indicator visible */\n        th.sorted.asc .th-label::after {\n            content: \"▲\";\n            padding-left: .4rem;\n            color: #333;\n            font-size: .9em;\n        }\n\n        th.sorted.desc .th-label::after {\n            content: \"▼\";\n            padding-left: .4rem;\n            color: #333;\n            font-size: .9em;\n        }\n\n        .report-table thead th select {\n            width: 100%;\n            margin-top: 5px;\n            padding: 4px;\n            border-radius: 4px;\n            border: 1px solid #ccc;\n            font-weight: normal;\n            background: #fff;\n        }\n\n        /* —— Badge shape (structure) —— */\n        .status-badge {\n            display: inline-block;\n            padding: 4px 10px;\n            border-radius: 12px;\n            color: #fff;\n            font-weight: bold;\n            font-size: 11px;\n            text-align: center;\n            white-space: nowrap;\n        }\n\n        /* —— Stub classes for per‑report overrides —— */\n        .status-ready {}\n\n        .status-not-ready {}\n\n        .status-unknown {}\n\n        .badge-ready {}\n\n        .badge-not-ready {}\n\n        .badge-unknown {}\n\n        .badge-already {}\n    </style>\n</head>\n\n<body>\n    {% block content %}{% endblock %}\n</body>\n\n</html>"
   },
   "template": {
-    "name": "Agents_Pending Reboot v1.2",
+    "name": "Agents_Pending Reboot (md) v1.2",
     "template_css": "",
     "template_md": "{% block content %}\r\n<style>\r\n  /* Basic styling for demonstration. In a real scenario, this would be in a separate CSS file. */\r\n  @page { margin: 0.5in; size: letter landscape; }\r\n</style>\r\n\r\n<div class=\"report-header\">\r\n  <div class=\"header-logo\">\r\n    <img src=\"https://github.com/amidaware/reporting-templates/blob/master/assets/gbtnavy%20(256).png?raw=true\" alt=\"Amidaware Logo\" style=\"width: 80px; height: auto;\">\r\n  </div>\r\n  <div class=\"header-titles\">\r\n    <h1>{{ title | default('Pending Reboot Report') }}</h1>\r\n    <h2 id=\"report-subtitle\">Client: All | Site: All</h2>\r\n    <div class=\"row-count\" aria-live=\"polite\">\r\n      Filtered Row Count: <strong><span id=\"visibleCount\">0</span></strong> of <span id=\"totalCount\">{{ data_sources.agentsPendingReboot | length }}</span>\r\n    </div>\r\n  </div>\r\n  <div class=\"header-date\">\r\n    <h2>Report Date:<br>{{ report_run_timestamp.strftime('%B %d, %Y') }}</h2>\r\n  </div>\r\n</div>\r\n\r\n{% set clients = data_sources.agentsPendingReboot | map(attribute='site__client__name') | unique | sort %}\r\n{% set sites = data_sources.agentsPendingReboot | map(attribute='site__name') | unique | sort %}\r\n{% set reboot_statuses = data_sources.agentsPendingReboot | map(attribute='needs_reboot') | unique | sort %}\r\n\r\n<table id=\"reportTable\" class=\"report-table\" aria-describedby=\"report-subtitle\">\r\n  <thead>\r\n    <tr>\r\n      <!-- Client (col 0) -->\r\n      <th data-col=\"client\" style=\"width: 15%;\">\r\n        <div class=\"th-topline\">\r\n          <span class=\"th-label\">Client</span>\r\n          <span class=\"sort-indicator\" data-for-col=\"0\"></span>\r\n        </div>\r\n        <select id=\"clientFilterH\" aria-label=\"Client filter\">\r\n          <option value=\"all\">All Clients</option>\r\n          {% for client in clients %}\r\n          <option value=\"{{ client }}\">{{ client }}</option>\r\n          {% endfor %}\r\n        </select>\r\n      </th>\r\n\r\n      <!-- Site (col 1) -->\r\n      <th data-col=\"site\" style=\"width: 15%;\">\r\n        <div class=\"th-topline\">\r\n          <span class=\"th-label\">Site</span>\r\n          <span class=\"sort-indicator\" data-for-col=\"1\"></span>\r\n        </div>\r\n        <select id=\"siteFilterH\" aria-label=\"Site filter\">\r\n          <option value=\"all\">All Sites</option>\r\n          {% for site in sites %}\r\n          <option value=\"{{ site }}\">{{ site }}</option>\r\n          {% endfor %}\r\n        </select>\r\n      </th>\r\n\r\n      <!-- Hostname (col 2) -->\r\n      <th data-col=\"device\" style=\"width: 30%;\">\r\n        <div class=\"th-topline\">\r\n          <span class=\"th-label\">Hostname</span>\r\n          <span class=\"sort-indicator\" data-for-col=\"2\"></span>\r\n        </div>\r\n      </th>\r\n\r\n      <!-- Needs Reboot (col 3) -->\r\n      <th data-col=\"reboot\" style=\"width: 15%;\">\r\n        <div class=\"th-topline\">\r\n          <span class=\"th-label\">Needs Reboot</span>\r\n          <span class=\"sort-indicator\" data-for-col=\"3\"></span>\r\n        </div>\r\n        <select id=\"rebootFilterH\" aria-label=\"Needs Reboot filter\">\r\n          <option value=\"all\">All Statuses</option>\r\n          {% for status in reboot_statuses %}\r\n          <option value=\"{{ status }}\">{{ status }}</option>\r\n          {% endfor %}\r\n        </select>\r\n      </th>\r\n    </tr>\r\n  </thead>\r\n\r\n  <tbody id=\"report-table-body\">\r\n    {% for agent in data_sources.agentsPendingReboot %}\r\n    <tr>\r\n      <td class=\"cell-client\">{{ agent.site__client__name }}</td>\r\n      <td class=\"cell-site\">{{ agent.site__name }}</td>\r\n      <td class=\"cell-device\" data-sort-value=\"{{ agent.hostname }}\">\r\n        <b class=\"device-name\">{{ agent.hostname }}</b><br>\r\n        {% if agent.last_seen %}\r\n        <small class=\"last-seen {% if (report_run_timestamp - agent.last_seen).days > 30 %}text-danger{% endif %}\" data-sort-value=\"{{ agent.last_seen.isoformat() }}\">\r\n          Last Seen: {{ agent.last_seen.strftime('%Y-%m-%d') }}\r\n        </small>\r\n        {% else %}\r\n        <small class=\"last-seen\" data-sort-value=\"N/A\">&nbsp;</small>\r\n        {% endif %}\r\n      </td>\r\n      <td class=\"cell-reboot\">{{ agent.needs_reboot }}</td>\r\n    </tr>\r\n    {% endfor %}\r\n  </tbody>\r\n</table>\r\n\r\n<script>\r\n(function() {\r\n  const $  = s => document.querySelector(s);\r\n  const $$ = s => Array.from(document.querySelectorAll(s));\r\n  const tbody = $('#report-table-body');\r\n\r\n  const selects = {\r\n    client: $('#clientFilterH'),\r\n    site:   $('#siteFilterH'),\r\n    reboot: $('#rebootFilterH'),\r\n  };\r\n\r\n  let currentSort = { colIndex: null, dirAsc: true };\r\n\r\n  function getCellText(row, selector, fallbackIndex=null) {\r\n    const el = row.querySelector(selector);\r\n    if (el) return el.textContent.trim();\r\n    if (fallbackIndex !== null) return row.cells[fallbackIndex].textContent.trim();\r\n    return '';\r\n  }\r\n\r\n  function buildOptionsFromSet(selectEl, set, allLabel) {\r\n    if (!selectEl) return;\r\n    const current = selectEl.value || 'all';\r\n    const sortedSet = [...set].sort((a,b) => String(a).localeCompare(String(b), undefined, {numeric:true, sensitivity:'base'}));\r\n    const opts = [`<option value=\"all\">${allLabel}</option>`]\r\n      .concat(sortedSet.map(v => `<option value=\"${String(v)}\">${String(v)}</option>`));\r\n    selectEl.innerHTML = opts.join('');\r\n    if ([...set].includes(current) || current === 'all') selectEl.value = current;\r\n  }\r\n\r\n  function updateDropdownsFromVisible() {\r\n    const rows = $$('#reportTable tbody tr').filter(r => r.style.display !== 'none');\r\n    const clients = new Set(), sites = new Set(), reboots = new Set();\r\n\r\n    rows.forEach(r => {\r\n      clients.add(getCellText(r, '.cell-client', 0));\r\n      sites.add(getCellText(r, '.cell-site', 1));\r\n      reboots.add(getCellText(r, '.cell-reboot', 3));\r\n    });\r\n\r\n    buildOptionsFromSet(selects.client, clients, 'All Clients');\r\n    buildOptionsFromSet(selects.site,   sites,   'All Sites');\r\n    buildOptionsFromSet(selects.reboot, reboots, 'All Statuses');\r\n  }\r\n\r\n  function setSortIndicator(colIndex, dirAscOrNull) {\r\n    $$('.sort-indicator').forEach(s => s.textContent = '');\r\n    if (dirAscOrNull === null) return;\r\n    const el = $(`.sort-indicator[data-for-col=\"${colIndex}\"]`);\r\n    if (el) el.textContent = dirAscOrNull ? '▲' : '▼';\r\n  }\r\n\r\n  function filterTable() {\r\n    const clientVal = selects.client?.value || 'all';\r\n    const siteVal   = selects.site?.value   || 'all';\r\n    const rebootVal = selects.reboot?.value || 'all';\r\n    let visible = 0;\r\n\r\n    $$('#reportTable tbody tr').forEach(row => {\r\n      const client = getCellText(row, '.cell-client', 0);\r\n      const site   = getCellText(row, '.cell-site', 1);\r\n      const reboot = getCellText(row, '.cell-reboot', 3);\r\n\r\n      const show = (clientVal === 'all' || client === clientVal)\r\n                && (siteVal   === 'all' || site   === siteVal)\r\n                && (rebootVal === 'all' || reboot === rebootVal);\r\n\r\n      row.style.display = show ? '' : 'none';\r\n      if (show) visible++;\r\n    });\r\n\r\n    updateDropdownsFromVisible();\r\n\r\n    const subtitle = `Client: ${clientVal === 'all' ? 'All' : clientVal} | Site: ${siteVal === 'all' ? 'All' : siteVal}`;\r\n    $('#report-subtitle').textContent = subtitle;\r\n    $('#visibleCount').textContent = String(visible);\r\n\r\n    if (currentSort.colIndex !== null) sortTable(currentSort.colIndex, currentSort.dirAsc, false);\r\n  }\r\n\r\n  function sortTable(colIndex, dirAsc = true, toggle = true) {\r\n    const rows = Array.from(tbody.rows);\r\n    const visibleRows = rows.filter(r => r.style.display !== 'none');\r\n\r\n    if (toggle) {\r\n      if (currentSort.colIndex === colIndex) currentSort.dirAsc = !currentSort.dirAsc;\r\n      else { currentSort.colIndex = colIndex; currentSort.dirAsc = true; }\r\n    } else {\r\n      currentSort.colIndex = colIndex; currentSort.dirAsc = dirAsc;\r\n    }\r\n\r\n    setSortIndicator(currentSort.colIndex, currentSort.dirAsc);\r\n\r\n    const getVal = (row, idx) => {\r\n      const cell = row.cells[idx];\r\n      return cell.getAttribute('data-sort-value') || cell.textContent.trim();\r\n    };\r\n\r\n    visibleRows.sort((a, b) => {\r\n      let cmp = 0;\r\n      // Primary Sort\r\n      if (colIndex === 2) { // Special logic for Hostname column (sort by name, then last seen)\r\n        const nameA = a.querySelector('.device-name')?.textContent.trim() || '';\r\n        const nameB = b.querySelector('.device-name')?.textContent.trim() || '';\r\n        cmp = nameA.localeCompare(nameB, undefined, { numeric: true, sensitivity: 'base' });\r\n        if (cmp === 0) {\r\n          const sa = a.querySelector('.last-seen')?.getAttribute('data-sort-value') || 'N/A';\r\n          const sb = b.querySelector('.last-seen')?.getAttribute('data-sort-value') || 'N/A';\r\n          if (sa !== 'N/A' && sb !== 'N/A') cmp = new Date(sa) - new Date(sb);\r\n        }\r\n      } else {\r\n        const vA = getVal(a, colIndex);\r\n        const vB = getVal(b, colIndex);\r\n        cmp = String(vA).localeCompare(String(vB), undefined, { numeric: true, sensitivity: 'base' });\r\n      }\r\n\r\n      // Tie-breaker Sort: Client > Site\r\n      if (cmp === 0 && colIndex !== 0) {\r\n        cmp = String(getVal(a, 0)).localeCompare(String(getVal(b, 0)), undefined, { numeric: true, sensitivity: 'base' });\r\n      }\r\n      if (cmp === 0 && colIndex !== 1) {\r\n        cmp = String(getVal(a, 1)).localeCompare(String(getVal(b, 1)), undefined, { numeric: true, sensitivity: 'base' });\r\n      }\r\n\r\n      return currentSort.dirAsc ? cmp : -cmp;\r\n    });\r\n\r\n    visibleRows.forEach(r => tbody.appendChild(r));\r\n    rows.filter(r => r.style.display === 'none').forEach(r => tbody.appendChild(r));\r\n  }\r\n\r\n  // Header click-to-sort; ignore clicks on the <select>\r\n  $$('#reportTable thead th').forEach((th, idx) => {\r\n    th.addEventListener('click', (e) => {\r\n      if (e.target && e.target.tagName && e.target.tagName.toLowerCase() === 'select') return;\r\n      sortTable(idx, true, true);\r\n    });\r\n  });\r\n\r\n  // Wire header selects\r\n  Object.values(selects).filter(Boolean).forEach(sel => sel.addEventListener('change', filterTable));\r\n\r\n  function init() {\r\n    filterTable();\r\n    // Initial sort by Client (which will tie-break on Site)\r\n    sortTable(0, true, false);\r\n  }\r\n  document.addEventListener('DOMContentLoaded', init);\r\n})();\r\n</script>\r\n{% endblock %}",
     "type": "markdown",
diff --git a/templates/Custom Fields Example1.json b/templates/Custom Fields Example1 (md).json
similarity index 97%
rename from templates/Custom Fields Example1.json
rename to templates/Custom Fields Example1 (md).json
index 1fae157..50dfdd4 100644
--- a/templates/Custom Fields Example1.json	
+++ b/templates/Custom Fields Example1 (md).json	
@@ -1,7 +1,7 @@
 {
     "base_template": null,
     "template": {
-        "name": "Custom Fields Example1",
+        "name": "Custom Fields Example1 (md)",
         "template_css": "",
         "template_md": "# Agents\r\n\r\n> There needs to be an Agent custom fields named: **Agent Test Field** and **Agent Test Field 2**\r\n\r\n<table>\r\n  <thead>\r\n    <tr>\r\n\t<th>Hostname</th>\r\n    <th>Test Field 1</th>\r\n    <th>Test Field 2</th>\r\n    </tr>\r\n  </thead>\r\n  <tbody>\r\n    {% for item in data_sources.agents %}\r\n    <tr>\r\n\t<td>{{ item.hostname }}</td>\r\n\t<td>{{ item.custom_fields.AgentTestField }}</td>\r\n    <td>{{ item.custom_fields[\"Agent Test Field 2\"] }}</td>\r\n    </tr>\r\n    {% endfor %}\r\n  </tbody>\r\n</table>\r\n\r\n\r\n# Clients\r\n\r\n> There needs to be an Client custom fields named: **Client Test Field** and **Client Test Field 2**\r\n\r\n<table>\r\n  <thead>\r\n    <tr>\r\n\t<th>Name</th>\r\n    <th>Test Field 1</th>\r\n    <th>Test Field 2</th>\r\n    </tr>\r\n  </thead>\r\n  <tbody>\r\n    {% for item in data_sources.clients %}\r\n    <tr>\r\n\t<td>{{ item.name }}</td>\r\n\t<td>{{ item.custom_fields.ClientTestField }}</td>\r\n    <td>{{ item.custom_fields[\"Client Test Field 2\"] }}</td>\r\n    </tr>\r\n    {% endfor %}\r\n  </tbody>\r\n</table>\r\n\r\n\r\n# Sites\r\n\r\n> There needs to be an Site custom fields named: **Site Test Field** and **Site Test Field 2**\r\n\r\n<table>\r\n  <thead>\r\n    <tr>\r\n\t<th>Name</th>\r\n    <th>Test Field 1</th>\r\n    <th>Test Field 2</th>\r\n    </tr>\r\n  </thead>\r\n  <tbody>\r\n    {% for item in data_sources.sites %}\r\n    <tr>\r\n\t<td>{{ item.name }}</td>\r\n\t<td>{{ item.custom_fields.SiteTestField }}</td>\r\n    <td>{{ item.custom_fields[\"Site Test Field 2\"] }}</td>\r\n    </tr>\r\n    {% endfor %}\r\n  </tbody>\r\n</table>",
         "type": "markdown",
diff --git a/templates/Software Report Full_By Agent.json b/templates/Software Report Full_By Agent (md).json
similarity index 96%
rename from templates/Software Report Full_By Agent.json
rename to templates/Software Report Full_By Agent (md).json
index d872213..9583492 100644
--- a/templates/Software Report Full_By Agent.json	
+++ b/templates/Software Report Full_By Agent (md).json	
@@ -4,7 +4,7 @@
         "html": "<!doctype html>\n<html lang=\"en\">\n    <head>\n        <style>\n            {{css}}\n        </style>\n        <link href=\"https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css\" rel=\"stylesheet\" integrity=\"sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC\" crossorigin=\"anonymous\">\n    </head>\n    <body>\n        {% block content %}{% endblock %}\n        {% block header %}{% endblock %}\n    </body>\n</html>"
     },
     "template": {
-        "name": "Software Report Full_By Agent",
+        "name": "Software Report Full_By Agent (md)",
         "template_css": "",
         "template_md": "{% block content %}\r\n# Software Audit Report - {{agent.hostname}}\r\n\r\n<table>\r\n    <thead>\r\n        <tr>\r\n           <th>Software Name</th>\r\n            <th>Version</th>\r\n            <th>Publisher</th>\r\n        </tr>\r\n    </thead>\r\n    <tbody>\r\n        {% for record in data_sources.agentSoftware %}\r\n            {% for software in record.software %}\r\n                <tr>\r\n                    <td>{{ software.name or 'N/A' }}</td>\r\n                    <td>{{ software.version or 'N/A' }}</td>\r\n                    <td>{{ software.publisher or 'N/A' }}</td>\r\n                </tr>\r\n            {% endfor %}\r\n        {% endfor %}\r\n    </tbody>\r\n</table>\r\n\r\n{% endblock %}",
         "type": "markdown",
diff --git a/templates/Software Report Full_By Client.json b/templates/Software Report Full_By Client (md).json
similarity index 97%
rename from templates/Software Report Full_By Client.json
rename to templates/Software Report Full_By Client (md).json
index 6958dc7..595a450 100644
--- a/templates/Software Report Full_By Client.json	
+++ b/templates/Software Report Full_By Client (md).json	
@@ -4,7 +4,7 @@
         "html": "<!doctype html>\n<html lang=\"en\">\n    <head>\n        <style>\n            {{css}}\n        </style>\n        <link href=\"https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css\" rel=\"stylesheet\" integrity=\"sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC\" crossorigin=\"anonymous\">\n    </head>\n    <body>\n        {% block content %}{% endblock %}\n        {% block header %}{% endblock %}\n    </body>\n</html>"
     },
     "template": {
-        "name": "Software Report Full_By Client",
+        "name": "Software Report Full_By Client (md)",
         "template_css": "",
         "template_md": "{% block content %}\r\n# Software Audit Report - {{client.name}}\r\n\r\n<table>\r\n    <thead>\r\n        <tr>\r\n           <th>Device Name</th>\r\n           <th>Software Name</th>\r\n            <th>Version</th>\r\n            <th>Publisher</th>\r\n        </tr>\r\n    </thead>\r\n    <tbody>\r\n        {% for record in data_sources.agentSoftware %}\r\n            {% for software in record.software %}\r\n                <tr>\r\n                    <td>{{ record.agent__hostname or 'N/A' }}</td>\r\n                    <td>{{ software.name or 'N/A' }}</td>\r\n                    <td>{{ software.version or 'N/A' }}</td>\r\n                    <td>{{ software.publisher or 'N/A' }}</td>\r\n                </tr>\r\n            {% endfor %}\r\n        {% endfor %}\r\n    </tbody>\r\n</table>\r\n\r\n{% endblock %}",
         "type": "markdown",
diff --git a/templates/Software Report Starts With_By Agent.json b/templates/Software Report Starts With_By Agent (md).json
similarity index 97%
rename from templates/Software Report Starts With_By Agent.json
rename to templates/Software Report Starts With_By Agent (md).json
index 9ea3054..3208cd1 100644
--- a/templates/Software Report Starts With_By Agent.json	
+++ b/templates/Software Report Starts With_By Agent (md).json	
@@ -4,7 +4,7 @@
         "html": "<!doctype html>\n<html lang=\"en\">\n    <head>\n        <style>\n            {{css}}\n        </style>\n        <link href=\"https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css\" rel=\"stylesheet\" integrity=\"sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC\" crossorigin=\"anonymous\">\n    </head>\n    <body>\n        {% block content %}{% endblock %}\n    </body>\n</html>"
     },
     "template": {
-        "name": "Software Report Starts With_By Agent",
+        "name": "Software Report Starts With_By Agent (md)",
         "template_css": "",
         "template_md": "{% block content %}\r\n# Software Audit Report - {{ software_name }}*\r\n\r\n<table class=\"table\">\r\n  <thead>\r\n    <tr>\r\n      <th>Client</th>\r\n      <th>Agent</th>\r\n      <th>Software Name</th>\r\n      <th>Version</th>\r\n      <th>Publisher</th>\r\n    </tr>\r\n  </thead>\r\n  <tbody>\r\n      <!-- loop through each agent returns -->\r\n      {% for record in data_sources.agentSoftware %}\r\n      \r\n        <!-- loop through software and only return the software we are looking for -->\r\n        {% for software in record.software %}      \r\n          <!-- only add row if software name matches-->\r\n          {% if software.name.lower().startswith(software_name.lower()) %}\r\n          <tr>\r\n              <td>{{ record.agent__site__client__name }}</td>\r\n              <td>{{ record.agent__hostname }}</td>\r\n              <td>{{ software.name }}</td>\r\n              <td>{{ software.version }}</td>\r\n              <td>{{ software.publisher }}</td>\r\n          </tr>\r\n          {% endif %}\r\n        {% endfor %}\r\n      {% endfor %}\r\n  </tbody>\r\n</table>\r\n{% endblock %}",
         "type": "markdown",
diff --git a/templates/Software Report_By Agent.json b/templates/Software Report_By Agent (md).json
similarity index 98%
rename from templates/Software Report_By Agent.json
rename to templates/Software Report_By Agent (md).json
index 007c2be..8b9bb8e 100644
--- a/templates/Software Report_By Agent.json	
+++ b/templates/Software Report_By Agent (md).json	
@@ -4,7 +4,7 @@
         "html": "<!doctype html>\n<html lang=\"en\">\n    <head>\n        <style>\n            {{css}}\n        </style>\n        <link href=\"https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css\" rel=\"stylesheet\" integrity=\"sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC\" crossorigin=\"anonymous\">\n    </head>\n    <body>\n        {% block content %}{% endblock %}\n        {% block header %}{% endblock %}\n    </body>\n</html>"
     },
     "template": {
-        "name": "Software Report_By Agent",
+        "name": "Software Report_By Agent (md)",
         "template_css": "",
         "template_md": "{% block content %}\r\n\r\n# Software Audit Report - {{ software_name }}\r\nTarget Version: {{ target_version }}\r\nTotal Agents: {{ data_sources.agentSoftware|count }}\r\nAgents Needing Update: {{ data_sources.agentSoftware|count - data_sources.hasUpdate }}\r\n\r\n<table class=\"table\">\r\n  <thead>\r\n    <tr>\r\n      <th>Client</th>\r\n      <th>Agent</th>\r\n      <th>Software Name</th>\r\n      <th>Version</th>\r\n      <th>Publisher</th>\r\n    </tr>\r\n  </thead>\r\n  <tbody>\r\n      <!-- loop through each agent returns -->\r\n      {% for record in data_sources.agentSoftware %}\r\n      \r\n        <!-- loop through software and only return the software we are looking for -->\r\n        {% for software in record.software %}\r\n\r\n          <!-- only add row if software name matches-->\r\n          {% if software.name == software_name %}\r\n          <tr {% if software.version != target_version %}class=\"table-danger\"{% endif %}>\r\n              <td>{{ record.agent__site__client__name }}</td>\r\n              <td>{{ record.agent__hostname }}</td>\r\n              <td>{{ software.name }}</td>\r\n              <td>{{ software.version }}</td>\r\n              <td>{{ software.publisher }}</td>\r\n          </tr>\r\n          {% endif %}\r\n        {% endfor %}\r\n      {% endfor %}\r\n  </tbody>\r\n</table>\r\n{% endblock %}",
         "type": "markdown",
diff --git a/templates/Windows Updates Not Installed_By Client.json b/templates/Windows Updates Not Installed_By Client (md).json
similarity index 96%
rename from templates/Windows Updates Not Installed_By Client.json
rename to templates/Windows Updates Not Installed_By Client (md).json
index a85ab79..176bbc9 100644
--- a/templates/Windows Updates Not Installed_By Client.json	
+++ b/templates/Windows Updates Not Installed_By Client (md).json	
@@ -4,7 +4,7 @@
         "html": "<!doctype html>\n<html lang=\"en\">\n    <head>\n        <style>\n            {{css}}\n        </style>\n        <link href=\"https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css\" rel=\"stylesheet\" integrity=\"sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC\" crossorigin=\"anonymous\">\n    </head>\n    <body>\n        {% block content %}{% endblock %}\n        {% block header %}{% endblock %}\n    </body>\n</html>"
     },
     "template": {
-        "name": "Windows Updates Not Installed_By Client",
+        "name": "Windows Updates Not Installed_By Client (md)",
         "template_css": "",
         "template_md": "{% block content %}\r\n<h1>Not Installed Windows Updates</h1>\r\n\r\n<table>\r\n  <thead>\r\n    <tr>\r\n\t<th>Device Name</th>\r\n\t<th>Title</th>\r\n\t<th>Installed</th>\r\n\t<th>Severity</th>\r\n    </tr>\r\n  </thead>\r\n  <tbody>\r\n{% set filtered_items = data_sources.allFieldsWindowsUpdates|selectattr('installed', 'ne', True)|list %}\r\n{% for item in filtered_items %}\r\n    <tr>\r\n\t<td>{{ item.agent__hostname if item.agent__hostname else 'N/A' }}</td>\r\n\t<td>{{ item.title if item.title else 'N/A' }}</td>\r\n\t<td>{{ item.installed if item.installed else 'False' }}</td>\r\n\t<td>{{ item.severity if item.severity else 'N/A' }}</td>\r\n\r\n    </tr>\r\n    {% endfor %}\r\n  </tbody>\r\n</table>\r\n\r\n\r\n{% endblock %}",
         "type": "markdown",

From f62bbf2adbf1a19580b7ac6dec637a3eb52b1d1c Mon Sep 17 00:00:00 2001
From: silversword411 <github.com@datmail.com>
Date: Thu, 1 Jan 2026 01:26:52 -0500
Subject: [PATCH 3/6] Update VSCode settings to enhance UI color customizations
 and ensure pytest is enabled

---
 .vscode/settings.json | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 3e99ede..cce827c 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -2,6 +2,25 @@
     "python.testing.pytestArgs": [
         "."
     ],
-    "python.testing.unittestEnabled": false,
-    "python.testing.pytestEnabled": true
+    "python.testing.pytestEnabled": true,
+    "workbench.colorCustomizations": {
+        "activityBar.activeBackground": "#66b2ff",
+        "activityBar.background": "#66b2ff",
+        "activityBar.foreground": "#15202b",
+        "activityBar.inactiveForeground": "#15202b99",
+        "activityBarBadge.background": "#df006f",
+        "activityBarBadge.foreground": "#e7e7e7",
+        "commandCenter.border": "#15202b99",
+        "sash.hoverBorder": "#66b2ff",
+        "statusBar.background": "#3399ff",
+        "statusBar.foreground": "#15202b",
+        "statusBarItem.hoverBackground": "#007fff",
+        "statusBarItem.remoteBackground": "#3399ff",
+        "statusBarItem.remoteForeground": "#15202b",
+        "titleBar.activeBackground": "#3399ff",
+        "titleBar.activeForeground": "#15202b",
+        "titleBar.inactiveBackground": "#3399ff99",
+        "titleBar.inactiveForeground": "#15202b99"
+    },
+    "peacock.color": "#3399ff"
 }
\ No newline at end of file

From 2fa0c0f39f6ef3e6e197b25f731c62ea54be79c4 Mon Sep 17 00:00:00 2001
From: silversword411 <github.com@datmail.com>
Date: Wed, 25 Feb 2026 21:43:08 -0500
Subject: [PATCH 4/6] Agent List_By Client with Specs (pdf) v1.6 - Fix NoneType
 is not iterable and margins. Agent_ListClientThenSite (csv) v1.1 - Version
 fix

---
 ...nt List_By Client with Specs (pdf) v1.3.json | 17 -----------------
 ...nt List_By Client with Specs (pdf) v1.6.json | 17 +++++++++++++++++
 .../Agent_ListClientThenSite (csv) v1.1.json    | 12 ++++++++++++
 templates/Agent_ListClientThenSite (csv).json   | 12 ------------
 4 files changed, 29 insertions(+), 29 deletions(-)
 delete mode 100644 templates/Agent List_By Client with Specs (pdf) v1.3.json
 create mode 100644 templates/Agent List_By Client with Specs (pdf) v1.6.json
 create mode 100644 templates/Agent_ListClientThenSite (csv) v1.1.json
 delete mode 100644 templates/Agent_ListClientThenSite (csv).json

diff --git a/templates/Agent List_By Client with Specs (pdf) v1.3.json b/templates/Agent List_By Client with Specs (pdf) v1.3.json
deleted file mode 100644
index 50d3213..0000000
--- a/templates/Agent List_By Client with Specs (pdf) v1.3.json	
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "base_template": {
-    "name": "Base Template_umyxxh",
-    "html": "<html>\n    <head>\n        <style>\n            {{ css }}\n        </style>\n    </head>\n    <body>\n        {% block content %}{% endblock %}\n    </body>\n</html>"
-  },
-  "template": {
-    "name": "Agent List_By Client with Specs (pdf) v1.3",
-    "template_css": "@font-face {\r\n  font-family: Fira Sans;\r\n  font-weight: 400;\r\n  src: url(https://raw.githubusercontent.com/CourtBouillon/weasyprint-samples/master/report/firasans-regular.otf);\r\n}\r\n@font-face {\r\n  font-family: Fira Sans;\r\n  font-style: italic;\r\n  font-weight: 400;\r\n  src: url(https://raw.githubusercontent.com/CourtBouillon/weasyprint-samples/master/report/firasans-italic.otf);\r\n}\r\n@font-face {\r\n  font-family: Fira Sans;\r\n  font-weight: 300;\r\n  src: url(https://raw.githubusercontent.com/CourtBouillon/weasyprint-samples/master/report/firasans-light.otf);\r\n}\r\n@font-face {\r\n  font-family: Fira Sans;\r\n  font-style: italic;\r\n  font-weight: 300;\r\n  src: url(https://raw.githubusercontent.com/CourtBouillon/weasyprint-samples/master/report/firasans-lightitalic.otf);\r\n}\r\n@font-face {\r\n  font-family: Fira Sans;\r\n  font-weight: 700;\r\n  src: url(https://raw.githubusercontent.com/CourtBouillon/weasyprint-samples/master/report/firasans-bold.otf);\r\n}\r\n\r\n@page {\r\n  size: landscape;\r\n  @top-left {\r\n    background: #ffcc00;\r\n    content: \"\";\r\n    height: 50px;\r\n    width: 50px;\r\n    position: absolute;\r\n    top: 0;\r\n    left: 0;\r\n    background-image: url('https://github.com/amidaware/reporting-templates/blob/471b2d34fae8029d8c05b6c3d000c027648a07e4/assets/2orig1%20(256).png?raw=true');\r\n    background-size: cover;\r\n    background-repeat: no-repeat;\r\n    background-position: center;\r\n  }\r\n  @top-center {\r\n    background: #ffcc00;\r\n    content: '';\r\n    display: block;\r\n    height: .05cm;\r\n    opacity: .5;\r\n    width: 100%;\r\n  }\r\n  \r\n  @bottom-left {\r\n    background: #ffcc00;\r\n    content: counter(page);\r\n    height: 1cm;\r\n    text-align: center;\r\n    width: 1cm;\r\n  }\r\n  @bottom-center {\r\n    background: #ffcc00;\r\n    content: '';\r\n    display: block;\r\n    height: .05cm;\r\n    opacity: .5;\r\n    width: 100%;\r\n  }\r\n  @bottom-right {\r\n    content: string(heading);\r\n    font-size: 9pt;\r\n    height: 1cm;\r\n    vertical-align: middle;\r\n    width: 100%;\r\n  }\r\n}\r\n@page :blank {\r\n  @top-left { background: none; content: '' }\r\n  @top-center { content: none }\r\n  @top-right { content: none }\r\n}\r\n@page no-chapter {\r\n  @top-left { background: none; content: none }\r\n  @top-center { content: none }\r\n  @top-right { content: none }\r\n}\r\n@page :first {\r\n  background: url(https://raw.githubusercontent.com/CourtBouillon/weasyprint-samples/master/report/report-cover.jpg) no-repeat center;\r\n  background-size: cover;\r\n  margin: 0;\r\n}\r\n@page chapter {\r\n  background: #ffcc00;\r\n  margin: 0;\r\n  @top-left { content: none }\r\n  @top-center { content: none }\r\n  @top-right { content: none }\r\n}\r\n.page-break {\r\n  page-break-before: always; /* For older browsers */\r\n  break-before: page; /* For newer browsers */\r\n}\r\n\r\n\r\nhtml {\r\n  color: #393939;\r\n  font-family: Fira Sans;\r\n  font-size: 11pt;\r\n  font-weight: 300;\r\n  line-height: 1.5;\r\n}\r\n\r\nh1 {\r\n  color: #ffcc00;\r\n  font-size: 38pt;\r\n  margin: 5cm 2cm 0 2cm;\r\n  page: no-chapter;\r\n  width: 100%;\r\n}\r\nh2, h3, h4 {\r\n  color: black;\r\n  font-weight: 400;\r\n}\r\nh2 {\r\n  break-before: always;\r\n  font-size: 28pt;\r\n  string-set: heading content();\r\n}\r\nh3 {\r\n  font-weight: 300;\r\n  font-size: 15pt;\r\n}\r\nh4 {\r\n  font-size: 13pt;\r\n}\r\n\r\n#cover {\r\n  align-content: space-between;\r\n  display: flex;\r\n  flex-wrap: wrap;\r\n}\r\n#cover address {\r\n  position: absolute; /* Absolute positioning */\r\n  bottom: 0; /* Stick to the bottom */\r\n  width: 100%; /* Full width */\r\n  text-align: center; /* Center the text */\r\n  background: transparent; /* Optional: make background transparent or adjust as needed */\r\n  margin: 0; /* Remove margins */\r\n  padding: 20px 0; /* Add padding at the top and bottom */\r\n}\r\n#cover address:first-of-type {\r\n  padding-left: 3cm;\r\n}\r\n#contents {\r\n  page: no-chapter;\r\n}\r\n#contents h2 {\r\n  font-size: 20pt;\r\n  font-weight: 400;\r\n  margin-bottom: 3cm;\r\n}\r\n#contents h3 {\r\n  font-weight: 500;\r\n  margin: 3em 0 1em;\r\n}\r\n#contents h3::before {\r\n  background: #ffcc00;\r\n  content: '';\r\n  display: block;\r\n  height: .08cm;\r\n  margin-bottom: .25cm;\r\n  width: 2cm;\r\n}\r\n#contents ul {\r\n  list-style: none;\r\n  padding-left: 0;\r\n}\r\n#contents ul li {\r\n  border-top: .25pt solid #c1c1c1;\r\n  margin: .25cm 0;\r\n  padding-top: .25cm;\r\n}\r\n#contents ul li::before {\r\n  color: #ffcc00;\r\n  content: '• ';\r\n  font-size: 40pt;\r\n  line-height: 16pt;\r\n  vertical-align: bottom;\r\n}\r\n#contents ul li a {\r\n  color: inherit;\r\n  text-decoration-line: inherit;\r\n}\r\n#contents ul li a::before {\r\n  content: target-text(attr(href));\r\n}\r\n#contents ul li a::after {\r\n  color: #ffcc00;\r\n  content: target-counter(attr(href), page);\r\n  float: right;\r\n}\r\n\r\n#columns section {\r\n  columns: 2;\r\n  column-gap: 1cm;\r\n  padding-top: 1cm;\r\n}\r\n#columns section p {\r\n  text-align: justify;\r\n}\r\n#columns section p:first-of-type {\r\n  font-weight: 700;\r\n}\r\n\r\n#skills h3 {\r\n  background: #ffcc00;\r\n  margin: 0 -3cm 1cm;\r\n  padding: 1cm 1cm 1cm 3cm;\r\n  width: 21cm;\r\n}\r\n#skills section {\r\n  padding: .5cm 0;\r\n}\r\ntable.GeneratedTable {\r\n  width: 100%;\r\n  background-color: #ffffff;\r\n  border-collapse: collapse;\r\n  border-width: 2px;\r\n  border-color: #ffcc00;\r\n  border-style: solid;\r\n  color: #000000;\r\n}\r\n\r\ntable.GeneratedTable td, table.GeneratedTable th {\r\n  border-width: 2px;\r\n  border-color: #ffcc00;\r\n  border-style: solid;\r\n  padding: 3px;\r\n}\r\n\r\ntable.GeneratedTable thead {\r\n  background-color: #ffcc00;\r\n}\r\n#skills section#tablecontent::before {\r\n  background: url(https://raw.githubusercontent.com/CourtBouillon/weasyprint-samples/master/report/table-content.svg) no-repeat center #ffcc00;\r\n  background-size: 50%;\r\n  content: '';\r\n  display: inline-block;\r\n  float: left;\r\n  height: 2cm;\r\n  margin-right: .5cm;\r\n  vertical-align: middle;\r\n  width: 2cm;\r\n}\r\n#skills section#heading::before {\r\n  background: url(https://raw.githubusercontent.com/CourtBouillon/weasyprint-samples/master/report/heading.svg) no-repeat center #ffcc00;\r\n  background-size: 50%;\r\n  content: '';\r\n  display: inline-block;\r\n  float: left;\r\n  height: 2cm;\r\n  margin-right: .5cm;\r\n  vertical-align: middle;\r\n  width: 2cm;\r\n}\r\n#skills section#multicolumns::before {\r\n  background: url(https://raw.githubusercontent.com/CourtBouillon/weasyprint-samples/master/report/multi-columns.svg) no-repeat center #ffcc00;\r\n  background-size: 50%;\r\n  content: '';\r\n  display: inline-block;\r\n  float: left;\r\n  height: 2cm;\r\n  margin-right: .5cm;\r\n  vertical-align: middle;\r\n  width: 2cm;\r\n}\r\n#skills section#internallinks::before {\r\n  background: url(https://raw.githubusercontent.com/CourtBouillon/weasyprint-samples/master/report/internal-links.svg) no-repeat center #ffcc00;\r\n  background-size: 50%;\r\n  content: '';\r\n  display: inline-block;\r\n  float: left;\r\n  height: 2cm;\r\n  margin-right: .5cm;\r\n  vertical-align: middle;\r\n  width: 2cm;\r\n}\r\n#skills section#style::before {\r\n  background: url(https://raw.githubusercontent.com/CourtBouillon/weasyprint-samples/master/report/style.svg) no-repeat center #ffcc00;\r\n  background-size: 50%;\r\n  content: '';\r\n  display: inline-block;\r\n  float: left;\r\n  height: 2cm;\r\n  margin-right: .5cm;\r\n  vertical-align: middle;\r\n  width: 2cm;\r\n}\r\n#skills section h4 {\r\n  margin: 0;\r\n}\r\n#skills section p {\r\n  margin-top: 0;\r\n}\r\n\r\n#offers {\r\n  display: flex;\r\n  flex-wrap: wrap;\r\n  justify-content: space-between;\r\n}\r\n#offers h2, #offers h3 {\r\n  width: 100%;\r\n}\r\n#offers section {\r\n  width: 30%;\r\n}\r\n#offers section h4 {\r\n  margin-bottom: 0;\r\n}\r\n#offers section ul {\r\n  list-style: none;\r\n  margin: 0;\r\n  padding-left: 0;\r\n}\r\n#offers section ul li:not(:last-of-type) {\r\n  margin: .5cm 0;\r\n}\r\n#offers section p {\r\n  background: #ffcc00;\r\n  display: block;\r\n  font-size: 15pt;\r\n  font-weight: 700;\r\n  margin-bottom: 0;\r\n  padding: .25cm 0;\r\n  text-align: center;\r\n}\r\n\r\n#chapter {\r\n  align-items: center;\r\n  display: flex;\r\n  height: 297mm;\r\n  justify-content: center;\r\n  page: chapter;\r\n}\r\n\r\n#typography section {\r\n  display: flex;\r\n  flex-wrap: wrap;\r\n  margin: 1cm 0;\r\n}\r\n#typography section h4 {\r\n  border-top: 1pt solid;\r\n  flex: 1 25%;\r\n  margin: 0;\r\n}\r\n#typography section h4 + * {\r\n  flex: 1 75%;\r\n  margin: 0;\r\n  padding-left: .5cm;\r\n}\r\n#typography section p {\r\n  text-align: justify;\r\n}\r\n#typography section ul {\r\n  line-height: 2;\r\n  list-style: none;\r\n}\r\n#typography section#smallcaps p {\r\n  font-variant: small-caps;\r\n}\r\n#typography section#ligatures dl {\r\n  display: flex;\r\n  flex-wrap: wrap;\r\n}\r\n#typography section#ligatures dl dt {\r\n  font-weight: 400;\r\n  width: 30%;\r\n}\r\n#typography section#ligatures dl dd {\r\n  flex: 1 70%;\r\n  margin: 0;\r\n  padding: 0;\r\n}\r\n#typography section#ligatures .none {\r\n  font-variant-ligatures: none;\r\n}\r\n#typography section#ligatures .common {\r\n  font-variant-ligatures: common-ligatures;\r\n}\r\n#typography section#ligatures .discretionary {\r\n  font-variant-ligatures: discretionary-ligatures;\r\n}\r\n#typography section#ligatures .contextual {\r\n  font-variant-ligatures: contextual;\r\n}\r\n#typography section#numbers dl {\r\n  display: flex;\r\n  flex-wrap: wrap;\r\n}\r\n#typography section#numbers dl dt {\r\n  font-weight: 400;\r\n  width: 30%;\r\n}\r\n#typography section#numbers dl dd {\r\n  flex: 1 70%;\r\n  margin: 0;\r\n  padding: 0;\r\n}\r\n#typography section#numbers #fractions {\r\n  font-variant-numeric: diagonal-fractions;\r\n}\r\n#typography section#numbers #ordinals {\r\n  font-variant-numeric: ordinal;\r\n}\r\n#typography section#numbers #slashed {\r\n  font-variant-numeric: slashed-zero;\r\n}\r\n#typography section#numbers #super {\r\n  font-variant-position: super;\r\n}\r\n#typography section#numbers #sub {\r\n  font-variant-position: sub;\r\n}\r\n#typography section#figures dl {\r\n  columns: 4;\r\n}\r\n#typography section#figures dl dt {\r\n  font-weight: 400;\r\n}\r\n#typography section#figures dl dd {\r\n  display: flex;\r\n  margin: 0;\r\n  padding: 0;\r\n}\r\n#typography section#figures dl dd ul {\r\n  padding: 0 1em 0 0;\r\n}\r\n#typography section#figures #oldstyle {\r\n  font-variant-numeric: oldstyle-nums;\r\n}",
-    "template_md": "{% block content %}\r\n<style>\r\n  .disk-bar-container {\r\n    width: 100px;\r\n    height: 15px;\r\n    background-color: #e0e0e0;\r\n    border: 1px solid #ccc;\r\n    border-radius: 3px;\r\n    margin-top: 2px;\r\n    margin-bottom: 5px;\r\n    overflow: hidden;\r\n  }\r\n  .disk-bar {\r\n    height: 100%;\r\n    background-color: #4CAF50; /* Green */\r\n  }\r\n  .disk-bar.warning {\r\n    background-color: #ff9800; /* Orange */\r\n  }\r\n  .disk-bar.critical {\r\n    background-color: #f44336; /* Red */\r\n  }\r\n</style>\r\n\r\n~~A cover~~\r\n# Agent List for {{client.name}}\r\n<address>\r\nCompany\r\n123 anywhere st\r\nCity, State zip\r\n</address>\r\n<address>\r\nme@here.com\r\nhttps://example.com\r\n</address>\r\n~~/A~~\r\n~~A~~\r\n{{ client.name }} Agents List\r\n<div class=\"page-break\"></div>\r\n<table class=\"GeneratedTable\">\r\n  <thead>\r\n    <tr>\r\n      <td colspan=\"4\" rowspan=\"1\" style=\"vertical-align: top;\">Agent Info</td>\r\n      <td style=\"vertical-align: top;\">Site Name</td>\r\n    </tr>\r\n  </thead>\r\n  <tbody>\r\n    {% for item in data_sources.agentAllFields %}\r\n    <tr>\r\n      <td style=\"vertical-align: top; text-align: right; width: 100px;\">\r\n        <span style=\"font-weight: bold;\">Name:</span><br>\r\n        <span style=\"font-weight: bold;\">User:</span><br>\r\n        <span style=\"font-weight: bold;\">OS:</span><br>\r\n        <span style=\"font-weight: bold;\">Last Seen:</span><br>\r\n      </td>\r\n      <td style=\"vertical-align: top; width: 250px;\">\r\n        {{ item.hostname }}<br>\r\n        {{ item.last_logged_in_user }}<br>\r\n        {{ item.operating_system.split(',')[0] if item.operating_system else 'N/A' }}<br>\r\n        \r\n        <!-- THIS BLOCK IS NOW FIXED AND SAFE -->\r\n        {% if item.last_seen and report_run_timestamp and (report_run_timestamp - item.last_seen).days > 7 %}\r\n          <span style=\"color: red;\">{{ item.last_seen.strftime('%Y-%m-%d %H:%M') }}</span><br>\r\n        {% elif item.last_seen %}\r\n          {{ item.last_seen.strftime('%Y-%m-%d %H:%M') }}<br>\r\n        {% else %}\r\n          N/A<br>\r\n        {% endif %}\r\n\r\n      </td>\r\n      <td style=\"vertical-align: top; text-align: right; width: 100px;\">\r\n        <span style=\"font-weight: bold;\">CPU:</span><br>\r\n        <span style=\"font-weight: bold;\">RAM:</span><br>\r\n        <span style=\"font-weight: bold;\">Disks:</span><br>\r\n      </td>\r\n      <td style=\"vertical-align: top;\">\r\n        {{ item.wmi_detail.cpu[0][0].Name.replace('(R)', '').replace('(TM)', '').split('@')[0].strip() if item.wmi_detail and item.wmi_detail.cpu and item.wmi_detail.cpu[0][0].Name else 'N/A' }}<br>\r\n        {{ item.total_ram }}GB <br>\r\n        {% for disk in item.disks %}\r\n          {% if not loop.previtem or loop.previtem.device != disk.device %}\r\n            {% set total_gb = disk.total | replace('GB','') | float(0) %}\r\n            {% set free_gb = disk.free | replace('GB','') | float(0) %}\r\n            {% set used_gb = total_gb - free_gb %}\r\n            {% set usage_percent = (used_gb / total_gb) * 100 if total_gb > 0 else 0 %}\r\n            \r\n            {% set bar_class = '' %}\r\n            {% if usage_percent > 90 %}\r\n              {% set bar_class = 'critical' %}\r\n            {% elif usage_percent > 80 %}\r\n              {% set bar_class = 'warning' %}\r\n            {% endif %}\r\n\r\n            {{ disk.device }} {{ disk.free }} free of {{ disk.total }}<br>\r\n            <div class=\"disk-bar-container\">\r\n              <div class=\"disk-bar {{ bar_class }}\" style=\"width: {{ usage_percent }}%;\"></div>\r\n            </div>\r\n          {% endif %}\r\n        {% else %}\r\n          N/A<br>\r\n        {% endfor %}\r\n      </td>\r\n      <td style=\"vertical-align: top;\">{{ item.site__name }}</td>\r\n    </tr>\r\n    {% endfor %}\r\n  </tbody>\r\n</table>\r\n~~/A~~\r\n{% endblock %}",
-    "type": "markdown",
-    "depends_on": [
-      "client"
-    ],
-    "template_variables": "data_sources:\n  agentAllFields:\n    only:\n      - hostname\n      - operating_system\n      - last_seen\n      - last_logged_in_user\n      - site__name\n      - wmi_detail\n      - total_ram\n      - disks\n    filter:\n      site__client_id: \"{{client.id}}\"\n    model: agent\nreport_run_timestamp: !now"
-  },
-  "assets": []
-}
\ No newline at end of file
diff --git a/templates/Agent List_By Client with Specs (pdf) v1.6.json b/templates/Agent List_By Client with Specs (pdf) v1.6.json
new file mode 100644
index 0000000..823e209
--- /dev/null
+++ b/templates/Agent List_By Client with Specs (pdf) v1.6.json	
@@ -0,0 +1,17 @@
+{
+  "base_template": {
+    "name": "Base Template",
+    "html": "<html>\n    <head>\n        <style>\n            {{ css }}\n        </style>\n    </head>\n    <body>\n        {% block content %}{% endblock %}\n    </body>\n</html>"
+  },
+  "template": {
+    "name": "Agent List_By Client with Specs (pdf) v1.6",
+    "template_css": "@font-face {\r\n  font-family: Fira Sans;\r\n  font-weight: 400;\r\n  src: url(https://raw.githubusercontent.com/CourtBouillon/weasyprint-samples/master/report/firasans-regular.otf);\r\n}\r\n@font-face {\r\n  font-family: Fira Sans;\r\n  font-style: italic;\r\n  font-weight: 400;\r\n  src: url(https://raw.githubusercontent.com/CourtBouillon/weasyprint-samples/master/report/firasans-italic.otf);\r\n}\r\n@font-face {\r\n  font-family: Fira Sans;\r\n  font-weight: 300;\r\n  src: url(https://raw.githubusercontent.com/CourtBouillon/weasyprint-samples/master/report/firasans-light.otf);\r\n}\r\n@font-face {\r\n  font-family: Fira Sans;\r\n  font-style: italic;\r\n  font-weight: 300;\r\n  src: url(https://raw.githubusercontent.com/CourtBouillon/weasyprint-samples/master/report/firasans-lightitalic.otf);\r\n}\r\n@font-face {\r\n  font-family: Fira Sans;\r\n  font-weight: 700;\r\n  src: url(https://raw.githubusercontent.com/CourtBouillon/weasyprint-samples/master/report/firasans-bold.otf);\r\n}\r\n\r\n@page {\r\n  size: landscape;\r\n  margin: 3.3cm 1.5cm 2.7cm 1.5cm;\r\n  @top-left {\r\n    background: #ffcc00;\r\n    content: \"\";\r\n    height: 50px;\r\n    width: 50px;\r\n    background-image: url('https://github.com/amidaware/reporting-templates/blob/471b2d34fae8029d8c05b6c3d000c027648a07e4/assets/2orig1%20(256).png?raw=true');\r\n    background-size: cover;\r\n    background-repeat: no-repeat;\r\n    background-position: center;\r\n  }\r\n  @top-center {\r\n    background: #ffcc00;\r\n    content: '';\r\n    display: block;\r\n    height: .05cm;\r\n    opacity: .5;\r\n    width: 100%;\r\n  }\r\n  \r\n  @bottom-left {\r\n    background: #ffcc00;\r\n    content: counter(page);\r\n    height: 1cm;\r\n    text-align: center;\r\n    width: 1cm;\r\n  }\r\n  @bottom-center {\r\n    background: #ffcc00;\r\n    content: '';\r\n    display: block;\r\n    height: .05cm;\r\n    opacity: .5;\r\n    width: 100%;\r\n  }\r\n  @bottom-right {\r\n    content: string(heading);\r\n    font-size: 9pt;\r\n    height: 1cm;\r\n    vertical-align: middle;\r\n    width: 100%;\r\n  }\r\n}\r\n@page :blank {\r\n  @top-left { background: none; content: '' }\r\n  @top-center { content: none }\r\n  @top-right { content: none }\r\n}\r\n@page no-chapter {\r\n  @top-left { background: none; content: none }\r\n  @top-center { content: none }\r\n  @top-right { content: none }\r\n}\r\n@page :first {\r\n  background: url(https://raw.githubusercontent.com/CourtBouillon/weasyprint-samples/master/report/report-cover.jpg) no-repeat center;\r\n  background-size: cover;\r\n  margin: 0;\r\n}\r\n@page chapter {\r\n  background: #ffcc00;\r\n  margin: 0;\r\n  @top-left { content: none }\r\n  @top-center { content: none }\r\n  @top-right { content: none }\r\n}\r\n.page-break {\r\n  page-break-before: always; /* For older browsers */\r\n  break-before: page; /* For newer browsers */\r\n}\r\n\r\n\r\nhtml {\r\n  color: #393939;\r\n  font-family: Fira Sans;\r\n  font-size: 11pt;\r\n  font-weight: 300;\r\n  line-height: 1.5;\r\n}\r\nbody {\r\n  margin: 0;\r\n  padding: 0;\r\n}\r\n\r\nh1 {\r\n  color: #ffcc00;\r\n  font-size: 38pt;\r\n  margin: 5cm 2cm 0 2cm;\r\n  page: no-chapter;\r\n  width: 100%;\r\n}\r\nh2, h3, h4 {\r\n  color: black;\r\n  font-weight: 400;\r\n}\r\nh2 {\r\n  break-before: always;\r\n  font-size: 28pt;\r\n  string-set: heading content();\r\n}\r\nh3 {\r\n  font-weight: 300;\r\n  font-size: 15pt;\r\n}\r\nh4 {\r\n  font-size: 13pt;\r\n}\r\n\r\n#cover {\r\n  align-content: space-between;\r\n  display: flex;\r\n  flex-wrap: wrap;\r\n}\r\n#cover address {\r\n  position: absolute; /* Absolute positioning */\r\n  bottom: 0; /* Stick to the bottom */\r\n  width: 100%; /* Full width */\r\n  text-align: center; /* Center the text */\r\n  background: transparent; /* Optional: make background transparent or adjust as needed */\r\n  margin: 0; /* Remove margins */\r\n  padding: 20px 0; /* Add padding at the top and bottom */\r\n}\r\n#cover address:first-of-type {\r\n  padding-left: 3cm;\r\n}\r\n#contents {\r\n  page: no-chapter;\r\n}\r\n#contents h2 {\r\n  font-size: 20pt;\r\n  font-weight: 400;\r\n  margin-bottom: 3cm;\r\n}\r\n#contents h3 {\r\n  font-weight: 500;\r\n  margin: 3em 0 1em;\r\n}\r\n#contents h3::before {\r\n  background: #ffcc00;\r\n  content: '';\r\n  display: block;\r\n  height: .08cm;\r\n  margin-bottom: .25cm;\r\n  width: 2cm;\r\n}\r\n#contents ul {\r\n  list-style: none;\r\n  padding-left: 0;\r\n}\r\n#contents ul li {\r\n  border-top: .25pt solid #c1c1c1;\r\n  margin: .25cm 0;\r\n  padding-top: .25cm;\r\n}\r\n#contents ul li::before {\r\n  color: #ffcc00;\r\n  content: '• ';\r\n  font-size: 40pt;\r\n  line-height: 16pt;\r\n  vertical-align: bottom;\r\n}\r\n#contents ul li a {\r\n  color: inherit;\r\n  text-decoration-line: inherit;\r\n}\r\n#contents ul li a::before {\r\n  content: target-text(attr(href));\r\n}\r\n#contents ul li a::after {\r\n  color: #ffcc00;\r\n  content: target-counter(attr(href), page);\r\n  float: right;\r\n}\r\n\r\n#columns section {\r\n  columns: 2;\r\n  column-gap: 1cm;\r\n  padding-top: 1cm;\r\n}\r\n#columns section p {\r\n  text-align: justify;\r\n}\r\n#columns section p:first-of-type {\r\n  font-weight: 700;\r\n}\r\n\r\n#skills h3 {\r\n  background: #ffcc00;\r\n  margin: 0 -3cm 1cm;\r\n  padding: 1cm 1cm 1cm 3cm;\r\n  width: 21cm;\r\n}\r\n#skills section {\r\n  padding: .5cm 0;\r\n}\r\ntable.GeneratedTable {\r\n  width: 100%;\r\n  background-color: #ffffff;\r\n  border-collapse: separate;\r\n  border-spacing: 0;\r\n  border-width: 2px;\r\n  border-color: #ffcc00;\r\n  border-style: solid;\r\n  color: #000000;\r\n}\r\n\r\ntable.GeneratedTable td, table.GeneratedTable th {\r\n  border-width: 2px;\r\n  border-color: #ffcc00;\r\n  border-style: solid;\r\n  padding: 3px;\r\n}\r\n\r\ntable.GeneratedTable thead {\r\n  background-color: #ffcc00;\r\n}\r\n#skills section#tablecontent::before {\r\n  background: url(https://raw.githubusercontent.com/CourtBouillon/weasyprint-samples/master/report/table-content.svg) no-repeat center #ffcc00;\r\n  background-size: 50%;\r\n  content: '';\r\n  display: inline-block;\r\n  float: left;\r\n  height: 2cm;\r\n  margin-right: .5cm;\r\n  vertical-align: middle;\r\n  width: 2cm;\r\n}\r\n#skills section#heading::before {\r\n  background: url(https://raw.githubusercontent.com/CourtBouillon/weasyprint-samples/master/report/heading.svg) no-repeat center #ffcc00;\r\n  background-size: 50%;\r\n  content: '';\r\n  display: inline-block;\r\n  float: left;\r\n  height: 2cm;\r\n  margin-right: .5cm;\r\n  vertical-align: middle;\r\n  width: 2cm;\r\n}\r\n#skills section#multicolumns::before {\r\n  background: url(https://raw.githubusercontent.com/CourtBouillon/weasyprint-samples/master/report/multi-columns.svg) no-repeat center #ffcc00;\r\n  background-size: 50%;\r\n  content: '';\r\n  display: inline-block;\r\n  float: left;\r\n  height: 2cm;\r\n  margin-right: .5cm;\r\n  vertical-align: middle;\r\n  width: 2cm;\r\n}\r\n#skills section#internallinks::before {\r\n  background: url(https://raw.githubusercontent.com/CourtBouillon/weasyprint-samples/master/report/internal-links.svg) no-repeat center #ffcc00;\r\n  background-size: 50%;\r\n  content: '';\r\n  display: inline-block;\r\n  float: left;\r\n  height: 2cm;\r\n  margin-right: .5cm;\r\n  vertical-align: middle;\r\n  width: 2cm;\r\n}\r\n#skills section#style::before {\r\n  background: url(https://raw.githubusercontent.com/CourtBouillon/weasyprint-samples/master/report/style.svg) no-repeat center #ffcc00;\r\n  background-size: 50%;\r\n  content: '';\r\n  display: inline-block;\r\n  float: left;\r\n  height: 2cm;\r\n  margin-right: .5cm;\r\n  vertical-align: middle;\r\n  width: 2cm;\r\n}\r\n#skills section h4 {\r\n  margin: 0;\r\n}\r\n#skills section p {\r\n  margin-top: 0;\r\n}\r\n\r\n#offers {\r\n  display: flex;\r\n  flex-wrap: wrap;\r\n  justify-content: space-between;\r\n}\r\n#offers h2, #offers h3 {\r\n  width: 100%;\r\n}\r\n#offers section {\r\n  width: 30%;\r\n}\r\n#offers section h4 {\r\n  margin-bottom: 0;\r\n}\r\n#offers section ul {\r\n  list-style: none;\r\n  margin: 0;\r\n  padding-left: 0;\r\n}\r\n#offers section ul li:not(:last-of-type) {\r\n  margin: .5cm 0;\r\n}\r\n#offers section p {\r\n  background: #ffcc00;\r\n  display: block;\r\n  font-size: 15pt;\r\n  font-weight: 700;\r\n  margin-bottom: 0;\r\n  padding: .25cm 0;\r\n  text-align: center;\r\n}\r\n\r\n#chapter {\r\n  align-items: center;\r\n  display: flex;\r\n  height: 297mm;\r\n  justify-content: center;\r\n  page: chapter;\r\n}\r\n\r\n#typography section {\r\n  display: flex;\r\n  flex-wrap: wrap;\r\n  margin: 1cm 0;\r\n}\r\n#typography section h4 {\r\n  border-top: 1pt solid;\r\n  flex: 1 25%;\r\n  margin: 0;\r\n}\r\n#typography section h4 + * {\r\n  flex: 1 75%;\r\n  margin: 0;\r\n  padding-left: .5cm;\r\n}\r\n#typography section p {\r\n  text-align: justify;\r\n}\r\n#typography section ul {\r\n  line-height: 2;\r\n  list-style: none;\r\n}\r\n#typography section#smallcaps p {\r\n  font-variant: small-caps;\r\n}\r\n#typography section#ligatures dl {\r\n  display: flex;\r\n  flex-wrap: wrap;\r\n}\r\n#typography section#ligatures dl dt {\r\n  font-weight: 400;\r\n  width: 30%;\r\n}\r\n#typography section#ligatures dl dd {\r\n  flex: 1 70%;\r\n  margin: 0;\r\n  padding: 0;\r\n}\r\n#typography section#ligatures .none {\r\n  font-variant-ligatures: none;\r\n}\r\n#typography section#ligatures .common {\r\n  font-variant-ligatures: common-ligatures;\r\n}\r\n#typography section#ligatures .discretionary {\r\n  font-variant-ligatures: discretionary-ligatures;\r\n}\r\n#typography section#ligatures .contextual {\r\n  font-variant-ligatures: contextual;\r\n}\r\n#typography section#numbers dl {\r\n  display: flex;\r\n  flex-wrap: wrap;\r\n}\r\n#typography section#numbers dl dt {\r\n  font-weight: 400;\r\n  width: 30%;\r\n}\r\n#typography section#numbers dl dd {\r\n  flex: 1 70%;\r\n  margin: 0;\r\n  padding: 0;\r\n}\r\n#typography section#numbers #fractions {\r\n  font-variant-numeric: diagonal-fractions;\r\n}\r\n#typography section#numbers #ordinals {\r\n  font-variant-numeric: ordinal;\r\n}\r\n#typography section#numbers #slashed {\r\n  font-variant-numeric: slashed-zero;\r\n}\r\n#typography section#numbers #super {\r\n  font-variant-position: super;\r\n}\r\n#typography section#numbers #sub {\r\n  font-variant-position: sub;\r\n}\r\n#typography section#figures dl {\r\n  columns: 4;\r\n}\r\n#typography section#figures dl dt {\r\n  font-weight: 400;\r\n}\r\n#typography section#figures dl dd {\r\n  display: flex;\r\n  margin: 0;\r\n  padding: 0;\r\n}\r\n#typography section#figures dl dd ul {\r\n  padding: 0 1em 0 0;\r\n}\r\n#typography section#figures #oldstyle {\r\n  font-variant-numeric: oldstyle-nums;\r\n}",
+    "template_md": "{% block content %}\r\n<style>\r\n  .disk-bar-container {\r\n    width: 100px;\r\n    height: 15px;\r\n    background-color: #e0e0e0;\r\n    border: 1px solid #ccc;\r\n    border-radius: 3px;\r\n    margin-top: 2px;\r\n    margin-bottom: 5px;\r\n    overflow: hidden;\r\n  }\r\n  .disk-bar {\r\n    height: 100%;\r\n    background-color: #4CAF50; /* Green */\r\n  }\r\n  .disk-bar.warning {\r\n    background-color: #ff9800; /* Orange */\r\n  }\r\n  .disk-bar.critical {\r\n    background-color: #f44336; /* Red */\r\n  }\r\n</style>\r\n\r\n~~A cover~~\r\n# Agent List for {{client.name}}\r\n<address>\r\nCompany\r\n123 anywhere st\r\nCity, State zip\r\n</address>\r\n<address>\r\nme@here.com\r\nhttps://example.com\r\n</address>\r\n~~/A~~\r\n~~A~~\r\n{{ client.name }} Agents List\r\n<div class=\"page-break\"></div>\r\n<table class=\"GeneratedTable\">\r\n  <thead>\r\n    <tr>\r\n      <td colspan=\"4\" rowspan=\"1\" style=\"vertical-align: top;\">Agent Info</td>\r\n      <td style=\"vertical-align: top;\">Site Name</td>\r\n    </tr>\r\n  </thead>\r\n  <tbody>\r\n    {% for item in data_sources.agentAllFields %}\r\n    <tr>\r\n      <td style=\"vertical-align: top; text-align: right; width: 100px;\">\r\n        <span style=\"font-weight: bold;\">Name:</span><br>\r\n        <span style=\"font-weight: bold;\">User:</span><br>\r\n        <span style=\"font-weight: bold;\">OS:</span><br>\r\n        <span style=\"font-weight: bold;\">Last Seen:</span><br>\r\n      </td>\r\n      <td style=\"vertical-align: top; width: 250px;\">\r\n        {{ item.hostname }}<br>\r\n        {{ item.last_logged_in_user }}<br>\r\n        {{ item.operating_system.split(',')[0] if item.operating_system else 'N/A' }}<br>\r\n        \r\n        <!-- THIS BLOCK IS NOW FIXED AND SAFE -->\r\n        {% if item.last_seen and report_run_timestamp and (report_run_timestamp - item.last_seen).days > 7 %}\r\n          <span style=\"color: red;\">{{ item.last_seen.strftime('%Y-%m-%d %H:%M') }}</span><br>\r\n        {% elif item.last_seen %}\r\n          {{ item.last_seen.strftime('%Y-%m-%d %H:%M') }}<br>\r\n        {% else %}\r\n          N/A<br>\r\n        {% endif %}\r\n\r\n      </td>\r\n      <td style=\"vertical-align: top; text-align: right; width: 100px;\">\r\n        <span style=\"font-weight: bold;\">CPU:</span><br>\r\n        <span style=\"font-weight: bold;\">RAM:</span><br>\r\n        <span style=\"font-weight: bold;\">Disks:</span><br>\r\n      </td>\r\n      <td style=\"vertical-align: top;\">\r\n        {{ item.wmi_detail.cpu[0][0].Name.replace('(R)', '').replace('(TM)', '').split('@')[0].strip() if item.wmi_detail and item.wmi_detail.cpu and item.wmi_detail.cpu[0][0].Name else 'N/A' }}<br>\r\n        {{ item.total_ram }}GB <br>\r\n        {% for disk in item.disks or [] %}\r\n          {% if not loop.previtem or loop.previtem.device != disk.device %}\r\n            {% set total_gb = disk.total | replace('GB','') | float(0) %}\r\n            {% set free_gb = disk.free | replace('GB','') | float(0) %}\r\n            {% set used_gb = total_gb - free_gb %}\r\n            {% set usage_percent = (used_gb / total_gb) * 100 if total_gb > 0 else 0 %}\r\n            \r\n            {% set bar_class = '' %}\r\n            {% if usage_percent > 90 %}\r\n              {% set bar_class = 'critical' %}\r\n            {% elif usage_percent > 80 %}\r\n              {% set bar_class = 'warning' %}\r\n            {% endif %}\r\n\r\n            {{ disk.device }} {{ disk.free }} free of {{ disk.total }}<br>\r\n            <div class=\"disk-bar-container\">\r\n              <div class=\"disk-bar {{ bar_class }}\" style=\"width: {{ usage_percent }}%;\"></div>\r\n            </div>\r\n          {% endif %}\r\n        {% else %}\r\n          N/A<br>\r\n        {% endfor %}\r\n      </td>\r\n      <td style=\"vertical-align: top;\">{{ item.site__name }}</td>\r\n    </tr>\r\n    {% endfor %}\r\n  </tbody>\r\n</table>\r\n~~/A~~\r\n{% endblock %}",
+    "type": "markdown",
+    "depends_on": [
+      "client"
+    ],
+    "template_variables": "data_sources:\n  agentAllFields:\n    only:\n      - hostname\n      - operating_system\n      - last_seen\n      - last_logged_in_user\n      - site__name\n      - wmi_detail\n      - total_ram\n      - disks\n    filter:\n      site__client_id: \"{{client.id}}\"\n    model: agent\nreport_run_timestamp: !now"
+  },
+  "assets": []
+}
\ No newline at end of file
diff --git a/templates/Agent_ListClientThenSite (csv) v1.1.json b/templates/Agent_ListClientThenSite (csv) v1.1.json
new file mode 100644
index 0000000..123b2b8
--- /dev/null
+++ b/templates/Agent_ListClientThenSite (csv) v1.1.json	
@@ -0,0 +1,12 @@
+{
+    "base_template": null,
+    "template": {
+        "name": "Agent_ListClientThenSite (csv) v1.1",
+        "template_css": "",
+        "template_md": "Client,Site,Hostname,Operating System,Last Boot Time,Offline Time (minutes),Overdue Time (minutes),Needs Reboot\n{% for agent in data_sources.agents %}{{ agent.site__client__name }},{{ agent.site__name }},{{ agent.hostname }},{{ agent.operating_system }},{% if agent.boot_time %}{{ (agent.boot_time | int) / 86400 + 25569 }}{% else %}Unknown{% endif %},{{ agent.offline_time if agent.offline_time else 0 }},{{ agent.overdue_time if agent.overdue_time else 0 }},{{ agent.needs_reboot }}\n{% endfor %}",
+        "type": "plaintext",
+        "depends_on": [],
+        "template_variables": "data_sources:\n  agents:\n    model: agent\n    only:\n      - site__client__name\n      - site__name\n      - hostname\n      - operating_system\n      - boot_time\n      - offline_time\n      - overdue_time\n      - needs_reboot\n    order_by: \n      - -site__client__name\n      - site__name\n      - hostname\n    select_related:\n      - site\n      - site__client"
+    },
+    "assets": []
+}
\ No newline at end of file
diff --git a/templates/Agent_ListClientThenSite (csv).json b/templates/Agent_ListClientThenSite (csv).json
deleted file mode 100644
index 4df95d6..0000000
--- a/templates/Agent_ListClientThenSite (csv).json	
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "base_template": null,
-    "template": {
-        "name": "Agent_ListClientThenSite (csv)",
-        "template_css": "",
-        "template_md": "{{ data_sources.agents }}",
-        "type": "plaintext",
-        "depends_on": [],
-        "template_variables": "data_sources:\n  agents:\n    model: agent\n    only:\n      - site__client__name\n      - site__name\n      - hostname\n      - operating_system\n    order_by: \n      - -site__client__name\n      - site__name\n      - hostname\n    select_related:\n      - site\n      - site__client\n    csv: \n      site__client__name: Client\n      site__name: Site\n      hostname: Hostname\n      operating_system: Operating System"
-    },
-    "assets": []
-}
\ No newline at end of file

From 22f2cf41a3242bdde8742004d1fac4a6ba9c17fe Mon Sep 17 00:00:00 2001
From: silversword411 <github.com@datmail.com>
Date: Wed, 25 Feb 2026 22:02:07 -0500
Subject: [PATCH 5/6] NoneType is not iterable Fixing reports

---
 ... Log (csv).json => All Fields - Audit Log (csv) v1.1.json} | 4 ++--
 ...Machine Specs (csv).json => Machine Specs (csv) v1.1.json} | 4 ++--
 ...gent (csv).json => Software List_By Agent (csv) v1.1.json} | 4 ++--
 ...sv).json => Software Report Full_By Agent (csv) v1.1.json} | 4 ++--
 ...v).json => Software Report Full_By Client (csv) v1.1.json} | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)
 rename templates/{All Fields - Audit Log (csv).json => All Fields - Audit Log (csv) v1.1.json} (86%)
 rename templates/{Machine Specs (csv).json => Machine Specs (csv) v1.1.json} (76%)
 rename templates/{Software List_By Agent (csv).json => Software List_By Agent (csv) v1.1.json} (57%)
 rename templates/{Software Report Full_By Agent (csv).json => Software Report Full_By Agent (csv) v1.1.json} (68%)
 rename templates/{Software Report Full_By Client (csv).json => Software Report Full_By Client (csv) v1.1.json} (68%)

diff --git a/templates/All Fields - Audit Log (csv).json b/templates/All Fields - Audit Log (csv) v1.1.json
similarity index 86%
rename from templates/All Fields - Audit Log (csv).json
rename to templates/All Fields - Audit Log (csv) v1.1.json
index d48743f..19b14db 100644
--- a/templates/All Fields - Audit Log (csv).json	
+++ b/templates/All Fields - Audit Log (csv) v1.1.json	
@@ -1,9 +1,9 @@
 {
     "base_template": null,
     "template": {
-        "name": "All Fields - Audit Log (csv)",
+        "name": "All Fields - Audit Log (csv) v1.1",
         "template_css": "",
-        "template_md": "id, username, agent, agent_id, entry_time, action, object_type, before_value, after_value, message, debug_info, debug_info.ip\r\n{% for item in data_sources.allFieldsAuditLog %}{{ item.id }}, {{ item.username }}, {{ item.agent }}, {{ item.agent_id }}, {{ item.entry_time }}, {{ item.action }}, {{ item.object_type }}, {{ item.before_value }}, {{ item.after_value }}, {{ item.message }}, {{ item.debug_info }}, {{ item.debug_info.ip }}\r\n{% endfor %}",
+        "template_md": "id, username, agent, agent_id, entry_time, action, object_type, before_value, after_value, message, debug_info, debug_info.ip\r\n{% for item in data_sources.allFieldsAuditLog %}{{ item.id }}, {{ item.username }}, {{ item.agent }}, {{ item.agent_id }}, {{ item.entry_time }}, {{ item.action }}, {{ item.object_type }}, {{ item.before_value }}, {{ item.after_value }}, {{ item.message }}, {{ item.debug_info }}, {{ item.debug_info.ip if item.debug_info else 'N/A' }}\r\n{% endfor %}",
         "type": "plaintext",
         "depends_on": [],
         "template_variables": "data_sources:\n  allFieldsAuditLog:\n    limit: 1000\n    model: auditlog\n"
diff --git a/templates/Machine Specs (csv).json b/templates/Machine Specs (csv) v1.1.json
similarity index 76%
rename from templates/Machine Specs (csv).json
rename to templates/Machine Specs (csv) v1.1.json
index 00c7f9b..04042d6 100644
--- a/templates/Machine Specs (csv).json	
+++ b/templates/Machine Specs (csv) v1.1.json	
@@ -1,9 +1,9 @@
 {
     "base_template": null,
     "template": {
-        "name": "Machine Specs (csv)",
+        "name": "Machine Specs (csv) v1.1",
         "template_css": "",
-        "template_md": "Device Name, User, Device OS, CPU, RAM, HDD \r\n{% for item in data_sources.agents %}{{item.hostname if item.hostname else 'N/A'}},{{item.last_logged_in_user if item.last_logged_in_user else 'N/A'}},{{item.operating_system|replace(\",\", \"\") if item.operating_system else 'N/A'}},{{item.wmi_detail.cpu[0][0].Name if item.wmi_detail and item.wmi_detail.cpu and item.wmi_detail.cpu[0][0].Name else 'N/A'}},{{item.total_ram if item.total_ram else 'N/A'}} GB,{% for disk in item.disks %}{% if not loop.previtem or loop.previtem.device != disk.device %}{{disk.device}} {{disk.total}},{% endif %}{% else %}N/A,{% endfor %}\r\n{% endfor %}",
+        "template_md": "Device Name, User, Device OS, CPU, RAM, HDD \r\n{% for item in data_sources.agents %}{{item.hostname if item.hostname else 'N/A'}},{{item.last_logged_in_user if item.last_logged_in_user else 'N/A'}},{{item.operating_system|replace(\",\", \"\") if item.operating_system else 'N/A'}},{{item.wmi_detail.cpu[0][0].Name if item.wmi_detail and item.wmi_detail.cpu and item.wmi_detail.cpu[0][0].Name else 'N/A'}},{{item.total_ram if item.total_ram else 'N/A'}} GB,{% for disk in item.disks | default([]) %}{% if not loop.previtem or loop.previtem.device != disk.device %}{{disk.device}} {{disk.total}},{% endif %}{% else %}N/A,{% endfor %}\r\n{% endfor %}",
         "type": "plaintext",
         "depends_on": [
             "client"
diff --git a/templates/Software List_By Agent (csv).json b/templates/Software List_By Agent (csv) v1.1.json
similarity index 57%
rename from templates/Software List_By Agent (csv).json
rename to templates/Software List_By Agent (csv) v1.1.json
index 683d5a6..b873956 100644
--- a/templates/Software List_By Agent (csv).json	
+++ b/templates/Software List_By Agent (csv) v1.1.json	
@@ -1,9 +1,9 @@
 {
     "base_template": null,
     "template": {
-        "name": "Software List_By Agent (csv)",
+        "name": "Software List_By Agent (csv) v1.1",
         "template_css": "",
-        "template_md": "Client, Agent, Software Name, Version, Publisher\r\n<!-- loop through each agent returns | loop through software and only return the software we are looking for | only add row if software name matches -->\r\n{% for record in data_sources.agentSoftware %}{% for software in record.software %}{% if software.name.startswith(software_name) %}{% if software.version != target_version %}{% endif %}{{ record.agent__site__client__name }}, {{ record.agent__hostname }}, {{ software.name }}, {{ software.version }}, {{ software.publisher }}\r\n{% endif %}{% endfor %}{% endfor %}",
+        "template_md": "Client, Agent, Software Name, Version, Publisher\r\n{% for record in data_sources.agentSoftware %}{% for software in record.software | default([]) %}{% if software.name.startswith(software_name) %}{% if software.version.startswith(target_version) %}{{ record.agent__site__client__name }}, {{ record.agent__hostname }}, {{ software.name }}, {{ software.version }}, {{ software.publisher }}\r\n{% endif %}{% endif %}{% endfor %}{% endfor %}",
         "type": "plaintext",
         "depends_on": [
             "software_name",
diff --git a/templates/Software Report Full_By Agent (csv).json b/templates/Software Report Full_By Agent (csv) v1.1.json
similarity index 68%
rename from templates/Software Report Full_By Agent (csv).json
rename to templates/Software Report Full_By Agent (csv) v1.1.json
index 51919dc..e332c07 100644
--- a/templates/Software Report Full_By Agent (csv).json	
+++ b/templates/Software Report Full_By Agent (csv) v1.1.json	
@@ -1,9 +1,9 @@
 {
     "base_template": null,
     "template": {
-        "name": "Software Report Full_By Agent (csv)",
+        "name": "Software Report Full_By Agent (csv) v1.1",
         "template_css": "",
-        "template_md": "Software Audit Report - {{agent.hostname}}\r\nSoftware Name, Version, Publisher\r\n{% for record in data_sources.agentSoftware %}{% for software in record.software %}{{ software.name or 'N/A' }}, {{ software.version or 'N/A' }}, {{ software.publisher or 'N/A' }}\r\n{% endfor %}{% endfor %}",
+        "template_md": "Software Audit Report - {{agent.hostname}}\r\nSoftware Name, Version, Publisher\r\n{% for record in data_sources.agentSoftware %}{% for software in record.software | default([]) %}{{ software.name or 'N/A' }}, {{ software.version or 'N/A' }}, {{ software.publisher or 'N/A' }}\r\n{% endfor %}{% endfor %}",
         "type": "plaintext",
         "depends_on": [
             "agent"
diff --git a/templates/Software Report Full_By Client (csv).json b/templates/Software Report Full_By Client (csv) v1.1.json
similarity index 68%
rename from templates/Software Report Full_By Client (csv).json
rename to templates/Software Report Full_By Client (csv) v1.1.json
index e6a1b59..2cf2af3 100644
--- a/templates/Software Report Full_By Client (csv).json	
+++ b/templates/Software Report Full_By Client (csv) v1.1.json	
@@ -1,9 +1,9 @@
 {
     "base_template": null,
     "template": {
-        "name": "Software Report Full_By Client (csv)",
+        "name": "Software Report Full_By Client (csv) v1.1",
         "template_css": "",
-        "template_md": "Device Name, Software Name, Version, Publisher\r\n{% for record in data_sources.agentSoftware %}{% for software in record.software %}{{ record.agent__hostname or 'N/A' }}, {{ software.name or 'N/A' }}, {{ software.version or 'N/A' }}, {{ software.publisher or 'N/A' }}\r\n{% endfor %}{% endfor %}",
+        "template_md": "Device Name, Software Name, Version, Publisher\r\n{% for record in data_sources.agentSoftware %}{% for software in record.software | default([]) %}{{ record.agent__hostname or 'N/A' }}, {{ software.name or 'N/A' }}, {{ software.version or 'N/A' }}, {{ software.publisher or 'N/A' }}\r\n{% endfor %}{% endfor %}",
         "type": "plaintext",
         "depends_on": [
             "client"

From 96bbb170f624240e24a9d6b6d325343d9bbc8a24 Mon Sep 17 00:00:00 2001
From: silversword411 <github.com@datmail.com>
Date: Wed, 25 Feb 2026 22:23:59 -0500
Subject: [PATCH 6/6] Fixing name convention and index

---
 index.json                                    | 32 +++++++++----------
 ...ced DataTables_By Client (html) v1.2.json} |  6 ++--
 2 files changed, 19 insertions(+), 19 deletions(-)
 rename templates/{Software Report - Advanced DataTables.json => Software Report - Advanced DataTables_By Client (html) v1.2.json} (66%)

diff --git a/index.json b/index.json
index dae30d6..32d9b70 100644
--- a/index.json
+++ b/index.json
@@ -12,8 +12,8 @@
     "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Agent%20List_By%20Client%20%28pdf%29.json"
   },
   {
-    "name": "Agent List_By Client with Specs (pdf) v1.3",
-    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Agent%20List_By%20Client%20with%20Specs%20%28pdf%29%20v1.3.json"
+    "name": "Agent List_By Client with Specs (pdf) v1.6",
+    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Agent%20List_By%20Client%20with%20Specs%20%28pdf%29%20v1.6.json"
   },
   {
     "name": "Agent Specs (md)",
@@ -28,8 +28,8 @@
     "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Agent%20Uptime_By%20Client%20%28html%29%20v1.5.json"
   },
   {
-    "name": "Agent_ListClientThenSite (csv)",
-    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Agent_ListClientThenSite%20%28csv%29.json"
+    "name": "Agent_ListClientThenSite (csv) v1.1",
+    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Agent_ListClientThenSite%20%28csv%29%20v1.1.json"
   },
   {
     "name": "Agent_ListClientThenSite-alt (csv)",
@@ -80,8 +80,8 @@
     "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/All%20Fields%20-%20Audit%20Log.json"
   },
   {
-    "name": "All Fields - Audit Log (csv)",
-    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/All%20Fields%20-%20Audit%20Log%20%28csv%29.json"
+    "name": "All Fields - Audit Log (csv) v1.1",
+    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/All%20Fields%20-%20Audit%20Log%20%28csv%29%20v1.1.json"
   },
   {
     "name": "All Fields - Automated Tasks",
@@ -168,8 +168,8 @@
     "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Device%20Inventory%20Report%20-%20Advanced%20DataTables%20v1.9.json"
   },
   {
-    "name": "Machine Specs (csv)",
-    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Machine%20Specs%20%28csv%29.json"
+    "name": "Machine Specs (csv) v1.1",
+    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Machine%20Specs%20%28csv%29%20v1.1.json"
   },
   {
     "name": "NOC Dashboard v1.31",
@@ -188,24 +188,24 @@
     "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Software%20Inventory_By%20Software%20Name.json"
   },
   {
-    "name": "Software List_By Agent (csv)",
-    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Software%20List_By%20Agent%20%28csv%29.json"
+    "name": "Software List_By Agent (csv) v1.1",
+    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Software%20List_By%20Agent%20%28csv%29%20v1.1.json"
   },
   {
-    "name": "Software Report - Advanced DataTables",
-    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Software%20Report%20-%20Advanced%20DataTables.json"
+    "name": "Software Report - Advanced DataTables_By Client (html) v1.2",
+    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Software%20Report%20-%20Advanced%20DataTables_By%20Client%20%28html%29%20v1.2.json"
   },
   {
-    "name": "Software Report Full_By Agent (csv)",
-    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Software%20Report%20Full_By%20Agent%20%28csv%29.json"
+    "name": "Software Report Full_By Agent (csv) v1.1",
+    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Software%20Report%20Full_By%20Agent%20%28csv%29%20v1.1.json"
   },
   {
     "name": "Software Report Full_By Agent (md)",
     "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Software%20Report%20Full_By%20Agent%20%28md%29.json"
   },
   {
-    "name": "Software Report Full_By Client (csv)",
-    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Software%20Report%20Full_By%20Client%20%28csv%29.json"
+    "name": "Software Report Full_By Client (csv) v1.1",
+    "download_url": "https://raw.githubusercontent.com/amidaware/reporting-templates/master/templates/Software%20Report%20Full_By%20Client%20%28csv%29%20v1.1.json"
   },
   {
     "name": "Software Report Full_By Client (md)",
diff --git a/templates/Software Report - Advanced DataTables.json b/templates/Software Report - Advanced DataTables_By Client (html) v1.2.json
similarity index 66%
rename from templates/Software Report - Advanced DataTables.json
rename to templates/Software Report - Advanced DataTables_By Client (html) v1.2.json
index 959fde7..6b2c422 100644
--- a/templates/Software Report - Advanced DataTables.json	
+++ b/templates/Software Report - Advanced DataTables_By Client (html) v1.2.json	
@@ -1,9 +1,9 @@
 {
   "base_template": null,
   "template": {
-    "name": "Software Report - Advanced DataTables",
+    "name": "Software Report - Advanced DataTables_By Client (html) v1.2",
     "template_css": "",
-    "template_md": "<!DOCTYPE html>\r\n<html lang=\"en\">\r\n<head>\r\n    <meta charset=\"UTF-8\">\r\n    <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">\r\n    <title>{{ client.name }} | Software Inventory Report</title>\r\n    <link rel=\"stylesheet\" href=\"https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css\">\r\n    <link rel=\"stylesheet\" type=\"text/css\" href=\"https://cdn.datatables.net/1.13.7/css/jquery.dataTables.min.css\">\r\n    <link rel=\"stylesheet\" type=\"text/css\" href=\"https://cdn.datatables.net/searchpanes/2.2.0/css/searchPanes.dataTables.min.css\">\r\n    <link rel=\"stylesheet\" type=\"text/css\" href=\"https://cdn.datatables.net/select/1.7.0/css/select.dataTables.min.css\">\r\n    <style>\r\n        body {\r\n            padding: 20px;\r\n        }\r\n        \r\n        .container-fluid {\r\n            max-width: 2500px;\r\n            margin: 0 auto;\r\n            padding-left: 30px;\r\n            padding-right: 30px;\r\n        }\r\n        \r\n        .card {\r\n            margin-bottom: 20px;\r\n        }\r\n        \r\n        .card-header {\r\n            background-color: #f8f9fa;\r\n            padding: 5px 20px;\r\n        }\r\n        \r\n        .card-body {\r\n            padding: 20px;\r\n        }\r\n        \r\n        #loading {\r\n            display: flex;\r\n            justify-content: center;\r\n            align-items: center;\r\n            height: 200px;\r\n            font-size: 18px;\r\n            font-weight: bold;\r\n        }\r\n        \r\n        #softwareTable {\r\n            display: none;\r\n        }\r\n        \r\n        div.dtsp-verticalContainer {\r\n            display: flex;\r\n            flex-direction: row;\r\n            flex-wrap: nowrap;\r\n            justify-content: flex-start;\r\n            align-items: flex-start;\r\n            padding-left: 10px;\r\n            padding-right: 10px;\r\n        }\r\n        \r\n        div.dtsp-verticalContainer div.dtsp-verticalPanes {\r\n            flex-basis: 300px;\r\n            flex-shrink: 0;\r\n            margin-right: 30px;\r\n        }\r\n        \r\n        div.dtsp-verticalContainer div.container-fluid {\r\n            flex-grow: 1;\r\n        }\r\n        \r\n        div.dtsp-panesContainer {\r\n            border: 1px solid #ccc;\r\n            border-radius: 6px;\r\n            padding: 15px;\r\n        }\r\n\r\n        .dataTables_length select {\r\n            width: auto;\r\n            padding: 5px;\r\n            border-radius: 4px;\r\n            border: 1px solid #ccc;\r\n        }\r\n\r\n        .dataTables_length {\r\n            float: left;\r\n            margin-left: 20px;\r\n            margin-top: 10px;\r\n        }\r\n        \r\n        .dataTables_info {\r\n            clear: none;\r\n            float: left;\r\n            margin-top: 5px;\r\n        }\r\n        \r\n        .dataTables_length select {\r\n            width: auto;\r\n            padding: 5px;\r\n            border-radius: 4px;\r\n            border: 1px solid #ccc;\r\n        }\r\n    </style>\r\n</head>\r\n<body>\r\n    <div class=\"container-fluid\">\r\n        <div class=\"card\">\r\n            <div class=\"card-header\">\r\n                <h2 style=\"text-align: center;\">{{ client.name }}'s Software Inventory Report</h2>\r\n                <p style=\"text-align: center;\">Below is a list of all software currently installed on computers in your organization. This data was exported on {{datetime.date.today()}} and may not reflect the current status.</p>\r\n            </div>\r\n            <div class=\"card-body\">\r\n                <div class=\"dtsp-verticalContainer\">\r\n                    <div class=\"dtsp-verticalPanes\"></div>\r\n                    <div class=\"container-fluid\">\r\n                        <div id=\"loading\">Loading...</div>\r\n                        <table id=\"softwareTable\" class=\"display nowrap\" width=\"100%\">\r\n                            <thead>\r\n                                <tr>\r\n                                    <th>Hostname</th>\r\n                                    <th>Last User</th>\r\n                                    <th>Site Name</th>\r\n                                    <th>Software Name</th>\r\n                                    <th>Publisher</th>\r\n                                    <th>Install Date</th>\r\n                                </tr>\r\n                            </thead>\r\n                            <tbody>\r\n                                {% for data in data_sources.agentSoftware %}\r\n                                    {% for software in data.software %}\r\n                                        <tr>\r\n                                            <td>{{ data.agent__hostname }}</td>\r\n                                            <td>{{ data.agent__last_logged_in_user }}</td>\r\n                                            <td>{{ data.agent__site__name }}</td>\r\n                                            <td>{{ software.name }}</td>\r\n                                            <td>{{ software.publisher }}</td>\r\n                                            <td>{{ software.install_date }}</td>\r\n                                        </tr>\r\n                                    {% endfor %}\r\n                                {% else %}\r\n                                    <tr>\r\n                                        <td colspan=\"6\">No software found.</td>\r\n                                    </tr>\r\n                                {% endfor %}\r\n                            </tbody>\r\n                        </table>\r\n                    </div>\r\n                </div>\r\n            </div>\r\n        </div>\r\n    </div>\r\n\r\n    <script type=\"text/javascript\" src=\"https://code.jquery.com/jquery-3.7.0.js\"></script>\r\n    <script type=\"text/javascript\" src=\"https://cdn.datatables.net/1.13.7/js/jquery.dataTables.min.js\"></script>\r\n    <script type=\"text/javascript\" src=\"https://cdn.datatables.net/searchpanes/2.2.0/js/dataTables.searchPanes.min.js\"></script>\r\n    <script type=\"text/javascript\" src=\"https://cdn.datatables.net/select/1.7.0/js/dataTables.select.min.js\"></script>\r\n\r\n    <script>\r\n        $(document).ready(function() {\r\n            var table = $('#softwareTable').DataTable({\r\n                searchPanes: {\r\n                    layout: 'columns-1'\r\n                },\r\n                dom: '<\"dtsp-dataTable\"frtilp>',\r\n                pageLength: 40,\r\n                lengthMenu: [[10, 25, 50, 100, -1], [10, 25, 50, 100, 'All']],\r\n                language: {\r\n                    lengthMenu: \"Show _MENU_ entries\",\r\n                    info: \"Showing _START_ to _END_ of _TOTAL_ entries\"\r\n                }\r\n            });\r\n            table.searchPanes();\r\n            $(\"div.dtsp-verticalPanes\").append(table.searchPanes.container());\r\n            \r\n            // Hide the loading message and show the table\r\n            $('#loading').hide();\r\n            $('#softwareTable').show();\r\n        });\r\n    </script>\r\n</body>\r\n</html>",
+    "template_md": "<!DOCTYPE html>\r\n<html lang=\"en\">\r\n<head>\r\n    <meta charset=\"UTF-8\">\r\n    <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">\r\n    <title>{{ client.name }} | Software Inventory Report</title>\r\n    <link rel=\"stylesheet\" href=\"https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css\">\r\n    <link rel=\"stylesheet\" type=\"text/css\" href=\"https://cdn.datatables.net/1.13.7/css/jquery.dataTables.min.css\">\r\n    <link rel=\"stylesheet\" type=\"text/css\" href=\"https://cdn.datatables.net/searchpanes/2.2.0/css/searchPanes.dataTables.min.css\">\r\n    <link rel=\"stylesheet\" type=\"text/css\" href=\"https://cdn.datatables.net/select/1.7.0/css/select.dataTables.min.css\">\r\n    <style>\r\n        body {\r\n            padding: 20px;\r\n        }\r\n        \r\n        .container-fluid {\r\n            max-width: 2500px;\r\n            margin: 0 auto;\r\n            padding-left: 30px;\r\n            padding-right: 30px;\r\n        }\r\n        \r\n        .card {\r\n            margin-bottom: 20px;\r\n        }\r\n        \r\n        .card-header {\r\n            background-color: #f8f9fa;\r\n            padding: 5px 20px;\r\n        }\r\n        \r\n        .card-body {\r\n            padding: 20px;\r\n        }\r\n        \r\n        #loading {\r\n            display: flex;\r\n            justify-content: center;\r\n            align-items: center;\r\n            height: 200px;\r\n            font-size: 18px;\r\n            font-weight: bold;\r\n        }\r\n        \r\n        #softwareTable {\r\n            display: none;\r\n        }\r\n        \r\n        div.dtsp-verticalContainer {\r\n            display: flex;\r\n            flex-direction: row;\r\n            flex-wrap: nowrap;\r\n            justify-content: flex-start;\r\n            align-items: flex-start;\r\n            padding-left: 10px;\r\n            padding-right: 10px;\r\n        }\r\n        \r\n        div.dtsp-verticalContainer div.dtsp-verticalPanes {\r\n            flex-basis: 300px;\r\n            flex-shrink: 0;\r\n            margin-right: 30px;\r\n        }\r\n        \r\n        div.dtsp-verticalContainer div.container-fluid {\r\n            flex-grow: 1;\r\n        }\r\n        \r\n        div.dtsp-panesContainer {\r\n            border: 1px solid #ccc;\r\n            border-radius: 6px;\r\n            padding: 15px;\r\n        }\r\n\r\n        .dataTables_length select {\r\n            width: auto;\r\n            padding: 5px;\r\n            border-radius: 4px;\r\n            border: 1px solid #ccc;\r\n        }\r\n\r\n        .dataTables_length {\r\n            float: left;\r\n            margin-left: 20px;\r\n            margin-top: 10px;\r\n        }\r\n        \r\n        .dataTables_info {\r\n            clear: none;\r\n            float: left;\r\n            margin-top: 5px;\r\n        }\r\n        \r\n        .dataTables_length select {\r\n            width: auto;\r\n            padding: 5px;\r\n            border-radius: 4px;\r\n            border: 1px solid #ccc;\r\n        }\r\n    </style>\r\n</head>\r\n<body>\r\n    <div class=\"container-fluid\">\r\n        <div class=\"card\">\r\n            <div class=\"card-header\">\r\n                <h2 style=\"text-align: center;\">{{ client.name }}'s Software Inventory Report</h2>\r\n                <p style=\"text-align: center;\">Below is a list of all software currently installed on computers in your organization. This data was exported on {{datetime.date.today()}} and may not reflect the current status.</p>\r\n            </div>\r\n            <div class=\"card-body\">\r\n                <div class=\"dtsp-verticalContainer\">\r\n                    <div class=\"dtsp-verticalPanes\"></div>\r\n                    <div class=\"container-fluid\">\r\n                        <div id=\"loading\">Loading...</div>\r\n                        <table id=\"softwareTable\" class=\"display nowrap\" width=\"100%\">\r\n                            <thead>\r\n                                <tr>\r\n                                    <th>Hostname</th>\r\n                                    <th>Last User</th>\r\n                                    <th>Site Name</th>\r\n                                    <th>Software Name</th>\r\n                                    <th>Publisher</th>\r\n                                    <th>Install Date</th>\r\n                                </tr>\r\n                            </thead>\r\n                            <tbody>\r\n                                {% for data in data_sources.agentSoftware %}\r\n                                    {% for software in data.software | default([]) %}\r\n                                        <tr>\r\n                                            <td>{{ data.agent__hostname }}</td>\r\n                                            <td>{{ data.agent__last_logged_in_user }}</td>\r\n                                            <td>{{ data.agent__site__name }}</td>\r\n                                            <td>{{ software.name }}</td>\r\n                                            <td>{{ software.publisher }}</td>\r\n                                            <td>{{ software.install_date }}</td>\r\n                                        </tr>\r\n                                    {% endfor %}\r\n                                {% else %}\r\n                                    <tr>\r\n                                        <td colspan=\"6\">No software found.</td>\r\n                                    </tr>\r\n                                {% endfor %}\r\n                            </tbody>\r\n                        </table>\r\n                    </div>\r\n                </div>\r\n            </div>\r\n        </div>\r\n    </div>\r\n\r\n    <script type=\"text/javascript\" src=\"https://code.jquery.com/jquery-3.7.0.js\"></script>\r\n    <script type=\"text/javascript\" src=\"https://cdn.datatables.net/1.13.7/js/jquery.dataTables.min.js\"></script>\r\n    <script type=\"text/javascript\" src=\"https://cdn.datatables.net/searchpanes/2.2.0/js/dataTables.searchPanes.min.js\"></script>\r\n    <script type=\"text/javascript\" src=\"https://cdn.datatables.net/select/1.7.0/js/dataTables.select.min.js\"></script>\r\n\r\n    <script>\r\n        $(document).ready(function() {\r\n            var table = $('#softwareTable').DataTable({\r\n                searchPanes: {\r\n                    layout: 'columns-1'\r\n                },\r\n                dom: '<\"dtsp-dataTable\"frtilp>',\r\n                pageLength: 40,\r\n                lengthMenu: [[10, 25, 50, 100, -1], [10, 25, 50, 100, 'All']],\r\n                language: {\r\n                    lengthMenu: \"Show _MENU_ entries\",\r\n                    info: \"Showing _START_ to _END_ of _TOTAL_ entries\"\r\n                }\r\n            });\r\n            table.searchPanes();\r\n            $(\"div.dtsp-verticalPanes\").append(table.searchPanes.container());\r\n            \r\n            // Hide the loading message and show the table\r\n            $('#loading').hide();\r\n            $('#softwareTable').show();\r\n        });\r\n    </script>\r\n</body>\r\n</html>",
     "type": "html",
     "depends_on": [
       "client"
@@ -11,4 +11,4 @@
     "template_variables": "data_sources:\r\n  agentSoftware:\r\n    model: installedsoftware\r\n    filter:\r\n      agent__site__client__id: \"{{client.id}}\"\r\n    only:\r\n      - software\r\n      - agent__hostname\r\n      - agent__site__name\r\n      - agent__site__client\r\n      - agent__last_logged_in_user"
   },
   "assets": []
-}
+}
\ No newline at end of file