pict-section-form 1.0.125 → 1.0.127

package/debug/Harness.js

@@ -3,5 +3,5 @@ const libParseCSV = require('../utility/csvparser/ParseCSV-Program.js');
 // This command takes the `TabularManifestCSV.csv` file and imports it into a JSON file
 //libParseCSV.run(['node', 'Harness.js', 'import']);
 // This command takes the `data/MathExampleForm.json` file and injects any sidecare files in the `input_data` folder into the JSON file
-//libParseCSV.run(['node', 'Harness.js', 'inject']);
-libParseCSV.run(['node', 'Harness.js', 'intersect']);
+libParseCSV.run(['node', 'Harness.js', 'inject']);
+//libParseCSV.run(['node', 'Harness.js', 'intersect']);

package/debug/data/DefaultFormManifest.json

@@ -868,7 +868,7 @@
                             "ExtraData": ""
                         },
                         {
-                            "Identifier": "C",
+                            "Identifier": "C and 4\" Nails",
                             "Width": "1",
                             "Height": "1",
                             "Depth": "1",

package/debug/data/MathExampleForm.json

@@ -868,7 +868,7 @@
                             "ExtraData": ""
                         },
                         {
-                            "Identifier": "C",
+                            "Identifier": "C and 4\" Nails",
                             "Width": "1",
                             "Height": "1",
                             "Depth": "1",

package/debug/input_data/Rectangles.csv

@@ -1,7 +1,7 @@
 Identifier,Width,Height,Depth,ExtraData
 A,1,1,1,
 B,1,1,1,
-C,1,1,1,
+"C and 4"" Nails",1,1,1,
 D,1,1,1,
 E,1,1,1,
 F,1,1,1,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "pict-section-form",
-    "version": "1.0.125",
+    "version": "1.0.127",
     "description": "Pict dynamic form sections",
     "main": "source/Pict-Section-Form.js",
     "directories": {

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

@@ -283,10 +283,10 @@ class PictDynamicFormsSolverBehaviors extends libPictProvider
 	 * @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.
+	 * @param {string} [pCSSSelector] - Optional. If provided, the color will be applied to the closest element matching this selector 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)
+	colorInputBackground(pSectionHash, pInputHash, pColor, pApplyChange, pCSSSelector)
 	{
 		if (pApplyChange == "0")
 		{
@@ -321,13 +321,13 @@ class PictDynamicFormsSolverBehaviors extends libPictProvider
 
 		// 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)
+		if (pCSSSelector)
 		{
 			// 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}`);
+				const closest = element.closest(`${pCSSSelector}`);
 				if (closest)
 				{
 					tmpElement = closest;

package/source/services/ManifestFactory.js

@@ -624,7 +624,7 @@ class ManifestFactory extends libFableServiceProviderBase
 		{
 			// Clean up the equation a bit to remove any leading/trailing spaces and replace HTML quotes
 			// that may have been added by the CSV or other source.
-			const tmpCleanEquation = tmpRecord['Equation'].trim().replace(/"/g, '"');
+			const tmpCleanEquation = tmpRecord['Equation'].trim();
 			this.log.trace(`Adding solver to ${tmpRecord.Form} --> ${tmpGroup.Name} for ${tmpRecord['Input Hash']}: ${tmpRecord['Equation']}`);
 			if ((tmpGroup.Layout == 'Tabular') || (tmpGroup.Layout == 'RecordSet'))
 			{

package/utility/csvparser/ParseCSV-Command-Inject.js

@@ -27,6 +27,7 @@ class ImportExtraDataCSVCommand extends libPictCommandLineUtility.ServiceCommand
 		// Parse the CSV file
 		const tmpRecords = [];
 		const tmpCSVParser = this.fable.instantiateServiceProvider('CSVParser');
+		tmpCSVParser.EscapedQuoteString = '"';
 		this.fable.log.info(`Parsing CSV file [${pFilePath}]...`);
 
 		const tmpReadline = libReadline.createInterface(
@@ -59,6 +60,7 @@ class ImportExtraDataCSVCommand extends libPictCommandLineUtility.ServiceCommand
 		// Parse the CSV file
 		const tmpRecords = [];
 		const tmpCSVParser = this.fable.instantiateServiceProvider('CSVParser');
+		tmpCSVParser.EscapedQuoteString = '"';
 		this.fable.log.info(`Parsing Options CSV file [${pFilePath}]...`);
 
 		const tmpReadline = libReadline.createInterface(

package/utility/csvparser/ParseCSV-Command-Parse.js

@@ -67,6 +67,7 @@ class ImportCSVCommand extends libPictCommandLineUtility.ServiceCommandLineComma
 		// Parse the CSV file
 		const tmpRecords = [];
 		const tmpCSVParser = this.fable.instantiateServiceProvider('CSVParser');
+		tmpCSVParser.EscapedQuoteString = '"';
 
 		this.fable.log.info(`Parsing CSV file [${tmpFileName}]...`);
 
@@ -82,6 +83,7 @@ class ImportCSVCommand extends libPictCommandLineUtility.ServiceCommandLineComma
 				const tmpRecord = tmpCSVParser.parseCSVLine(pLine);
 				if (tmpRecord)
 				{
+					tmpRecord.Equation = tmpRecord.Equation.replace(/"/g, '"');
 					tmpRecords.push(tmpRecord);
 				}
 			});