Added spinner to new pieces and fixed some merge issues. Deployed 0.9.4 to nuc(autoupdates)

kgOrdersClient/AddCustomer.pas

@@ -135,7 +135,7 @@ implementation
 
 {$R *.dfm}
 
-uses View.Main, View.Customers, View.SelectCustomer;
+uses View.Main, View.Customers, View.SelectCustomer, Utils;
 
 procedure TFViewAddCustomer.Clear();
 // Clears the shipping address fields.
@@ -184,9 +184,7 @@ begin
   xdwdsShipTo.Close;
   xdwdsShipTo.SetJSONData(notification['ADDRESS']);
   xdwdsShipTo.Open;
-  asm
-    endSpinner();
-  end;
+  Utils.HideSpinner('spinner');
 end;
 
 procedure TFViewAddCustomer.SendAddressToServer;
@@ -547,8 +545,8 @@ begin
       var confirmationModal = new bootstrap.Modal(document.getElementById('confirmation_modal'), {
       keyboard: false });
       confirmationModal.hide();
-      startSpinner();
     end;
+    Utils.ShowSpinner('spinner');
     //delCustomer();
     tmrReturn.Enabled := true;
   end
@@ -558,8 +556,8 @@ begin
       var confirmationModal = new bootstrap.Modal(document.getElementById('confirmation_modal'), {
       keyboard: false });
       confirmationModal.hide();
-      startSpinner();
     end;
+    Utils.ShowSpinner('spinner');
     delAddress();
   end;
 end;
@@ -715,9 +713,7 @@ procedure TFViewAddCustomer.tmrReturnTimer(Sender: TObject);
 // Timer to returnto the customer page  because it takes slightly too long to
 // Delete customers causing ghost customers to show up.
 begin
-  asm
-    endSpinner();
-  end;
+  Utils.HideSpinner('spinner');
   tmrReturn.Enabled := false;
   FViewMain.ViewCustomerList('Success:Customer Successfully Deleted');
 end;

kgOrdersClient/ConnectionModule.pas

@@ -19,7 +19,7 @@ type
     FUnauthorizedAccessProc: TUnauthorizedAccessProc;
 
   public
-    const clientVersion = '0.9.3';
+    const clientVersion = '0.9.4';
     procedure InitApp(SuccessProc: TSuccessProc;
       UnauthorizedAccessProc: TUnauthorizedAccessProc);
     procedure SetClientConfig(Callback: TVersionCheckCallback);

kgOrdersClient/View.Customers.pas

@@ -61,7 +61,7 @@ var
 implementation
 
 uses
-  XData.Model.Classes, View.Main, View.SelectCustomer;
+  XData.Model.Classes, View.Main, View.SelectCustomer, Utils;
 
 {$R *.dfm}
 
@@ -124,9 +124,7 @@ var
 begin
   if PageNumber > 0 then
   begin
-    asm
-      startSpinner();
-    end;
+    Utils.ShowSpinner('spinner');
     xdcResponse := await(XDataWebClient1.RawInvokeAsync('ILookupService.GetCustomers', [searchOptions]));
     customerList := TJSObject(xdcResponse.Result);
 
@@ -135,9 +133,7 @@ begin
     xdwdsCustomers.SetJsonData(customerList['data']);
     xdwdsCustomers.Open;
 
-    asm
-      endSpinner();
-    end;
+    Utils.HideSpinner('spinner');
 
     customerListLength := integer(customerList['count']);
     TotalPages := ( (customerListLength + PageSize - 1) div PageSize);

kgOrdersClient/View.Items.pas

@@ -119,6 +119,7 @@ begin
 
   // Appends new rows to the table body
   TJSHTMLElement(document.getElementById('tblPhoneGrid').getElementsByTagName('tbody')[0]).appendChild(NewRow);
+  Utils.HideSpinner('spinner');
 end;
 
 procedure TFViewItems.GeneratePagination(TotalPages: Integer);

kgOrdersClient/View.Orders.pas

@@ -396,9 +396,7 @@ begin
     begin
       if newform.confirm then
       begin
-        asm
-          startSpinner();
-        end;
+        Utils.ShowSpinner('spinner');
         StatusJSON := TJSONObject.Create;
         StatusJSON.AddPair('ORDER_ID', OrderID);
         StatusJSON.AddPair('date', DateTimeToStr(newform.dtpDate.Date));
