Merge remote-tracking branch 'origin/master'

emiMobileServer/Source/Api.Database.dfm

 object ApiDatabaseModule: TApiDatabaseModule
-  OnCreate = DataModuleCreate
   Height = 491
   Width = 640
   object ucEnvoy: TUniConnection

emiMobileServer/Source/Api.Database.pas

@@ -121,7 +121,6 @@ type
     uqComplaintDetailsDATERESPONDED: TDateTimeField;
     uqComplaintDetailsDATEARRIVED: TDateTimeField;
     uqComplaintDetailsDATECLEARED: TDateTimeField;
-    procedure DataModuleCreate(Sender: TObject);
     procedure uqComplaintListCalcFields(DataSet: TDataSet);
     procedure uqMapComplaintsCalcFields(DataSet: TDataSet);
   private
@@ -142,52 +141,6 @@ implementation
 
 {$R *.dfm}
 
-procedure TApiDatabaseModule.DataModuleCreate(Sender: TObject);
-var
-  iniFile: TIniFile;
-begin
-  iniFile := TIniFile.Create(ChangeFileExt(Application.ExeName, '.ini'));
-  try
-    ucEnvoy.Server := iniFile.ReadString('Database', 'Server', '');
-    ucEnvoy.Database := iniFile.ReadString('Database', 'Database', '');
-    ucEnvoy.Username := iniFile.ReadString('Database', 'Username', '');
-    ucEnvoy.Password := iniFile.ReadString('Database', 'Password', '');
-
-    try
-      Logger.Log(2, '');
-      Logger.Log(2, 'Connecting to envoyCalls Database (ApiDatabaseModule)...');
-      Logger.Log(2, Format('--ucEnvoy.Server: %s ucEnvoy.Username: %s', [ucEnvoy.Server, ucEnvoy.Username]));
-      if not ucEnvoy.Connected then
-        ucEnvoy.Connect;
-      Logger.Log(2, '--ucEnvoy connected!');
-    except
-      on E: Exception do
-      begin
-        Logger.Log(2, Format('Failed to connect to envoyCalls database: %s', [E.Message]));
-      end;
-    end;
-
-    Logger.Log(1, '');
-    Logger.Log(1, 'Loading Twilio settings...');
-
-    var twilioSID := iniFile.ReadString('Twilio', 'AccountSID', '');
-    if twilioSID.IsEmpty then
-      Logger.Log(1, 'Twilio->AccountSID: Entry not found')
-    else
-      Logger.Log(1, 'Twilio->AccountSID: ' + twilioSID);
-
-    var twilioAuth := iniFile.ReadString('Twilio', 'AuthHeader', '');
-    if twilioAuth.IsEmpty then
-      Logger.Log(1, 'Twilio->AuthHeader: Entry not found')
-    else
-      Logger.Log(1, 'Twilio->AuthHeader: ' + twilioAuth);
-
-  finally
-    iniFile.Free;
-  end;
-end;
-
-
 class procedure TApiDatabaseModule.ExecSQL(const SQL: string);
 var
   DB: TApiDatabaseModule;

webEMIMobile/View.Units.pas

@@ -57,26 +57,26 @@ begin
   GetUnits;
   tmrRefresh.Enabled := True;
 
-  {$IFNDEF WIN32}
-  asm
-    var root = pas.TFViewUnits(Self).dblUnitsList.ElementHandle;
-    if (root && !root.__emiDelegated) {
-      root.__emiDelegated = true;
-
-      root.addEventListener('click', function (e) {
-        // Look for a click on, or inside, the details button
-        var btn = e.target && e.target.closest('.btn-unit-details');
-        if (!btn || !root.contains(btn)) return;
-
-        e.preventDefault();
-        e.stopPropagation();
-
-        var unitId = btn.getAttribute('data-unitid') || '';
-        pas.TFViewUnits(Self).OpenUnitDetails(unitId);
-      }, { passive: true });
-    }
-  end;
-  {$ENDIF}
+//  {$IFNDEF WIN32}
+//  asm
+//    var root = pas.TFViewUnits(Self).dblUnitsList.ElementHandle;
+//    if (root && !root.__emiDelegated) {
+//      root.__emiDelegated = true;
+//
+//      root.addEventListener('click', function (e) {
+//        // Look for a click on, or inside, the details button
+//        var btn = e.target && e.target.closest('.btn-unit-details');
+//        if (!btn || !root.contains(btn)) return;
+//
+//        e.preventDefault();
+//        e.stopPropagation();
+//
+//        var unitId = btn.getAttribute('data-unitid') || '';
+//        pas.TFViewUnits(Self).OpenUnitDetails(unitId);
+//      }, { passive: true });
+//    }
+//  end;
+//  {$ENDIF}
 end;
 
 procedure TFViewUnits.btnRefreshClick(Sender: TObject);

webEMIMobile/webEmiMobile.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.3</ProjectVersion>
@@ -94,10 +94,10 @@
         <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
         <VerInfo_MinorVer>9</VerInfo_MinorVer>
         <VerInfo_MajorVer>0</VerInfo_MajorVer>
-        <TMSWebSingleInstance>1</TMSWebSingleInstance>
-        <TMSUseJSDebugger>2</TMSUseJSDebugger>
         <VerInfo_Release>3</VerInfo_Release>
         <TMSWebBrowser>1</TMSWebBrowser>
+        <TMSWebSingleInstance>1</TMSWebSingleInstance>
+        <TMSUseJSDebugger>2</TMSUseJSDebugger>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2)'!=''">
         <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>