Ready for testing

emT3VCLDemo/emT3VCLDemo.cbproj

@@ -87,7 +87,7 @@
         <ILINK_TranslatedLibraryPath>$(BDSLIB)\$(PLATFORM)\release\$(LANGDIR);$(ILINK_TranslatedLibraryPath)</ILINK_TranslatedLibraryPath>
         <ProjectType>CppVCLApplication</ProjectType>
         <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;$(DCC_Namespace)</DCC_Namespace>
-        <AllPackageLibs>rtl.lib;vcl.lib;unidac290.lib;dac290.lib;dbrtl.lib</AllPackageLibs>
+        <AllPackageLibs>rtl.lib;vcl.lib;dbrtl.lib;unidac370.lib;dac370.lib</AllPackageLibs>
         <_TCHARMapping>wchar_t</_TCHARMapping>
         <Multithreaded>true</Multithreaded>
         <Icon_MainIcon>$(BDS)\bin\cbuilder_PROJECTICON.ico</Icon_MainIcon>
@@ -160,7 +160,7 @@
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win64x)'!=''">
         <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
-        <LinkPackageImports>rtl.bpi;vcl.bpi;unidac290.bpi;dac290.bpi;dbrtl.bpi</LinkPackageImports>
+        <LinkPackageImports>rtl.bpi;vcl.bpi;dbrtl.bpi;unidac370.bpi;dac370.bpi</LinkPackageImports>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2)'!=''">
         <Defines>NDEBUG;$(Defines)</Defines>
@@ -244,6 +244,16 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
+                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin64\cc64370.dll" Class="DependencyModule">
+                    <Platform Name="Win64">
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin64\cc64370mt.dll" Class="DependencyModule">
+                    <Platform Name="Win64">
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
                 <DeployFile Condition="'$(UsingDelphiRTL)'=='true'" LocalName="$(BDS)\bin\borlndmm.dll" Class="DependencyModule">
                     <Platform Name="Win32">
                         <Overwrite>true</Overwrite>
@@ -259,6 +269,16 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
+                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32370.dll" Class="DependencyModule">
+                    <Platform Name="Win32">
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32370mt.dll" Class="DependencyModule">
+                    <Platform Name="Win32">
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
                 <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32c290.dll" Class="DependencyModule">
                     <Platform Name="Win32">
                         <Overwrite>true</Overwrite>
@@ -269,6 +289,16 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
+                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32c370.dll" Class="DependencyModule">
+                    <Platform Name="Win32">
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32c370mt.dll" Class="DependencyModule">
+                    <Platform Name="Win32">
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
                 <DeployFile LocalName=".\Win64x\Debug\emT3VCLDemo.exe" Configuration="Debug" Class="ProjectOutput">
                     <Platform Name="Win64x">
                         <RemoteName>emT3VCLDemo.exe</RemoteName>

emT3webClient/View.Main.pas

@@ -64,7 +64,7 @@ procedure TFViewMain.WebFormCreate(Sender: TObject);
 begin
   console.log('TFViewMain.WebFormCreate fired');
 
-  FChildForm := nil;
+//  FChildForm := nil;
   console.log('About to ShowForm(TFTasksHTML), host=' + WebPanel1.ElementID);
   ShowForm(TFTasksHTML);
   lblAppTitle.Caption := 'emT3web';
@@ -111,6 +111,7 @@ begin
   if Assigned(FChildForm) then
     FChildForm.Free;
   Application.CreateForm(AFormClass, WebPanel1.ElementID, FChildForm);
+  console.log('CreateForm called, FChildForm assigned: ' + BoolToStr(Assigned(FChildForm)));
 end;
 
 //procedure TFViewMain.ShowTasksForm(Info: string);

emT3webClient/View.TasksHTML.pas

@@ -65,6 +65,7 @@ uses
 
 procedure TFTasksHTML.WebFormShow(Sender: TObject);
 begin
+  console.log('TFTasksHTML.WebFormShow fired');
   FTaskId := window.localStorage.getItem('EMT3_TASK_ID');
   console.log('The task id is: ' + FTaskId);
 
@@ -75,7 +76,18 @@ begin
   end;
 
   btnAddRow.Enabled := False;
-  LoadTasks(FTaskId);
+
+  if not DMConnection.ApiConnection.Connected then
+  begin
+      DMConnection.ApiConnection.Open(
+      procedure
+      begin
+        LoadTasks(FTaskID);
+      end
+     );
+  end
+  else
+    LoadTasks(FTaskId);
 end;
 
 
@@ -250,6 +262,7 @@ var
   tasksArray, itemsArray, flatItems: TJSArray;
   taskIndex, itemIndex: Integer;
 begin
+  console.log('Load Tasks Fired');
   SetTaskLabel(ATaskId);
   Utils.ShowSpinner('spinner');
   try

emT3webClient/emT3webClient.dpr

@@ -75,20 +75,10 @@ begin
 end;
 
 procedure DisplayMainView;
-
-  procedure ConnectProc;
-  begin
-    if Assigned(FViewLogin) then
-      FViewLogin.Free;
-
-    TFViewMain.Display(@DisplayLoginView);
-  end;
-
 begin
-  if not DMConnection.ApiConnection.Connected then
-    DMConnection.ApiConnection.Open(@ConnectProc)
-  else
-    ConnectProc;
+  if Assigned(FViewLogin) then
+    FViewLogin.Free;
+  TFViewMain.Display(@DisplayLoginView);
 end;
 
 procedure UnauthorizedAccessProc(AMessage: string);
@@ -132,6 +122,7 @@ begin
                 UserIdParam, TaskIdParam, CodeParam,
                 procedure
                 begin
+
                   DisplayMainView;
                 end,
                 procedure(LoginError: string)

emT3webClient/emT3webClient.dproj

@@ -100,9 +100,10 @@
         <VerInfo_MinorVer>9</VerInfo_MinorVer>
         <VerInfo_Release>8</VerInfo_Release>
         <TMSWebBrowser>1</TMSWebBrowser>
-        <TMSUseJSDebugger>2</TMSUseJSDebugger>
-        <TMSWebSingleInstance>1</TMSWebSingleInstance>
         <TMSWebOutputPath>..\kgOrdersServer\bin\static</TMSWebOutputPath>
+        <TMSWebSingleInstance>1</TMSWebSingleInstance>
+        <TMSURLParams>?user_id=1019&amp;task_id=4245&amp;code=749358</TMSURLParams>
+        <TMSUseJSDebugger>2</TMSUseJSDebugger>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2)'!=''">
         <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
@@ -183,12 +184,7 @@
                 <Source>
                     <Source Name="MainSource">emT3webClient.dpr</Source>
                 </Source>
-                <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k290.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp290.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k290.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp290.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
-                </Excluded_Packages>
+                <Excluded_Packages/>
             </Delphi.Personality>
             <Deployment Version="5">
                 <DeployFile LocalName="Win32\Debug\emT3webClient.exe" Configuration="Debug" Class="ProjectOutput">

emT3webServer/Source/Api.Server.Module.dfm

@@ -14,7 +14,7 @@ object ApiServerModule: TApiServerModule
     SwaggerUIOptions.Enabled = True
     SwaggerUIOptions.ShowFilter = True
     SwaggerUIOptions.TryItOutEnabled = True
-    Left = 80
+    Left = 82
     Top = 142
     object XDataServerJWT: TSparkleJwtMiddleware
       ForbidAnonymousAccess = True