@@ -422,9 +420,7 @@ end;
 
 procedure TFViewOrders.tmrReturnTimer(Sender: TObject);
 begin
-  asm
-    endSpinner();
-  end;
+  Utils.HideSpinner('spinner');
   tmrReturn.Enabled := false;
   getOrders(fViewMain.search);
 end;
@@ -668,6 +664,7 @@ var
   orderListLength: integer;
   TotalPages: integer;
 begin
+  Utils.ShowSpinner('spinner');
   if PageNumber > 0 then
   begin
     xdcResponse := await(XDataWebClient1.RawInvokeAsync('ILookupService.GetOrders', [searchOptions]));

kgOrdersClient/View.SelectCustomer.pas

@@ -62,7 +62,7 @@ implementation
 
 {$R *.dfm}
 
-uses View.Main;
+uses View.Main, Utils;
 
 procedure TFSelectCustomer.WebFormCreate(Sender: TObject);
 begin
@@ -75,9 +75,7 @@ end;
 
 procedure TFSelectCustomer.WebFormShow(Sender: TObject);
 begin
-  asm
-    startSpinner();
-  end;
+  Utils.ShowSpinner('spinner');
   getCustomers();
 end;
 
@@ -112,9 +110,7 @@ begin
 
   // Manually populate the grid
   PopulateGridManually;
-  asm
-    endSpinner();
-  end;
+  Utils.HideSpinner('spinner');
 end;
 
 procedure TFSelectCustomer.PopulateGridManually;
@@ -192,16 +188,14 @@ begin
   CustomerJSON.AddPair('name', xdwdsCustomers.FieldByName('CompanyName').AsString);
   CustomerJSON.AddPair('mode', 'ADD');
 
-  asm
-    startSpinner()
-  end;
+  Utils.ShowSpinner('spinner');
+
   Response := await(XDataWebClient1.RawInvokeAsync('ILookupService.ImportQBCustomer',
               [customerJSON.ToString]));
 
   notification := TJSObject(Response.Result);
-  asm
-    endSpinner();
-  end;
+
+  Utils.HideSpinner('spinner');
 
   FViewMain.ViewAddCustomer(string(notification['CustomerID']), string(notification['status']));
   Close();

kgOrdersClient/webKGOrders.dpr

@@ -28,7 +28,7 @@ uses
   View.Customers in 'View.Customers.pas' {FViewCustomers: TWebForm} {*.html},
   AddCustomer in 'AddCustomer.pas' {FViewAddCustomer: TWebForm} {*.html},
   View.AddAddress in 'View.AddAddress.pas' {FViewAddAddress: TWebForm} {*.html},
-  View.SelectCustomer in 'View.SelectCustomer.pas' {FSelectCustomer: TWebForm} {*.html};
+  View.SelectCustomer in 'View.SelectCustomer.pas' {FSelectCustomer: TWebForm} {*.html},
   Utils in 'Utils.pas';
 
 {$R *.res}

kgOrdersClient/webKGOrders.dproj

-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{DB6F5DBF-7E4B-45DA-AFFA-6C8DF15BA740}</ProjectGuid>
         <ProjectVersion>20.2</ProjectVersion>

kgOrdersServer/kgOrdersServer.dproj

@@ -116,8 +116,8 @@
         <DCC_UnitSearchPath>C:\RADTOOLS\FastMM4;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
         <VerInfo_MajorVer>0</VerInfo_MajorVer>
         <VerInfo_MinorVer>9</VerInfo_MinorVer>
-        <VerInfo_Release>3</VerInfo_Release>
-        <VerInfo_Keys>CompanyName=EM Systems;FileDescription=$(MSBuildProjectName);FileVersion=0.9.3.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=0.9.3.0;Comments=</VerInfo_Keys>
+        <VerInfo_Release>4</VerInfo_Release>
+        <VerInfo_Keys>CompanyName=EM Systems;FileDescription=$(MSBuildProjectName);FileVersion=0.9.4.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=0.9.4.0;Comments=</VerInfo_Keys>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
         <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>

kgOrdersServer/kgOrdersServer.ini

 [Settings]
 MemoLogLevel=3
 FileLogLevel=5
-webClientVersion=0.9.3
-LogFileNum=621
+webClientVersion=0.9.4
+LogFileNum=626
 
 [Database]
 --Server=192.168.159.131