Refactor emT3 startup/config flow, compare server and client revisions, fix…

Refactor emT3 startup/config flow, compare server and client revisions, fix Common.Ini, cleanup and add-row append behavior, and centralize client modal handling

emT3VCLDemo/uMain.dfm

@@ -104,8 +104,8 @@ object fMain: TfMain
       'MySQL.HttpAuthenticationType=atBasic'
       'MySQL.HttpTrustServerCertificate=False'
       'MySQL.ProxyPort=0')
-    Username = 'etask'
-    Server = '192.168.116.131'
+    Username = 'root'
+    Server = '192.168.102.131'
     LoginPrompt = False
     Left = 390
     Top = 342

emT3Web/Auth.Service.pas

@@ -111,7 +111,7 @@ procedure TAuthService.Login(AUser, APassword, AClientVersion: string; ASuccess:
 begin
   if (AUser = '') or (APassword = '') then
   begin
-    AError('Please enter a username and a password');
+    AError('Invalid or expired code, please try again.');
     Exit;
   end;
 

emT3Web/ConnectionModule.pas

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

emT3Web/Utils.pas

@@ -13,6 +13,7 @@ procedure ShowErrorModal(msg: string);
 procedure ShowToast(const MessageText: string; const ToastType: string = 'success');
 procedure ShowConfirmationModal(msg, leftLabel, rightLabel: string; ConfirmProc: TProc<Boolean>);
 procedure ShowNotificationModal(msg: string);
+procedure ShowAppDialog(const Msg: string; const Title: string = 'emT3 web app'; ReloadOnClose: Boolean = False; ButtonText: string = 'Close');
 
 
 implementation
@@ -185,6 +186,37 @@ begin
 end;
 
 
+procedure ShowAppDialog(const Msg: string; const Title: string = 'emT3 web app'; ReloadOnClose: Boolean = False; ButtonText: string = 'Close');
+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'>" + Title + "</h5>" +
+      "<p class='mb-3' style='white-space: pre-wrap;'>" + Msg + "</p>" +
+      "<div class='text-end'>" +
+      "<button id='appDialogBtn' class='btn btn-primary'>" + ButtonText + "</button>" +
+      "</div>";
+
+    document.body.appendChild(dlg);
+    dlg.showModal();
+
+    document.getElementById("appDialogBtn").addEventListener("click", function () {
+      if (ReloadOnClose) {
+        location.reload();
+      } else {
+        dlg.close();
+        dlg.remove();
+      }
+    });
+  end;
+end;
+
+
 procedure ShowToast(const MessageText: string; const ToastType: string = 'success');
 var
   ParsedText, ToastKind, MsgPrefix: string;

emT3Web/View.Main.pas

@@ -35,8 +35,7 @@ implementation
 
 uses
   Auth.Service,
-  View.Test,
-  View.TasksHTML;
+  View.TaskItems;
 
 {$R *.dfm}
 
@@ -48,7 +47,7 @@ begin
   lblUsername.Caption := userName;
   lblVersion.Caption := 'v' + DMConnection.clientVersion;
 
-  ShowForm(TFTasksHTML);
+  ShowForm(TFTaskItems);
 end;
 
 procedure TFViewMain.lblLogoutClick(Sender: TObject);

emT3Web/View.TasksHTML.dfm → emT3Web/View.TaskItems.dfm

-object FTasksHTML: TFTasksHTML
+object FTaskItems: TFTaskItems
   Width = 640
   Height = 480
   CSSLibrary = cssBootstrap

emT3Web/View.TasksHTML.pas → emT3Web/View.TaskItems.pas

-unit View.TasksHTML;
+unit View.TaskItems;
 
 interface
 
@@ -11,7 +11,7 @@ uses
   WEBLib.StdCtrls;
 
 type
-  TFTasksHTML = class(TWebForm)
+  TFTaskItems = class(TWebForm)
     xdwcTasks: TXDataWebClient;
     xdwdsTasks: TXDataWebDataSet;
     xdwdsTaskstaskId: TStringField;
@@ -82,7 +82,7 @@ type
   end;
 
 var
-  FTasksHTML: TFTasksHTML;
+  FTaskItems: TFTaskItems;
 
 implementation
 
@@ -91,9 +91,9 @@ uses
 
 {$R *.dfm}
 
-procedure TFTasksHTML.WebFormCreate(Sender: TObject);
+procedure TFTaskItems.WebFormCreate(Sender: TObject);
 begin
-  console.log('TFTasksHTML.WebFormCreate fired');
+  console.log('TFTaskItems.WebFormCreate fired');
   FTaskId := Application.Parameters.Values['task_id'];
   FReportedByOptions := TJSArray.new;
   FAssignedToOptions := TJSArray.new;
@@ -141,7 +141,7 @@ begin
 end;
 
 
-function TFTasksHTML.HtmlEncode(const s: string): string;
+function TFTaskItems.HtmlEncode(const s: string): string;
 begin
   Result := s;
   Result := StringReplace(Result, '&', '&', [rfReplaceAll]);
@@ -152,7 +152,7 @@ begin
 end;
 
 
-procedure TFTasksHTML.GotoRowIndex(AIndex: Integer);
+procedure TFTaskItems.GotoRowIndex(AIndex: Integer);
 var
   i: Integer;
 begin
@@ -169,7 +169,7 @@ begin
 end;
 
 
-procedure TFTasksHTML.EditorInput(Event: TJSEvent);
+procedure TFTaskItems.EditorInput(Event: TJSEvent);
 var
   el: TJSHTMLElement;
   idx: Integer;
@@ -206,7 +206,7 @@ begin
 end;
 
 
-procedure TFTasksHTML.SelectChange(Event: TJSEvent);
+procedure TFTaskItems.SelectChange(Event: TJSEvent);
 var
   el: TJSHTMLElement;
   idx: Integer;
@@ -241,7 +241,7 @@ begin
 end;
 
 
-procedure TFTasksHTML.BindTableEditors;
+procedure TFTaskItems.BindTableEditors;
 var
   nodes: TJSNodeList;
   i: Integer;
@@ -292,7 +292,7 @@ begin
 end;
 
 
-procedure TFTasksHTML.EditorKeyDown(Event: TJSEvent);
+procedure TFTaskItems.EditorKeyDown(Event: TJSEvent);
 var
   el: TJSHTMLElement;
   fieldName: string;
@@ -322,7 +322,7 @@ begin
 end;
 
 
-[async] procedure TFTasksHTML.btnAddRowClick(Sender: TObject);
+[async] procedure TFTaskItems.btnAddRowClick(Sender: TObject);
 begin
   Utils.ShowSpinner('spinner');
   try
@@ -336,7 +336,7 @@ begin
   end;
 end;
 
-[async] procedure TFTasksHTML.btnDeleteRowClick(Sender: TObject);
+[async] procedure TFTaskItems.btnDeleteRowClick(Sender: TObject);
 var
   deletedItemNum: Integer;
 begin
@@ -378,7 +378,7 @@ begin
   end;
 end;
 
-procedure TFTasksHTML.RowClick(Event: TJSEvent);
+procedure TFTaskItems.RowClick(Event: TJSEvent);
 var
   rowEl: TJSHTMLElement;
   taskItemIdStr: string;
@@ -398,7 +398,7 @@ begin
   ApplySelectedRowState;
 end;
 
-procedure TFTasksHTML.ApplySelectedRowState;
+procedure TFTaskItems.ApplySelectedRowState;
 begin
   asm
     const selectedTaskItemId = this.FSelectedTaskItemId;
@@ -413,7 +413,7 @@ begin
 end;
 
 
-[async] function TFTasksHTML.AddTaskRow: Boolean;
+[async] function TFTaskItems.AddTaskRow: Boolean;
 var
   response: TXDataClientResponse;
   insertAfterItemNum: Integer;
@@ -471,7 +471,7 @@ begin
 end;
 
 
-procedure TFTasksHTML.btnReloadClick(Sender: TObject);
+procedure TFTaskItems.btnReloadClick(Sender: TObject);
 begin
   if FTaskId = '' then
   begin
@@ -483,7 +483,7 @@ begin
 end;
 
 
-procedure TFTasksHTML.EnableAutoGrowTextAreas;
+procedure TFTaskItems.EnableAutoGrowTextAreas;
 begin
   asm
     (function(){
@@ -499,7 +499,7 @@ begin
 end;
 
 
-procedure TFTasksHTML.SetTotalRowsLabel(ARowCount: Integer);
+procedure TFTaskItems.SetTotalRowsLabel(ARowCount: Integer);
 var
   el: TJSHTMLElement;
 begin
@@ -509,7 +509,7 @@ begin
 end;
 
 
-procedure TFTasksHTML.SetTaskLabel(const ATitle: string);
+procedure TFTaskItems.SetTaskLabel(const ATitle: string);
 var
   el: TJSHTMLElement;
 begin
@@ -519,7 +519,7 @@ begin
 end;
 
 
-[async] procedure TFTasksHTML.LoadTasks(const ATaskId: string);
+[async] procedure TFTaskItems.LoadTasks(const ATaskId: string);
 var
   response: TXDataClientResponse;
   resultObj, taskObj: TJSObject;
@@ -581,7 +581,7 @@ begin
 end;
 
 
-procedure TFTasksHTML.RenderTable;
+procedure TFTaskItems.RenderTable;
 var
   host: TJSHTMLElement;
   html: string;
@@ -798,7 +798,7 @@ begin
 end;
 
 
-procedure TFTasksHTML.EnableColumnResize;
+procedure TFTaskItems.EnableColumnResize;
 begin
   asm
     (function(){
@@ -837,7 +837,7 @@ begin
 end;
 
 
-procedure TFTasksHTML.EditorBlur(Event: TJSEvent);
+procedure TFTaskItems.EditorBlur(Event: TJSEvent);
 var
   el: TJSHTMLElement;
   idx: Integer;
@@ -874,7 +874,7 @@ begin
 end;
 
 
-[async] procedure TFTasksHTML.MoveTaskRow(AIndex: Integer; const newItemNum: Integer);
+[async] procedure TFTaskItems.MoveTaskRow(AIndex: Integer; const newItemNum: Integer);
 var
   response: TXDataClientResponse;
   movedTaskItemId: Integer;
@@ -915,7 +915,7 @@ begin
 end;
 
 
-[async] procedure TFTasksHTML.SaveRow(AIndex: Integer);
+[async] procedure TFTaskItems.SaveRow(AIndex: Integer);
 const
   // Note: Use this to manipulate saving to the server or not for testing
   ENABLE_SERVER_SAVE = True;
@@ -966,7 +966,7 @@ begin
 end;
 
 
-[async] function TFTasksHTML.DeleteTaskRow: Boolean;
+[async] function TFTaskItems.DeleteTaskRow: Boolean;
 var
   response: TXDataClientResponse;
 begin
@@ -991,7 +991,7 @@ begin
   end;
 end;
 
-function TFTasksHTML.ExtractOptionNames(const SourceArray: TJSArray): TJSArray;
+function TFTaskItems.ExtractOptionNames(const SourceArray: TJSArray): TJSArray;
 var
   i: Integer;
   optionObj: TJSObject;
@@ -1010,7 +1010,7 @@ begin
 end;
 
 
-function TFTasksHTML.ExtractCodeDescs(const SourceArray: TJSArray): TJSArray;
+function TFTaskItems.ExtractCodeDescs(const SourceArray: TJSArray): TJSArray;
 var
   i: Integer;
   optionObj: TJSObject;
@@ -1029,7 +1029,7 @@ begin
 end;
 
 
-function TFTasksHTML.GetOptionsForField(const AFieldName: string): TJSArray;
+function TFTaskItems.GetOptionsForField(const AFieldName: string): TJSArray;
 begin
   if SameText(AFieldName, 'reportedBy') then
     Result := FReportedByOptions
@@ -1040,7 +1040,7 @@ begin
 end;
 
 
-procedure TFTasksHTML.FocusTrigger(const ATriggerId: string);
+procedure TFTaskItems.FocusTrigger(const ATriggerId: string);
 var
   el: TJSHTMLElement;
 begin
@@ -1053,7 +1053,7 @@ begin
 end;
 
 
-procedure TFTasksHTML.DropdownItemClick(Event: TJSEvent);
+procedure TFTaskItems.DropdownItemClick(Event: TJSEvent);
 var
   el: TJSHTMLElement;
   idx: Integer;
@@ -1100,7 +1100,7 @@ begin
 end;
 
 
-procedure TFTasksHTML.DropdownEditClick(Event: TJSEvent);
+procedure TFTaskItems.DropdownEditClick(Event: TJSEvent);
 var
   el: TJSHTMLElement;
   idx: Integer;
@@ -1123,7 +1123,7 @@ begin
 end;
 
 
-procedure TFTasksHTML.ApplyPendingFocus;
+procedure TFTaskItems.ApplyPendingFocus;
 var
   el: TJSHTMLElement;
   selector: string;
@@ -1149,7 +1149,7 @@ begin
 end;
 
 
-procedure TFTasksHTML.ApplyPendingDeleteFocus;
+procedure TFTaskItems.ApplyPendingDeleteFocus;
 var
   el: TJSHTMLElement;
   rowEl: TJSHTMLElement;
@@ -1190,7 +1190,7 @@ begin
   FPendingFocusTaskField := '';
 end;
 
-procedure TFTasksHTML.CaptureTableScroll;
+procedure TFTaskItems.CaptureTableScroll;
 begin
   asm
     const vscroll = document.querySelector('.tasks-vscroll');
@@ -1201,7 +1201,7 @@ begin
   end;
 end;
 
-procedure TFTasksHTML.RestoreTableScroll;
+procedure TFTaskItems.RestoreTableScroll;
 begin
   asm
     const vscroll = document.querySelector('.tasks-vscroll');

emT3Web/View.Test.dfm

-object FTest: TFTest
-  Width = 640
-  Height = 480
-  CSSLibrary = cssBootstrap
-  ElementFont = efCSS
-  object lblTest: TWebLabel
-    Left = 280
-    Top = 204
-    Width = 52
-    Height = 15
-    Caption = 'Test Form'
-    ElementID = 'lbl_test'
-    ElementFont = efCSS
-    HeightStyle = ssAuto
-    HeightPercent = 100.000000000000000000
-    WidthPercent = 100.000000000000000000
-  end
-  object btnTestApi: TWebButton
-    Left = 266
-    Top = 240
-    Width = 96
-    Height = 25
-    Caption = 'Test Api'
-    ChildOrder = 1
-    ElementID = 'btn_test_api'
-    ElementFont = efCSS
-    HeightStyle = ssAuto
-    HeightPercent = 100.000000000000000000
-    WidthPercent = 100.000000000000000000
-    OnClick = btnTestApiClick
-  end
-  object memoTestDebug: TWebMemo
-    Left = 224
-    Top = 286
-    Width = 185
-    Height = 89
-    ElementClassName = 'form-control'
-    ElementID = 'memo_test_debug'
-    ElementFont = efCSS
-    HeightPercent = 100.000000000000000000
-    Lines.Strings = (
-      '')
-    SelLength = 0
-    SelStart = 2
-    ShowHint = False
-    WidthPercent = 100.000000000000000000
-    OnChange = memoTestDebugChange
-  end
-  object xdwcTest: TXDataWebClient
-    Connection = DMConnection.ApiConnection
-    Left = 464
-    Top = 208
-  end
-end

emT3Web/View.Test.html

-<div class="container py-4">
-  <div class="d-flex flex-wrap align-items-center justify-content-between gap-3 mb-4">
-    <div>
-      <div id="lbl_test" class="h2 fw-semibold mb-1">Test Form</div>
-      <div class="text-muted">Quick API + JWT/version diagnostics</div>
-    </div>
-
-    <button id="btn_test_api" class="btn btn-primary">Test API</button>
-  </div>
-
-  <div class="card border-0 shadow-sm">
-    <div class="card-header bg-body-tertiary d-flex align-items-center justify-content-between">
-      <div class="fw-semibold">Debug Output</div>
-    </div>
-
-    <div class="card-body" style="min-height: 70vh;">
-      <textarea id="memo_test_debug"
-        class="form-control font-monospace h-100"
-        style="min-height: 65vh;"
-        rows="28"
-        placeholder="Click Test API to populate diagnostics..."></textarea>
-    </div>
-  </div>
-</div>
-
-
-

emT3Web/View.Test.pas

-unit View.Test;
-
-interface
-
-uses
-  System.SysUtils, System.Classes, JS, Web,
-  WEBLib.Graphics, WEBLib.Controls, WEBLib.Forms, WEBLib.StdCtrls,
-  XData.Web.Client,
-  App.Types, ConnectionModule, Vcl.StdCtrls, Vcl.Controls;
-
-type
-  TFTest = class(TWebForm)
-    lblTest: TWebLabel;
-    btnTestApi: TWebButton;
-    memoTestDebug: TWebMemo;
-    xdwcTest: TXDataWebClient;
-    [async] procedure btnTestApiClick(Sender: TObject);
-    procedure memoTestDebugChange(Sender: TObject);
-  private
-    procedure AddLine(const s: string);
-    procedure DumpClaims;
-  public
-  end;
-
-var
-  FTest: TFTest;
-
-implementation
-
-uses
-  Auth.Service;
-
-procedure TFTest.AddLine(const s: string);
-begin
-  memoTestDebug.Lines.Add(s);
-end;
-
-procedure TFTest.DumpClaims;
-var
-  token: string;
-  payload: TJSObject;
-begin
-  token := AuthService.GetToken;
-  AddLine('token:' + token);
-  //add null logic
-  AddLine('token present: ' + BoolToStr(token <> '', True));
-  if token = '' then
-    Exit;
-
-  AddLine('token expired: ' + BoolToStr(AuthService.TokenExpired, True));
-  AddLine('token exp (local): ' + DateTimeToStr(AuthService.TokenExpirationDate));
-
-  payload := TJSObject(AuthService.TokenPayload);
-  if not Assigned(payload) then
-    Exit;
-
-  asm
-    const p = payload;
-    const keys = Object.keys(p);
-    for (let i = 0; i < keys.length; i++) {
-      const k = keys[i];
-      const v = p[k];
-      this.AddLine('claim ' + k + ': ' + String(v));
-    }
-  end;
-end;
-
-[async] procedure TFTest.btnTestApiClick(Sender: TObject);
-var
-  response: TXDataClientResponse;
-  resultObj: TJSObject;
-  messageText: string;
-  requiredVersion: string;
-begin
-  memoTestDebug.Visible := True;
-  memoTestDebug.Lines.Clear;
-
-  AddLine('--- request ---');
-  AddLine('api url: ' + DMConnection.ApiConnection.URL);
-  AddLine('auth url: ' + DMConnection.AuthConnection.URL);
-  AddLine('clientVersion const: ' + DMConnection.clientVersion);
-
-  AddLine('');
-  AddLine('--- token / claims ---');
-  DumpClaims;
-
-  messageText := 'hello from TFTest @ ' + DateTimeToStr(Now);
-
-  AddLine('');
-  AddLine('calling IApiService.TestApi ...');
-  try
-    response := await(xdwcTest.RawInvokeAsync('IApiService.TestApi', [messageText]));
-  except
-    on E: Exception do
-    begin
-      AddLine('');
-      AddLine('--- api exception ---');
-      AddLine(E.Message);
-      Exit;
-    end;
-  end;
-
-  AddLine('');
-  AddLine('--- api response ---');
-
-  if not Assigned(response.Result) then
-  begin
-    AddLine('response.Result is nil');
-    Exit;
-  end;
-
-  resultObj := TJSObject(response.Result);
-
-  AddLine('messageEcho: ' + JS.toString(resultObj['messageEcho']));
-  AddLine('serverTime: ' + JS.toString(resultObj['serverTime']));
-  AddLine('requiredWebClientVersion: ' + JS.toString(resultObj['requiredWebClientVersion']));
-  AddLine('note: ' + JS.toString(resultObj['note']));
-
-  requiredVersion := JS.toString(resultObj['requiredWebClientVersion']);
-
-  AddLine('');
-  AddLine('--- version compare (client-side) ---');
-  AddLine('clientVersion const: ' + DMConnection.clientVersion);
-  AddLine('requiredWebClientVersion: ' + requiredVersion);
-  AddLine('match: ' + BoolToStr(DMConnection.clientVersion = requiredVersion, True));
-end;
-
-procedure TFTest.memoTestDebugChange(Sender: TObject);
-begin
-
-end;
-
-end.

emT3Web/emT3web.dpr

@@ -11,8 +11,7 @@ uses
   App.Config in 'App.Config.pas',
   View.Main in 'View.Main.pas' {FViewMain: TWebForm} {*.html},
   Utils in 'Utils.pas',
-  View.Test in 'View.Test.pas' {FTest: TWebForm} {*.html},
-  View.TasksHTML in 'View.TasksHTML.pas' {FTasksHTML: TWebForm} {*.html},
+  View.TaskItems in 'View.TaskItems.pas' {FTaskItems: TWebForm} {*.html},
   uNameManager in 'uNameManager.pas';
 
 {$R *.res}
@@ -42,7 +41,7 @@ procedure Login(userId: string; taskId: string; urlCode: string);
 
   procedure LoginError(AMsg: string);
   begin
-    ShowMessage('Login Error: ' + AMsg);
+    ShowAppDialog('' + AMsg);
   end;
 
 begin
@@ -74,13 +73,13 @@ end;
 procedure DoLogout(AMsg: string);
 begin
   AuthService.Logout;
-  ShowMessage('Logout successful: ' + AMsg);
+   ShowAppDialog('Logout successful ' + AMsg);
 end;
 
 
 procedure UnauthorizedAccessProc(AMessage: string);
 begin
-  ShowMessage('UnauthorizedAccessProc: ' + AMessage);
+   ShowAppDialog('UnauthorizedAccessProc: ' + AMessage);
 end;
 
 
@@ -102,27 +101,7 @@ begin
           end
           else
           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'>emT3 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 () {
-                var base = location.origin + location.pathname;
-                location.replace(base + "?ver=" + ClientVer + "&r=" + Date.now() + location.hash);
-              });
-            end;
+            ShowAppDialog(ErrorMessage, 'emT3 web app', True, 'Reload');
           end;
         end);
     end,

emT3Web/emT3web.dproj

@@ -94,16 +94,15 @@
         <DCC_RemoteDebug>false</DCC_RemoteDebug>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
-        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=0.9.8.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=0.9.8.0;Comments=;LastCompiledTime=2018/08/27 15:18:29</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=0.8.5.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=0.9.8.0;Comments=;LastCompiledTime=2018/08/27 15:18:29</VerInfo_Keys>
         <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
         <VerInfo_MajorVer>0</VerInfo_MajorVer>
-        <VerInfo_MinorVer>9</VerInfo_MinorVer>
-        <VerInfo_Release>8</VerInfo_Release>
+        <VerInfo_MinorVer>8</VerInfo_MinorVer>
+        <VerInfo_Release>5</VerInfo_Release>
         <TMSWebBrowser>1</TMSWebBrowser>
-        <TMSWebOutputPath>..\emT3XDataServer\bin\static</TMSWebOutputPath>
-        <TMSWebSingleInstance>1</TMSWebSingleInstance>
-        <TMSURLParams>?user_id=1019&amp;task_id=4045&amp;url_code=123456</TMSURLParams>
         <TMSUseJSDebugger>2</TMSUseJSDebugger>
+        <TMSWebSingleInstance>1</TMSWebSingleInstance>
+        <TMSWebOutputPath>..\emT3XDataServer\bin\static</TMSWebOutputPath>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2)'!=''">
         <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
@@ -119,6 +118,8 @@
         <VerInfo_Locale>1033</VerInfo_Locale>
         <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
         <TMSWebBrowser>1</TMSWebBrowser>
+        <TMSWebObfuscation>2</TMSWebObfuscation>
+        <TMSWebOutputPath>..\emT3XDataServer\bin\static</TMSWebOutputPath>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -136,12 +137,8 @@
             <DesignClass>TWebForm</DesignClass>
         </DCCReference>
         <DCCReference Include="Utils.pas"/>
-        <DCCReference Include="View.Test.pas">
-            <Form>FTest</Form>
-            <DesignClass>TWebForm</DesignClass>
-        </DCCReference>
-        <DCCReference Include="View.TasksHTML.pas">
-            <Form>FTasksHTML</Form>
+        <DCCReference Include="View.TaskItems.pas">
+            <Form>FTaskItems</Form>
             <FormType>dfm</FormType>
             <DesignClass>TWebForm</DesignClass>
         </DCCReference>
@@ -180,7 +177,7 @@
             <Deployment Version="5">
                 <DeployFile LocalName="Win32\Debug\emT3Web.exe" Configuration="Debug" Class="ProjectOutput">
                     <Platform Name="Win32">
-                        <RemoteName>emT3Web.exe</RemoteName>
+                        <RemoteName>emT3web.exe</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>

emT3XDataServer/Source/Api.Database.dfm

@@ -495,7 +495,7 @@ object ApiDatabase: TApiDatabase
       '  and ITEM_NUM > :OLD_ITEM_NUM'
       '  and ITEM_NUM <= :NEW_ITEM_NUM')
     Left = 236
-    Top = 184
+    Top = 186
     ParamData = <
       item
         DataType = ftUnknown
@@ -554,10 +554,6 @@ object ApiDatabase: TApiDatabase
         Name = 'TASK_ID'
         Value = nil
       end>
-    object uqGetTaskMaxItemNumMAX_ITEM_NUM: TIntegerField
-      FieldName = 'MAX_ITEM_NUM'
-      ReadOnly = True
-    end
   end
   object uqDeleteTaskRow: TUniQuery
     Connection = ucETaskApi

emT3XDataServer/Source/Api.Database.pas

@@ -61,7 +61,6 @@ type
     uqGetTaskMaxItemNum: TUniQuery;
     uqGetTaskRowPositionTASK_ID: TStringField;
     uqGetTaskRowPositionITEM_NUM: TSmallintField;
-    uqGetTaskMaxItemNumMAX_ITEM_NUM: TIntegerField;
     uqTaskItemsTASK_ITEM_ID: TIntegerField;
     uqGetTaskRowPositionTASK_ITEM_ID: TIntegerField;
     uqDeleteTaskRow: TUniQuery;

emT3XDataServer/Source/Api.ServiceImpl.pas

@@ -187,7 +187,7 @@ begin
   apiDB.uqGetTaskMaxItemNum.Close;
   apiDB.uqGetTaskMaxItemNum.ParamByName('TASK_ID').AsString := taskId;
   apiDB.uqGetTaskMaxItemNum.Open;
-  maxItemNum := apiDB.uqGetTaskMaxItemNumMAX_ITEM_NUM.AsInteger;
+  maxItemNum := apiDB.uqGetTaskMaxItemNum.FieldByName('MAX_ITEM_NUM').AsInteger;
 
   if insertAfterItemNum < 0 then
     insertAfterItemNum := 0;
@@ -261,7 +261,7 @@ begin
   apiDB.uqGetTaskMaxItemNum.ParamByName('TASK_ID').AsInteger := taskId;
   apiDB.uqGetTaskMaxItemNum.Open;
 
-  maxItemNum := apiDB.uqGetTaskMaxItemNumMAX_ITEM_NUM.AsInteger;
+  maxItemNum := apiDB.uqGetTaskMaxItemNum.FieldByName('MAX_ITEM_NUM').AsInteger;
 
   finalItemNum := newItemNum;
 

emT3XDataServer/Source/Auth.ServiceImpl.pas

@@ -92,7 +92,7 @@ begin
       Result.AddPair('error',
         'Your browser is running an old version of the app.' + sLineBreak +
         'Please click button to reload.' + sLineBreak + sLineBreak +
-        'if Error continues, then you need to Empty Cache and Hard Reload!');
+        'If error continues, empty cache and hard reload.');
     end;
   finally
     iniFile.Free;

