Added static folder to server to test. Version added, fixed scroll on main form.

kgOrdersClient/App.Types.pas

@@ -11,6 +11,7 @@ type
   TSuccessProc = reference to procedure;
   TLogoutProc = reference to procedure(AMessage: string = '');
   TUnauthorizedAccessProc = reference to procedure(AMessage: string);
+  TVersionCheckCallback = reference to procedure(Success: Boolean; ErrorMessage: string);
 
   TListProc = reference to procedure;
   TSelectProc = reference to procedure(AParam: string);

kgOrdersClient/ConnectionModule.dfm

@@ -2,17 +2,22 @@ object DMConnection: TDMConnection
   Height = 264
   Width = 395
   object ApiConnection: TXDataWebConnection
-    URL = 'http://localhost:2004/emsys/kgOrders/api/'
     OnError = ApiConnectionError
     OnRequest = ApiConnectionRequest
     OnResponse = ApiConnectionResponse
+    URL = 'http://localhost:2004/emsys/kgOrders/api/'
     Left = 48
     Top = 80
   end
   object AuthConnection: TXDataWebConnection
-    URL = 'http://localhost:2004/emsys/kgOrders/auth/'
     OnError = AuthConnectionError
+    URL = 'http://localhost:2004/emsys/kgOrders/auth/'
     Left = 48
     Top = 16
   end
+  object XDataWebClient1: TXDataWebClient
+    Connection = AuthConnection
+    Left = 269
+    Top = 164
+  end
 end

kgOrdersClient/ConnectionModule.pas

@@ -4,21 +4,25 @@ interface
 
 uses
   System.SysUtils, System.Classes, WEBLib.Modules, XData.Web.Connection,
-  App.Types, App.Config;
+  App.Types, App.Config, XData.Web.Client;
 
 type
   TDMConnection = class(TWebDataModule)
     ApiConnection: TXDataWebConnection;
     AuthConnection: TXDataWebConnection;
+    XDataWebClient1: TXDataWebClient;
     procedure ApiConnectionError(Error: TXDataWebConnectionError);
     procedure ApiConnectionRequest(Args: TXDataWebConnectionRequest);
     procedure ApiConnectionResponse(Args: TXDataWebConnectionResponse);
     procedure AuthConnectionError(Error: TXDataWebConnectionError);
   private
     FUnauthorizedAccessProc: TUnauthorizedAccessProc;
+
   public
+    const clientVersion = '0.9.0';
     procedure InitApp(SuccessProc: TSuccessProc;
       UnauthorizedAccessProc: TUnauthorizedAccessProc);
+    procedure SetClientConfig(Callback: TVersionCheckCallback);
   end;
 
 var
@@ -79,4 +83,31 @@ begin
   LoadConfig(@ConfigLoaded);
 end;
 
+
+procedure TDMConnection.SetClientConfig(Callback: TVersionCheckCallback);
+
+begin
+  XDataWebClient1.Connection := AuthConnection;
+
+  XDataWebClient1.RawInvoke('IAuthService.VerifyVersion', [clientVersion],
+    procedure(Response: TXDataClientResponse)
+    var
+      jsonResult: TJSObject;
+      error: string;
+    begin
+      jsonResult := TJSObject(Response.Result);
+
+      if jsonResult.HasOwnProperty('error') then
+        error := string(jsonResult['error'])
+      else
+        error := '';
+
+      if error <> '' then
+        Callback(False, error)
+      else
+        Callback(True, '');
+    end);
+end;
+
+
 end.

kgOrdersClient/View.Login.dfm

 object FViewLogin: TFViewLogin
-  Width = 640
-  Height = 480
+  Color = clWhite
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
   Font.Height = -11
   Font.Name = 'Tahoma'
+  Font.Size = 8
   Font.Style = []
+  FormStyle = fsNormal
+  Height = 764
+  Left = 0
   ParentFont = False
-  OnCreate = WebFormCreate
+  TabOrder = 0
+  Top = 0
+  Width = 1322
   object WebLabel1: TWebLabel
-    Left = 240
-    Top = 112
-    Width = 67
-    Height = 13
     Caption = 'Please Sign In'
     ElementID = 'view.login.title'
