pict-section-form 1.0.23 → 1.0.25

package/debug/PICTSection-TabularManifests.json

@@ -56,10 +56,28 @@
                 "DataAddress": "Header.Planet",
                 "DataType": "String",
                 "PictForm": {
-                    "InputType": "SelectFixed",
+                    "InputType": "Option",
                     "Row": "3",
                     "Width": "1",
                     "Units": "planetary",
+                    "SelectOptions": [
+                        {
+                            "id": "Earth",
+                            "text": "Earth"
+                        },
+                        {
+                            "id": "Mars",
+                            "text": "Mars"
+                        },
+                        {
+                            "id": "Saturn",
+                            "text": "Saturn"
+                        },
+                        {
+                            "id": "Jupiter",
+                            "text": "Jupiter"
+                        }
+                    ],
                     "Section": "Header",
                     "Group": "General_Info"
                 }
@@ -198,15 +216,15 @@
             {
                 "Name": "Package Dimensions",
                 "Hash": "Package_Dimensions",
-                "Solvers": [
-                    "Area = Width * Height"
-                ],
+                "Solvers": [],
                 "Groups": [
                     {
                         "Name": "Size",
                         "Hash": "Size",
                         "Rows": [],
-                        "RecordSetSolvers": [],
+                        "RecordSetSolvers": [
+                            "Area = Width * Height"
+                        ],
                         "Layout": "Tabular",
                         "RecordSetAddress": "Inventory.Packages",
                         "RecordManifest": "Packages"
@@ -241,7 +259,8 @@
                             "Width": "3",
                             "Section": "Package_Dimensions",
                             "Group": "Size"
-                        }
+                        },
+                        "IsTabular": true
                     },
                     "ReceiveDate": {
                         "Hash": "ReceiveDate",
@@ -253,7 +272,8 @@
                             "Width": "1",
                             "Section": "Package_Dimensions",
                             "Group": "Size"
-                        }
+                        },
+                        "IsTabular": true
                     },
                     "Width": {
                         "Hash": "Width",
@@ -266,7 +286,8 @@
                             "Units": "inches",
                             "Section": "Package_Dimensions",
                             "Group": "Size"
-                        }
+                        },
+                        "IsTabular": true
                     },
                     "Height": {
                         "Hash": "Height",
@@ -279,7 +300,8 @@
                             "Units": "inches",
                             "Section": "Package_Dimensions",
                             "Group": "Size"
-                        }
+                        },
+                        "IsTabular": true
                     },
                     "Area": {
                         "Hash": "Area",
@@ -292,7 +314,8 @@
                             "Units": "square inches",
                             "Section": "Package_Dimensions",
                             "Group": "Size"
-                        }
+                        },
+                        "IsTabular": true
                     }
                 },
                 "Sections": [],

package/debug/TabularManifestCSV.csv

@@ -3,7 +3,7 @@ ExampleForm,Example Form,,,Header,General Info,1,1,Header.FirstName,First Name,H
 ExampleForm,,,,Header,General Info,1,1,Header.LastName,Last Name,HeaderLastName,,,String,,,,,,
 ExampleForm,,,,Header,General Info,1,2,Header.JobTitle,Job Title,JobTitle,,,String,,,,,,
 ExampleForm,,,,Header,General Info,2,4,Header.Description,Description,Description,,,String,,,,,,
-ExampleForm,,,,Header,General Info,3,1,Header.Planet,Planet,Planet,"Earth,Mars,Saturn,Jupiter",planetary,String,SelectFixed,,,,,
+ExampleForm,,,,Header,General Info,3,1,Header.Planet,Planet,Planet,"Earth,Mars,Saturn,Jupiter",planetary,String,Option,,,,,
 ExampleForm,,,,Header,Address,1,1,Header.Location.Address,Address,Address,,,String,,,,,,
 ExampleForm,,,,Header,Address,2,2,Header.Location.City,City,City,,,String,,,,,,
 ExampleForm,,,,Header,Address,2,2,Header.Location.State,State,State,,,String,,,,,,

package/debug/data/ExampleForm.json

@@ -55,10 +55,28 @@
             "DataAddress": "Header.Planet",
             "DataType": "String",
             "PictForm": {
-                "InputType": "SelectFixed",
+                "InputType": "Option",
                 "Row": "3",
                 "Width": "1",
                 "Units": "planetary",
+                "SelectOptions": [
+                    {
+                        "id": "Earth",
+                        "text": "Earth"
+                    },
+                    {
+                        "id": "Mars",
+                        "text": "Mars"
+                    },
+                    {
+                        "id": "Saturn",
+                        "text": "Saturn"
+                    },
+                    {
+                        "id": "Jupiter",
+                        "text": "Jupiter"
+                    }
+                ],
                 "Section": "Header",
                 "Group": "General_Info"
             }
