pict-section-form 1.2.0 → 1.2.1

package/.vscode/settings.json

@@ -1,5 +1,5 @@
 {
-	"workbench.colorTheme": "Default High Contrast",
+	"workbench.colorTheme": "Default Dark Modern",
 	"sqltools.connections": [
 		{
 			"mysqlOptions": {

package/package.json

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

package/source/providers/layouts/Pict-Layout-Custom.js

@@ -26,6 +26,19 @@ class RecordLayout extends libPictSectionGroupLayout
 	 */
 	generateGroupLayoutTemplate(pView, pGroup)
 	{
+		pGroup.Rows.sort((rowA, rowB) =>
+		{
+			if (rowA.RowNumber && rowB.RowNumber)
+			{
+				return rowA.RowNumber >= rowB.RowNumber ? 1 : -1;
+			}
+			if (!rowA.RowNumber && !rowB.RowNumber)
+			{
+				return rowA.Hash >= rowB.Hash ? 1 : -1;
+			}
+			return rowA.RowNumber ? 1 : -1;
+		});
+
 		// loop over descriptors that have my group set?
 		// set their GroupIndex from pGroup
 		for (let j = 0; j < pGroup.Rows.length; j++)

package/source/providers/layouts/Pict-Layout-Record.js

@@ -29,6 +29,19 @@ class RecordLayout extends libPictSectionGroupLayout
 		let tmpMetatemplateGenerator = this.pict.providers.MetatemplateGenerator;
 		let tmpTemplate = '';
 
+		pGroup.Rows.sort((rowA, rowB) =>
+		{
+			if (rowA.RowNumber && rowB.RowNumber)
+			{
+				return rowA.RowNumber >= rowB.RowNumber ? 1 : -1;
+			}
+			if (!rowA.RowNumber && !rowB.RowNumber)
+			{
+				return rowA.Hash >= rowB.Hash ? 1 : -1;
+			}
+			return rowA.RowNumber ? 1 : -1;
+		});
+
 		if (!('Rows' in pGroup))
 		{
 			pGroup.Rows = [];

package/source/providers/layouts/Pict-Layout-VerticalRecord.js

@@ -34,6 +34,19 @@ class VerticalRecordLayout extends libPictSectionGroupLayout
 			pGroup.Rows = [];
 		}
 
+		pGroup.Rows.sort((rowA, rowB) =>
+		{
+			if (rowA.RowNumber && rowB.RowNumber)
+			{
+				return rowA.RowNumber >= rowB.RowNumber ? 1 : -1;
+			}
+			if (!rowA.RowNumber && !rowB.RowNumber)
+			{
+				return rowA.Hash >= rowB.Hash ? 1 : -1;
+			}
+			return rowA.RowNumber ? 1 : -1;
+		});
+
 		tmpTemplate += tmpMetatemplateGenerator.getMetatemplateTemplateReference(pView, `-Template-Group-Prefix`, `getGroup("${pGroup.GroupIndex}")`);
 		// Every input has its own "row" in the vertical layout
 		tmpTemplate += tmpMetatemplateGenerator.getMetatemplateTemplateReference(pView, `-Template-VerticalRow-Prefix`, `getGroup("${pGroup.GroupIndex}")`);

package/source/services/ManifestFactory.js

@@ -122,6 +122,10 @@ class ManifestFactory extends libFableServiceProviderBase
 					tmpGroup.Rows = [];
 				}
 
+				if (Number(tmpDescriptor.PictForm.Row))
+				{
+					tmpDescriptor.PictForm.Row = Number(tmpDescriptor.PictForm.Row);
+				}
 				let tmpRowHash = (typeof (tmpDescriptor.PictForm.Row) == 'string') ? tmpDescriptor.PictForm.Row :
 					(typeof (tmpDescriptor.PictForm.Row) == 'number') ? `Row_${tmpDescriptor.PictForm.Row.toString()}` :
 						'Row_Default';
@@ -133,6 +137,10 @@ class ManifestFactory extends libFableServiceProviderBase
 				if (!tmpRow)
 				{
 					tmpRow = { Hash: tmpRowHash, Name: tmpRowHash, Inputs: [] };
+					if (typeof (tmpDescriptor.PictForm.Row) == 'number')
+					{
+						tmpRow.RowNumber = tmpDescriptor.PictForm.Row
+					}
 					tmpGroup.Rows.push(tmpRow);
 					tmpRow.Inputs.push(tmpDescriptor);
 				}