-    HeightPercent = 100.000000000000000000
+    ElementPosition = epRelative
+    Font.Charset = ANSI_CHARSET
+    Font.Color = clWindowText
+    Font.Height = -11
+    Font.Name = 'Tahoma'
+    Font.Size = 8
+    Font.Style = []
+    Height = 19
+    Left = 240
+    Top = 112
     Transparent = False
-    WidthPercent = 100.000000000000000000
+    Width = 322
   end
   object WebImageControl1: TWebImageControl
-    Left = 22
-    Top = 68
-    Width = 200
-    Height = 200
-    ElementID = 'kgpicture'
-    HeightPercent = 100.000000000000000000
-    WidthPercent = 100.000000000000000000
     ChildOrder = 5
+    ElementID = 'kgpicture'
+    ElementPosition = epRelative
+    Height = 200
+    Left = 22
     Picture.Data = {
       0954506E67496D61676589504E470D0A1A0A0000000D49484452000000560000
       006B0806000000EDB27584000000017352474200AECE1CE90000000467414D41
@@ -232,67 +239,121 @@ object FViewLogin: TFViewLogin
       009C3C91D367F2FCB02B62870F03D6AC362E807ED96157C4F6EA695C667F37EB
       ABD8ED0E925883B242109BF333C69AD5E51079CD0D5914A6EC12D476FF0FA62D
       A3F3F4F969570000000049454E44AE426082}
+    Top = 68
+    Width = 200
   end
   object edtUsername: TWebEdit
+    Alignment = taLeftJustify
+    Color = clWindow
+    ElementID = 'view.login.edtusername'
+    ElementPosition = epRelative
+    Font.Charset = ANSI_CHARSET
+    Font.Color = clBlack
+    Font.Height = -11
+    Font.Name = 'Arial'
+    Font.Size = 8
+    Font.Style = []
+    Height = 21
+    HideSelection = False
     Left = 240
+    ParentFont = False
+    ShowFocus = True
+    TabOrder = 0
+    TextHint = 'Username'
     Top = 136
     Width = 121
-    Height = 21
-    ElementID = 'view.login.edtusername'
-    HeightPercent = 100.000000000000000000
-    TextHint = 'Username'
-    WidthPercent = 100.000000000000000000
   end
   object edtPassword: TWebEdit
-    Left = 240
-    Top = 163
-    Width = 121
-    Height = 21
+    Alignment = taLeftJustify
+    Color = clWindow
     ElementID = 'view.login.edtpassword'
-    HeightPercent = 100.000000000000000000
+    ElementPosition = epRelative
+    Font.Charset = ANSI_CHARSET
+    Font.Color = clBlack
+    Font.Height = -11
+    Font.Name = 'Arial'
+    Font.Size = 8
+    Font.Style = []
+    Height = 21
+    HideSelection = False
+    Left = 240
+    ParentFont = False
     PasswordChar = '*'
+    ShowFocus = True
     TabOrder = 1
     TextHint = 'Password'
-    WidthPercent = 100.000000000000000000
+    Top = 163
+    Width = 121
   end
   object btnLogin: TWebButton
-    Left = 240
-    Top = 190
-    Width = 121
-    Height = 25
     Caption = 'Login'
+    Color = clNone
     ElementID = 'view.login.btnlogin'
-    HeightPercent = 100.000000000000000000
-    TabOrder = 2
-    WidthPercent = 100.000000000000000000
+    ElementPosition = epRelative
+    Font.Charset = ANSI_CHARSET
+    Font.Color = clBlack
+    Font.Height = -11
+    Font.Name = 'Arial'
+    Font.Size = 8
+    Font.Style = []
+    Height = 25
+    Left = 240
     OnClick = btnLoginClick
+    ParentFont = False
+    Role = 'null'
+    TabOrder = 2
+    Top = 190
+    Width = 121
   end
   object pnlMessage: TWebPanel
+    Color = clBtnFace
+    ElementID = 'view.login.message'
+    ElementPosition = epRelative
+    Font.Charset = ANSI_CHARSET
+    Font.Color = clBlack
+    Font.Height = -11
+    Font.Name = 'Arial'
+    Font.Size = 8
+    Font.Style = []
+    Height = 33
     Left = 240
+    ParentFont = False
+    Role = 'null'
+    TabOrder = 3
+    TabStop = False
     Top = 65
