Commit 074ca098 by Mac Stephens

Bug fixes and several changes, Deployed v0.9.0

parent 892b81cb
...@@ -21,6 +21,7 @@ type ...@@ -21,6 +21,7 @@ type
public public
currentTaskId: string; currentTaskId: string;
currentTimeEntryDate: string;
const clientVersion = '0.8.9'; const clientVersion = '0.8.9';
procedure InitApp(SuccessProc: TSuccessProc; procedure InitApp(SuccessProc: TSuccessProc;
UnauthorizedAccessProc: TUnauthorizedAccessProc); UnauthorizedAccessProc: TUnauthorizedAccessProc);
......
<nav class="navbar navbar-light bg-light login-navbar"> <nav class="navbar navbar-light bg-light login-navbar">
<div class="container-fluid"> <div class="container-fluid">
<a class="navbar-brand" href="#">emT3web</a> <a class="navbar-brand">emT3web</a>
</div> </div>
</nav> </nav>
<div class="container mt-5"> <div class="container mt-5">
......
...@@ -50,11 +50,22 @@ uses ...@@ -50,11 +50,22 @@ uses
procedure TFViewLogin.btnLoginClick(Sender: TObject); procedure TFViewLogin.btnLoginClick(Sender: TObject);
var var
timeEntriesParam: string; timeEntriesParam: string;
newUrl: string;
procedure LoginSuccess; procedure LoginSuccess;
begin begin
if SameText(timeEntriesParam, 'true') then if SameText(timeEntriesParam, 'true') then
DMConnection.currentTaskId := '' begin
DMConnection.currentTaskId := '';
DMConnection.currentTimeEntryDate := edtDate.Text;
if edtDate.Text <> '' then
newUrl := window.location.pathname + '?time_entries=true&date=' + edtDate.Text
else
newUrl := window.location.pathname + '?time_entries=true';
window.history.replaceState(TJSObject.new, '', newUrl);
end
else else
DMConnection.currentTaskId := edtTaskId.Text; DMConnection.currentTaskId := edtTaskId.Text;
......
...@@ -17,18 +17,18 @@ ...@@ -17,18 +17,18 @@
<ul class="dropdown-menu dropdown-menu-end shadow-sm" aria-labelledby="lnk_navbar_dropdown_menu_link"> <ul class="dropdown-menu dropdown-menu-end shadow-sm" aria-labelledby="lnk_navbar_dropdown_menu_link">
<li> <li>
<a class="dropdown-item d-flex align-items-center gap-2" id="lbl_home" href="#"> <a class="dropdown-item d-flex align-items-center gap-2" id="lbl_home">
<i class="fa fa-home fa-fw"></i><span>Home</span> <i class="fa fa-home fa-fw"></i><span>Home</span>
</a> </a>
</li> </li>
<li> <li>
<a class="dropdown-item d-flex align-items-center gap-2" id="lbl_user_profile" href="#"> <a class="dropdown-item d-flex align-items-center gap-2" id="lbl_user_profile">
<i class="fa fa-user fa-fw"></i><span>User Profile</span> <i class="fa fa-user fa-fw"></i><span>User Profile</span>
</a> </a>
</li> </li>
<li><hr class="dropdown-divider"></li> <li><hr class="dropdown-divider"></li>
<li> <li>
<a class="dropdown-item d-flex align-items-center gap-2 text-danger" id="lbl_logout" href="#"> <a class="dropdown-item d-flex align-items-center gap-2 text-danger" id="lbl_logout">
<i class="fa fa-sign-out fa-fw"></i><span>Logout</span> <i class="fa fa-sign-out fa-fw"></i><span>Logout</span>
</a> </a>
</li> </li>
......
...@@ -149,7 +149,11 @@ begin ...@@ -149,7 +149,11 @@ begin
SetTimeEntriesLabel(FUserName); SetTimeEntriesLabel(FUserName);
btnDeleteEntry.Enabled := False; btnDeleteEntry.Enabled := False;
anchorDate := DMConnection.currentTimeEntryDate;
if anchorDate = '' then
anchorDate := Application.Parameters.Values['date']; anchorDate := Application.Parameters.Values['date'];
if anchorDate = '' then if anchorDate = '' then
anchorDate := DateToIso(Date); anchorDate := DateToIso(Date);
......
...@@ -98,11 +98,10 @@ ...@@ -98,11 +98,10 @@
<AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode> <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
<VerInfo_MajorVer>0</VerInfo_MajorVer> <VerInfo_MajorVer>0</VerInfo_MajorVer>
<VerInfo_MinorVer>9</VerInfo_MinorVer> <VerInfo_MinorVer>9</VerInfo_MinorVer>
<TMSWebOutputPath>..\emT3XDataServer\bin\static</TMSWebOutputPath>
<TMSUseJSDebugger>2</TMSUseJSDebugger> <TMSUseJSDebugger>2</TMSUseJSDebugger>
<TMSWebBrowser>1</TMSWebBrowser> <TMSWebOutputPath>..\emT3XDataServer\bin\static</TMSWebOutputPath>
<TMSWebSingleInstance>1</TMSWebSingleInstance> <TMSWebSingleInstance>1</TMSWebSingleInstance>
<TMSURLParams>?time_entries=true&amp;date=2026-05-01</TMSURLParams> <TMSWebBrowser>1</TMSWebBrowser>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2)'!=''"> <PropertyGroup Condition="'$(Cfg_2)'!=''">
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols> <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
MemoLogLevel=4 MemoLogLevel=4
FileLogLevel=4 FileLogLevel=4
webClientVersion=0.8.9 webClientVersion=0.8.9
LogFileNum=242 LogFileNum=243
[Database] [Database]
Server=192.168.102.133 Server=192.168.102.133
......
...@@ -114,10 +114,11 @@ ...@@ -114,10 +114,11 @@
<VerInfo_Locale>1033</VerInfo_Locale> <VerInfo_Locale>1033</VerInfo_Locale>
<DCC_ExeOutput>.\bin</DCC_ExeOutput> <DCC_ExeOutput>.\bin</DCC_ExeOutput>
<DCC_UnitSearchPath>C:\RADTOOLS\FastMM4;$(DCC_UnitSearchPath)</DCC_UnitSearchPath> <DCC_UnitSearchPath>C:\RADTOOLS\FastMM4;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
<VerInfo_Keys>CompanyName=EM Systems;FileDescription=$(MSBuildProjectName);FileVersion=0.9.0.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.9.0.1;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=0.9.11;Comments=</VerInfo_Keys>
<VerInfo_MajorVer>0</VerInfo_MajorVer> <VerInfo_MajorVer>0</VerInfo_MajorVer>
<VerInfo_MinorVer>9</VerInfo_MinorVer> <VerInfo_MinorVer>9</VerInfo_MinorVer>
<VerInfo_AutoIncVersion>true</VerInfo_AutoIncVersion> <VerInfo_AutoIncVersion>true</VerInfo_AutoIncVersion>
<VerInfo_Build>1</VerInfo_Build>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Win64)'!=''"> <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
<AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode> <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment