From 20d58288034f116389115a45236c4d02868bb4a7 Mon Sep 17 00:00:00 2001
From: Brian Read <brianr@bjsystems.co.uk>
Date: Fri, 13 Sep 2024 16:36:57 +0100
Subject: [PATCH] Maily debugging info to find reason nfsshare works but
 diskusage fails

---
 Targets/_du_PARAMS.html.ep          |  12 +-
 Targets/diskusage.html.ep           |   4 +-
 Templates/html_controls.html.ep.xml |   6 +-
 json5/CreateStarterWebsite.json5    |   2 +-
 json5/DiskUsage.json5               |  55 ++-
 sm1-html-2-json5.py                 |   2 +-
 sm2gen.py                           | 659 ++++++++++++++--------------
 7 files changed, 371 insertions(+), 369 deletions(-)

diff --git a/Targets/_du_PARAMS.html.ep b/Targets/_du_PARAMS.html.ep
index 367a34e..15cebe4 100644
--- a/Targets/_du_PARAMS.html.ep
+++ b/Targets/_du_PARAMS.html.ep
@@ -1,7 +1,7 @@
 %#
-%# Generated by SM2Gen version:0.8 Chameleon version:3.8.1 On Python:3.12.3 ( at 2024-09-12 19:46 
+%# Generated by SM2Gen version:0.8 Chameleon version:3.8.1 On Python:3.12.3 at 2024-09-13 15:33 
 %#
