pict-section-form 1.0.86 → 1.0.88

package/example_applications/simple_form/Simple-Form_Default_Manifest.json

@@ -14,7 +14,11 @@
 				[
 					"Area = Height * Width",
 					"WidthCubeArea = Width ^ 3",
-					"HeightCubeArea = Height ^ 3"
+					"HeightCubeArea = Height ^ 3",
+					"DTPN = Height * Width",
+					"ITPNRO = Height * Width",
+					"ITDRO = Height * Width",
+					"ITPRO = Height * Width"
 				],
 			"MetaTemplates":
 				[
@@ -81,39 +85,29 @@
 					"Hash":"Area",
 					"DataType":"PreciseNumber"
 					
-					,"PictForm": {"InputType": "PreciseNumberReadOnly", "DecimalPrecision": 3, "DigitsPrefix": "$", "DigitsPostfix": " DOllars", "Section":"Area", "Row":4, "Width":2 }
+					,"PictForm": {"Section":"Area", "Row":4, "Width":2 }
 				},
 
-			"PreciseNumberOutputExercise":
+			"DTPN":
 				{
 					"Name":"DataType PreciseNumber",
 					"Hash":"DTPN",
 					"DataType":"PreciseNumber"
 					,"PictForm": {"InputType": "PreciseNumberReadOnly", "Section":"Marshaling", "Row":1, "Width":3 }
 				},
-			"PreciseNumberInputOutputExercise":
+			"ITPNRO":
 				{
 					"Name":"InputType PreciseNumberReadOnly",
 					"Hash":"ITPNRO",
 					"DataType":"PreciseNumber",
 					"InputType": "PreciseNumberReadOnly"
-					,"PictForm": { "Section":"Marshaling", "Row":1, "Width":3 }
-				},
-			"DollarsOutputExercise":
-				{
-					"Name":"InputType DollarsReadOnly",
-					"Hash":"ITDRO",
-					"DataType":"PreciseNumber",
-					"InputType": "DollarsReadOnly"
-					,"PictForm": { "Section":"Marshaling", "Row":1, "Width":3 }
-				},
-			"PercentOutputExercise":
-				{
-					"Name":"InputType PercentReadOnly",
-					"Hash":"ITPRO",
-					"DataType":"PreciseNumber",
-					"InputType": "PercentReadOnly"
-					,"PictForm": { "Section":"Marshaling", "Row":1, "Width":3 }
+					,"PictForm": { 
+						"InputType": "PreciseNumberReadOnly", 
+						"DecimalPrecision": 2,
+						"AddCommas": false,
+						"DigitsPrefix": "$", 
+						"DigitsPostfix": " (estimated)", 
+						"Section":"Marshaling", "Row":1, "Width":3 }
 				}
 		}
 }

package/harness/Harness.js