+    Visible = False
     Width = 121
-    Height = 33
-    ElementID = 'view.login.message'
-    TabOrder = 3
     object lblMessage: TWebLabel
-      Left = 16
-      Top = 11
-      Width = 42
-      Height = 13
       Caption = 'Message'
       ElementID = 'view.login.message.label'
-      HeightPercent = 100.000000000000000000
-      WidthPercent = 100.000000000000000000
+      Font.Charset = ANSI_CHARSET
+      Font.Color = clBlack
+      Font.Height = -11
+      Font.Name = 'Arial'
+      Font.Size = 8
+      Font.Style = []
+      Height = 13
+      Left = 16
+      Top = 11
+      Width = 43
     end
     object btnCloseNotification: TWebButton
+      Color = clNone
+      ElementID = 'view.login.message.button'
+      Font.Charset = ANSI_CHARSET
+      Font.Color = clBlack
+      Font.Height = -11
+      Font.Name = 'Arial'
+      Font.Size = 8
+      Font.Style = []
+      Height = 25
       Left = 96
+      OnClick = btnCloseNotificationClick
+      Role = 'null'
+      TabOrder = 0
       Top = 3
       Width = 22
-      Height = 25
-      ElementID = 'view.login.message.button'
-      HeightPercent = 100.000000000000000000
-      WidthPercent = 100.000000000000000000
-      OnClick = btnCloseNotificationClick
     end
   end
   object XDataWebClient: TXDataWebClient

kgOrdersClient/View.Login.pas

@@ -27,7 +27,6 @@ type
     FMessage: string;
     procedure ShowNotification(Notification: string);
     procedure HideNotification;
-    [async] procedure VerifyVersion();
   public
     class procedure Display(LoginProc: TSuccessProc); overload;
     class procedure Display(LoginProc: TSuccessProc; AMsg: string); overload;
@@ -85,7 +84,8 @@ end;
 
 procedure TFViewLogin.HideNotification;
 begin
-  pnlMessage.ElementHandle.hidden := True;
+  pnlMessage.ElementHandle.classList.add('d-none');
+  pnlMessage.Visible := False;
 end;
 
 procedure TFViewLogin.ShowNotification(Notification: string);
@@ -93,32 +93,23 @@ begin
   if Notification <> '' then
   begin
     lblMessage.Caption := Notification;
-    pnlMessage.ElementHandle.hidden := False;
+    pnlMessage.ElementHandle.classList.remove('d-none');
+    pnlMessage.Visible := True;
   end;
 end;
 
-procedure TFViewLogin.btnCloseNotificationClick(Sender: TObject);
-begin
-  HideNotification;
-end;
-
-procedure TFViewLogin.VerifyVersion();
-var
-  xdcResponse: TXDataClientResponse;
-begin
-  xdcResponse := await(XDataWebClient.RawInvokeAsync('IAuthService.VerifyVersion',
-        ['1.0.0']));
-  ShowNotification(string(TJSObject(xdcResponse.Result)['value']));
-end;
-
 procedure TFViewLogin.WebFormCreate(Sender: TObject);
 begin
-//  lblAppTitle.Caption := 'EM Systems - webCharms App ver 0.9.2.22';
-  VerifyVersion();
   if FMessage <> '' then
     ShowNotification(FMessage)
   else
     HideNotification;
 end;
 
+procedure TFViewLogin.btnCloseNotificationClick(Sender: TObject);
+begin
+  HideNotification;
+end;
+
+
 end.

kgOrdersClient/View.Main.dfm

@@ -9,12 +9,12 @@ object FViewMain: TFViewMain
   Font.Size = 8
   Font.Style = []
   FormStyle = fsNormal
-  Height = 586
+  Height = 764
   Left = 0
   OnCreate = WebFormCreate
   TabOrder = 0
   Top = 0
-  Width = 640
+  Width = 1322
   object lblUsername: TWebLabel
     Caption = 'lblUsername'
     ElementID = 'view.main.username'
@@ -29,7 +29,7 @@ object FViewMain: TFViewMain
     Left = 529
     Top = 4
     Transparent = False
-    Width = 88
+    Width = 80
   end
   object wllblUserProfile: TWebLinkLabel
     Caption = ' User Profile'
