pict-section-form 1.0.121 → 1.0.123

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

@@ -149,7 +149,7 @@ class PictDynamicFormsSolverBehaviors extends libPictProvider
 
 	setGroupVisibility(pSectionHash, pGroupHash, pVisible)
 	{
-		if (pVisible)
+		if (pVisible != "0")
 		{
 			return this.showGroup(pSectionHash, pGroupHash);
 		}
@@ -264,7 +264,7 @@ class PictDynamicFormsSolverBehaviors extends libPictProvider
 		}
 
 		let tmpElementSet = this.pict.ContentAssignment.getElement(this.getGroupSelector(tmpGroupView.formID, pGroupHash));
-		
+
 		if (tmpElementSet.length < 1)
 		{
 			this.log.warn(`PictDynamicFormsInformary: colorGroup could not find group element with section hash [${pSectionHash}] group [${pGroupHash}] selector [${this.getGroupSelector(tmpGroupView.formID, pGroupHash)}].`);
@@ -277,14 +277,23 @@ class PictDynamicFormsSolverBehaviors extends libPictProvider
 		return true;
 	}
 
-	colorInputBackground(pSectionHash, pInputHash, pColor, pApplyChange)
+	/**
+	 * Colors an input background or its container with a HTML hex color (e.g. #FF0000 for red).
+	 * @param {string} pSectionHash - The hash of the section containing the input.
+	 * @param {string} pInputHash - The hash of the input to color.
+	 * @param {string} pColor - The HTML hex color to apply (e.g. #FF0000 for red).
+	 * @param {string} pApplyChange - If "0", the change will not be applied.
+	 * @param {string} [pClassTarget] - Optional. If provided, the color will be applied to the closest element with this class instead of the input itself.
+	 * @returns {boolean} - Returns true if the color was applied successfully or if the change was skipped for pApplyChange equal to "0", false otherwise.
+	 */
+	colorInputBackground(pSectionHash, pInputHash, pColor, pApplyChange, pClassTarget)
 	{
 		if (pApplyChange == "0")
 		{
 			return true;
 		}
 
-		let tmpInputView = this.pict.views.PictFormMetacontroller.getInputViewFromHash(pSectionHash)
+		let tmpInputView = this.pict.views.PictFormMetacontroller.getSectionViewFromHash(pSectionHash)
 
 		if (!tmpInputView)
 		{
@@ -300,15 +309,33 @@ class PictDynamicFormsSolverBehaviors extends libPictProvider
 			return false;
 		}
 
-		let tmpElementSet = this.pict.ContentAssignment.getElement(`#INPUT-${tmpInput.formID}`);
+		let tmpElementSet = this.pict.ContentAssignment.getElement(`#${tmpInput.Macro.RawHTMLID}`);
 
 		if (tmpElementSet.length < 1)
 		{
-			this.log.warn(`PictDynamicFormsInformary: colorInput could not find input element with section hash [${pSectionHash}] input [${pInputHash}] selector [#INPUT-${tmpInput.formID}].`);
+			this.log.warn(`PictDynamicFormsInformary: colorInput could not find input element with section hash [${pSectionHash}] input [${pInputHash}] selector [${ tmpElementSet[0].id}].`);
 			return false;
 		}
 
 		let tmpElement = tmpElementSet[0];
+
+		// if we passed a class target, find the closest element with that class and apply the color to it
+		// otherwise, just apply it to the input element itself
+		if (pClassTarget)
+		{
+			// find closest target by class name and if we find it, immediately break out of the loop
+			for (let i = 0; i < tmpElementSet.length; i++)
+			{
+				const element = tmpElementSet[i];
+				const closest = element.closest(`.${pClassTarget}`);
+				if (closest)
+				{
+					tmpElement = closest;
+					break;
+				}
+			}
+		}
+
 		tmpElement.style.backgroundColor = pColor;
 
 		return true;

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

@@ -75,9 +75,11 @@ class PictDynamicInputEvents extends libPictProvider
 	 * @param {Object} pView - The view object.
 	 * @param {string} pInputHash - The input hash.
 	 * @param {string} pEvent - The input event.
+	 * @param {string} [pTransactionGUID] - (optional) The active transaction GUID.
 	 */
-	inputEvent(pView, pInputHash, pEvent)
+	inputEvent(pView, pInputHash, pEvent, pTransactionGUID)
 	{
+		const tmpTransactionGUID = (pTransactionGUID && typeof pTransactionGUID === 'string') ? pTransactionGUID : this.pict.getUUID();
 		let tmpInput = pView.getInputFromHash(pInputHash);
 		if (pInputHash)
 		{
@@ -94,7 +96,11 @@ class PictDynamicInputEvents extends libPictProvider
 						// we may find uninitialized inputs here, so we do not send events to those
 						if (tmpInput.Macro)
 						{
-							pView.pict.providers[tmpInputProviderList[i]].onEvent(pView, tmpInput, tmpValue, tmpInput.Macro.HTMLSelector, pEvent);
+							pView.pict.providers[tmpInputProviderList[i]].onEvent(pView, tmpInput, tmpValue, tmpInput.Macro.HTMLSelector, pEvent, tmpTransactionGUID);
+							pView.registerOnTransactionCompleteCallback(tmpTransactionGUID, () =>
+							{
+								pView.pict.providers[tmpInputProviderList[i]].onAfterEventCompletion(pView, tmpInput, tmpValue, tmpInput.Macro.HTMLSelector, pEvent, tmpTransactionGUID);
+							});
 						}
 					}
 					else
@@ -102,6 +108,11 @@ class PictDynamicInputEvents extends libPictProvider
 						pView.log.error(`Dynamic form [${pView.Hash}]::[${pView.UUID}] inputEvent ${pEvent} cannot find embedded provider [${tmpInputProviderList[i]}] for input [${tmpInput.Hash}].`);
 					}
 				}
