Update username and password error message

.gitignore

@@ -18,3 +18,5 @@ emT3XDataServer/Win32/
 *.tvsconfig
 *.txt
 *.zip
+
+emT3VCLDemo/__recovery/

emT3Web/emT3web.dproj

@@ -9,7 +9,7 @@
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Application</AppType>
-        <ProjectName Condition="'$(ProjectName)'==''">emT3Web</ProjectName>
+        <ProjectName Condition="'$(ProjectName)'==''">emT3web</ProjectName>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
@@ -99,10 +99,11 @@
         <VerInfo_MajorVer>0</VerInfo_MajorVer>
         <VerInfo_MinorVer>9</VerInfo_MinorVer>
         <VerInfo_Release>8</VerInfo_Release>
-        <TMSUseJSDebugger>2</TMSUseJSDebugger>
-        <TMSWebSingleInstance>1</TMSWebSingleInstance>
         <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>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2)'!=''">
         <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>

emT3XDataServer/Source/Api.ServiceImpl.pas

@@ -195,7 +195,10 @@ begin
   if insertAfterItemNum > maxItemNum then
     insertAfterItemNum := maxItemNum;
 
-  newItemNum := insertAfterItemNum + 1;
+  if insertAfterItemNum = 0 then
+    newItemNum := maxItemNum + 1
+  else
+    newItemNum := insertAfterItemNum + 1;
 
   apiDB.uqAddTaskRow.Connection.StartTransaction;
   try

emT3XDataServer/Source/Common.Ini.pas

@@ -34,21 +34,25 @@ type
     property dbDatabase: string read FDBDatabase;
     property dbUsername: string read FDBUsername;
     property dbPassword: string read FDBPassword;
+  end;
 
-end;
-
-procedure LoadIniEntries;
+  procedure LoadIniEntries;
 
 var
   IniEntries: TIniEntries;
 
 implementation
 
+uses
+  Common.Logging;
+
+
 procedure LoadIniEntries;
 begin
-  if Assigned(IniEntries) then
-    IniEntries.Free;
-  IniEntries := TIniEntries.Create;
+  Logger.Log(1, 'IniEntries global variable instantiated');
+//  if Assigned(IniEntries) then
+//    IniEntries.Free;
+//  IniEntries := TIniEntries.Create;
 end;
 
 { TIniEntries }
@@ -60,7 +64,7 @@ begin
   iniFile := TIniFile.Create(ChangeFileExt(Application.ExeName, '.ini'));
   try
     // [Settings]
-    FMemoLogLevel := iniFile.ReadInteger('Settings', 'ConsoleLogLevel', 3);
+    FMemoLogLevel := iniFile.ReadInteger('Settings', 'MemoLogLevel', 3);
     FFileLogLevel := iniFile.ReadInteger('Settings', 'FileLogLevel', 3);
     FLogFileNum := iniFile.ReadInteger('Settings', 'LogFileNum', 0);
     Inc(FLogFileNum);
@@ -77,6 +81,12 @@ begin
   end;
 end;
 
+initialization
+  IniEntries := TIniEntries.Create;
+
+finalization
+  IniEntries.Free;
+
 
 end.
 

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

@@ -2,12 +2,12 @@
 MemoLogLevel=4
 FileLogLevel=4
 webClientVersion=0.8.3
-LogFileNum=111
+LogFileNum=136
 
 [Database]
-Server=192.168.116.131
+--Server=192.168.116.131
 --Server=192.168.116.128
---Server=192.168.75.133
+Server=192.168.102.131
 --Server=192.168.159.10
 Database=eTask
 Username=root

emT3XDataServer/emT3XDataServer.dpr

@@ -160,7 +160,8 @@ begin
   iniFilename := ChangeFileExt( Application.ExeName, '.ini' );
   iniFile := TIniFile.Create( iniFilename );
   try
-    LoadIniEntries;
+
+//    LoadIniEntries;
     //memoLogLevel := iniFile.ReadInteger('Settings', 'MemoLogLevel', 3);
     //fileLogLevel := iniFile.ReadInteger('Settings', 'FileLogLevel', 4);
     //fileNum := iniFile.ReadInteger( 'Settings', 'LogFileNum', 0 );
@@ -175,6 +176,7 @@ begin
     Logger.Log( 1, '*******************************************************' );
     Logger.Log( 1, '' );
 
+    LoadIniEntries;
     Logger.Log( 1, 'iniFile: ' + iniFilename );
 
     iniStr := iniFile.ReadString( 'Settings', 'MemoLogLevel', '' );