@@ -0,0 +1,125 @@
+
+const Pict = require('pict');
+const Provider = require('../source/providers/inputs/Pict-Provider-Input-EntityBundleRequest.js');
+
+const main = async (projectID) =>
+{
+	const pict = new Pict({ RestClientURLPrefix: 'https://api.qa.headlight.com', PictDefaultURLPrefix: '/1.0/' });
+	pict.LogNoisiness = 1;
+	const preRequestOptions = pict.RestClient.prepareRequestOptions;
+	let token = '';
+	pict.RestClient.prepareRequestOptions = (pOptions) =>
+	{
+		if (!pOptions.headers)
+		{
+			pOptions.headers = { };
+		}
+		if (token)
+		{
+			pOptions.headers.Authorization = `Bearer ${token}`;
+		}
+		pict.log.info(`Requesting ${pOptions.url} with token ${token}`);
+		return preRequestOptions(pOptions);
+	};
+	await new Promise((resolve, reject) => pict.RestClient.postJSON({ url: '/1.0/Authenticate', body: { UserName: 'ladotd', Password: 'emerald guppy' } }, (err, response, result) =>
+		{
+			if (err)
+			{
+				return reject(err);
+			}
+			token = result.SessionID;
+			pict.log.info(`Received token ${token}`);
+			resolve(result);
+		}));
+	pict.AppData.IDProject = projectID;
+	const provider = pict.addProvider('EntityBundleRequest', {}, Provider);
+	const dataLoadError = await provider.gatherDataFromServer({},
+		{
+			PictForm:
+			{
+				EntitiesBundle:
+				[
+					{
+						"Entity": "Project",
+						"Filter": "FBV~IDProject~EQ~{~D:Record.Value.IDProject~}",
+						"Destination": "AppData.Project",
+						"SingleRecord": true
+					},
+					{
+						"Entity": "Document",
+						"Filter": "FBV~IDProject~EQ~{~D:Record.Value.IDProject~}~FBV~DocumentType~EQ~LADOTD-PartialPayment~FSF~DocumentDate~DESC~0~FSF~IDDocument~DESC~0",
+						"Destination": "AppData.PaymentForms",
+						"RecordCount": 1
+					},
+					{
+						"Entity": "Document",
+						"Filter": "FBV~IDProject~EQ~{~D:Record.Value.IDProject~}~FBV~DocumentType~EQ~ProjectProgressUpdate-LADOTD~FSF~DocumentDate~DESC~0~FSF~IDDocument~DESC~0",
+						"Destination": "AppData.ProgressForms",
+						"RecordCount": 1
+					},
+					{
+						"Entity": "Contract",
+						"Filter": "FBV~IDContract~EQ~{~D:AppData.Project.IDContract~}",
+						"Destination": "AppData.Contract"
+					},
+					{
+						"Entity": "ContractDate",
+						"Filter": "FBV~IDContract~EQ~{~D:AppData.Project.IDContract~}~FBV~Hash~EQ~NTPD",
+						"Destination": "AppData.NTPDate",
+						"SingleRecord": true
+					},
+					{
+						"Entity": "LineItem",
+						"Filter": "FBV~IDProject~EQ~{~D:Record.Value.IDProject~}",
+						"Destination": "AppData.LineItems"
+					},
+				]
+			}
+		}, { IDProject: projectID });
+	if (dataLoadError)
+	{
+		pict.log.error(`Error loading data from server: ${dataLoadError.message || dataLoadError}`, { dataLoadError });
+	}
+	const data =
+	{
+		ProjectID: pict.AppData.Project.IDProject,
+		ContractID: pict.AppData.Project.IDContract,
+		Project: pict.AppData.Project.Name,
+		ContractedDays: pict.AppData.Project.ContractedDays,
+		//TODO: precise math?
+		SumOfLineItemAmounts: pict.AppData.LineItems.reduce((sum, lineItem) => sum + lineItem.ExpectedQuantity * lineItem.CostPerUnit, 0),
+		TotalBidAmount: pict.AppData.Contract.TotalBidAmount,
+		NetChangeOrderAmount: pict.AppData.Contract.NetChangeOrderAmount,
+		NTPDate: pict.AppData.NTPDate ? pict.AppData.NTPDate.Date : null,
+	};
+	if (pict.AppData.PaymentForms.length > 0)
+	{
+		data.PaymentDaysTotalPaidIncludingThisPayment = pict.AppData.PaymentForms[0].FormData.PaymentDaysTotalPaidIncludingThisPayment;
+		data.WorkingDaysTotal = pict.AppData.PaymentForms[0].FormData.WorkingDaysTotal;
+		for (const total of pict.AppData.PaymentForms[0].FormData.Totals)
+		{
+			if (total.name == 'Grand Total Paid to Date this Contract - Including this Payment')
+			{
+				data.PaidTotal = total.amount;
+			}
+		}
+	}
+	if (pict.AppData.ProgressForms.length > 0)
+	{
+		const progressData = pict.AppData.ProgressForms[0].FormData?.EstimatedCompletion;
+		if (progressData)
+		{
+			data.EstimatedCompletionDate = `${progressData.Month}, ${progressData.Year}`;
+			data.ECDNotes = progressData.Notes;
+		}
+	}
+	pict.log.info('Data gathered from server', data);
+};
+
+main(7323).then(() =>
+{
+	console.info('Done');
+}).catch((err) =>
+{
+	console.error(err);
+});

package/harness/package.json

@@ -0,0 +1,14 @@
+{
+  "name": "harness",
+  "version": "1.0.0",
+  "main": "Harness.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC",
+  "description": "",
+  "dependencies": {
+    "pict": "^1.0.241"
+  }
+}

package/harness/tsconfig.json

@@ -0,0 +1,16 @@
+{
+	"include": ["*.js", "../source"],
+	"compilerOptions":
+	{
+		"target": "es2019",
+		"esModuleInterop": true,
+		"allowJs": true,
+		"checkJs": true,
+		"declaration": true,
+		"emitDeclarationOnly": true,
+		"outDir": "types",
+		"declarationMap": true,
+		"module": "commonjs",
+		"resolveJsonModule": true
+	}
+}

package/package.json

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

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

@@ -164,7 +164,7 @@ class PictDynamicSolver extends libPictProvider
 				continue;
 			}
 
-			tmpSolver.StartTimeStamp = +new Date();
+			tmpSolver.StartTimeStamp = Date.now();
 			tmpSolver.Hash = `${pGroupSolverArray[j].ViewHash}-GroupSolver-${j}`;
 
 			if (this.pict.LogNoisiness > 1)
@@ -174,12 +174,11 @@ class PictDynamicSolver extends libPictProvider
 
 			let tmpRecordSet = tmpView.getTabularRecordSet(tmpGroup.GroupIndex);
 
-			if (typeof(tmpRecordSet) == 'object')
+			if (Array.isArray(tmpRecordSet))
 			{
-				let tmpRecordSetKeys = Object.keys(tmpRecordSet);
-				for (let l = 0; l < tmpRecordSetKeys.length; l++)
+				for (let l = 0; l < tmpRecordSet.length; l++)
 				{
-					let tmpRecord = tmpRecordSet[tmpRecordSetKeys[l]];
+					let tmpRecord = tmpRecordSet[l];
 					tmpSolver.ResultsObject = {};
 					let tmpSolutionValue = tmpView.fable.ExpressionParser.solve(tmpSolver.Expression, tmpRecord, tmpSolver.ResultsObject, tmpGroup.supportingManifest, tmpRecord);
 					if (this.pict.LogNoisiness > 1)
@@ -188,11 +187,12 @@ class PictDynamicSolver extends libPictProvider
 					}
 				}
 			}