@@ -197,15 +215,15 @@
         {
             "Name": "Package Dimensions",
             "Hash": "Package_Dimensions",
-            "Solvers": [
-                "Area = Width * Height"
-            ],
+            "Solvers": [],
             "Groups": [
                 {
                     "Name": "Size",
                     "Hash": "Size",
                     "Rows": [],
-                    "RecordSetSolvers": [],
+                    "RecordSetSolvers": [
+                        "Area = Width * Height"
+                    ],
                     "Layout": "Tabular",
                     "RecordSetAddress": "Inventory.Packages",
                     "RecordManifest": "Packages"
@@ -240,7 +258,8 @@
                         "Width": "3",
                         "Section": "Package_Dimensions",
                         "Group": "Size"
-                    }
+                    },
+                    "IsTabular": true
                 },
                 "ReceiveDate": {
                     "Hash": "ReceiveDate",
@@ -252,7 +271,8 @@
                         "Width": "1",
                         "Section": "Package_Dimensions",
                         "Group": "Size"
-                    }
+                    },
+                    "IsTabular": true
                 },
                 "Width": {
                     "Hash": "Width",
@@ -265,7 +285,8 @@
                         "Units": "inches",
                         "Section": "Package_Dimensions",
                         "Group": "Size"
-                    }
+                    },
+                    "IsTabular": true
                 },
                 "Height": {
                     "Hash": "Height",
@@ -278,7 +299,8 @@
                         "Units": "inches",
                         "Section": "Package_Dimensions",
                         "Group": "Size"
-                    }
+                    },
+                    "IsTabular": true
                 },
                 "Area": {
                     "Hash": "Area",
@@ -291,7 +313,8 @@
                         "Units": "square inches",
                         "Section": "Package_Dimensions",
                         "Group": "Size"
-                    }
+                    },
+                    "IsTabular": true
                 }
             },
             "Sections": [],

package/example_applications/complex_table/Complex-Tabular-CustomDataProvider.js