-<div id="DiskUsage-PARAMS" class="partial DiskUsage-PARAMS">
+<div id="Diskusage-PARAMS" class="partial Diskusage-PARAMS">
   <script>
     window.onload = function() {
       SelectInput();
@@ -11,7 +11,7 @@
      %= l('du Hello PARAMS');
      </h2>
     % my $btn = l('APPLY');
-    %= form_for "DiskUsaged" => (method => 'POST') => begin
+    %= form_for "Diskusaged" => (method => 'POST') => begin
 
    	    % param 'trt' => ${prefix}_data->{trt} unless param 'trt';
 		%= hidden_field 'trt' => ${prefix}_data->{trt}
@@ -27,15 +27,15 @@
 			%= l('Wed Sep 11 19:01:00 BST 2024')
 		</p>
 	
-		<pre>
-			Filesystem             Size  Used Avail Use% Mounted on
+<pre>
+	Filesystem             Size  Used Avail Use% Mounted on
 /dev/mapper/main-root   29G  4.8G   24G  17% /
 devtmpfs               2.0G     0  2.0G   0% /dev
 tmpfs                  2.0G   12K  2.0G   1% /dev/shm
 tmpfs                  2.0G     0  2.0G   0% /sys/fs/cgroup
 tmpfs                  2.0G  648K  2.0G   1% /run
 /dev/sda1              497M  111M  386M  23% /boot'
-		</pre>
+</pre>
 	
 	
 		<br /><table class="sme-border TableSort sme-table">
diff --git a/Targets/diskusage.html.ep b/Targets/diskusage.html.ep
index 952a523..125e443 100644
--- a/Targets/diskusage.html.ep
+++ b/Targets/diskusage.html.ep
@@ -1,9 +1,9 @@
 % layout 'default', title => "Sme server 2 - Disk Usage", share_dir => './';
 %#
-%# Generated by SM2Gen version:0.8 Chameleon version:3.8.1 On Python:3.12.3 ( at 2024-09-12 19:46 
+%# Generated by SM2Gen version:0.8 Chameleon version:3.8.1 On Python:3.12.3 at 2024-09-13 15:33 
 %#
 % content_for 'module' => begin
-<div id="module" class="module DiskUsage-panel">
+<div id="module" class="module Diskusage-panel">
 
     % if ($config->{debug} == 1) {
 	<p>
diff --git a/Templates/html_controls.html.ep.xml b/Templates/html_controls.html.ep.xml
index 9d31aa9..88607b1 100644
--- a/Templates/html_controls.html.ep.xml
+++ b/Templates/html_controls.html.ep.xml
@@ -119,9 +119,9 @@
 	</Table>
 	
 	<Preformatted><![CDATA[
-		<pre>
-			${value}'
-		</pre>
+<pre>
+	${value}'
+</pre>
 	]]>
 	</Preformatted>
 	
diff --git a/json5/CreateStarterWebsite.json5 b/json5/CreateStarterWebsite.json5
index 9a1322f..26f0efd 100644
--- a/json5/CreateStarterWebsite.json5
+++ b/json5/CreateStarterWebsite.json5
@@ -15,7 +15,7 @@
         'Paragraph1': 'To create a simple web page for your company, fill \n\t  in the fields below and click onCreate.',
         'Paragraph2': 'You can leave any field blank if you do not need it.',
         'Paragraph3': 'The text that you enter below will be line wrapped \n\t  for a nicer appearance in your web page. Leave a blank line \n\t  whenever you want to start a new paragraph. If you need \n\t  to force a line break without starting a new paragraph (for \n\t  example after each line of a mailing address), then type \n\t  the four-character sequence',
-        'Paragraph4': 'Do not use this optionif you have already customized your web site, since it will \n\t  overwrite the \'index.htm\' file in your web site directory.',
+        'Paragraph4': 'Do not use this option if you have already customized your web site, since it will \n\t  overwrite the \'index.htm\' file in your web site directory.',
         'Input1': {
             'Type': 'Text',
             'Value': '',
diff --git a/json5/DiskUsage.json5 b/json5/DiskUsage.json5
index d3ff96c..4e5b0ff 100644
--- a/json5/DiskUsage.json5
+++ b/json5/DiskUsage.json5
@@ -1,48 +1,47 @@
 {
-    'PackageName': 'DiskUsage',
-    'prefix': 'du',
-    'MenuHeading': 'Miscellaneous',
-    'MenuDescription': 'Disk Usage',
-    'MenuNavigation': '2000 400',
-    'firstPanel': 'PARAMS',
-    'signalEvent': 'smeserver-diskusage-update',
-    'html': [ {
-        'Name': 'params',
-        'route': 'PARAMS',
-        'Header': 'Disk usage',
-        'SubHeader': 'Manage DiskUsage settings:',
-        'Paragraph1': '&nbsp',
-        'Paragraph2': 'Wed Sep 11 19:01:00 BST 2024',
-        'Preformatted1': 'Filesystem             Size  Used Avail Use% Mounted on\n/dev/mapper/main-root   29G  4.8G   24G  17% /\ndevtmpfs               2.0G     0  2.0G   0% /dev\ntmpfs                  2.0G   12K  2.0G   1% /dev/shm\ntmpfs                  2.0G     0  2.0G   0% /sys/fs/cgroup\ntmpfs                  2.0G  648K  2.0G   1% /run\n/dev/sda1              497M  111M  386M  23% /boot',
-        'Table1': {
-            'Type': 'Table',
-            'TableControl': 'Table1',
-            'TopHeadings': [
+    PackageName: 'Diskusage',
+    prefix: 'du',
+    MenuHeading: 'Miscellaneous',
+    MenuDescription: 'Disk Usage',
+    MenuNavigation: '2000 400',
+    firstPanel: 'PARAMS',
+    signalEvent: 'smeserver-diskusage-update',
+    html: [{ 
+        Name: 'params',
+        route: 'PARAMS',
+        Header: 'Disk usage',
+        SubHeader: 'Manage DiskUsage settings:',
+        Paragraph1: '&nbsp',
+        Paragraph2: 'Wed Sep 11 19:01:00 BST 2024',
+        Preformatted1: 'Filesystem             Size  Used Avail Use% Mounted on\n/dev/mapper/main-root   29G  4.8G   24G  17% /\ndevtmpfs               2.0G     0  2.0G   0% /dev\ntmpfs                  2.0G   12K  2.0G   1% /dev/shm\ntmpfs                  2.0G     0  2.0G   0% /sys/fs/cgroup\ntmpfs                  2.0G  648K  2.0G   1% /run\n/dev/sda1              497M  111M  386M  23% /boot',
+        Table1: {
+            Type: 'Table',
+            TableControl: 'Table1',
+            TopHeadings: [
                 'I-bays',
                 'Usage',
                 'Path'
             ],
-            'Columns': [
+            Columns: [
                 'Table1-I-bays',
                 'Table1-Usage',
                 'Table1-Path'
             ]
         },
-        'Paragraph3': '&nbsp',
-        'Table2': {
-            'Type': 'Table',
-            'TableControl': 'Table2',
-            'TopHeadings': [
+        Paragraph3: '&nbsp',
+        Table2: {
+            Type: 'Table',
+            TableControl: 'Table2',
+            TopHeadings: [
                 'Users',
                 'Usage',
                 'Path'
             ],
-            'Columns': [
+            Columns: [
                 'Table2-Users',
                 'Table2-Usage',
                 'Table2-Path'
             ]
         }
-    }
-    ]
+    }]
 }
diff --git a/sm1-html-2-json5.py b/sm1-html-2-json5.py
index 616c141..f22857e 100644
--- a/sm1-html-2-json5.py
+++ b/sm1-html-2-json5.py
@@ -149,7 +149,7 @@ def insert_spaces_before_caps(text):
 def save_to_json5(data, output_filename, package_name, header, sub_header):
     """Save extracted data to a JSON5 file with a specific structure."""
     # Generate prefix from uppercase letters in PackageName made into lowercase
-    prefix = ''.join(re.findall(r'[A-Z]', package_name)).lowercase()
+    prefix = ''.join(re.findall(r'[A-Z]', package_name)).lower()
 
     # Prepare structured html list
     structured_html = []
diff --git a/sm2gen.py b/sm2gen.py
index ad81e8a..9fc8baa 100644
--- a/sm2gen.py
+++ b/sm2gen.py
@@ -304,355 +304,358 @@ def convert_lex_to_dict(pairs_string):
 
 
 if __name__ == "__main__":
-    try:
-        chameleon_version = pkg_resources.get_distribution("Chameleon").version
-    except pkg_resources.DistributionNotFound:
-        chameleon_version = "Version information not available"
-    python_version = sys.version
-    python_version = python_version[:8]
-    current_datetime = datetime.now()
-    formatted_datetime = current_datetime.strftime("%Y-%m-%d %H:%M")
+	try:
+		chameleon_version = pkg_resources.get_distribution("Chameleon").version
+	except pkg_resources.DistributionNotFound:
+		chameleon_version = "Version information not available"
+	python_version = sys.version
+	version_pattern = r'(\d{1,3}\.\d{1,3}\.\d{1,3})'
+	version_match = re.search(version_pattern, python_version)
+	python_version = version_match.group(0) if version_match else 'Unknown'
+	current_datetime = datetime.now()
+	formatted_datetime = current_datetime.strftime("%Y-%m-%d %H:%M")
+	strVersion = (
+		"SM2Gen version:"
+		+ SME2Gen_version
+		+ " Chameleon version:"
+		+ chameleon_version
+		+ " On Python:"
+		+ python_version
+		+ " at "
+		+ formatted_datetime
+	)
 
-    strVersion = (
-        "SM2Gen version:"
-        + SME2Gen_version
-        + " Chameleon version:"
-        + chameleon_version
-        + " On Python:"
-        + python_version
-        + " at "
-        + formatted_datetime
-    )
+	json5_dict: dict = {}
+	json5_html_list: list = []
 
-    json5_dict: dict = {}
-    json5_html_list: list = []
+	print(f"SM2 code from JSON5 - {strVersion}")
 
-    print(f"SM2 code from JSON5 - {strVersion}")
+	home_dir = "/home/brianr/clients/SM2/SM2Gen/"
+	json_filename = f"{home_dir}/json5/nfsshare.json5"    #CreateStarterWebsite.json5"
 
-    home_dir = "/home/brianr/clients/SM2/SM2Gen/"
-    json_filename = f"{home_dir}/json5/nfsshare.json5"    #CreateStarterWebsite.json5"
+	# read open ai key from ini file
+	# Check if the file exists
+	if os.path.exists(ini_file_path):
+		# Create a configparser object and read the file
+		config = configparser.ConfigParser()
+		config.read(ini_file_path)
 
-    # read open ai key from ini file
-    # Check if the file exists
-    if os.path.exists(ini_file_path):
-        # Create a configparser object and read the file
-        config = configparser.ConfigParser()
-        config.read(ini_file_path)
+		# Read the value of "OPENAI_API_KEY"
+		if "OPENAI_API_KEY" in config["smegit"]:
+			OPENAI_API_KEY = config["smegit"]["OPENAI_API_KEY"]
+			# print("API Key:", OPENAI_API_KEY)
+			client = OpenAI(api_key=OPENAI_API_KEY)
+		else:
+			print("OPENAI_API_KEY not found in the configuration file.")
+	else:
+		print("Configuration file not found at:", file_path)
 
-        # Read the value of "OPENAI_API_KEY"
-        if "OPENAI_API_KEY" in config["smegit"]:
-            OPENAI_API_KEY = config["smegit"]["OPENAI_API_KEY"]
-            # print("API Key:", OPENAI_API_KEY)
-            client = OpenAI(api_key=OPENAI_API_KEY)
-        else:
-            print("OPENAI_API_KEY not found in the configuration file.")
-    else:
-        print("Configuration file not found at:", file_path)
+	# Command line parameters - not in use
+	parser = argparse.ArgumentParser(description="SM2Gen")
+	parser.add_argument(
+		"-f",
+		"--filename",
+		help="Specify a filename for the JSON5 file",
+		default=json_filename,
+	)
+	parser.add_argument(
+		"-nco",
+		"--noController",
+		help="Stop it creating a controller file",
+		default="no",
+	)
+	parser.add_argument(
+		"-nh", "--noHtml", help="Stop it creating html files(s)", default="no"
+	)
+	parser.add_argument(
+		"-nl",
+		"--noLang",
+		help="Stop it creating language localise files(s)",
+		default="no",
+	)
+	parser.add_argument(
+		"-ncu", "--noCust", help="Stop it creating Custom controller file", default="no"
+	)
+	args = parser.parse_args()
+	json_filename = args.filename
+	print(
+		f"JSON5 from {json_filename} with noController={args.noController}, noHtml={args.noHtml} and noLang={args.noLang}"
+	)  # Not yet activated
 
-    # Command line parameters - not in use
-    parser = argparse.ArgumentParser(description="SM2Gen")
-    parser.add_argument(
-        "-f",
-        "--filename",
-        help="Specify a filename for the JSON5 file",
-        default=json_filename,
-    )
-    parser.add_argument(
-        "-nco",
-        "--noController",
-        help="Stop it creating a controller file",
-        default="no",
-    )
-    parser.add_argument(
-        "-nh", "--noHtml", help="Stop it creating html files(s)", default="no"
-    )
-    parser.add_argument(
-        "-nl",
-        "--noLang",
-        help="Stop it creating language localise files(s)",
-        default="no",
-    )
-    parser.add_argument(
-        "-ncu", "--noCust", help="Stop it creating Custom controller file", default="no"
-    )
-    args = parser.parse_args()
-    json_filename = args.filename
-    print(
-        f"JSON5 from {json_filename} with noController={args.noController}, noHtml={args.noHtml} and noLang={args.noLang}"
-    )  # Not yet activated
+	# check syntax of JSON5
+	lint_json5(json_filename)
 
-    # check syntax of JSON5
-    lint_json5(json_filename)
+	# Get dict of it all
+	json5_dict = json5_to_dict(json_filename)
 
-    # Get dict of it all
-    json5_dict = json5_to_dict(json_filename)
+	# Get dict of just the html bit
+	json5_html_list = json5_dict["html"]
 
-    # Get dict of just the html bit
-    json5_html_list = json5_dict["html"]
+	# Identify message
+	print(f"\nGenerating mojo panels for {hl('PackageName')}")
+	print("-----------------------------------")
 
-    # Identify message
-    print(f"\nGenerating mojo panels for {hl('PackageName')}")
-    print("-----------------------------------")
+	# Routes for each panel
+	routes = get_all_routes()
+	lc_routes = lc_get_all_routes()
 
-    # Routes for each panel
-    routes = get_all_routes()
-    lc_routes = lc_get_all_routes()
+	# File names
+	controller_file = "Targets/" + hl("PackageName") + ".pm"
+	custom_controller_file = "Targets/" + hl("PackageName") + "-Custom.pm"
+	# Call it .new if one is already there (and may have been editted by the developer)
+	if os.path.exists(custom_controller_file):
+		custom_controller_file = custom_controller_file + ".new"
+	layout_file = "Targets/" + hl("PackageName").lower() + ".html.ep"
+	partial_files = list()
+	for panel in routes:
+		partial_files.append("Targets/_" + hl("prefix") + "_" + panel + ".html.ep")
+	print(partial_files)
+	lex_file = "Targets/" + hl("PackageName").lower() + "_en.lex"
+	tablecontrols = (
+		get_table_control_data()
+	)  # arrays of hashes used to drive rows in tables
 
-    # File names
-    controller_file = "Targets/" + hl("PackageName") + ".pm"
-    custom_controller_file = "Targets/" + hl("PackageName") + "-Custom.pm"
-    # Call it .new if one is already there (and may have been editted by the developer)
-    if os.path.exists(custom_controller_file):
-        custom_controller_file = custom_controller_file + ".new"
-    layout_file = "Targets/" + hl("PackageName").lower() + ".html.ep"
-    partial_files = list()
-    for panel in routes:
-        partial_files.append("Targets/_" + hl("prefix") + "_" + panel + ".html.ep")
-    print(partial_files)
-    lex_file = "Targets/" + hl("PackageName").lower() + "_en.lex"
-    tablecontrols = (
-        get_table_control_data()
-    )  # arrays of hashes used to drive rows in tables
+	#    print(strVersion,tablecontrols,routes)
 
-    # Generate controller file
-    try:
-        controller_template = PageTemplateFile("Templates/controller.pm.tem")
-        dbentries = get_db_fields()  # Params which correspond to Db fields
-        try:
-            controller_perl = controller_template.render(
-                version=strVersion,
-                tablecontrols=tablecontrols,
-                dbentries=dbentries,
-                **json5_dict,
-                panels=routes,
-                lcPackageName=json5_dict["PackageName"].lower(),
-            )
-            with open(controller_file, "w") as file:
-                file.write(controller_perl)
-            print(f"{controller_file} controller generated ok")
-        except Exception as e:
-            print(f"A Chameleon controller render error occurred: {e}")
-    except Exception as e:
-        print(f"A Chameleon controller template error occurred: {e}")
+	# Generate controller file
+	try:
+		controller_template = PageTemplateFile("Templates/controller.pm.tem",CHAMELEON_DEBUG="true")
+		dbentries = get_db_fields()  # Params which correspond to Db fields
+		try:
+			controller_perl = controller_template.render(
+				version=strVersion,
+				tablecontrols=tablecontrols,
+				dbentries=dbentries,
+				**json5_dict,
+				panels=routes,
+				lcPackageName=json5_dict["PackageName"].lower(),
+			)
+			with open(controller_file, "w") as file:
+				file.write(controller_perl)
+			print(f"{controller_file} controller generated ok")
+		except Exception as e:
+			print(f"A Chameleon controller render error occurred: {e}")
+	except Exception as e:
+		print(f"A Chameleon controller template error occurred: {e}")
 
-    # Generate Custom controller file
-    try:
-        custom_controller_template = PageTemplateFile("Templates/custom.pm.tem")
-        try:
-            custom_controller_perl = custom_controller_template.render(
-                version=strVersion, panels=routes, tablecontrols=tablecontrols
-            )
-            # We must be careful to not overwrite the custom file if the developer has already written to it - TBD
-            with open(custom_controller_file, "w") as file:
-                file.write(custom_controller_perl)
-            print(f"{custom_controller_file} custom controller generated ok")
-        except Exception as e:
-            print(f"A Chameleon custom controller render error occurred: {e}")
-    except Exception as e:
-        print(f"A Chameleon custom controller template error occurred: {e}")
+	# Generate Custom controller file
+	try:
+		custom_controller_template = PageTemplateFile("Templates/custom.pm.tem")
+		try:
+			custom_controller_perl = custom_controller_template.render(
+				version=strVersion, panels=routes, tablecontrols=tablecontrols
+			)
+			# We must be careful to not overwrite the custom file if the developer has already written to it - TBD
+			with open(custom_controller_file, "w") as file:
+				file.write(custom_controller_perl)
+			print(f"{custom_controller_file} custom controller generated ok")
+		except Exception as e:
+			print(f"A Chameleon custom controller render error occurred: {e}")
+	except Exception as e:
+		print(f"A Chameleon custom controller template error occurred: {e}")
 
-    # generate Layout file
-    layout_template = PageTemplateFile("Templates/layout.html.ep.tem")
-    try:
-        try:
-            layout_mojo = layout_template.render(
-                version=strVersion, **json5_dict, conditions=routes
-            )
-            with open(layout_file, "w") as file:
-                file.write(layout_mojo)
-            print(f"{layout_file} mojo template layout file generated ok")
-        except Exception as e:
-            print(f"A Chameleon render on layout file error occurred: {e}")
-    except Exception as e:
-        print(f"A Chameleon template layout file error occurred: {e}")
+	# generate Layout file
+	layout_template = PageTemplateFile("Templates/layout.html.ep.tem")
+	try:
+		try:
+			layout_mojo = layout_template.render(
+				version=strVersion, **json5_dict, conditions=routes
+			)
+			with open(layout_file, "w") as file:
+				file.write(layout_mojo)
+			print(f"{layout_file} mojo template layout file generated ok")
+		except Exception as e:
+			print(f"A Chameleon render on layout file error occurred: {e}")
+	except Exception as e:
+		print(f"A Chameleon template layout file error occurred: {e}")
 
-    # Generate a partial file for each of the entries in the html list
-    # Pull in the template code for each of the input types
-    # html_controls = json5_to_dict('Templates/html_controls.html.ep.tem')
-    html_controls = parse_xml_to_dict("Templates/html_controls.html.ep.xml")
-    i = 0
-    for html in json5_html_list:
-        # Generate a mojo template file, and then add in the controls
-        # main file first
-        try:
-            partial_template = PageTemplateFile("Templates/partial.html.ep.tem")
-            partial_mojo_context = {**json5_dict, **html}
-            try:
-                partial_mojo_template = partial_template.render(
-                    version=strVersion, **partial_mojo_context
-                )
-                with open(partial_files[i], "w") as file:
-                    file.write(partial_mojo_template)
-                print(f"{partial_files[i]} mojo template generated ok - phase 1")
-            except Exception as e:
-                print(
-                    f"A Chameleon render error on partial file {html['route']} occurred: {e}"
-                )
-        except Exception as e:
-            print(f"A Chameleon html  {html['route']} error occurred: {e}")
+	# Generate a partial file for each of the entries in the html list
+	# Pull in the template code for each of the input types
+	# html_controls = json5_to_dict('Templates/html_controls.html.ep.tem')
+	html_controls = parse_xml_to_dict("Templates/html_controls.html.ep.xml")
+	i = 0
+	for html in json5_html_list:
+		# Generate a mojo template file, and then add in the controls
+		# main file first
+		try:
+			partial_template = PageTemplateFile("Templates/partial.html.ep.tem")
+			partial_mojo_context = {**json5_dict, **html}
+			try:
+				partial_mojo_template = partial_template.render(
+					version=strVersion, **partial_mojo_context
+				)
+				with open(partial_files[i], "w") as file:
+					file.write(partial_mojo_template)
+				print(f"{partial_files[i]} mojo template generated ok - phase 1")
+			except Exception as e:
+				print(
+					f"A Chameleon render error on partial file {html['route']} occurred: {e}"
+				)
+		except Exception as e:
+			print(f"A Chameleon html  {html['route']} error occurred: {e}")
 
-        # Now generate the controls from the rest of the entries in the dict.
-        all_controls_html = ""
-        prefix_is = hl("prefix")
-        for html_control in html:
-            inner_html = html[html_control]
-            if isinstance(inner_html, dict):
-                try:
-                    control_template = PageTemplate(html_controls[inner_html["Type"]])
-                    try:
-                        control_html = control_template.render(
-                            version=strVersion, **inner_html, prefix=prefix_is
-                        )
-                        all_controls_html = all_controls_html + control_html
-                    except Exception as e:
-                        print(
-                            f"A Chameleon render on partial file control {inner_html['Name']} error occurred: {e}"
-                        )
-                except Exception as e:
-                    print(
-                        f"A Chameleon render on partial file control {inner_html['Name']} error occurred: {e}"
-                    )
-            else:
-                # just a simple entry - name less numerics is type
-                html_Type = "".join(char for char in html_control if not char.isdigit())
-                try:
-                    simple_control_template = PageTemplate(html_controls[html_Type])
-                    try:
-                        simple_control_html = simple_control_template.render(
-                            version=strVersion, value=inner_html, prefix=prefix_is
-                        )
-                        all_controls_html = all_controls_html + simple_control_html
-                    except Exception as e:
-                        print(
-                            f"A Chameleon render on partial file control {html_control} error occurred: {e}"
-                        )
-                except Exception as e:
-                    print(
-                        f"A Chameleon template partial file control {html_control} error occurred: {e}"
-                    )
+		# Now generate the controls from the rest of the entries in the dict.
+		all_controls_html = ""
+		prefix_is = hl("prefix")
+		for html_control in html:
+			inner_html = html[html_control]
+			if isinstance(inner_html, dict):
+				try:
+					control_template = PageTemplate(html_controls[inner_html["Type"]])
+					try:
+						control_html = control_template.render(
+							version=strVersion, **inner_html, prefix=prefix_is
+						)
+						all_controls_html = all_controls_html + control_html
+					except Exception as e:
+						print(
+							f"A Chameleon render on partial file control {inner_html['Name']} error occurred: {e}"
+						)
+				except Exception as e:
+					print(
+						f"A Chameleon render on partial file control {inner_html['Name']} error occurred: {e}"
+					)
+			else:
+				# just a simple entry - name less numerics is type
+				html_Type = "".join(char for char in html_control if not char.isdigit())
+				try:
+					simple_control_template = PageTemplate(html_controls[html_Type])
+					try:
+						simple_control_html = simple_control_template.render(
+							version=strVersion, value=inner_html, prefix=prefix_is
+						)
+						all_controls_html = all_controls_html + simple_control_html
+					except Exception as e:
+						print(
+							f"A Chameleon render on partial file control {html_control} error occurred: {e}"
+						)
+				except Exception as e:
+					print(
+						f"A Chameleon template partial file control {html_control} error occurred: {e}"
+					)
 
-        # Now insert it into the partial file in the correct place.
-        # Read in the text file and split at "%# Inputs etc in here."
-        with open(partial_files[i], "r") as file:
-            lines = file.readlines()
-            index = next(
-                (i for i, line in enumerate(lines) if "%# Inputs etc in here." in line),
-                len(lines),
-            )
+		# Now insert it into the partial file in the correct place.
+		# Read in the text file and split at "%# Inputs etc in here."
+		with open(partial_files[i], "r") as file:
+			lines = file.readlines()
+			index = next(
+				(i for i, line in enumerate(lines) if "%# Inputs etc in here." in line),
+				len(lines),
+			)
 
-        # Insert the string at the specified index
-        lines.insert(index + 1, all_controls_html + "\n")
+		# Insert the string at the specified index
+		lines.insert(index + 1, all_controls_html + "\n")
 
-        # Write the modified content back to the file
-        with open(partial_files[i], "w") as file:
-            file.writelines(lines)
-        print(f"Content modified and saved to {partial_files[i]}")
-        i += 1
+		# Write the modified content back to the file
+		with open(partial_files[i], "w") as file:
+			file.writelines(lines)
+		print(f"Content modified and saved to {partial_files[i]}")
+		i += 1
 
-    # Now generate the <name>.en file
-    # Look through the generated files for the /l[\s|(]['|"](.*)['|"]\)/ strings.
+	# Now generate the <name>.en file
+	# Look through the generated files for the /l[\s|(]['|"](.*)['|"]\)/ strings.
 
-    # create a combined list of all the files
-    all_files = [controller_file, layout_file] + partial_files
-    all_strings = []
-    for filename in all_files:
-        with open(filename, "r") as file:
-            file_content = file.read()
-        # Define the regular expression pattern to match the strings you want to extract
-        pattern = r"l[\s|(][\'|\"](.*)[\'|\"]\)"
-        # Use re.findall to extract all occurrences of the pattern from the file content
-        extracted_strings = re.findall(pattern, file_content)
-        all_strings = all_strings + extracted_strings
-    # Take out any duplicates
-    all_strings = deduplicate_array(all_strings)
-    # '<prefix>_english-message' => 'English Message',
-    string_lib = []  # Array of dicts
-    for lex_message in all_strings:
-        # If has a prefix - leave it for left hand side but delete it for the right
-        # If has no prefix - add one for left hand side but and leave it for the right
-        # Map all spaces to "_" on left hand side
-        # amd truncate it to max five words
-        original_str = lex_message
-        # Checkif  it starts with the prefix (any case|)
-        if lex_message.lower().startswith(hl("prefix").lower()):
-            left_str = lex_message
-            right_str = lex_message[len(hl("prefix")) + 1 :]
-            # And take out any "_", map to " "
-        else:
-            left_str = hl("prefix") + "_" + lex_message
-            right_str = lex_message
-        right_str = right_str.replace("_", " ")
-        # print(f"Right:{right_str}")
-        right_str = format_text(right_str)
-        left_str = left_str.replace(" ", "_")
-        words = left_str.split("_")[:6]
-        left_str = "_".join(words)
-        next_lex_str = {"orig": original_str, "left": left_str, "right": right_str}
-        string_lib.append(next_lex_str)
-    # And write it to lex file
-    # Now process them one by one into the lexical file
-    lex_all = ""
-    for lex_str in string_lib:
-        lex_all += f"'{lex_str['left']}' => '{lex_str['right']}',\n"
-    print(f"Writing {lex_file}")
-    with open(lex_file, "w") as file:
-        file.write(lex_all)
-    # and then play the strings back into the partials and the layout file
-    print("..and feed the lex string names back into other files")
-    for filename in all_files:
-        with open(filename, "r") as file:
-            file_content = file.read()
-        # Scan through
-        for item in string_lib:
-            original_str = item["orig"]
-            left_str = item["left"]
-            right_str = item["right"]
-            # Replace all occurrences of original string with left string in 'contents'
-            file_content = file_content.replace(
-                "l('" + original_str + "')", "l('" + left_str + "')"
-            )
-        # and write it back
-        with open(filename, "w") as file:
-            file.write(file_content)
-        print(f"Write out modified:{filename}")
+	# create a combined list of all the files
+	all_files = [controller_file, layout_file] + partial_files
+	all_strings = []
+	for filename in all_files:
+		with open(filename, "r") as file:
+			file_content = file.read()
+		# Define the regular expression pattern to match the strings you want to extract
+		pattern = r"l[\s|(][\'|\"](.*)[\'|\"]\)"
+		# Use re.findall to extract all occurrences of the pattern from the file content
+		extracted_strings = re.findall(pattern, file_content)
+		all_strings = all_strings + extracted_strings
+	# Take out any duplicates
+	all_strings = deduplicate_array(all_strings)
+	# '<prefix>_english-message' => 'English Message',
+	string_lib = []  # Array of dicts
+	for lex_message in all_strings:
+		# If has a prefix - leave it for left hand side but delete it for the right
+		# If has no prefix - add one for left hand side but and leave it for the right
+		# Map all spaces to "_" on left hand side
+		# amd truncate it to max five words
+		original_str = lex_message
+		# Checkif  it starts with the prefix (any case|)
+		if lex_message.lower().startswith(hl("prefix").lower()):
+			left_str = lex_message
+			right_str = lex_message[len(hl("prefix")) + 1 :]
+			# And take out any "_", map to " "
+		else:
+			left_str = hl("prefix") + "_" + lex_message
+			right_str = lex_message
+		right_str = right_str.replace("_", " ")
+		# print(f"Right:{right_str}")
+		right_str = format_text(right_str)
+		left_str = left_str.replace(" ", "_")
+		words = left_str.split("_")[:6]
+		left_str = "_".join(words)
+		next_lex_str = {"orig": original_str, "left": left_str, "right": right_str}
+		string_lib.append(next_lex_str)
+	# And write it to lex file
+	# Now process them one by one into the lexical file
+	lex_all = ""
+	for lex_str in string_lib:
+		lex_all += f"'{lex_str['left']}' => '{lex_str['right']}',\n"
+	print(f"Writing {lex_file}")
+	with open(lex_file, "w") as file:
+		file.write(lex_all)
+	# and then play the strings back into the partials and the layout file
+	print("..and feed the lex string names back into other files")
+	for filename in all_files:
+		with open(filename, "r") as file:
+			file_content = file.read()
+		# Scan through
+		for item in string_lib:
+			original_str = item["orig"]
+			left_str = item["left"]
+			right_str = item["right"]
+			# Replace all occurrences of original string with left string in 'contents'
+			file_content = file_content.replace(
+				"l('" + original_str + "')", "l('" + left_str + "')"
+			)
+		# and write it back
+		with open(filename, "w") as file:
+			file.write(file_content)
+		print(f"Write out modified:{filename}")
 
-        #  Now generate all the translated lex files from a list of the languages and codes
-    #home_dir = os.path.dirname(json_filename)
-    languages_path = "Templates/languages.json"
-    with open(languages_path, "r") as file:
-        languages_str = file.read()
-    lang_dict = json.loads(languages_str)
-    with open(lex_file, "r") as file:
-        lex_str = file.read()
-    eng_lex_dict = convert_lex_to_dict(lex_str)
-    for lang_item in lang_dict:
-        print(f"Translating from english lex file to {lang_item['language']}")
-        code = lang_item["code"]
-        translated_lex_file = f"Targets/{hl('PackageName').lower()}_{code}.lex"
-        # Only do it if the lex file is missing
-        if not os.path.exists(translated_lex_file):
-            translated_dict = []
-            for lex_item in eng_lex_dict:
-                # Get it from ChatGPT
-                translated_text = get_translation(
-                    lex_item["text"], lang_item["language"]
-                )
-                translated_dict.append({"id": lex_item["id"], "text": translated_text})
-            print(f"Writing out lex file for {lang_item['code']}")
-            with open(translated_lex_file, "w") as file:
-                for item in translated_dict:
-                    # escape any nasties
-                    translated_text = (
-                        item["text"]
-                        .replace("\\", r"\\")
-                        .replace('"', r"\"")
-                        .replace("'", r"\'")
-                    )
-                    line = "'" + item["id"] + "' => " + '"' + translated_text + '",\n'
-                    file.write(line)
-                    # print(f"{item['id']} => {item['text']}\n")
-        else:
-            print(
-                f"Skipping the creation of {translated_lex_file} as it exists already"
-            )
-    quit()  # end of the program
+		#  Now generate all the translated lex files from a list of the languages and codes
+	#home_dir = os.path.dirname(json_filename)
+	languages_path = "Templates/languages.json"
+	with open(languages_path, "r") as file:
+		languages_str = file.read()
+	lang_dict = json.loads(languages_str)
+	with open(lex_file, "r") as file:
+		lex_str = file.read()
+	eng_lex_dict = convert_lex_to_dict(lex_str)
+	for lang_item in lang_dict:
+		print(f"Translating from english lex file to {lang_item['language']}")
+		code = lang_item["code"]
+		translated_lex_file = f"Targets/{hl('PackageName').lower()}_{code}.lex"
+		# Only do it if the lex file is missing
+		if not os.path.exists(translated_lex_file):
+			translated_dict = []
+			for lex_item in eng_lex_dict:
+				# Get it from ChatGPT
+				translated_text = get_translation(
+					lex_item["text"], lang_item["language"]
+				)
+				translated_dict.append({"id": lex_item["id"], "text": translated_text})
+			print(f"Writing out lex file for {lang_item['code']}")
+			with open(translated_lex_file, "w") as file:
+				for item in translated_dict:
+					# escape any nasties
+					translated_text = (
+						item["text"]
+						.replace("\\", r"\\")
+						.replace('"', r"\"")
+						.replace("'", r"\'")
+					)
+					line = "'" + item["id"] + "' => " + '"' + translated_text + '",\n'
+					file.write(line)
+					# print(f"{item['id']} => {item['text']}\n")
+		else:
+			print(
+				f"Skipping the creation of {translated_lex_file} as it exists already"
+			)
+	quit()  # end of the program