@@ -93,7 +93,7 @@ object FViewMain: TFViewMain
     Left = 57
     Top = 31
     Transparent = False
-    Width = 78
+    Width = 202
   end
   object lblItemsList: TWebLinkLabel
     Caption = 'Items'
@@ -110,7 +110,7 @@ object FViewMain: TFViewMain
     Left = 560
     OnClick = lblItemsListClick
     Top = 85
-    Width = 71
+    Width = 95
   end
   object lblUsers: TWebLinkLabel
     Caption = 'Users'
@@ -140,12 +140,12 @@ object FViewMain: TFViewMain
     Font.Name = 'Arial'
     Font.Size = 8
     Font.Style = []
-    Height = 8
+    Height = 32
     HeightStyle = ssAuto
     Left = 556
     OnClick = lblordersClick
     Top = 52
-    Width = 32
+    Width = 104
   end
   object lblCustomers: TWebLabel
     Caption = 'Customers'
@@ -158,12 +158,12 @@ object FViewMain: TFViewMain
     Font.Name = 'Arial'
     Font.Size = 8
     Font.Style = []
-    Height = 8
+    Height = 32
     HeightStyle = ssAuto
     Left = 540
     OnClick = lblCustomersClick
     Top = 69
-    Width = 32
+    Width = 131
   end
   object lblQuickbooks: TWebLabel
     Caption = 'QuickBooks'
@@ -176,12 +176,12 @@ object FViewMain: TFViewMain
     Font.Name = 'Arial'
     Font.Size = 8
     Font.Style = []
-    Height = 8
+    Height = 32
     HeightStyle = ssAuto
     Left = 546
     OnClick = lblQuickbooksClick
     Top = 125
-    Width = 32
+    Width = 139
   end
   object WebPanel1: TWebPanel
     ChildOrder = 3
@@ -195,14 +195,14 @@ object FViewMain: TFViewMain
     Font.Name = 'Arial'
     Font.Size = 8
     Font.Style = []
-    Height = 32
+    Height = 0
     HeightStyle = ssAuto
     Left = 77
     Role = 'null'
     TabOrder = 0
     TabStop = False
     Top = 112
-    Width = 640
+    Width = 1322
     WidthStyle = ssAuto
   end
   object WebMemo1: TWebMemo
@@ -223,13 +223,30 @@ object FViewMain: TFViewMain
     ReadOnly = False
     Role = 'null'
     SelLength = 0
-    SelStart = 8
+    SelStart = 0
     ShowFocus = True
     TabOrder = 0
     Top = 479
     Visible = False
     Width = 471
   end
+  object lblVersion: TWebLabel
+    Caption = 'lblVersion'
+    ElementFont = efCSS
+    ElementID = 'view.main.version'
+    ElementPosition = epRelative
+    Font.Charset = ANSI_CHARSET
+    Font.Color = clBlack
+    Font.Height = -11
+    Font.Name = 'Arial'
+    Font.Size = 8
+    Font.Style = []
+    Height = 21
+    HeightStyle = ssAuto
+    Left = 358
+    Top = 209
+    Width = 60
+  end
   object WebMessageDlg1: TWebMessageDlg
     CustomButtons = <>
     DialogText.Strings = (

kgOrdersClient/View.Main.html

 <div id="wrapper">
     <nav class="navbar navbar-expand navbar-light bg-light" style="margin-bottom: 0px;">
         <div class="container-fluid">
-            <a id="view.main.apptitle" class="navbar-brand" href="index.html">Koehler-Gibson Orders</a>
+            <div class="d-flex align-items-center">
+                <a id="view.main.apptitle" class="navbar-brand" href="index.html">Koehler-Gibson Orders</a>
+                <span id="view.main.version" class="small text-muted ms-2"></span>
+            </div>
             <ul class="navbar-nav ml-auto">
                 <li class="nav-item">
                     <a class="dropdown-item" id="lblorders" href="#"><i class="fa fa-tags fa-fw"></i><span> Orders</span></a>

kgOrdersClient/View.Main.pas

@@ -6,7 +6,7 @@ uses
   System.SysUtils, System.Classes, JS, Web, WEBLib.Graphics, WEBLib.Controls,
   WEBLib.Forms, WEBLib.Dialogs, WEBLib.ExtCtrls, Vcl.Controls, Vcl.StdCtrls,
   WEBLib.StdCtrls, Data.DB, XData.Web.JsonDataset, XData.Web.Dataset,
-  App.Types, ConnectionModule, XData.Web.Client;
+  App.Types, ConnectionModule, XData.Web.Client, WEBLib.Menus;
 
 type
   TFViewMain = class(TWebForm)
@@ -24,6 +24,7 @@ type
     lblorders: TWebLabel;
     lblCustomers: TWebLabel;
     lblQuickbooks: TWebLabel;
+    lblVersion: TWebLabel;
     procedure WebFormCreate(Sender: TObject);
     procedure mnuLogoutClick(Sender: TObject);
     procedure wllblUserProfileClick(Sender: TObject);
@@ -93,6 +94,8 @@ begin
   lblUsers.Visible := true;
   ShowForm(TFViewOrders);
   lblAppTitle.Caption := 'Koehler-Gibson Orders';
+  lblVersion.Caption := 'v' + DMConnection.clientVersion;
+
   setActive('Orders');
 end;
 

kgOrdersClient/View.Orders.html

-<div class="container h-100 d-flex flex-column mt-0" style="max-width: 100%; padding-bottom: 0;">
+<div class="container h-100 d-flex flex-column mt-0 py-0" style="max-width: 100%;">
     <!-- Alert Section -->
     <div class="row">
         <div class=col-sm>
@@ -10,7 +10,7 @@
     </div>
 
     <!-- Actions Row -->
-    <div class="row mt-3 justify-content-center">
+    <div class="row mt-2 justify-content-center">
         <div class="col-auto d-flex align-items-center">
             <label class="mt-3" style="font-weight: 700;">Show <select class="custom-select" id="wcbpagesize" style="font-size: 1.00rem;"></select> entries</label>
         </div>
@@ -62,7 +62,7 @@
     </div>
 
     <!-- Pagination Section -->
-    <div class="d-flex justify-content-center w-100 mt-4">
+    <div class="d-flex justify-content-center w-100 mt-2">
         <nav aria-label="Page navigation">
             <ul id="pagination" class="pagination">
                 <!-- Pagination items added dynamically -->

kgOrdersClient/config/config.json

@@ -2,3 +2,4 @@
   "AuthUrl" : "http://localhost:2004/emsys/kgOrders/auth/",
   "ApiUrl" : "http://localhost:2004/emsys/kgOrders/api/"
 }
+

kgOrdersClient/webKGOrders.dpr

@@ -3,6 +3,7 @@ program webKGOrders;
 uses
   Vcl.Forms,
   XData.Web.Connection,
+  WEBLib.Dialogs,
   Auth.Service in 'Auth.Service.pas',
   App.Types in 'App.Types.pas',
   ConnectionModule in 'ConnectionModule.pas' {DMConnection: TWebDataModule},
@@ -44,6 +45,7 @@ begin
     ConnectProc;
 end;
 
+
 procedure DisplayLoginView(AMessage: string);
 begin
   AuthService.Logout;
@@ -53,23 +55,41 @@ begin
   TFViewLogin.Display(@DisplayMainView, AMessage);
 end;
 
+
 procedure UnauthorizedAccessProc(AMessage: string);
 begin
   DisplayLoginView(AMessage);
 end;
 
+
 procedure StartApplication;
 begin
-  if (not AuthService.Authenticated) or AuthService.TokenExpired then
-    DisplayLoginView
-  else
-    DisplayMainView;
+  DMConnection.InitApp(
+    procedure
+    begin
+      DMConnection.SetClientConfig(
+        procedure(Success: Boolean; ErrorMessage: string)
+        begin
+          if Success then
+          begin
+            if (not AuthService.Authenticated) or AuthService.TokenExpired then
+              DisplayLoginView
+            else
+              DisplayMainView;
+          end
+          else
+            ShowMessage(ErrorMessage)
+        end);
+    end,
+    @UnauthorizedAccessProc
+  );
 end;
 
+
 begin
   Application.Initialize;
   Application.MainFormOnTaskbar := True;
   Application.CreateForm(TDMConnection, DMConnection);
