Version 0.9.2 Deployed

kgOrdersClient/ConnectionModule.dfm

@@ -5,13 +5,11 @@ object DMConnection: TDMConnection
     OnError = ApiConnectionError
     OnRequest = ApiConnectionRequest
     OnResponse = ApiConnectionResponse
-    URL = 'http://localhost:2004/emsys/kgOrders/api/'
     Left = 48
     Top = 80
   end
   object AuthConnection: TXDataWebConnection
     OnError = AuthConnectionError
-    URL = 'http://localhost:2004/emsys/kgOrders/auth/'
     Left = 48
     Top = 16
   end

kgOrdersClient/ConnectionModule.pas

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

kgOrdersClient/config/config.json

 {
-  "AuthUrl" : "http://localhost:2004/emsys/kgOrders/auth/",
-  "ApiUrl" : "http://localhost:2004/emsys/kgOrders/api/"
+  "AuthUrl" : "http://localhost:2004/kgOrders/auth/",
+  "ApiUrl" : "http://localhost:2004/kgOrders/api/"
 }
 

kgOrdersClient/webKGOrders.dpr

@@ -78,7 +78,28 @@ begin
               DisplayMainView;
           end
           else
-            ShowMessage(ErrorMessage)
+          begin
+            asm
+              var dlg = document.createElement("dialog");
+              dlg.classList.add("shadow", "rounded", "border", "p-4");
+              dlg.style.maxWidth = "500px";
+              dlg.style.width = "90%";
+              dlg.style.fontFamily = "system-ui, sans-serif";
+
+              dlg.innerHTML =
+                "<h5 class='fw-bold mb-3 text-danger'>kgOrders web app</h5>" +
+                "<p class='mb-3' style='white-space: pre-wrap;'>" + ErrorMessage + "</p>" +
+                "<div class='text-end'>" +
+                "<button id='refreshBtn' class='btn btn-primary'>Reload</button></div>";
+
+              document.body.appendChild(dlg);
+              dlg.showModal();
+
+              document.getElementById("refreshBtn").addEventListener("click", function () {
+                location.reload(true); // Hard refresh
+              });
+            end;
+          end;
         end);
     end,
     @UnauthorizedAccessProc
@@ -86,6 +107,8 @@ begin
 end;
 
 
+
+
 begin
   Application.Initialize;
   Application.MainFormOnTaskbar := True;

kgOrdersClient/webKGOrders.dproj

@@ -90,10 +90,13 @@
         <DCC_RemoteDebug>false</DCC_RemoteDebug>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
-        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;LastCompiledTime=2018/08/27 15:18:29</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=0.9.2.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=0.9.2.0;Comments=;LastCompiledTime=2018/08/27 15:18:29</VerInfo_Keys>
         <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
-        <TMSUseJSDebugger>2</TMSUseJSDebugger>
+        <VerInfo_MajorVer>0</VerInfo_MajorVer>
+        <VerInfo_MinorVer>9</VerInfo_MinorVer>
         <TMSWebSingleInstance>1</TMSWebSingleInstance>
+        <TMSUseJSDebugger>2</TMSUseJSDebugger>
+        <VerInfo_Release>2</VerInfo_Release>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2)'!=''">
         <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>

kgOrdersServer/Source/Auth.ServiceImpl.pas

@@ -87,10 +87,11 @@ 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.');
+      Result.AddPair('error',
+        'Your browser is running an old version of the app.' + sLineBreak +
+        'Please click below to reload.');
     end;
   finally
     iniFile.Free;

kgOrdersServer/Source/Main.dfm

@@ -28,6 +28,7 @@ object FMain: TFMain
     Font.Style = []
     ParentFont = False
     ReadOnly = True
+    ScrollBars = ssVertical
     TabOrder = 0
   end
   object btnApiSwaggerUI: TButton
@@ -73,7 +74,7 @@ object FMain: TFMain
   end
   object ExeInfo1: TExeInfo
     Version = '1.6.1.1'
-    Left = 158
-    Top = 404
+    Left = 156
+    Top = 406
   end
 end

kgOrdersServer/Source/rOrderList.pas

@@ -87,7 +87,7 @@ var
   DateFormat: TFormatSettings;
   tempStr: string;
 begin