emT3XDataServer/bin/emT3XDataServer.ini → emT3XDataServer/bin/emT3XDataServer2.ini

 [Settings]
 MemoLogLevel=4
 FileLogLevel=4
-webClientVersion=0.8.3
-LogFileNum=136
+webClientVersion=0.8.5
+LogFileNum=146
 
 [Database]
 --Server=192.168.116.131

emT3XDataServer/emT3XDataServer.dproj

@@ -114,10 +114,10 @@
         <VerInfo_Locale>1033</VerInfo_Locale>
         <DCC_ExeOutput>.\bin</DCC_ExeOutput>
         <DCC_UnitSearchPath>C:\RADTOOLS\FastMM4;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
-        <VerInfo_Keys>CompanyName=EM Systems;FileDescription=$(MSBuildProjectName);FileVersion=0.8.3.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=0.9.11;Comments=</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=EM Systems;FileDescription=$(MSBuildProjectName);FileVersion=0.8.5.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=0.9.11;Comments=</VerInfo_Keys>
         <VerInfo_MajorVer>0</VerInfo_MajorVer>
         <VerInfo_MinorVer>8</VerInfo_MinorVer>
-        <VerInfo_Release>3</VerInfo_Release>
+        <VerInfo_Release>5</VerInfo_Release>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
         <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>