-			if (Array.isArray(tmpRecordSet))
+			else if (typeof(tmpRecordSet) == 'object')
 			{
-				for (let l = 0; l < tmpRecordSet.length; l++)
+				let tmpRecordSetKeys = Object.keys(tmpRecordSet);
+				for (let l = 0; l < tmpRecordSetKeys.length; l++)
 				{
-					let tmpRecord = tmpRecordSet[l];
+					let tmpRecord = tmpRecordSet[tmpRecordSetKeys[l]];
 					tmpSolver.ResultsObject = {};
 					let tmpSolutionValue = tmpView.fable.ExpressionParser.solve(tmpSolver.Expression, tmpRecord, tmpSolver.ResultsObject, tmpGroup.supportingManifest, tmpRecord);
 					if (this.pict.LogNoisiness > 1)
@@ -201,7 +201,7 @@ class PictDynamicSolver extends libPictProvider
 					}
 				}
 			}
-			tmpSolver.EndTimeStamp = +new Date();
+			tmpSolver.EndTimeStamp = Date.now();
 		}
 	}
 

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

@@ -15,7 +15,7 @@ class CustomInputHandler extends libPictSectionInputExtension
 
 		/** @type {import('pict')} */
 		this.pict;
-		/** @type {import('pict') & { Math: any }} */
+		/** @type {import('pict') & { Math: any } & { DataFormat: any }} */
 		this.fable;
 		/** @type {any} */
 		this.log;
@@ -42,6 +42,11 @@ class CustomInputHandler extends libPictSectionInputExtension
 			tmpValue = this.fable.Math.roundPrecise(tmpValue, pInput.PictForm.DecimalPrecision, tmpRoundingMethod);
 		}
 
+		if (('AddCommas' in pInput.PictForm) && pInput.PictForm.AddCommas)
+		{
+			tmpValue = this.fable.DataFormat.formatterAddCommasToNumber(tmpValue);
+		}
+
 		if ('DigitsPrefix' in pInput.PictForm)
 		{
 			tmpValue = pInput.PictForm.DigitsPrefix + tmpValue;

package/types/source/providers/inputs/Pict-Provider-Input-PreciseNumber.d.ts

@@ -10,9 +10,11 @@ declare class CustomInputHandler extends libPictSectionInputExtension {
     constructor(pFable: any, pOptions: any, pServiceHash: any);
     /** @type {import('pict')} */
     pict: import("pict");
-    /** @type {import('pict') & { Math: any }} */
+    /** @type {import('pict') & { Math: any } & { DataFormat: any }} */
     fable: import("pict") & {
         Math: any;
+    } & {
+        DataFormat: any;
     };
     /** @type {any} */
     log: any;

package/types/source/providers/inputs/Pict-Provider-Input-PreciseNumber.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Pict-Provider-Input-PreciseNumber.d.ts","sourceRoot":"","sources":["../../../../source/providers/inputs/Pict-Provider-Input-PreciseNumber.js"],"names":[],"mappings":";AAEA;;;;;;GAMG;AACH;IAEC,2DAUC;IANA,6BAA6B;IAC7B,MADW,OAAO,MAAM,CAAC,CAChB;IACT,6CAA6C;IAC7C,OADW,OAAO,MAAM,CAAC,GAAG;QAAE,IAAI,EAAE,GAAG,CAAA;KAAE,CAC/B;IACV,kBAAkB;IAClB,KADW,GAAG,CACN;IAGT,0CA+BC;IAED;;;;;;;;;;OAUG;IACH,6EAJW,GAAG,iBACH,MAAM,GACJ,OAAO,CAMnB;IAED;;;;;;;;;;OAUG;IACH,yEALW,GAAG,iBACH,MAAM,aACN,MAAM,GACJ,GAAG,CAMf;CACD"}
+{"version":3,"file":"Pict-Provider-Input-PreciseNumber.d.ts","sourceRoot":"","sources":["../../../../source/providers/inputs/Pict-Provider-Input-PreciseNumber.js"],"names":[],"mappings":";AAEA;;;;;;GAMG;AACH;IAEC,2DAUC;IANA,6BAA6B;IAC7B,MADW,OAAO,MAAM,CAAC,CAChB;IACT,mEAAmE;IACnE,OADW,OAAO,MAAM,CAAC,GAAG;QAAE,IAAI,EAAE,GAAG,CAAA;KAAE,GAAG;QAAE,UAAU,EAAE,GAAG,CAAA;KAAE,CACrD;IACV,kBAAkB;IAClB,KADW,GAAG,CACN;IAGT,0CAoCC;IAED;;;;;;;;;;OAUG;IACH,6EAJW,GAAG,iBACH,MAAM,GACJ,OAAO,CAMnB;IAED;;;;;;;;;;OAUG;IACH,yEALW,GAAG,iBACH,MAAM,aACN,MAAM,GACJ,GAAG,CAMf;CACD"}