Skip to content

E
emiMobile
Commit b272a8e0 by Mac Stephens
Options

WIP

parent 63541f7e
Showing with 66 additions and 16 deletions
emiMobileServer/Source/Main.dfm
......@@ -2,8 +2,8 @@ object FMain: TFMain
Left = 0
Top = 0
Caption = 'emiMobileServer'
ClientHeight = 597
ClientWidth = 764
ClientHeight = 583
ClientWidth = 761
Color = clBtnFace
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
......@@ -12,20 +12,22 @@ object FMain: TFMain
Font.Style = []
OnClose = FormClose
DesignSize = (
764
597)
761
583)
TextHeight = 13
object memoInfo: TMemo
Left = 8
Top = 39
Width = 744
Height = 549
Width = 741
Height = 535
Anchors = [akLeft, akTop, akRight, akBottom]
ReadOnly = True
TabOrder = 0
ExplicitWidth = 744
ExplicitHeight = 549
end
object btnApiSwaggerUI: TButton
Left = 297
Left = 141
Top = 8
Width = 100
Height = 25
......@@ -43,7 +45,7 @@ object FMain: TFMain
OnClick = btnExitClick
end
object btnAuthSwaggerUI: TButton
Left = 169
Left = 31
Top = 8
Width = 100
Height = 25
......
emiMobileServer/bin/emiMobileServer.ini
[Settings]
LogFileNum=652
LogFileNum=659
webClientVersion=0.1.0
emiMobileServer/emiMobileServer.dproj
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{2A3028D9-BC39-4625-9BA5-0338012E2824}</ProjectGuid>
<ProjectVersion>20.3</ProjectVersion>
<ProjectVersion>20.4</ProjectVersion>
<FrameworkType>VCL</FrameworkType>
<Base>True</Base>
<Config Condition="'$(Config)'==''">Debug</Config>
......@@ -852,6 +852,9 @@
<Platform Name="Win64x">
<Operation>1</Operation>
</Platform>
<Platform Name="WinARM64EC">
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="ProjectiOSDeviceDebug">
<Platform Name="iOSDevice32">
......@@ -922,6 +925,10 @@
<RemoteDir>Assets</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="WinARM64EC">
<RemoteDir>Assets</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="UWP_DelphiLogo44">
<Platform Name="Win32">
......@@ -932,6 +939,10 @@
<RemoteDir>Assets</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="WinARM64EC">
<RemoteDir>Assets</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="iOS_AppStore1024">
<Platform Name="iOSDevice64">
......@@ -1145,6 +1156,7 @@
<ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="Win64x" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="WinARM64EC" Name="$(PROJECTNAME)"/>
</Deployment>
<Platforms>
<Platform value="Win32">True</Platform>
......
webEMIMobile/View.Main.dfm
......@@ -159,7 +159,7 @@ object FViewMain: TFViewMain
end
object pnlUnits: TWebPanel
Left = 740
Top = 180
Top = 182
Width = 227
Height = 139
ElementID = 'pnl_units'
......@@ -177,7 +177,7 @@ object FViewMain: TFViewMain
end
object pnlDetails: TWebPanel
Left = 992
Top = 277
Top = 275
Width = 163
Height = 114
ElementID = 'pnl_details'
......@@ -197,6 +197,28 @@ object FViewMain: TFViewMain
OnClick = btnDetailsModalCloseClick
end
end
object pnlArchive: TWebPanel
Left = 992
Top = 395
Width = 163
Height = 114
ElementID = 'pnl_archive'
ChildOrder = 15
ElementFont = efCSS
TabOrder = 10
object WebButton1: TWebButton
Left = 127
Top = 8
Width = 28
Height = 23
ElementClassName = 'btn btn-light'
ElementFont = efCSS
HeightStyle = ssAuto
HeightPercent = 100.000000000000000000
WidthPercent = 100.000000000000000000
OnClick = btnDetailsModalCloseClick
end
end
object xdwcBadgeCounts: TXDataWebClient
Connection = DMConnection.ApiConnection
Left = 44
......
webEMIMobile/View.Main.html
......@@ -21,6 +21,7 @@
<div id="pnl_map" class="flex-grow-1 position-relative p-0 overflow-hidden" style="min-height:0;"></div>
<div id="pnl_units" class="flex-grow-1 position-relative p-0 overflow-hidden d-none" style="min-height:0;"></div>
<div id="pnl_complaints" class="flex-grow-1 position-relative p-0 overflow-hidden d-none" style="min-height:0;"></div>
<div id="pnl_archive" class="flex-grow-1 position-relative p-0 overflow-hidden d-none" style="min-height:0;"></div>
<!-- Details modal (new panel pnl_details) -->
......@@ -58,7 +59,6 @@
</div>
</div>
</nav>
</div>
<!-- Spinner -->
......@@ -81,7 +81,7 @@
Please contact EMSystems to solve the issue.
</div>
<div class="modal-footer justify-content-center">
<button type="button" id="btn_modal_restart" class="btn btn-primary">Back to Orders</button>
<button type="button" id="btn_modal_restart" class="btn btn-primary">Restart Application</button>
</div>
</div>
</div>
......
webEMIMobile/View.Main.pas
......@@ -30,6 +30,8 @@ type
tmrGlobalRefresh: TWebTimer;
pnlDetails: TWebPanel;
btnDetailsModalClose: TWebButton;
pnlArchive: TWebPanel;
WebButton1: TWebButton;
procedure WebFormCreate(Sender: TObject);
procedure mnuLogoutClick(Sender: TObject);
procedure wllblLogoutClick(Sender: TObject);
......
webEMIMobile/webEmiMobile.dpr
......@@ -82,7 +82,7 @@ begin
dlg.style.fontFamily = "system-ui, sans-serif";
dlg.innerHTML =
"<h5 class='fw-bold mb-3 text-danger'>kgOrders web app</h5>" +
"<h5 class='fw-bold mb-3 text-danger'>emiMobile</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>";
......
webEMIMobile/webEmiMobile.dproj
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{DB6F5DBF-7E4B-45DA-AFFA-6C8DF15BA740}</ProjectGuid>
<ProjectVersion>20.3</ProjectVersion>
<ProjectVersion>20.4</ProjectVersion>
<FrameworkType>VCL</FrameworkType>
<MainSource>webEmiMobile.dpr</MainSource>
<Base>True</Base>
......@@ -1667,6 +1667,9 @@
<Platform Name="Win64x">
<Operation>1</Operation>
</Platform>
<Platform Name="WinARM64EC">
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="ProjectiOSDeviceDebug">
<Platform Name="iOSDevice32">
......@@ -1737,6 +1740,10 @@
<RemoteDir>Assets</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="WinARM64EC">
<RemoteDir>Assets</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="UWP_DelphiLogo44">
<Platform Name="Win32">
......@@ -1747,6 +1754,10 @@
<RemoteDir>Assets</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="WinARM64EC">
<RemoteDir>Assets</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="iOS_AppStore1024">
<Platform Name="iOSDevice64">
......@@ -1961,6 +1972,7 @@
<ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="Win64x" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="WinARM64EC" Name="$(PROJECTNAME)"/>
</Deployment>
<Platforms>
<Platform value="Win32">True</Platform>
......
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