+				if (pTransactionGUID !== tmpTransactionGUID)
+				{
+					// since we synthesized this transaction, finalize it
+					pView.finalizeTransaction(tmpTransactionGUID);
+				}
 			}
 			catch (pError)
 			{
@@ -171,9 +182,11 @@ class PictDynamicInputEvents extends libPictProvider
 	 * @param {number} pInputIndex - The index of the input.
 	 * @param {number} pRowIndex - The index of the row.
 	 * @param {string} pEvent - The input event.
+	 * @param {string} [pTransactionGUID] - (optional) The active transaction GUID.
 	 */
-	inputEventTabular(pView, pGroupIndex, pInputIndex, pRowIndex, pEvent)
+	inputEventTabular(pView, pGroupIndex, pInputIndex, pRowIndex, pEvent, pTransactionGUID)
 	{
+		const tmpTransactionGUID = (pTransactionGUID && typeof pTransactionGUID === 'string') ? pTransactionGUID : this.pict.getUUID();
 		let tmpInput = pView.getTabularRecordInput(pGroupIndex, pInputIndex);
 		if (pGroupIndex != null && pInputIndex != null && pRowIndex != null && tmpInput)
 		{
@@ -191,13 +204,22 @@ class PictDynamicInputEvents extends libPictProvider
 				{
 					if (pView.pict.providers[tmpInputProviderList[i]])
 					{
-						pView.pict.providers[tmpInputProviderList[i]].onEventTabular(pView, tmpInput, tmpValue, tmpVirtualInformaryHTMLSelector, pRowIndex, pEvent);
+						pView.pict.providers[tmpInputProviderList[i]].onEventTabular(pView, tmpInput, tmpValue, tmpVirtualInformaryHTMLSelector, pRowIndex, pEvent, tmpTransactionGUID);
+						pView.registerOnTransactionCompleteCallback(tmpTransactionGUID, () =>
+						{
+							pView.pict.providers[tmpInputProviderList[i]].onAfterEventTabularCompletion(pView, tmpInput, tmpValue, tmpVirtualInformaryHTMLSelector, pRowIndex, pEvent, tmpTransactionGUID);
+						});
 					}
 					else
 					{
 						pView.log.error(`Dynamic form [${pView.Hash}]::[${pView.UUID}] cannot find embedded provider [${tmpInputProviderList[i]}] for input [${tmpInput.Hash}] row ${pRowIndex} calling inputEvent ${pEvent}.`);
 					}
 				}
+				if (pTransactionGUID !== tmpTransactionGUID)
+				{
+					// since we synthesized this transaction, finalize it
+					pView.finalizeTransaction(tmpTransactionGUID);
+				}
 			}
 			catch (pError)
 			{

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

@@ -65,9 +65,10 @@ class PictInputExtensionProvider extends libPictProvider
 	 * @param {Object} pRow - The Row index.
 	 * @param {Object} pInput - The input object.
 	 * @param {any} pValue - The value of the input object
+	 * @param {string} pTransactionGUID - The transaction GUID for the event dispatch.
 	 * @param {string} pHTMLSelector - The HTML selector for the input object
 	 */
-	onInputInitialize(pView, pGroup, pRow, pInput, pValue, pHTMLSelector)
+	onInputInitialize(pView, pGroup, pRow, pInput, pValue, pHTMLSelector, pTransactionGUID)
 	{
 		return true;
 	}
@@ -82,9 +83,10 @@ class PictInputExtensionProvider extends libPictProvider
 	 * @param {Object} pInput - The input object.
 	 * @param {any} pValue - The value of the input object
 	 * @param {string} pHTMLSelector - The HTML selector for the input object (it will return an array).
+	 * @param {string} pTransactionGUID - The transaction GUID for the event dispatch.
 	 * @param {number} pRowIndex - The row index of the tabular data
 	 */
-	onInputInitializeTabular(pView, pGroup, pInput, pValue, pHTMLSelector, pRowIndex)
+	onInputInitializeTabular(pView, pGroup, pInput, pValue, pHTMLSelector, pRowIndex, pTransactionGUID)
 	{
 		return true;
 	}
@@ -98,8 +100,9 @@ class PictInputExtensionProvider extends libPictProvider
 	 * @param {Object} pInput - The input object.
 	 * @param {any} pValue - The new value of the input object
 	 * @param {string} pHTMLSelector - The HTML selector for the input object
+	 * @param {string} pTransactionGUID - The transaction GUID for the event dispatch.
 	 */
-	onDataChange(pView, pInput, pValue, pHTMLSelector)
+	onDataChange(pView, pInput, pValue, pHTMLSelector, pTransactionGUID)
 	{
 		return true;
 	}
@@ -112,8 +115,9 @@ class PictInputExtensionProvider extends libPictProvider
 	 * @param {any} pValue - The new value of the input object
 	 * @param {string} pHTMLSelector - The HTML selector for the input object
 	 * @param {number} pRowIndex - The row index of the tabular data
+	 * @param {string} pTransactionGUID - The transaction GUID for the event dispatch.
 	 */
-	onDataChangeTabular(pView, pInput, pValue, pHTMLSelector, pRowIndex)
+	onDataChangeTabular(pView, pInput, pValue, pHTMLSelector, pRowIndex, pTransactionGUID)
 	{
 		return true;
 	}
@@ -127,9 +131,10 @@ class PictInputExtensionProvider extends libPictProvider
 	 * @param {Object} pInput - The input object.
 	 * @param {any} pValue - The value to marshal.
 	 * @param {string} pHTMLSelector - The HTML selector.
+	 * @param {string} pTransactionGUID - The transaction GUID for the event dispatch.
 	 * @returns {boolean} - Returns true if the data was successfully marshaled to the form.
 	 */
-	onDataMarshalToForm(pView, pGroup, pRow, pInput, pValue, pHTMLSelector)
+	onDataMarshalToForm(pView, pGroup, pRow, pInput, pValue, pHTMLSelector, pTransactionGUID)
 	{
 		return true;
 	}
@@ -143,9 +148,10 @@ class PictInputExtensionProvider extends libPictProvider
 	 * @param {any} pValue - The value to marshal.
 	 * @param {string} pHTMLSelector - The HTML selector.
 	 * @param {number} pRowIndex - The index of the input in the row columns.
+	 * @param {string} pTransactionGUID - The transaction GUID for the event dispatch.
 	 * @returns {boolean} - Returns true if the data was successfully marshaled to the form.
 	 */
-	onDataMarshalToFormTabular(pView, pGroup, pInput, pValue, pHTMLSelector, pRowIndex)
+	onDataMarshalToFormTabular(pView, pGroup, pInput, pValue, pHTMLSelector, pRowIndex, pTransactionGUID)
 	{
 		return true;
 	}
@@ -188,9 +194,43 @@ class PictInputExtensionProvider extends libPictProvider
 	 * @param {any} pValue - The value from AppData.
 	 * @param {string} pHTMLSelector - The HTML selector.
 	 * @param {string} pEvent - The event hash that is expected to be triggered.
+	 * @param {string} pTransactionGUID - The transaction GUID, if any.
 	 * @returns {boolean} - Returns true.
 	 */
-	onEvent(pView, pInput, pValue, pHTMLSelector, pEvent)
+	onEvent(pView, pInput, pValue, pHTMLSelector, pEvent, pTransactionGUID)
+	{
+		return true;
+	}
+
+	/**
+	 * Handles events for the Pict-Provider-InputExtension.
+	 *
+	 * @param {Object} pView - The view object.
+	 * @param {Object} pInput - The input object.
+	 * @param {any} pValue - The value from AppData.
+	 * @param {string} pHTMLSelector - The HTML selector.
+	 * @param {string} pEvent - The event hash that is expected to be triggered.
+	 * @param {string} pTransactionGUID - The transaction GUID, if any.
+	 * @returns {boolean} - Returns true.
+	 */
+	onAfterEventCompletion(pView, pInput, pValue, pHTMLSelector, pEvent, pTransactionGUID)
+	{
+		return true;
+	}
+
+	/**
+	 * Handles events for the Pict-Provider-InputExtension.
+	 *
+	 * @param {Object} pView - The view object.
+	 * @param {Object} pInput - The input object.
+	 * @param {any} pValue - The value from AppData.
+	 * @param {string} pHTMLSelector - The HTML selector.
+	 * @param {number} pRowIndex - The row index of the tabular data.
+	 * @param {string} pEvent - The event hash that is expected to be triggered.
+	 * @param {string} pTransactionGUID - The transaction GUID, if any.
+	 * @returns {boolean} - Returns true.
+	 */
+	onEventTabular(pView, pInput, pValue, pHTMLSelector, pRowIndex, pEvent, pTransactionGUID)
 	{
 		return true;
 	}
@@ -204,9 +244,10 @@ class PictInputExtensionProvider extends libPictProvider
 	 * @param {string} pHTMLSelector - The HTML selector.
 	 * @param {number} pRowIndex - The row index of the tabular data.
 	 * @param {string} pEvent - The event hash that is expected to be triggered.
+	 * @param {string} pTransactionGUID - The transaction GUID, if any.
 	 * @returns {boolean} - Returns true.
 	 */
-	onEventTabular(pView, pInput, pValue, pHTMLSelector, pRowIndex, pEvent)
+	onAfterEventTabularCompletion(pView, pInput, pValue, pHTMLSelector, pRowIndex, pEvent, pTransactionGUID)
 	{
 		return true;
 	}

package/source/providers/inputs/Pict-Provider-Input-AutofillTriggerGroup.js

@@ -15,7 +15,7 @@ const libPictSectionInputExtension = require('../Pict-Provider-InputExtension.js
 	Providers: ["Pict-Input-AutofillTriggerGroup"],
 	AutofillTriggerGroup:
 		{
-			TriggerGroupName: "Author",
+			TriggerGroupHash: "Author",
 			TriggerAddress: "AppData.CurrentAuthor.Name",
 			MarshalEmptyValues: true
 		}
@@ -56,9 +56,9 @@ class CustomInputHandler extends libPictSectionInputExtension
 	autoFillFromAddressList(pView, pInput, pTriggerGroupInfo, pHTMLSelector)
 	{
 		// First sanity check the triggergroupinfo
-		if (!('TriggerGroupName' in pTriggerGroupInfo) || (typeof(pTriggerGroupInfo.TriggerGroupName) != 'string'))
+		if (!('TriggerGroupHash' in pTriggerGroupInfo) || (typeof(pTriggerGroupInfo.TriggerGroupHash) != 'string'))
 		{
-			this.log.warn(`AutofillTriggerGroup failed to autofill because a TriggerGroupName string is not present.`);
+			this.log.warn(`AutofillTriggerGroup failed to autofill because a TriggerGroupHash string is not present.`);
 			return false;
 		}
 		if (!('TriggerAddress' in pTriggerGroupInfo) || (typeof(pTriggerGroupInfo.TriggerAddress) != 'string'))
@@ -82,9 +82,9 @@ class CustomInputHandler extends libPictSectionInputExtension
 	autoFillFromAddressListTabular(pView, pInput, pTriggerGroupInfo, pHTMLSelector, pRowIndex)
 	{
 		// First sanity check the triggergroupinfo
-		if (!('TriggerGroupName' in pTriggerGroupInfo) || (typeof(pTriggerGroupInfo.TriggerGroupName) != 'string'))
+		if (!('TriggerGroupHash' in pTriggerGroupInfo) || (typeof(pTriggerGroupInfo.TriggerGroupHash) != 'string'))
 		{
-			this.log.warn(`AutofillTriggerGroup failed to autofill because a TriggerGroupName string is not present.`);
+			this.log.warn(`AutofillTriggerGroup failed to autofill because a TriggerGroupHash string is not present.`);
 			return false;
 		}
 		if (!('TriggerAddress' in pTriggerGroupInfo) || (typeof(pTriggerGroupInfo.TriggerAddress) != 'string'))
@@ -113,22 +113,26 @@ class CustomInputHandler extends libPictSectionInputExtension
 	 * @param {Object} pInput - The input object.
 	 * @param {any} pValue - The new value of the input.
 	 * @param {string} pHTMLSelector - The HTML selector of the input.
+	 * @param {string} pTransactionGUID - The transaction GUID, if any.
 	 * @returns {any} - The result of the super.onDataChange method.
 	 */
-	onDataChange(pView, pInput, pValue, pHTMLSelector)
+	onDataChange(pView, pInput, pValue, pHTMLSelector, pTransactionGUID)
 	{
 		let tmpTriggerGroupConfigurations = this.getTriggerGroupConfigurationArray(pInput);
 		if (Array.isArray(tmpTriggerGroupConfigurations) && this.pict.views.PictFormMetacontroller)
 		{
 			for (let i = 0; i < tmpTriggerGroupConfigurations.length; i++)
 			{
-				if (tmpTriggerGroupConfigurations[i].TriggerAllInputs)
+				const tmpGroupConfig = tmpTriggerGroupConfigurations[i];
+				if (tmpGroupConfig.TriggerAllInputs)
 				{
-					this.pict.views.PictFormMetacontroller.triggerGlobalInputEvent(`AFTG-ODC-${this.pict.getUUID()}`);
+					this.pict.views.PictFormMetacontroller.triggerGlobalInputEvent(
+						`TriggerGroup:${tmpGroupConfig.TriggerGroupHash}:DataChange:${pInput.Hash || pInput.DataAddress}:${this.pict.getUUID()}`,
+						pTransactionGUID);
 				}
 			}
 		}
-		return super.onDataChange(pView, pInput, pValue, pHTMLSelector);
+		return super.onDataChange(pView, pInput, pValue, pHTMLSelector, pTransactionGUID);
 	}
 
 	/**
@@ -139,34 +143,52 @@ class CustomInputHandler extends libPictSectionInputExtension
 	 * @param {any} pValue - The new value.
 	 * @param {string} pHTMLSelector - The HTML selector.
 	 * @param {number} pRowIndex - The index of the row.
+	 * @param {string} pTransactionGUID - The transaction GUID, if any.
 	 * @returns {any} - The result of the super method.
 	 */
-	onDataChangeTabular(pView, pInput, pValue, pHTMLSelector, pRowIndex)
+	onDataChangeTabular(pView, pInput, pValue, pHTMLSelector, pRowIndex, pTransactionGUID)
 	{
 		let tmpTriggerGroupConfigurations = this.getTriggerGroupConfigurationArray(pInput);
 		if (Array.isArray(tmpTriggerGroupConfigurations) && this.pict.views.PictFormMetacontroller)
 		{
 			for (let i = 0; i < tmpTriggerGroupConfigurations.length; i++)
 			{
-				if (tmpTriggerGroupConfigurations[i].TriggerAllInputs)
+				const tmpGroupConfig = tmpTriggerGroupConfigurations[i];
+				if (tmpGroupConfig.TriggerAllInputs)
 				{
-					this.pict.views.PictFormMetacontroller.triggerGlobalInputEvent(`AFTG-ODC-${this.pict.getUUID()}`);
+					this.pict.views.PictFormMetacontroller.triggerGlobalInputEvent(
+						`TriggerGroup:${tmpGroupConfig.TriggerGroupHash}:DataChange:${pInput.Hash || pInput.DataAddress}:${this.pict.getUUID()}`,
+						pTransactionGUID);
 				}
 			}
 		}
-		return super.onDataChangeTabular(pView, pInput, pValue, pHTMLSelector, pRowIndex);
+		return super.onDataChangeTabular(pView, pInput, pValue, pHTMLSelector, pRowIndex, pTransactionGUID);
 	}
 
-	// This input extension only responds to events
-	onEvent(pView, pInput, pValue, pHTMLSelector, pEvent)
+	/**
+	 * This input extension only responds to events
+	 *
+	 * @param {Object} pView - The view object.
+	 * @param {Object} pInput - The input object.
+	 * @param {any} pValue - The value from AppData.
+	 * @param {string} pHTMLSelector - The HTML selector.
+	 * @param {string} pEvent - The event hash that is expected to be triggered.
+	 * @param {string} pTransactionGUID - The transaction GUID, if any.
+	 * @returns {boolean} - Returns true.
+	 */
+	onEvent(pView, pInput, pValue, pHTMLSelector, pEvent, pTransactionGUID)
 	{
-		// Get all inputs that are in this autofill trigger group
-		let tmpEventGUID = (typeof(pEvent) === 'string') ? pEvent : this.pict.getUUID();
+		const tmpPayload = typeof pValue === 'string' ? pEvent : '';
+		let [ tmpType, tmpGroupHash, tmpEvent, tmpInputHash, tmpEventGUID ] = tmpPayload.split(':');
+		if (!tmpEventGUID)
+		{
+			tmpEventGUID = this.pict.getUUID();
+		}
 
 		let tmpAutoFillTriggerGroups = pInput.PictForm.AutofillTriggerGroup;
-		if (!tmpAutoFillTriggerGroups)
+		if (!tmpAutoFillTriggerGroups || tmpType !== 'TriggerGroup' || (pInput.Hash || pInput.DataAddress) == tmpInputHash)
 		{
-			return super.onEvent(pView, pInput, pValue, pHTMLSelector, pEvent);			
+			return super.onEvent(pView, pInput, pValue, pHTMLSelector, pEvent, pTransactionGUID);
 		}
 		if (!Array.isArray(tmpAutoFillTriggerGroups))
 		{
@@ -175,6 +197,10 @@ class CustomInputHandler extends libPictSectionInputExtension
 		for (let i = 0; i < tmpAutoFillTriggerGroups.length; i++)
 		{
 			let tmpAutoFillTriggerGroup = tmpAutoFillTriggerGroups[i];
+			if (tmpAutoFillTriggerGroup.TriggerGroupHash !== tmpGroupHash)
+			{
+				continue;
+			}
 
 			//FIXME: why is this check here? revisit
 			if ('TriggerAddress' in tmpAutoFillTriggerGroup)
@@ -194,17 +220,34 @@ class CustomInputHandler extends libPictSectionInputExtension
 			}
 		}
 
-		return super.onEvent(pView, pInput, pValue, pHTMLSelector, pEvent);
+		return super.onEvent(pView, pInput, pValue, pHTMLSelector, pEvent, pTransactionGUID);
 	}
 
-	onEventTabular(pView, pInput, pValue, pHTMLSelector, pRowIndex, pEvent)
+	/**
+	 * Handles events for the Pict-Provider-InputExtension.
+	 *
+	 * @param {Object} pView - The view object.
+	 * @param {Object} pInput - The input object.
+	 * @param {any} pValue - The value from AppData.
+	 * @param {string} pHTMLSelector - The HTML selector.
+	 * @param {number} pRowIndex - The row index of the tabular data.
+	 * @param {string} pEvent - The event hash that is expected to be triggered.
+	 * @param {string} pTransactionGUID - The transaction GUID, if any.
+	 * @returns {boolean} - Returns true.
+	 */
+	onEventTabular(pView, pInput, pValue, pHTMLSelector, pRowIndex, pEvent, pTransactionGUID)
 	{
-		let tmpEventGUID = (typeof(pEvent) === 'string') ? pEvent : this.pict.getUUID();
+		const tmpPayload = typeof pValue === 'string' ? pEvent : '';
+		let [ tmpType, tmpGroupHash, tmpEvent, tmpInputHash, tmpEventGUID ] = tmpPayload.split(':');
+		if (!tmpEventGUID)
+		{
+			tmpEventGUID = this.pict.getUUID();
+		}
 
-		if (!pInput.PictForm.hasOwnProperty('AutofillTriggerGroup'))
+		if (!pInput.PictForm.AutofillTriggerGroup || tmpType !== 'TriggerGroup' || (pInput.Hash || pInput.DataAddress) == tmpInputHash)
 		{
 			// Do nothing for now -- this is the triggering element
-			return;
+			return super.onEventTabular(pView, pInput, pValue, pHTMLSelector, pRowIndex, pEvent, pTransactionGUID);
 		}
 		let tmpAutoFillTriggerGroups = pInput.PictForm.AutofillTriggerGroup;
 		if (!Array.isArray(tmpAutoFillTriggerGroups))
@@ -213,6 +256,10 @@ class CustomInputHandler extends libPictSectionInputExtension
 		}
 		for (const tmpAutoFillTriggerGroup of tmpAutoFillTriggerGroups)
 		{
+			if (tmpAutoFillTriggerGroup.TriggerGroupHash !== tmpGroupHash)
+			{
+				continue;
+			}
 			//FIXME: why is this flow different from non-tabular? revisit
 			if (!tmpAutoFillTriggerGroup.SelectOptionsRefresh)
 			{
@@ -235,7 +282,7 @@ class CustomInputHandler extends libPictSectionInputExtension
 			}
 		}
 
-		return super.onEventTabular(pView, pInput, pValue, pHTMLSelector, pRowIndex, pEvent);
+		return super.onEventTabular(pView, pInput, pValue, pHTMLSelector, pRowIndex, pEvent, pTransactionGUID);
 	}
 }
 

package/source/providers/inputs/Pict-Provider-Input-DateTime.js

@@ -63,12 +63,13 @@ class CustomInputHandler extends libPictSectionInputExtension
 	 * @param {Object} pInput - The input object.
 	 * @param {any} pValue - The value to be assigned.
 	 * @param {string} pHTMLSelector - The HTML selector.
+	 * @param {string} pTransactionGUID - The transaction GUID for the event dispatch.
 	 * @returns {any} - The result of the super method call.
 	 */
-	onDataMarshalToForm(pView, pGroup, pRow, pInput, pValue, pHTMLSelector)
+	onDataMarshalToForm(pView, pGroup, pRow, pInput, pValue, pHTMLSelector, pTransactionGUID)
 	{
 		this.pict.ContentAssignment.assignContent(this.getDateTimeInputHTMLID(pInput.Macro.RawHTMLID), pValue);
-		return super.onDataMarshalToForm(pView, pGroup, pRow, pInput, pValue, pHTMLSelector);
+		return super.onDataMarshalToForm(pView, pGroup, pRow, pInput, pValue, pHTMLSelector, pTransactionGUID);
 	}
 
 	/**
@@ -80,12 +81,13 @@ class CustomInputHandler extends libPictSectionInputExtension
 	 * @param {any} pValue - The value to be assigned.
 	 * @param {string} pHTMLSelector - The HTML selector.
 	 * @param {number} pRowIndex - The index of the row.
+	 * @param {string} pTransactionGUID - The transaction GUID for the event dispatch.
 	 * @returns {any} - The result of the data marshaling.
 	 */
-	onDataMarshalToFormTabular(pView, pGroup, pInput, pValue, pHTMLSelector, pRowIndex)
+	onDataMarshalToFormTabular(pView, pGroup, pInput, pValue, pHTMLSelector, pRowIndex, pTransactionGUID)
 	{
 		this.pict.ContentAssignment.assignContent(this.getTabularDateTimeInputHTMLID(pInput.Macro.RawHTMLID, pRowIndex), pValue);
-		return super.onDataMarshalToFormTabular(pView, pGroup, pInput, pValue, pHTMLSelector, pRowIndex);
+		return super.onDataMarshalToFormTabular(pView, pGroup, pInput, pValue, pHTMLSelector, pRowIndex, pTransactionGUID);
 	}
 
 	/**

package/source/providers/inputs/Pict-Provider-Input-EntityBundleRequest.js

@@ -248,7 +248,7 @@ class CustomInputHandler extends libPictSectionInputExtension
 				if (tmpInput.PictForm.EntityBundleTriggerGroup && this.pict.views.PictFormMetacontroller)
 				{
 					// Trigger the autofill global event
-					this.pict.views.PictFormMetacontroller.triggerGlobalInputEvent(`AutoFill-${tmpInput.PictForm.EntityBundleTriggerGroup}`);
+					this.pict.views.PictFormMetacontroller.triggerGlobalInputEvent(`TriggerGroup:${tmpInput.PictForm.EntityBundleTriggerGroup}:BundleLoad:${pInput.Hash || pInput.DataAddress}:${this.pict.getUUID()}`);
 				}
 				if (tmpInput.PictForm.EntityBundleTriggerMetacontrollerSolve && this.pict.views.PictFormMetacontroller)
 				{
@@ -289,9 +289,10 @@ class CustomInputHandler extends libPictSectionInputExtension
 	 * @param {Object} pInput - The input object.
 	 * @param {any} pValue - The input value.
 	 * @param {string} pHTMLSelector - The HTML selector.
+	 * @param {string} pTransactionGUID - The transaction GUID for the event dispatch.
 	 * @returns {boolean} - Returns true if the input element is successfully initialized, false otherwise.
 	 */
-	onInputInitialize(pView, pGroup, pRow, pInput, pValue, pHTMLSelector)
+	onInputInitialize(pView, pGroup, pRow, pInput, pValue, pHTMLSelector, pTransactionGUID)
 	{
 		// Try to get the input element
 		if (pValue && pInput.PictForm && pInput.PictForm.EntityBundleTriggerOnInitialize)
@@ -300,7 +301,7 @@ class CustomInputHandler extends libPictSectionInputExtension
 			this.gatherDataFromServer(pView, pInput, pValue, pHTMLSelector);
 		}
 		// This is in case we need to do a request on initial load!
-		return super.onInputInitialize(pView, pGroup, pRow, pInput, pValue, pHTMLSelector);
+		return super.onInputInitialize(pView, pGroup, pRow, pInput, pValue, pHTMLSelector, pTransactionGUID);
 	}
 
 	/**
@@ -312,11 +313,12 @@ class CustomInputHandler extends libPictSectionInputExtension
 	 * @param {any} pValue - The input value.
 	 * @param {string} pHTMLSelector - The HTML selector.
 	 * @param {number} pRowIndex - The index of the row.
+	 * @param {string} pTransactionGUID - The transaction GUID for the event dispatch.
 	 * @returns {any} - The result of the initialization.
 	 */
-	onInputInitializeTabular(pView, pGroup, pInput, pValue, pHTMLSelector, pRowIndex)
+	onInputInitializeTabular(pView, pGroup, pInput, pValue, pHTMLSelector, pRowIndex, pTransactionGUID)
 	{
-		return super.onInputInitializeTabular(pView, pGroup, pInput, pValue, pHTMLSelector, pRowIndex);
+		return super.onInputInitializeTabular(pView, pGroup, pInput, pValue, pHTMLSelector, pRowIndex, pTransactionGUID);
 	}
 
 	/**
@@ -326,12 +328,13 @@ class CustomInputHandler extends libPictSectionInputExtension
 	 * @param {Object} pInput - The input object.
 	 * @param {any} pValue - The new value of the input.
 	 * @param {string} pHTMLSelector - The HTML selector of the input.
+	 * @param {string} pTransactionGUID - The transaction GUID for the event dispatch.
 	 * @returns {any} - The result of the super.onDataChange method.
 	 */
-	onDataChange(pView, pInput, pValue, pHTMLSelector)
+	onDataChange(pView, pInput, pValue, pHTMLSelector, pTransactionGUID)
 	{
 		this.gatherDataFromServer(pView, pInput, pValue, pHTMLSelector);
-		return super.onDataChange(pView, pInput, pValue, pHTMLSelector);
+		return super.onDataChange(pView, pInput, pValue, pHTMLSelector, pTransactionGUID);
 	}
 
 	/**
@@ -342,12 +345,13 @@ class CustomInputHandler extends libPictSectionInputExtension
 	 * @param {any} pValue - The new value.
 	 * @param {string} pHTMLSelector - The HTML selector.
 	 * @param {number} pRowIndex - The index of the row.
+	 * @param {string} pTransactionGUID - The transaction GUID for the event dispatch.
 	 * @returns {any} - The result of the super method.
 	 */
-	onDataChangeTabular(pView, pInput, pValue, pHTMLSelector, pRowIndex)
+	onDataChangeTabular(pView, pInput, pValue, pHTMLSelector, pRowIndex, pTransactionGUID)
 	{
 		this.gatherDataFromServer(pView, pInput, pValue, pHTMLSelector);
-		return super.onDataChangeTabular(pView, pInput, pValue, pHTMLSelector, pRowIndex);
+		return super.onDataChangeTabular(pView, pInput, pValue, pHTMLSelector, pRowIndex, pTransactionGUID);
 	}
 
 	/**
@@ -359,11 +363,12 @@ class CustomInputHandler extends libPictSectionInputExtension
 	 * @param {Object} pInput - The input object.
 	 * @param {any} pValue - The value to be marshaled.
 	 * @param {string} pHTMLSelector - The HTML selector.
+	 * @param {string} pTransactionGUID - The transaction GUID for the event dispatch.
 	 * @returns {boolean} - Returns true if the value is successfully marshaled to the form, otherwise false.
 	 */
-	onDataMarshalToForm(pView, pGroup, pRow, pInput, pValue, pHTMLSelector)
+	onDataMarshalToForm(pView, pGroup, pRow, pInput, pValue, pHTMLSelector, pTransactionGUID)
 	{
-		return super.onDataMarshalToForm(pView, pGroup, pRow, pInput, pValue, pHTMLSelector);
+		return super.onDataMarshalToForm(pView, pGroup, pRow, pInput, pValue, pHTMLSelector, pTransactionGUID);
 	}
 
 	/**
@@ -375,11 +380,12 @@ class CustomInputHandler extends libPictSectionInputExtension
 	 * @param {any} pValue - The value parameter.
 	 * @param {string} pHTMLSelector - The HTML selector parameter.
 	 * @param {number} pRowIndex - The row index parameter.
+	 * @param {string} pTransactionGUID - The transaction GUID for the event dispatch.
 	 * @returns {any} - The result of the data marshaling.
 	 */
-	onDataMarshalToFormTabular(pView, pGroup, pInput, pValue, pHTMLSelector, pRowIndex)
+	onDataMarshalToFormTabular(pView, pGroup, pInput, pValue, pHTMLSelector, pRowIndex, pTransactionGUID)
 	{
-		return super.onDataMarshalToFormTabular(pView, pGroup, pInput, pValue, pHTMLSelector, pRowIndex);
+		return super.onDataMarshalToFormTabular(pView, pGroup, pInput, pValue, pHTMLSelector, pRowIndex, pTransactionGUID);
 	}
 }