-  DMConnection.InitApp(@StartApplication, @UnauthorizedAccessProc);
+  StartApplication;
   Application.Run;
 end.

kgOrdersClient/webKGOrders.dproj

@@ -137,62 +137,50 @@
         <DCCReference Include="Paginator.Plugins.pas"/>
         <DCCReference Include="View.Items.pas">
             <Form>FViewItems</Form>
-            <FormType>dfm</FormType>
             <DesignClass>TWebForm</DesignClass>
         </DCCReference>
         <DCCReference Include="View.Main.pas">
             <Form>FViewMain</Form>
-            <FormType>dfm</FormType>
             <DesignClass>TWebForm</DesignClass>
         </DCCReference>
         <DCCReference Include="View.Home.pas">
             <Form>FViewHome</Form>
-            <FormType>dfm</FormType>
             <DesignClass>TWebForm</DesignClass>
         </DCCReference>
         <DCCReference Include="View.Users.pas">
             <Form>FViewUsers</Form>
-            <FormType>dfm</FormType>
             <DesignClass>TWebForm</DesignClass>
         </DCCReference>
         <DCCReference Include="View.EditUser.pas">
             <Form>FViewEditUser</Form>
-            <FormType>dfm</FormType>
             <DesignClass>TWebForm</DesignClass>
         </DCCReference>
         <DCCReference Include="View.Orders.pas">
             <Form>FViewOrders</Form>
-            <FormType>dfm</FormType>
             <DesignClass>TWebForm</DesignClass>
         </DCCReference>
         <DCCReference Include="View.OrderEntryCorrugated.pas">
             <Form>FOrderEntryCorrugated</Form>
-            <FormType>dfm</FormType>
             <DesignClass>TWebForm</DesignClass>
         </DCCReference>
         <DCCReference Include="View.AddOrder.pas">
             <Form>FAddOrder</Form>
-            <FormType>dfm</FormType>
             <DesignClass>TWebForm</DesignClass>
         </DCCReference>
         <DCCReference Include="View.Search.pas">
             <Form>FSearch</Form>
-            <FormType>dfm</FormType>
             <DesignClass>TWebForm</DesignClass>
         </DCCReference>
         <DCCReference Include="View.SetStatus.pas">
             <Form>FSetStatus</Form>
-            <FormType>dfm</FormType>
             <DesignClass>TWebForm</DesignClass>
         </DCCReference>
         <DCCReference Include="View.OrderEntryCuttingDie.pas">
             <Form>FOrderEntryCuttingDie</Form>
-            <FormType>dfm</FormType>
             <DesignClass>TWebForm</DesignClass>
         </DCCReference>
         <DCCReference Include="View.OrderEntryWeb.pas">
             <Form>FOrderEntryWeb</Form>
-            <FormType>dfm</FormType>
             <DesignClass>TWebForm</DesignClass>
         </DCCReference>
         <None Include="index.html"/>
@@ -231,7 +219,6 @@
                 <DeployFile LocalName="config\config.json" Configuration="Debug" Class="ProjectFile"/>
                 <DeployFile LocalName="css\app.css" Configuration="Debug" Class="ProjectFile"/>
                 <DeployFile LocalName="index.html" Configuration="Debug" Class="ProjectFile"/>
-                <DeployFile LocalName="index.html" Configuration="Debug" Class="ProjectFile"/>
                 <DeployFile LocalName="template\bootstrap\bootstrap.min.css" Configuration="Debug" Class="ProjectFile"/>
                 <DeployFile LocalName="template\bootstrap\bootstrap.min.js" Configuration="Debug" Class="ProjectFile"/>
                 <DeployFile LocalName="template\bootstrap\dataTables.bootstrap.css" Configuration="Debug" Class="ProjectFile"/>

kgOrdersServer/Source/Auth.Service.pas

@@ -7,7 +7,8 @@ interface
 uses
   XData.Service.Common,
   Aurelius.Mapping.Attributes,
-  System.Generics.Collections;
+  System.Generics.Collections,
+  System.JSON;
 
 const
   AUTH_MODEL = 'Auth';
@@ -18,7 +19,7 @@ type
   IAuthService = interface(IInvokable)
   ['{9CFD59B2-A832-4F82-82BB-9A25FC93F305}']
     function Login(const user, password: string): string;
