Merge remote-tracking branch 'origin/mac3' into cam3

kgOrdersClient/View.AddItem.pas

@@ -10,7 +10,7 @@ uses
   Data.DB, XData.Web.JsonDataset, XData.Web.Dataset, WEBLib.DB, VCL.TMSFNCTypes, VCL.TMSFNCUtils,
   VCL.TMSFNCGraphics, VCL.TMSFNCGraphicsTypes, VCL.TMSFNCGridCell,
   VCL.TMSFNCGridOptions, VCL.TMSFNCCustomControl, VCL.TMSFNCCustomScrollControl,
-  VCL.TMSFNCGridData, VCL.TMSFNCCustomGrid, VCL.TMSFNCGrid;
+  VCL.TMSFNCGridData, VCL.TMSFNCCustomGrid, VCL.TMSFNCGrid, Utils;
 
 type
   TfViewAddItem = class(TWebForm)
@@ -138,6 +138,7 @@ begin
   finally
     TMSFNCGrid1.EndUpdate;
   end;
+  Utils.HideSpinner('spinner');
 end;
 
 procedure TfViewAddItem.TMSFNCGrid1CellClick(Sender: TObject; ACol,

kgOrdersClient/View.Items.dfm

@@ -50,6 +50,7 @@ object FViewItems: TFViewItems
     ChildOrder = 7
     ElementID = 'btnadd'
     ElementFont = efCSS
+    Enabled = False
     HeightStyle = ssAuto
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
@@ -151,6 +152,7 @@ object FViewItems: TFViewItems
     ElementID = 'btnconfirm'
     ElementFont = efCSS
     ElementPosition = epRelative
+    Enabled = False
     HeightStyle = ssAuto
     HeightPercent = 100.000000000000000000
     Role = 'null'
@@ -167,6 +169,7 @@ object FViewItems: TFViewItems
     ElementID = 'btncancel'
     ElementFont = efCSS
     ElementPosition = epRelative
+    Enabled = False
     HeightStyle = ssAuto
     HeightPercent = 100.000000000000000000
     Role = 'null'
@@ -182,6 +185,7 @@ object FViewItems: TFViewItems
     ChildOrder = 79
     ElementID = 'btndelete'
     ElementFont = efCSS
+    Enabled = False
     HeightStyle = ssAuto
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
@@ -196,6 +200,7 @@ object FViewItems: TFViewItems
     ChildOrder = 83
     ElementID = 'btnedit'
     ElementFont = efCSS
+    Enabled = False
     HeightStyle = ssAuto
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000

kgOrdersClient/View.Items.html

@@ -21,9 +21,6 @@
             <li class="nav-item pe-2">
                 <button id="btncancel" class="btn btn-danger btn-sm">Cancel</button>
             </li>
-            <li class="nav-item">
-                <button id="btnclose" class="btn btn-primary btn-sm">Close</button>
-            </li>
         </ul>
     </div>
 </nav>

kgOrdersClient/View.Items.pas

@@ -143,7 +143,7 @@ begin
       Rows := TBody.children;
       for I := 0 to Rows.length - 1 do
       begin
-        RowElem := TJSHTMLElement(Rows.item(I));   // ? cast Node ? HTMLElement
+        RowElem := TJSHTMLElement(Rows.item(I));   // cast Node HTMLElement
         RowElem.classList.remove('table-primary');
       end;
 

kgOrdersServer/kgOrdersServer.ini

@@ -2,7 +2,7 @@
 MemoLogLevel=3
 FileLogLevel=5
 webClientVersion=0.9.4
-LogFileNum=704
+LogFileNum=722
 
 [Database]
 Server=192.168.159.131