@@ -11,14 +11,14 @@ class CustomInputHandler extends libPictSectionInputExtension
 	{
 		this.log.trace(`CustomInputHandler.onInputInitializeTabular() for view [${pView.Hash}] called`);
 		//this.log.trace(`The input object is: ${JSON.stringify(pInput)}`);
-		return super.onInputInitialize(pView, pGroup, pInput, pHTMLSelector);
+		return super.onInputInitialize(pView, pGroup, pInput, pValue, pHTMLSelector);
 	}
 
 	onInputInitializeTabular(pView, pGroup, pInput, pValue, pHTMLSelector)
 	{
 		this.log.trace(`CustomInputHandler.onInputInitializeTabular() for view [${pView.Hash}] called`);
 		//this.log.trace(`The input object is: ${JSON.stringify(pInput)}`);
-		return super.onInputInitializeTabular(pView, pGroup, pInput, pHTMLSelector);
+		return super.onInputInitializeTabular(pView, pGroup, pInput, pValue, pHTMLSelector);
 	}
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "pict-section-form",
-    "version": "1.0.23",
+    "version": "1.0.25",
     "description": "Pict dynamic form sections",
     "main": "source/Pict-Section-Form.js",
     "directories": {
@@ -27,11 +27,11 @@
     "author": "steven velozo <steven@velozo.com>",
     "license": "MIT",
     "devDependencies": {
-        "@eslint/js": "^9.6.0",
+        "@eslint/js": "^9.7.0",
         "browser-env": "^3.3.0",
-        "eslint": "^9.6.0",
+        "eslint": "^9.7.0",
         "jquery": "^3.7.1",
-        "pict": "^1.0.205",
+        "pict": "^1.0.209",
         "pict-application": "^1.0.19",
         "pict-service-commandlineutility": "^1.0.13",
         "quackage": "^1.0.30",

package/source/providers/Pict-Provider-DynamicInput.js

@@ -0,0 +1,107 @@
+const libPictProvider = require('pict-provider');
+
+const _DefaultProviderConfiguration = (
+{
+	"ProviderIdentifier": "Pict-DynamicForms-Input",
+
+	"AutoInitialize": true,
+	"AutoInitializeOrdinal": 0,
+
+	"AutoSolveWithApp": false
+});
+
+/**
+ * The PictDynamicInput class is a provider that manages data brokering and provider mappings for dynamic inputs.
+ */
+class PictDynamicInput extends libPictProvider
+{
+	/**
+	 * Creates an instance of the PictDynamicLayout class.
+	 * 
+	 * @param {object} pFable - The fable object.
+	 * @param {object} pOptions - The options object.
+	 * @param {object} pServiceHash - The service hash object.
+	 */
+	constructor(pFable, pOptions, pServiceHash)
+	{
+		let tmpOptions = Object.assign({}, JSON.parse(JSON.stringify(_DefaultProviderConfiguration)), pOptions);
+		super(pFable, tmpOptions, pServiceHash);
+		// A map of strings for each input template, mapping it to arrays of default providers.
+		this.templateProviderMap = {};
+	}
+
+	getInputTemplateHash(pView, pInput)
+	{
+		if (pInput.IsTabular)
+		{
+			let tmpTemplateBeginInputTypePostfix = `-TabularTemplate-Begin-Input-InputType-${pInput.PictForm.InputType}`;
+			let tmpTemplateEndInputTypePostfix = `-TabularTemplate-End-Input-InputType-${pInput.PictForm.InputType}`;
+
+			let tmpTemplateBeginDataTypePostfix = `-TabularTemplate-Begin-Input-DataType-${pInput.DataType}`;
+			let tmpTemplateEndDataTypePostfix = `-TabularTemplate-End-Input-DataType-${pInput.DataType}`;
+			if (pView.checkViewSpecificTemplate(tmpTemplateBeginInputTypePostfix) && pView.checkViewSpecificTemplate(tmpTemplateEndInputTypePostfix))
+			{
+				return pView.getViewSpecificTemplateHash(tmpTemplateBeginInputTypePostfix);
+			}
+			else if (pView.checkThemeSpecificTemplate(tmpTemplateBeginInputTypePostfix) && pView.checkThemeSpecificTemplate(tmpTemplateEndInputTypePostfix))
+			{
+				return pView.getThemeSpecificTemplateHash(tmpTemplateBeginInputTypePostfix);
+			}
+			else if (pView.checkViewSpecificTemplate(tmpTemplateBeginDataTypePostfix) && pView.checkViewSpecificTemplate(tmpTemplateEndDataTypePostfix))
+			{
+				return pView.getViewSpecificTemplateHash(tmpTemplateBeginDataTypePostfix);
+			}
+			else if (pView.checkThemeSpecificTemplate(tmpTemplateBeginDataTypePostfix) && pView.checkThemeSpecificTemplate(tmpTemplateEndDataTypePostfix))
+			{
+				return pView.getThemeSpecificTemplateHash(tmpTemplateBeginDataTypePostfix);
+			}
+		}
+		else
+		{
+			let tmpTemplateInputTypePostfix = `-Template-Input-InputType-${pInput.PictForm.InputType}`;
+			let tmpTemplateDataTypePostfix = `-Template-Input-DataType-${pInput.DataType}`;
+			if (pView.checkViewSpecificTemplate(tmpTemplateInputTypePostfix))
+			{
+				return pView.getViewSpecificTemplateHash(tmpTemplateInputTypePostfix);
+			}
+			else if (pView.checkThemeSpecificTemplate(tmpTemplateInputTypePostfix))
+			{
+				return pView.getThemeSpecificTemplateHash(tmpTemplateInputTypePostfix);
+			}
+			else if (pView.checkViewSpecificTemplate(tmpTemplateDataTypePostfix))
+			{
+				return pView.getViewSpecificTemplateHash(tmpTemplateDataTypePostfix);
+			}
+			else if (pView.checkThemeSpecificTemplate(tmpTemplateDataTypePostfix))
+			{
+				return pView.getThemeSpecificTemplateHash(tmpTemplateDataTypePostfix);
+			}
+		}
+		return false;
+	}
+
+	addDefaultInputProvider(pTemplateFullHash, pProvider)
+	{
+		if (!(pTemplateFullHash in this.templateProviderMap))
+		{
+			this.templateProviderMap[pTemplateFullHash] = [];
+		}
+		if (this.templateProviderMap[pTemplateFullHash].indexOf(pProvider) < 0)
+		{
+			this.templateProviderMap[pTemplateFullHash].push(pProvider);
+		}
+	}
+
+	getDefaultInputProviders(pView, pInput)
+	{
+		let tmpTemplateHash = this.getInputTemplateHash(pView, pInput);
+		if (tmpTemplateHash && this.templateProviderMap[tmpTemplateHash])
+		{
+			return this.templateProviderMap[tmpTemplateHash];
+		}
+		return [];
+	}
+}
+
+module.exports = PictDynamicInput;
+module.exports.default_configuration = _DefaultProviderConfiguration;

package/source/providers/Pict-Provider-DynamicSolver.js

@@ -37,18 +37,15 @@ class PictDynamicSolver extends libPictProvider
 
 		if (!this.pict.providers.DynamicMetaLists)
 		{
-			let tmpDynamicMetaLists = this.pict.addProvider('DynamicMetaLists', libDynamicMetaLists.default_configuration, libDynamicMetaLists);
-			tmpDynamicMetaLists.initialize();
+			this.pict.addProvider('DynamicMetaLists', libDynamicMetaLists.default_configuration, libDynamicMetaLists);
 		}
 		if (!this.pict.providers['Pict-Input-Select']);
 		{
-			let tmpInputSelectProvider = this.pict.addProvider('Pict-Input-Select', libInputSelect.default_configuration, libInputSelect);
-			tmpInputSelectProvider.initialize();
+			this.pict.addProvider('Pict-Input-Select', libInputSelect.default_configuration, libInputSelect);
 		}
 		if (!this.pict.providers['Pict-Input-DateTime']);
 		{
-			let tmpInputDateTimeProvider = this.pict.addProvider('Pict-Input-DateTime', libInputDateTime.default_configuration, libInputDateTime);
-			tmpInputDateTimeProvider.initialize();
+			this.pict.addProvider('Pict-Input-DateTime', libInputDateTime.default_configuration, libInputDateTime);
 		}
 	}
 

package/source/providers/Pict-Provider-DynamicTemplates-DefaultFormTemplates.js

@@ -157,6 +157,7 @@ Glug glug glug Oo... -->
 		},
 		{
 			"HashPostfix": "-Template-Input-InputType-Option",
+			"DefaultInputExtensions": ["Pict-Input-Select"],
 			"Template": /*HTML*/`
 					<!-- InputType Option {~D:Record.Hash~} {~D:Record.DataType~} -->
 					<input type="hidden" {~D:Record.Macro.InputFullProperties~} {~D:Record.Macro.InputChangeHandler~} value="">
@@ -172,6 +173,7 @@ Glug glug glug Oo... -->
 		},
 		{
 			"HashPostfix": "-Template-Input-DataType-DateTime",
+			"DefaultInputExtensions": ["Pict-Input-DateTime"],
 			"Template": /*HTML*/`
 					<!-- DataType DateTime {~D:Record.Hash~} {~D:Record.DataType~} -->
 					<input type="hidden" {~D:Record.Macro.InputFullProperties~} value="">
@@ -372,6 +374,7 @@ Glug glug glug Oo... -->
 		},
 		{
 			"HashPostfix": "-TabularTemplate-Begin-Input-InputType-Option",
+			"DefaultInputExtensions": ["Pict-Input-Select"],
 			"Template": /*HTML*/`
 					<!-- InputType Option {~D:Record.Hash~} {~D:Record.DataType~} -->
 					<input type="hidden" id="SELECT-TABULAR-DATA-{~D:Record.Macro.RawHTMLID~}-{~D:Context[2].Key~}" {~D:Record.Macro.HTMLName~} {~D:Record.Macro.InformaryTabular~} `
@@ -395,6 +398,7 @@ Glug glug glug Oo... -->
 		},
 		{
 			"HashPostfix": "-TabularTemplate-Begin-Input-DataType-DateTime",
+			"DefaultInputExtensions": ["Pict-Input-DateTime"],
 			"Template": /*HTML*/`
 					<!-- DataType DateTime {~D:Record.Hash~} {~D:Record.DataType~} -->
 					<input type="hidden" id="DATETIME-TABULAR-DATA-{~D:Record.Macro.RawHTMLID~}-{~D:Context[2].Key~}" {~D:Record.Macro.HTMLName~} {~D:Record.Macro.InformaryTabular~} `

package/source/providers/Pict-Provider-DynamicTemplates.js

@@ -58,6 +58,14 @@ class PictDynamicFormsTemplates extends libPictProvider
 					Hash: tmpTemplateHash,
 					Template: tmpTemplate.Template
 				});
+			if ('DefaultInputExtensions' in tmpTemplate)
+			{
+				this.formsTemplateSet[tmpTemplateHash].DefaultInputExtensions = tmpTemplate.DefaultInputExtensions;
+				for (let i = 0; i < tmpTemplate.DefaultInputExtensions.length; i++)
+				{
+					this.pict.providers.DynamicInput.addDefaultInputProvider(tmpTemplateHash, tmpTemplate.DefaultInputExtensions[i]);
+				}
+			}
 		}
 
 		for (let i = 0; i < _DefaultFormTemplates.Templates.length; i++)