-    function VerifyVersion(version: string): string;
+    function VerifyVersion(ClientVersion: string): TJSONObject;
   end;
 
 implementation

kgOrdersServer/Source/Auth.ServiceImpl.pas

@@ -10,7 +10,7 @@ uses
   XData.Server.Module,
   Auth.Service,
   Auth.Database,
-  Uni, Data.DB, System.Hash;
+  Uni, Data.DB, System.Hash, System.IniFiles, System.JSON;
 
 type
   [ServiceImplementation]
@@ -33,7 +33,7 @@ type
     function CheckUser(const user, password: string): Integer;
   public
     function Login(const user, password: string): string;
-    function VerifyVersion(version: string): string;
+    function VerifyVersion(ClientVersion: string): TJSONObject;
   end;
 
 implementation
@@ -69,17 +69,35 @@ begin
   Result := authDB.uq;
 end;
 
-function TAuthService.VerifyVersion(version: string): string;
+function TAuthService.VerifyVersion(ClientVersion: string): TJSONObject;
+var
+  iniFile: TIniFile;
+  webClientVersion: string;
 begin
-  if( version <> '1.0.0' ) then
-  begin
-    Logger.Log( 2, 'TLoginService.GetAgenciesConfigList - Error: wrong ver!' );
-    result := 'Error - You have the wrong version! Please clear your cache and refresh!';
-    Exit;
+  Result := TJSONObject.Create;
+  TXDataOperationContext.Current.Handler.ManagedObjects.Add(Result);
+
+  iniFile := TIniFile.Create(ChangeFileExt(ParamStr(0), '.ini'));
+  try
+    webClientVersion := iniFile.ReadString('Settings', 'webClientVersion', '');
+    Result.AddPair('webClientVersion', webClientVersion);
+
+    if webClientVersion = '' then
+    begin
+      Result.AddPair('error', 'webClientVersion is not configured.');
+      Exit;
+    end;
+
+    if clientVersion <> webClientVersion then
+    begin
+      Result.AddPair('error', 'Version mismatch. Please celar your cache and refresh your browser.');
+    end;
+  finally
+    iniFile.Free;
   end;
-  result := '';
 end;
 
+
 function TAuthService.Login(const user, password: string): string;
 // Login verification: currently checks if logins are the same or if the user
 // is admin, checks for admin password. Eventually will do a database lookup

kgOrdersServer/Source/Common.Config.pas

@@ -6,7 +6,7 @@ unit Common.Config;
 interface
 
 const
-  defaultServerUrl = 'http://localhost:2004/emsys/kgOrders/';
+  defaultServerUrl = 'http://localhost:2004/kgOrders/';
 
 type
   TServerConfig = class
@@ -17,12 +17,13 @@ type
     FWebAppFolder: string;
     FReportsFolder: string;
   public
-    constructor Create;
     property url: string read FUrl write FUrl;
     property jwtTokenSecret: string read FJWTTokenSecret write FJWTTokenSecret;
     property adminPassword: string read FAdminPassword write FAdminPassword;
     property webAppFolder: string read FWebAppFolder write FWebAppFolder;
     property reportsFolder: string read FReportsFolder write FReportsFolder;
+
+    constructor Create;
   end;
 
 procedure LoadServerConfig;
@@ -79,7 +80,7 @@ begin
   adminPassword := 'whatisthisusedfor';
   jwtTokenSecret := 'super_secret0123super_secret4567';
   webAppFolder := 'static';
-  reportsFolder := '..\kgOrdersClient\TMSWeb\Debug\';
+  reportsFolder := 'static/';
 //  ServerConfigStr := Bcl.Json.TJson.Serialize( ServerConfig );
 //  ConfigFile := 'serverconfig.json';
 //  TFile.WriteAllText( ConfigFile, ServerConfigStr );

kgOrdersServer/Source/Main.dfm

@@ -71,4 +71,9 @@ object FMain: TFMain
     Left = 58
     Top = 398
   end
+  object ExeInfo1: TExeInfo
+    Version = '1.6.1.1'
+    Left = 158
+    Top = 404
+  end
 end

kgOrdersServer/Source/Main.pas