-  Logger.Log(3, 'Generated SQL for Prepare Report: ' + SQL);
+  Logger.Log(5, 'Generated SQL for Prepare Report: ' + SQL);
 
   uqOrders.Close;
   uqOrders.SQL.Text := SQL;

kgOrdersServer/kgOrdersServer.dproj

@@ -76,18 +76,26 @@
         <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
         <BT_BuildType>Debug</BT_BuildType>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=0.9.2.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=0.9.2.0;Comments=</VerInfo_Keys>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
+        <VerInfo_MajorVer>0</VerInfo_MajorVer>
+        <VerInfo_MinorVer>9</VerInfo_MinorVer>
+        <VerInfo_Release>2</VerInfo_Release>
+        <AppDPIAwarenessMode>none</AppDPIAwarenessMode>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win64)'!=''">
         <DCC_UsePackage>vclwinx;FlexCel_Report;fmx;PKIEDB28;vclie;DbxCommonDriver;bindengine;IndyIPCommon;VCLRESTComponents;FireDACCommonODBC;FireDACCommonDriver;appanalytics;IndyProtocols;vclx;FMXTMSFNCMapsPkgDXE14;IndyIPClient;dbxcds;vcledge;bindcompvclwinx;VCLTMSFNCUIPackPkgDXE14;FlexCel_Pdf;bindcompfmx;VCLTMSFNCDashboardPackPkgDXE14;TMSVCLUIPackPkgDXE14;inetdb;FireDACSqliteDriver;DbxClientDriver;soapmidas;vclactnband;fmxFireDAC;dbexpress;DBXMySQLDriver;VclSmp;inet;fcstudiowin;vcltouch;fmxase;VCLTMSFNCMapsPkgDXE14;ipstudiowin;dbrtl;QRWRunDXE11_w64;fmxdae;FlexCel_XlsAdapter;FireDACMSAccDriver;VCL_FlexCel_Core;CustomIPTransport;vcldsnap;DBXInterBaseDriver;IndySystem;ipstudiowinclient;VCLTMSFNCCorePkgDXE14;vcldb;CamRemoteD11;FMXTMSFNCUIPackPkgDXE14;VirtualTreesR;WPViewPDF_RT;FlexCel_Core;vclFireDAC;bindcomp;FireDACCommon;FlexCel_Render;FMXTMSFNCCorePkgDXE14;IndyCore;RESTBackendComponents;bindcompdbx;rtl;FireDACMySQLDriver;FireDACADSDriver;VCL_FlexCel_Components;RESTComponents;DBXSqliteDriver;vcl;IndyIPServer;dsnapxml;dsnapcon;adortl;TMSVCLUIPackPkgExDXE14;AdvChartDXE14;vclimg;FireDACPgDriver;FireDAC;inetdbxpress;TMSVCLUIPackPkgXlsDXE14;xmlrtl;tethering;PKIECtrl28;bindcompvcl;dsnap;CloudService;fmxobj;bindcompvclsmp;soaprtl;soapserver;FireDACIBDriver;$(DCC_UsePackage)</DCC_UsePackage>
         <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
         <BT_BuildType>Debug</BT_BuildType>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=;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>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
+        <VerInfo_MajorVer>0</VerInfo_MajorVer>
+        <VerInfo_MinorVer>9</VerInfo_MinorVer>
+        <VerInfo_Release>2</VerInfo_Release>
+        <AppDPIAwarenessMode>none</AppDPIAwarenessMode>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1)'!=''">
         <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>

kgOrdersServer/kgOrdersServer.ini

 [Settings]
-MemoLogLevel=4
+MemoLogLevel=3
 FileLogLevel=5
-LogFileNum=332
-webClientVersion=0.9.0
+LogFileNum=345
+webClientVersion=0.9.2
 
 [Database]
 --Server=192.168.159.132

kgOrdersServer/kgOrdersServer.json

 {
-  "url": "http://localhost:2004/emsys/kgOrders/",
+  "url": "http://localhost:2004/kgOrders/",
   "jwtTokenSecret": "super_secret0123super_secret4567",
   "adminPassword": "whatisthisusedfor",
   "webAppFolder": "static",