@@ -9,7 +9,8 @@ uses
   Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, Winapi.ShellApi,
   System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs,
   Vcl.StdCtrls, Vcl.ExtCtrls, System.Generics.Collections, System.IniFiles,
-  Auth.Service, Auth.Server.Module, Lookup.Service, Api.Server.Module, App.Server.Module;
+  Auth.Service, Auth.Server.Module, Lookup.Service, Api.Server.Module, App.Server.Module,
+  ExeInfo;
 
 type
   TFMain = class(TForm)
@@ -19,6 +20,7 @@ type
     btnExit: TButton;
     initTimer: TTimer;
     btnAuthSwaggerUI: TButton;
+    ExeInfo1: TExeInfo;
     procedure btnApiSwaggerUIClick(Sender: TObject);
     procedure btnDataClick(Sender: TObject);
     procedure btnExitClick(Sender: TObject);
@@ -87,6 +89,7 @@ end;
 procedure TFMain.initTimerTimer(Sender: TObject);
 begin
   initTimer.Enabled := False;
+  Caption := Caption + ' ver ' + ExeInfo1.FileVersion;
   ServerConfig := TServerConfig.Create;
   LoadServerConfig;
   StartServers;
@@ -99,9 +102,10 @@ var
   iniFile: TIniFile;
   iniStr: string;
 begin
-  // this looks ok in the log file but not in the memo on the form
+  // The version is centered when the app is running
   Logger.Log( 1, '*******************************************************' );
-  Logger.Log( 1, '*             kgOrdersServer - ver 1.1.0              *' );
+  Logger.Log( 1, '*                  kgOrdersServer                     *' );
+  Logger.Log(1, Format('                  Version: %s               ', [FMain.ExeInfo1.FileVersion]));
   Logger.Log( 1, '*            Developed by EM Systems, Inc.            *' );
   Logger.Log( 1, '*******************************************************' );
   Logger.Log( 1, '' );

kgOrdersServer/Source/rOrderCorrugated.pas

@@ -212,7 +212,7 @@ begin
     ForceDirectories(ReportDir);
     Logger.Log(5, 'Reports directory created: ' + ReportDir);
   end;
-  reportURL :=  'reports\' + FormatDateTime('yyyymmdd_hhnnss', Now) + '.pdf';
+  reportURL :=  FormatDateTime('yyyymmdd_hhnnss', Now) + '.pdf';
 
   ReportFileName := reportDir + reportUrl;
 

kgOrdersServer/Source/rOrderList.pas

@@ -210,7 +210,7 @@ begin
     ForceDirectories(ReportDir);
     Logger.Log(5, 'Reports directory created: ' + ReportDir);
   end;
-  reportURL :=  'reports\' + FormatDateTime('yyyymmdd_hhnnss', Now) + '.pdf';
+  reportURL :=  'reports/' + FormatDateTime('yyyymmdd_hhnnss', Now) + '.pdf';
 
   ReportFileName := reportDir + reportUrl;
 

kgOrdersServer/kgOrdersServer.dproj

@@ -106,6 +106,10 @@
         <VerInfo_Locale>1033</VerInfo_Locale>
         <DCC_ExeOutput>.</DCC_ExeOutput>
         <DCC_UnitSearchPath>C:\RADTOOLS\FastMM4;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+        <VerInfo_MajorVer>0</VerInfo_MajorVer>
+        <VerInfo_MinorVer>9</VerInfo_MinorVer>
+        <VerInfo_Release>2</VerInfo_Release>
+        <VerInfo_Keys>CompanyName=EM Systems;FileDescription=$(MSBuildProjectName);FileVersion=0.9.2.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
         <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>

kgOrdersServer/kgOrdersServer.ini

 [Settings]
 MemoLogLevel=4
 FileLogLevel=5
-LogFileNum=310
-webClientVersion=1.0.0
+LogFileNum=332
+webClientVersion=0.9.0
 
 [Database]
 --Server=192.168.159.132

kgOrdersServer/kgOrdersServer.json

+{
+  "url": "http://localhost:2004/emsys/kgOrders/",
+  "jwtTokenSecret": "super_secret0123super_secret4567",
+  "adminPassword": "whatisthisusedfor",
+  "webAppFolder": "static",
+  "reportsFolder": "reports/"
+}
\ No newline at end of file