Skip to content

K
KGOrders
Commit 1700ddf5 by Mac Stephens
Options

Added static folder to server to test. Version added, fixed scroll on main form.

parent 227def3a
Showing with 289 additions and 128 deletions
kgOrdersClient/App.Types.pas
...@@ -11,6 +11,7 @@ type ...@@ -11,6 +11,7 @@ type
TSuccessProc = reference to procedure; TSuccessProc = reference to procedure;
TLogoutProc = reference to procedure(AMessage: string = ''); TLogoutProc = reference to procedure(AMessage: string = '');
TUnauthorizedAccessProc = reference to procedure(AMessage: string); TUnauthorizedAccessProc = reference to procedure(AMessage: string);
TVersionCheckCallback = reference to procedure(Success: Boolean; ErrorMessage: string);
TListProc = reference to procedure; TListProc = reference to procedure;
TSelectProc = reference to procedure(AParam: string); TSelectProc = reference to procedure(AParam: string);
......
kgOrdersClient/ConnectionModule.dfm
...@@ -2,17 +2,22 @@ object DMConnection: TDMConnection ...@@ -2,17 +2,22 @@ object DMConnection: TDMConnection
Height = 264 Height = 264
Width = 395 Width = 395
object ApiConnection: TXDataWebConnection object ApiConnection: TXDataWebConnection
URL = 'http://localhost:2004/emsys/kgOrders/api/'
OnError = ApiConnectionError OnError = ApiConnectionError
OnRequest = ApiConnectionRequest OnRequest = ApiConnectionRequest
OnResponse = ApiConnectionResponse OnResponse = ApiConnectionResponse
URL = 'http://localhost:2004/emsys/kgOrders/api/'
Left = 48 Left = 48
Top = 80 Top = 80
end end
object AuthConnection: TXDataWebConnection object AuthConnection: TXDataWebConnection
URL = 'http://localhost:2004/emsys/kgOrders/auth/'
OnError = AuthConnectionError OnError = AuthConnectionError
URL = 'http://localhost:2004/emsys/kgOrders/auth/'
Left = 48 Left = 48
Top = 16 Top = 16
end end
object XDataWebClient1: TXDataWebClient
Connection = AuthConnection
Left = 269
Top = 164
end
end end
kgOrdersClient/ConnectionModule.pas
...@@ -4,21 +4,25 @@ interface ...@@ -4,21 +4,25 @@ interface
uses uses
System.SysUtils, System.Classes, WEBLib.Modules, XData.Web.Connection, System.SysUtils, System.Classes, WEBLib.Modules, XData.Web.Connection,
App.Types, App.Config; App.Types, App.Config, XData.Web.Client;
type type
TDMConnection = class(TWebDataModule) TDMConnection = class(TWebDataModule)
ApiConnection: TXDataWebConnection; ApiConnection: TXDataWebConnection;
AuthConnection: TXDataWebConnection; AuthConnection: TXDataWebConnection;
XDataWebClient1: TXDataWebClient;
procedure ApiConnectionError(Error: TXDataWebConnectionError); procedure ApiConnectionError(Error: TXDataWebConnectionError);
procedure ApiConnectionRequest(Args: TXDataWebConnectionRequest); procedure ApiConnectionRequest(Args: TXDataWebConnectionRequest);
procedure ApiConnectionResponse(Args: TXDataWebConnectionResponse); procedure ApiConnectionResponse(Args: TXDataWebConnectionResponse);
procedure AuthConnectionError(Error: TXDataWebConnectionError); procedure AuthConnectionError(Error: TXDataWebConnectionError);
private private
FUnauthorizedAccessProc: TUnauthorizedAccessProc; FUnauthorizedAccessProc: TUnauthorizedAccessProc;
public public
const clientVersion = '0.9.0';
procedure InitApp(SuccessProc: TSuccessProc; procedure InitApp(SuccessProc: TSuccessProc;
UnauthorizedAccessProc: TUnauthorizedAccessProc); UnauthorizedAccessProc: TUnauthorizedAccessProc);
procedure SetClientConfig(Callback: TVersionCheckCallback);
end; end;
var var
...@@ -79,4 +83,31 @@ begin ...@@ -79,4 +83,31 @@ begin
LoadConfig(@ConfigLoaded); LoadConfig(@ConfigLoaded);
end; end;
procedure TDMConnection.SetClientConfig(Callback: TVersionCheckCallback);
begin
XDataWebClient1.Connection := AuthConnection;
XDataWebClient1.RawInvoke('IAuthService.VerifyVersion', [clientVersion],
procedure(Response: TXDataClientResponse)
var
jsonResult: TJSObject;
error: string;
begin
jsonResult := TJSObject(Response.Result);
if jsonResult.HasOwnProperty('error') then
error := string(jsonResult['error'])
else
error := '';
if error <> '' then
Callback(False, error)
else
Callback(True, '');
end);
end;
end. end.
kgOrdersClient/View.Login.dfm
object FViewLogin: TFViewLogin object FViewLogin: TFViewLogin
Width = 640 Color = clWhite
Height = 480
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
Font.Height = -11 Font.Height = -11
Font.Name = 'Tahoma' Font.Name = 'Tahoma'
Font.Size = 8
Font.Style = [] Font.Style = []
FormStyle = fsNormal
Height = 764
Left = 0
ParentFont = False ParentFont = False
OnCreate = WebFormCreate TabOrder = 0
Top = 0
Width = 1322
object WebLabel1: TWebLabel object WebLabel1: TWebLabel
Left = 240
Top = 112
Width = 67
Height = 13
Caption = 'Please Sign In' Caption = 'Please Sign In'
ElementID = 'view.login.title' ElementID = 'view.login.title'
HeightPercent = 100.000000000000000000 ElementPosition = epRelative
Font.Charset = ANSI_CHARSET
Font.Color = clWindowText
Font.Height = -11
Font.Name = 'Tahoma'
Font.Size = 8
Font.Style = []
Height = 19
Left = 240
Top = 112
Transparent = False Transparent = False
WidthPercent = 100.000000000000000000 Width = 322
end end
object WebImageControl1: TWebImageControl object WebImageControl1: TWebImageControl
Left = 22
Top = 68
Width = 200
Height = 200
ElementID = 'kgpicture'
HeightPercent = 100.000000000000000000
WidthPercent = 100.000000000000000000
ChildOrder = 5 ChildOrder = 5
ElementID = 'kgpicture'
ElementPosition = epRelative
Height = 200
Left = 22
Picture.Data = { Picture.Data = {
0954506E67496D61676589504E470D0A1A0A0000000D49484452000000560000 0954506E67496D61676589504E470D0A1A0A0000000D49484452000000560000
006B0806000000EDB27584000000017352474200AECE1CE90000000467414D41 006B0806000000EDB27584000000017352474200AECE1CE90000000467414D41
...@@ -232,67 +239,121 @@ object FViewLogin: TFViewLogin ...@@ -232,67 +239,121 @@ object FViewLogin: TFViewLogin
009C3C91D367F2FCB02B62870F03D6AC362E807ED96157C4F6EA695C667F37EB 009C3C91D367F2FCB02B62870F03D6AC362E807ED96157C4F6EA695C667F37EB
ABD8ED0E925883B242109BF333C69AD5E51079CD0D5914A6EC12D476FF0FA62D ABD8ED0E925883B242109BF333C69AD5E51079CD0D5914A6EC12D476FF0FA62D
A3F3F4F969570000000049454E44AE426082} A3F3F4F969570000000049454E44AE426082}
Top = 68
Width = 200
end end
object edtUsername: TWebEdit object edtUsername: TWebEdit
Alignment = taLeftJustify
Color = clWindow
ElementID = 'view.login.edtusername'
ElementPosition = epRelative
Font.Charset = ANSI_CHARSET
Font.Color = clBlack
Font.Height = -11
Font.Name = 'Arial'
Font.Size = 8
Font.Style = []
Height = 21
HideSelection = False
Left = 240 Left = 240
ParentFont = False
ShowFocus = True
TabOrder = 0
TextHint = 'Username'
Top = 136 Top = 136
Width = 121 Width = 121
Height = 21
ElementID = 'view.login.edtusername'
HeightPercent = 100.000000000000000000
TextHint = 'Username'
WidthPercent = 100.000000000000000000
end end
object edtPassword: TWebEdit object edtPassword: TWebEdit
Left = 240 Alignment = taLeftJustify
Top = 163 Color = clWindow
Width = 121
Height = 21
ElementID = 'view.login.edtpassword' ElementID = 'view.login.edtpassword'
HeightPercent = 100.000000000000000000 ElementPosition = epRelative
Font.Charset = ANSI_CHARSET
Font.Color = clBlack
Font.Height = -11
Font.Name = 'Arial'
Font.Size = 8
Font.Style = []
Height = 21
HideSelection = False
Left = 240
ParentFont = False
PasswordChar = '*' PasswordChar = '*'
ShowFocus = True
TabOrder = 1 TabOrder = 1
TextHint = 'Password' TextHint = 'Password'
WidthPercent = 100.000000000000000000 Top = 163
Width = 121
end end
object btnLogin: TWebButton object btnLogin: TWebButton
Left = 240
Top = 190
Width = 121
Height = 25
Caption = 'Login' Caption = 'Login'
Color = clNone
ElementID = 'view.login.btnlogin' ElementID = 'view.login.btnlogin'
HeightPercent = 100.000000000000000000 ElementPosition = epRelative
TabOrder = 2 Font.Charset = ANSI_CHARSET
WidthPercent = 100.000000000000000000 Font.Color = clBlack
Font.Height = -11
Font.Name = 'Arial'
Font.Size = 8
Font.Style = []
Height = 25
Left = 240
OnClick = btnLoginClick OnClick = btnLoginClick
ParentFont = False
Role = 'null'
TabOrder = 2
Top = 190
Width = 121
end end
object pnlMessage: TWebPanel object pnlMessage: TWebPanel
Color = clBtnFace
ElementID = 'view.login.message'
ElementPosition = epRelative
Font.Charset = ANSI_CHARSET
Font.Color = clBlack
Font.Height = -11
Font.Name = 'Arial'
Font.Size = 8
Font.Style = []
Height = 33
Left = 240 Left = 240
ParentFont = False
Role = 'null'
TabOrder = 3
TabStop = False
Top = 65 Top = 65
Visible = False
Width = 121 Width = 121
Height = 33
ElementID = 'view.login.message'
TabOrder = 3
object lblMessage: TWebLabel object lblMessage: TWebLabel
Left = 16
Top = 11
Width = 42
Height = 13
Caption = 'Message' Caption = 'Message'
ElementID = 'view.login.message.label' ElementID = 'view.login.message.label'
HeightPercent = 100.000000000000000000 Font.Charset = ANSI_CHARSET
WidthPercent = 100.000000000000000000 Font.Color = clBlack
Font.Height = -11
Font.Name = 'Arial'
Font.Size = 8
Font.Style = []
Height = 13
Left = 16
Top = 11
Width = 43
end end
object btnCloseNotification: TWebButton object btnCloseNotification: TWebButton
Color = clNone
ElementID = 'view.login.message.button'
Font.Charset = ANSI_CHARSET
Font.Color = clBlack
Font.Height = -11
Font.Name = 'Arial'
Font.Size = 8
Font.Style = []
Height = 25
Left = 96 Left = 96
OnClick = btnCloseNotificationClick
Role = 'null'
TabOrder = 0
Top = 3 Top = 3
Width = 22 Width = 22
Height = 25
ElementID = 'view.login.message.button'
HeightPercent = 100.000000000000000000
WidthPercent = 100.000000000000000000
OnClick = btnCloseNotificationClick
end end
end end
object XDataWebClient: TXDataWebClient object XDataWebClient: TXDataWebClient
......
kgOrdersClient/View.Login.pas
...@@ -27,7 +27,6 @@ type ...@@ -27,7 +27,6 @@ type
FMessage: string; FMessage: string;
procedure ShowNotification(Notification: string); procedure ShowNotification(Notification: string);
procedure HideNotification; procedure HideNotification;
[async] procedure VerifyVersion();
public public
class procedure Display(LoginProc: TSuccessProc); overload; class procedure Display(LoginProc: TSuccessProc); overload;
class procedure Display(LoginProc: TSuccessProc; AMsg: string); overload; class procedure Display(LoginProc: TSuccessProc; AMsg: string); overload;
...@@ -85,7 +84,8 @@ end; ...@@ -85,7 +84,8 @@ end;
procedure TFViewLogin.HideNotification; procedure TFViewLogin.HideNotification;
begin begin
pnlMessage.ElementHandle.hidden := True; pnlMessage.ElementHandle.classList.add('d-none');
pnlMessage.Visible := False;
end; end;
procedure TFViewLogin.ShowNotification(Notification: string); procedure TFViewLogin.ShowNotification(Notification: string);
...@@ -93,32 +93,23 @@ begin ...@@ -93,32 +93,23 @@ begin
if Notification <> '' then if Notification <> '' then
begin begin
lblMessage.Caption := Notification; lblMessage.Caption := Notification;
pnlMessage.ElementHandle.hidden := False; pnlMessage.ElementHandle.classList.remove('d-none');
pnlMessage.Visible := True;
end; end;
end; end;
procedure TFViewLogin.btnCloseNotificationClick(Sender: TObject);
begin
HideNotification;
end;
procedure TFViewLogin.VerifyVersion();
var
xdcResponse: TXDataClientResponse;
begin
xdcResponse := await(XDataWebClient.RawInvokeAsync('IAuthService.VerifyVersion',
['1.0.0']));
ShowNotification(string(TJSObject(xdcResponse.Result)['value']));
end;
procedure TFViewLogin.WebFormCreate(Sender: TObject); procedure TFViewLogin.WebFormCreate(Sender: TObject);
begin begin
// lblAppTitle.Caption := 'EM Systems - webCharms App ver 0.9.2.22';
VerifyVersion();
if FMessage <> '' then if FMessage <> '' then
ShowNotification(FMessage) ShowNotification(FMessage)
else else
HideNotification; HideNotification;
end; end;
procedure TFViewLogin.btnCloseNotificationClick(Sender: TObject);
begin
HideNotification;
end;
end. end.
kgOrdersClient/View.Main.dfm
...@@ -9,12 +9,12 @@ object FViewMain: TFViewMain ...@@ -9,12 +9,12 @@ object FViewMain: TFViewMain
Font.Size = 8 Font.Size = 8
Font.Style = [] Font.Style = []
FormStyle = fsNormal FormStyle = fsNormal
Height = 586 Height = 764
Left = 0 Left = 0
OnCreate = WebFormCreate OnCreate = WebFormCreate
TabOrder = 0 TabOrder = 0
Top = 0 Top = 0
Width = 640 Width = 1322
object lblUsername: TWebLabel object lblUsername: TWebLabel
Caption = 'lblUsername' Caption = 'lblUsername'
ElementID = 'view.main.username' ElementID = 'view.main.username'
...@@ -29,7 +29,7 @@ object FViewMain: TFViewMain ...@@ -29,7 +29,7 @@ object FViewMain: TFViewMain
Left = 529 Left = 529
Top = 4 Top = 4
Transparent = False Transparent = False
Width = 88 Width = 80
end end
object wllblUserProfile: TWebLinkLabel object wllblUserProfile: TWebLinkLabel
Caption = ' User Profile' Caption = ' User Profile'
...@@ -93,7 +93,7 @@ object FViewMain: TFViewMain ...@@ -93,7 +93,7 @@ object FViewMain: TFViewMain
Left = 57 Left = 57
Top = 31 Top = 31
Transparent = False Transparent = False
Width = 78 Width = 202
end end
object lblItemsList: TWebLinkLabel object lblItemsList: TWebLinkLabel
Caption = 'Items' Caption = 'Items'
...@@ -110,7 +110,7 @@ object FViewMain: TFViewMain ...@@ -110,7 +110,7 @@ object FViewMain: TFViewMain
Left = 560 Left = 560
OnClick = lblItemsListClick OnClick = lblItemsListClick
Top = 85 Top = 85
Width = 71 Width = 95
end end
object lblUsers: TWebLinkLabel object lblUsers: TWebLinkLabel
Caption = 'Users' Caption = 'Users'
...@@ -140,12 +140,12 @@ object FViewMain: TFViewMain ...@@ -140,12 +140,12 @@ object FViewMain: TFViewMain
Font.Name = 'Arial' Font.Name = 'Arial'
Font.Size = 8 Font.Size = 8
Font.Style = [] Font.Style = []
Height = 8 Height = 32
HeightStyle = ssAuto HeightStyle = ssAuto
Left = 556 Left = 556
OnClick = lblordersClick OnClick = lblordersClick
Top = 52 Top = 52
Width = 32 Width = 104
end end
object lblCustomers: TWebLabel object lblCustomers: TWebLabel
Caption = 'Customers' Caption = 'Customers'
...@@ -158,12 +158,12 @@ object FViewMain: TFViewMain ...@@ -158,12 +158,12 @@ object FViewMain: TFViewMain
Font.Name = 'Arial' Font.Name = 'Arial'
Font.Size = 8 Font.Size = 8
Font.Style = [] Font.Style = []
Height = 8 Height = 32
HeightStyle = ssAuto HeightStyle = ssAuto
Left = 540 Left = 540
OnClick = lblCustomersClick OnClick = lblCustomersClick
Top = 69 Top = 69
Width = 32 Width = 131
end end
object lblQuickbooks: TWebLabel object lblQuickbooks: TWebLabel
Caption = 'QuickBooks' Caption = 'QuickBooks'
...@@ -176,12 +176,12 @@ object FViewMain: TFViewMain ...@@ -176,12 +176,12 @@ object FViewMain: TFViewMain
Font.Name = 'Arial' Font.Name = 'Arial'
Font.Size = 8 Font.Size = 8
Font.Style = [] Font.Style = []
Height = 8 Height = 32
HeightStyle = ssAuto HeightStyle = ssAuto
Left = 546 Left = 546
OnClick = lblQuickbooksClick OnClick = lblQuickbooksClick
Top = 125 Top = 125
Width = 32 Width = 139
end end
object WebPanel1: TWebPanel object WebPanel1: TWebPanel
ChildOrder = 3 ChildOrder = 3
...@@ -195,14 +195,14 @@ object FViewMain: TFViewMain ...@@ -195,14 +195,14 @@ object FViewMain: TFViewMain
Font.Name = 'Arial' Font.Name = 'Arial'
Font.Size = 8 Font.Size = 8
Font.Style = [] Font.Style = []
Height = 32 Height = 0
HeightStyle = ssAuto HeightStyle = ssAuto
Left = 77 Left = 77
Role = 'null' Role = 'null'
TabOrder = 0 TabOrder = 0
TabStop = False TabStop = False
Top = 112 Top = 112
Width = 640 Width = 1322
WidthStyle = ssAuto WidthStyle = ssAuto
end end
object WebMemo1: TWebMemo object WebMemo1: TWebMemo
...@@ -223,13 +223,30 @@ object FViewMain: TFViewMain ...@@ -223,13 +223,30 @@ object FViewMain: TFViewMain
ReadOnly = False ReadOnly = False
Role = 'null' Role = 'null'
SelLength = 0 SelLength = 0
SelStart = 8 SelStart = 0
ShowFocus = True ShowFocus = True
TabOrder = 0 TabOrder = 0
Top = 479 Top = 479
Visible = False Visible = False
Width = 471 Width = 471
end end
object lblVersion: TWebLabel
Caption = 'lblVersion'
ElementFont = efCSS
ElementID = 'view.main.version'
ElementPosition = epRelative
Font.Charset = ANSI_CHARSET
Font.Color = clBlack
Font.Height = -11
Font.Name = 'Arial'
Font.Size = 8
Font.Style = []
Height = 21
HeightStyle = ssAuto
Left = 358
Top = 209
Width = 60
end
object WebMessageDlg1: TWebMessageDlg object WebMessageDlg1: TWebMessageDlg
CustomButtons = <> CustomButtons = <>
DialogText.Strings = ( DialogText.Strings = (
......
kgOrdersClient/View.Main.html
<div id="wrapper"> <div id="wrapper">
<nav class="navbar navbar-expand navbar-light bg-light" style="margin-bottom: 0px;"> <nav class="navbar navbar-expand navbar-light bg-light" style="margin-bottom: 0px;">
<div class="container-fluid"> <div class="container-fluid">
<a id="view.main.apptitle" class="navbar-brand" href="index.html">Koehler-Gibson Orders</a> <div class="d-flex align-items-center">
<a id="view.main.apptitle" class="navbar-brand" href="index.html">Koehler-Gibson Orders</a>
<span id="view.main.version" class="small text-muted ms-2"></span>
</div>
<ul class="navbar-nav ml-auto"> <ul class="navbar-nav ml-auto">
<li class="nav-item"> <li class="nav-item">
<a class="dropdown-item" id="lblorders" href="#"><i class="fa fa-tags fa-fw"></i><span> Orders</span></a> <a class="dropdown-item" id="lblorders" href="#"><i class="fa fa-tags fa-fw"></i><span> Orders</span></a>
......
kgOrdersClient/View.Main.pas
...@@ -6,7 +6,7 @@ uses ...@@ -6,7 +6,7 @@ uses
System.SysUtils, System.Classes, JS, Web, WEBLib.Graphics, WEBLib.Controls, System.SysUtils, System.Classes, JS, Web, WEBLib.Graphics, WEBLib.Controls,
WEBLib.Forms, WEBLib.Dialogs, WEBLib.ExtCtrls, Vcl.Controls, Vcl.StdCtrls, WEBLib.Forms, WEBLib.Dialogs, WEBLib.ExtCtrls, Vcl.Controls, Vcl.StdCtrls,
WEBLib.StdCtrls, Data.DB, XData.Web.JsonDataset, XData.Web.Dataset, WEBLib.StdCtrls, Data.DB, XData.Web.JsonDataset, XData.Web.Dataset,
App.Types, ConnectionModule, XData.Web.Client; App.Types, ConnectionModule, XData.Web.Client, WEBLib.Menus;
type type
TFViewMain = class(TWebForm) TFViewMain = class(TWebForm)
...@@ -24,6 +24,7 @@ type ...@@ -24,6 +24,7 @@ type
lblorders: TWebLabel; lblorders: TWebLabel;
lblCustomers: TWebLabel; lblCustomers: TWebLabel;
lblQuickbooks: TWebLabel; lblQuickbooks: TWebLabel;
lblVersion: TWebLabel;
procedure WebFormCreate(Sender: TObject); procedure WebFormCreate(Sender: TObject);
procedure mnuLogoutClick(Sender: TObject); procedure mnuLogoutClick(Sender: TObject);
procedure wllblUserProfileClick(Sender: TObject); procedure wllblUserProfileClick(Sender: TObject);
...@@ -93,6 +94,8 @@ begin ...@@ -93,6 +94,8 @@ begin
lblUsers.Visible := true; lblUsers.Visible := true;
ShowForm(TFViewOrders); ShowForm(TFViewOrders);
lblAppTitle.Caption := 'Koehler-Gibson Orders'; lblAppTitle.Caption := 'Koehler-Gibson Orders';
lblVersion.Caption := 'v' + DMConnection.clientVersion;
setActive('Orders'); setActive('Orders');
end; end;
......
kgOrdersClient/View.Orders.html
<div class="container h-100 d-flex flex-column mt-0" style="max-width: 100%; padding-bottom: 0;"> <div class="container h-100 d-flex flex-column mt-0 py-0" style="max-width: 100%;">
<!-- Alert Section --> <!-- Alert Section -->
<div class="row"> <div class="row">
<div class=col-sm> <div class=col-sm>
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</div> </div>
<!-- Actions Row --> <!-- Actions Row -->
<div class="row mt-3 justify-content-center"> <div class="row mt-2 justify-content-center">
<div class="col-auto d-flex align-items-center"> <div class="col-auto d-flex align-items-center">
<label class="mt-3" style="font-weight: 700;">Show <select class="custom-select" id="wcbpagesize" style="font-size: 1.00rem;"></select> entries</label> <label class="mt-3" style="font-weight: 700;">Show <select class="custom-select" id="wcbpagesize" style="font-size: 1.00rem;"></select> entries</label>
</div> </div>
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
</div> </div>
<!-- Pagination Section --> <!-- Pagination Section -->
<div class="d-flex justify-content-center w-100 mt-4"> <div class="d-flex justify-content-center w-100 mt-2">
<nav aria-label="Page navigation"> <nav aria-label="Page navigation">
<ul id="pagination" class="pagination"> <ul id="pagination" class="pagination">
<!-- Pagination items added dynamically --> <!-- Pagination items added dynamically -->
......
kgOrdersClient/config/config.json
...@@ -2,3 +2,4 @@ ...@@ -2,3 +2,4 @@
"AuthUrl" : "http://localhost:2004/emsys/kgOrders/auth/", "AuthUrl" : "http://localhost:2004/emsys/kgOrders/auth/",
"ApiUrl" : "http://localhost:2004/emsys/kgOrders/api/" "ApiUrl" : "http://localhost:2004/emsys/kgOrders/api/"
} }
kgOrdersClient/webKGOrders.dpr
...@@ -3,6 +3,7 @@ program webKGOrders; ...@@ -3,6 +3,7 @@ program webKGOrders;
uses uses
Vcl.Forms, Vcl.Forms,
XData.Web.Connection, XData.Web.Connection,
WEBLib.Dialogs,
Auth.Service in 'Auth.Service.pas', Auth.Service in 'Auth.Service.pas',
App.Types in 'App.Types.pas', App.Types in 'App.Types.pas',
ConnectionModule in 'ConnectionModule.pas' {DMConnection: TWebDataModule}, ConnectionModule in 'ConnectionModule.pas' {DMConnection: TWebDataModule},
...@@ -44,6 +45,7 @@ begin ...@@ -44,6 +45,7 @@ begin
ConnectProc; ConnectProc;
end; end;
procedure DisplayLoginView(AMessage: string); procedure DisplayLoginView(AMessage: string);
begin begin
AuthService.Logout; AuthService.Logout;
...@@ -53,23 +55,41 @@ begin ...@@ -53,23 +55,41 @@ begin
TFViewLogin.Display(@DisplayMainView, AMessage); TFViewLogin.Display(@DisplayMainView, AMessage);
end; end;
procedure UnauthorizedAccessProc(AMessage: string); procedure UnauthorizedAccessProc(AMessage: string);
begin begin
DisplayLoginView(AMessage); DisplayLoginView(AMessage);
end; end;
procedure StartApplication; procedure StartApplication;
begin begin
if (not AuthService.Authenticated) or AuthService.TokenExpired then DMConnection.InitApp(
DisplayLoginView procedure
else begin
DisplayMainView; DMConnection.SetClientConfig(
procedure(Success: Boolean; ErrorMessage: string)
begin
if Success then
begin
if (not AuthService.Authenticated) or AuthService.TokenExpired then
DisplayLoginView
else
DisplayMainView;
end
else
ShowMessage(ErrorMessage)
end);
end,
@UnauthorizedAccessProc
);
end; end;
begin begin
Application.Initialize; Application.Initialize;
Application.MainFormOnTaskbar := True; Application.MainFormOnTaskbar := True;
Application.CreateForm(TDMConnection, DMConnection); Application.CreateForm(TDMConnection, DMConnection);
DMConnection.InitApp(@StartApplication, @UnauthorizedAccessProc); StartApplication;
Application.Run; Application.Run;
end. end.
kgOrdersClient/webKGOrders.dproj
...@@ -137,62 +137,50 @@ ...@@ -137,62 +137,50 @@
<DCCReference Include="Paginator.Plugins.pas"/> <DCCReference Include="Paginator.Plugins.pas"/>
<DCCReference Include="View.Items.pas"> <DCCReference Include="View.Items.pas">
<Form>FViewItems</Form> <Form>FViewItems</Form>
<FormType>dfm</FormType>
<DesignClass>TWebForm</DesignClass> <DesignClass>TWebForm</DesignClass>
</DCCReference> </DCCReference>
<DCCReference Include="View.Main.pas"> <DCCReference Include="View.Main.pas">
<Form>FViewMain</Form> <Form>FViewMain</Form>
<FormType>dfm</FormType>
<DesignClass>TWebForm</DesignClass> <DesignClass>TWebForm</DesignClass>
</DCCReference> </DCCReference>
<DCCReference Include="View.Home.pas"> <DCCReference Include="View.Home.pas">
<Form>FViewHome</Form> <Form>FViewHome</Form>
<FormType>dfm</FormType>
<DesignClass>TWebForm</DesignClass> <DesignClass>TWebForm</DesignClass>
</DCCReference> </DCCReference>
<DCCReference Include="View.Users.pas"> <DCCReference Include="View.Users.pas">
<Form>FViewUsers</Form> <Form>FViewUsers</Form>
<FormType>dfm</FormType>
<DesignClass>TWebForm</DesignClass> <DesignClass>TWebForm</DesignClass>
</DCCReference> </DCCReference>
<DCCReference Include="View.EditUser.pas"> <DCCReference Include="View.EditUser.pas">
<Form>FViewEditUser</Form> <Form>FViewEditUser</Form>
<FormType>dfm</FormType>
<DesignClass>TWebForm</DesignClass> <DesignClass>TWebForm</DesignClass>
</DCCReference> </DCCReference>
<DCCReference Include="View.Orders.pas"> <DCCReference Include="View.Orders.pas">
<Form>FViewOrders</Form> <Form>FViewOrders</Form>
<FormType>dfm</FormType>
<DesignClass>TWebForm</DesignClass> <DesignClass>TWebForm</DesignClass>
</DCCReference> </DCCReference>
<DCCReference Include="View.OrderEntryCorrugated.pas"> <DCCReference Include="View.OrderEntryCorrugated.pas">
<Form>FOrderEntryCorrugated</Form> <Form>FOrderEntryCorrugated</Form>
<FormType>dfm</FormType>
<DesignClass>TWebForm</DesignClass> <DesignClass>TWebForm</DesignClass>
</DCCReference> </DCCReference>
<DCCReference Include="View.AddOrder.pas"> <DCCReference Include="View.AddOrder.pas">
<Form>FAddOrder</Form> <Form>FAddOrder</Form>
<FormType>dfm</FormType>
<DesignClass>TWebForm</DesignClass> <DesignClass>TWebForm</DesignClass>
</DCCReference> </DCCReference>
<DCCReference Include="View.Search.pas"> <DCCReference Include="View.Search.pas">
<Form>FSearch</Form> <Form>FSearch</Form>
<FormType>dfm</FormType>
<DesignClass>TWebForm</DesignClass> <DesignClass>TWebForm</DesignClass>
</DCCReference> </DCCReference>
<DCCReference Include="View.SetStatus.pas"> <DCCReference Include="View.SetStatus.pas">
<Form>FSetStatus</Form> <Form>FSetStatus</Form>
<FormType>dfm</FormType>
<DesignClass>TWebForm</DesignClass> <DesignClass>TWebForm</DesignClass>
</DCCReference> </DCCReference>
<DCCReference Include="View.OrderEntryCuttingDie.pas"> <DCCReference Include="View.OrderEntryCuttingDie.pas">
<Form>FOrderEntryCuttingDie</Form> <Form>FOrderEntryCuttingDie</Form>
<FormType>dfm</FormType>
<DesignClass>TWebForm</DesignClass> <DesignClass>TWebForm</DesignClass>
</DCCReference> </DCCReference>
<DCCReference Include="View.OrderEntryWeb.pas"> <DCCReference Include="View.OrderEntryWeb.pas">
<Form>FOrderEntryWeb</Form> <Form>FOrderEntryWeb</Form>
<FormType>dfm</FormType>
<DesignClass>TWebForm</DesignClass> <DesignClass>TWebForm</DesignClass>
</DCCReference> </DCCReference>
<None Include="index.html"/> <None Include="index.html"/>
...@@ -231,7 +219,6 @@ ...@@ -231,7 +219,6 @@
<DeployFile LocalName="config\config.json" Configuration="Debug" Class="ProjectFile"/> <DeployFile LocalName="config\config.json" Configuration="Debug" Class="ProjectFile"/>
<DeployFile LocalName="css\app.css" Configuration="Debug" Class="ProjectFile"/> <DeployFile LocalName="css\app.css" Configuration="Debug" Class="ProjectFile"/>
<DeployFile LocalName="index.html" Configuration="Debug" Class="ProjectFile"/> <DeployFile LocalName="index.html" Configuration="Debug" Class="ProjectFile"/>
<DeployFile LocalName="index.html" Configuration="Debug" Class="ProjectFile"/>
<DeployFile LocalName="template\bootstrap\bootstrap.min.css" Configuration="Debug" Class="ProjectFile"/> <DeployFile LocalName="template\bootstrap\bootstrap.min.css" Configuration="Debug" Class="ProjectFile"/>
<DeployFile LocalName="template\bootstrap\bootstrap.min.js" Configuration="Debug" Class="ProjectFile"/> <DeployFile LocalName="template\bootstrap\bootstrap.min.js" Configuration="Debug" Class="ProjectFile"/>
<DeployFile LocalName="template\bootstrap\dataTables.bootstrap.css" Configuration="Debug" Class="ProjectFile"/> <DeployFile LocalName="template\bootstrap\dataTables.bootstrap.css" Configuration="Debug" Class="ProjectFile"/>
......
kgOrdersServer/Source/Auth.Service.pas
...@@ -7,7 +7,8 @@ interface ...@@ -7,7 +7,8 @@ interface
uses uses
XData.Service.Common, XData.Service.Common,
Aurelius.Mapping.Attributes, Aurelius.Mapping.Attributes,
System.Generics.Collections; System.Generics.Collections,
System.JSON;
const const
AUTH_MODEL = 'Auth'; AUTH_MODEL = 'Auth';
...@@ -18,7 +19,7 @@ type ...@@ -18,7 +19,7 @@ type
IAuthService = interface(IInvokable) IAuthService = interface(IInvokable)
['{9CFD59B2-A832-4F82-82BB-9A25FC93F305}'] ['{9CFD59B2-A832-4F82-82BB-9A25FC93F305}']
function Login(const user, password: string): string; function Login(const user, password: string): string;
function VerifyVersion(version: string): string; function VerifyVersion(ClientVersion: string): TJSONObject;
end; end;
implementation implementation
......
kgOrdersServer/Source/Auth.ServiceImpl.pas
...@@ -10,7 +10,7 @@ uses ...@@ -10,7 +10,7 @@ uses
XData.Server.Module, XData.Server.Module,
Auth.Service, Auth.Service,
Auth.Database, Auth.Database,
Uni, Data.DB, System.Hash; Uni, Data.DB, System.Hash, System.IniFiles, System.JSON;
type type
[ServiceImplementation] [ServiceImplementation]
...@@ -33,7 +33,7 @@ type ...@@ -33,7 +33,7 @@ type
function CheckUser(const user, password: string): Integer; function CheckUser(const user, password: string): Integer;
public public
function Login(const user, password: string): string; function Login(const user, password: string): string;
function VerifyVersion(version: string): string; function VerifyVersion(ClientVersion: string): TJSONObject;
end; end;
implementation implementation
...@@ -69,17 +69,35 @@ begin ...@@ -69,17 +69,35 @@ begin
Result := authDB.uq; Result := authDB.uq;
end; end;
function TAuthService.VerifyVersion(version: string): string; function TAuthService.VerifyVersion(ClientVersion: string): TJSONObject;
var
iniFile: TIniFile;
webClientVersion: string;
begin begin
if( version <> '1.0.0' ) then Result := TJSONObject.Create;
begin TXDataOperationContext.Current.Handler.ManagedObjects.Add(Result);
Logger.Log( 2, 'TLoginService.GetAgenciesConfigList - Error: wrong ver!' );
result := 'Error - You have the wrong version! Please clear your cache and refresh!'; iniFile := TIniFile.Create(ChangeFileExt(ParamStr(0), '.ini'));
Exit; try
webClientVersion := iniFile.ReadString('Settings', 'webClientVersion', '');
Result.AddPair('webClientVersion', webClientVersion);
if webClientVersion = '' then
begin
Result.AddPair('error', 'webClientVersion is not configured.');
Exit;
end;
if clientVersion <> webClientVersion then
begin
Result.AddPair('error', 'Version mismatch. Please celar your cache and refresh your browser.');
end;
finally
iniFile.Free;
end; end;
result := '';
end; end;
function TAuthService.Login(const user, password: string): string; function TAuthService.Login(const user, password: string): string;
// Login verification: currently checks if logins are the same or if the user // Login verification: currently checks if logins are the same or if the user
// is admin, checks for admin password. Eventually will do a database lookup // is admin, checks for admin password. Eventually will do a database lookup
......
kgOrdersServer/Source/Common.Config.pas
...@@ -6,7 +6,7 @@ unit Common.Config; ...@@ -6,7 +6,7 @@ unit Common.Config;
interface interface
const const
defaultServerUrl = 'http://localhost:2004/emsys/kgOrders/'; defaultServerUrl = 'http://localhost:2004/kgOrders/';
type type
TServerConfig = class TServerConfig = class
...@@ -17,12 +17,13 @@ type ...@@ -17,12 +17,13 @@ type
FWebAppFolder: string; FWebAppFolder: string;
FReportsFolder: string; FReportsFolder: string;
public public
constructor Create;
property url: string read FUrl write FUrl; property url: string read FUrl write FUrl;
property jwtTokenSecret: string read FJWTTokenSecret write FJWTTokenSecret; property jwtTokenSecret: string read FJWTTokenSecret write FJWTTokenSecret;
property adminPassword: string read FAdminPassword write FAdminPassword; property adminPassword: string read FAdminPassword write FAdminPassword;
property webAppFolder: string read FWebAppFolder write FWebAppFolder; property webAppFolder: string read FWebAppFolder write FWebAppFolder;
property reportsFolder: string read FReportsFolder write FReportsFolder; property reportsFolder: string read FReportsFolder write FReportsFolder;
constructor Create;
end; end;
procedure LoadServerConfig; procedure LoadServerConfig;
...@@ -79,7 +80,7 @@ begin ...@@ -79,7 +80,7 @@ begin
adminPassword := 'whatisthisusedfor'; adminPassword := 'whatisthisusedfor';
jwtTokenSecret := 'super_secret0123super_secret4567'; jwtTokenSecret := 'super_secret0123super_secret4567';
webAppFolder := 'static'; webAppFolder := 'static';
reportsFolder := '..\kgOrdersClient\TMSWeb\Debug\'; reportsFolder := 'static/';
// ServerConfigStr := Bcl.Json.TJson.Serialize( ServerConfig ); // ServerConfigStr := Bcl.Json.TJson.Serialize( ServerConfig );
// ConfigFile := 'serverconfig.json'; // ConfigFile := 'serverconfig.json';
// TFile.WriteAllText( ConfigFile, ServerConfigStr ); // TFile.WriteAllText( ConfigFile, ServerConfigStr );
......
kgOrdersServer/Source/Main.dfm
...@@ -71,4 +71,9 @@ object FMain: TFMain ...@@ -71,4 +71,9 @@ object FMain: TFMain
Left = 58 Left = 58
Top = 398 Top = 398
end end
object ExeInfo1: TExeInfo
Version = '1.6.1.1'
Left = 158
Top = 404
end
end end
kgOrdersServer/Source/Main.pas
...@@ -9,7 +9,8 @@ uses ...@@ -9,7 +9,8 @@ uses
Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, Winapi.ShellApi, Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, Winapi.ShellApi,
System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs,
Vcl.StdCtrls, Vcl.ExtCtrls, System.Generics.Collections, System.IniFiles, Vcl.StdCtrls, Vcl.ExtCtrls, System.Generics.Collections, System.IniFiles,
Auth.Service, Auth.Server.Module, Lookup.Service, Api.Server.Module, App.Server.Module; Auth.Service, Auth.Server.Module, Lookup.Service, Api.Server.Module, App.Server.Module,
ExeInfo;
type type
TFMain = class(TForm) TFMain = class(TForm)
...@@ -19,6 +20,7 @@ type ...@@ -19,6 +20,7 @@ type
btnExit: TButton; btnExit: TButton;
initTimer: TTimer; initTimer: TTimer;
btnAuthSwaggerUI: TButton; btnAuthSwaggerUI: TButton;
ExeInfo1: TExeInfo;
procedure btnApiSwaggerUIClick(Sender: TObject); procedure btnApiSwaggerUIClick(Sender: TObject);
procedure btnDataClick(Sender: TObject); procedure btnDataClick(Sender: TObject);
procedure btnExitClick(Sender: TObject); procedure btnExitClick(Sender: TObject);
...@@ -87,6 +89,7 @@ end; ...@@ -87,6 +89,7 @@ end;
procedure TFMain.initTimerTimer(Sender: TObject); procedure TFMain.initTimerTimer(Sender: TObject);
begin begin
initTimer.Enabled := False; initTimer.Enabled := False;
Caption := Caption + ' ver ' + ExeInfo1.FileVersion;
ServerConfig := TServerConfig.Create; ServerConfig := TServerConfig.Create;
LoadServerConfig; LoadServerConfig;
StartServers; StartServers;
...@@ -99,9 +102,10 @@ var ...@@ -99,9 +102,10 @@ var
iniFile: TIniFile; iniFile: TIniFile;
iniStr: string; iniStr: string;
begin begin
// this looks ok in the log file but not in the memo on the form // The version is centered when the app is running
Logger.Log( 1, '*******************************************************' ); Logger.Log( 1, '*******************************************************' );
Logger.Log( 1, '* kgOrdersServer - ver 1.1.0 *' ); Logger.Log( 1, '* kgOrdersServer *' );
Logger.Log(1, Format(' Version: %s ', [FMain.ExeInfo1.FileVersion]));
Logger.Log( 1, '* Developed by EM Systems, Inc. *' ); Logger.Log( 1, '* Developed by EM Systems, Inc. *' );
Logger.Log( 1, '*******************************************************' ); Logger.Log( 1, '*******************************************************' );
Logger.Log( 1, '' ); Logger.Log( 1, '' );
......
kgOrdersServer/Source/rOrderCorrugated.pas
...@@ -212,7 +212,7 @@ begin ...@@ -212,7 +212,7 @@ begin
ForceDirectories(ReportDir); ForceDirectories(ReportDir);
Logger.Log(5, 'Reports directory created: ' + ReportDir); Logger.Log(5, 'Reports directory created: ' + ReportDir);
end; end;
reportURL := 'reports\' + FormatDateTime('yyyymmdd_hhnnss', Now) + '.pdf'; reportURL := FormatDateTime('yyyymmdd_hhnnss', Now) + '.pdf';
ReportFileName := reportDir + reportUrl; ReportFileName := reportDir + reportUrl;
......
kgOrdersServer/Source/rOrderList.pas
...@@ -210,7 +210,7 @@ begin ...@@ -210,7 +210,7 @@ begin
ForceDirectories(ReportDir); ForceDirectories(ReportDir);
Logger.Log(5, 'Reports directory created: ' + ReportDir); Logger.Log(5, 'Reports directory created: ' + ReportDir);
end; end;
reportURL := 'reports\' + FormatDateTime('yyyymmdd_hhnnss', Now) + '.pdf'; reportURL := 'reports/' + FormatDateTime('yyyymmdd_hhnnss', Now) + '.pdf';
ReportFileName := reportDir + reportUrl; ReportFileName := reportDir + reportUrl;
......
kgOrdersServer/kgOrdersServer.dproj
...@@ -106,6 +106,10 @@ ...@@ -106,6 +106,10 @@
<VerInfo_Locale>1033</VerInfo_Locale> <VerInfo_Locale>1033</VerInfo_Locale>
<DCC_ExeOutput>.</DCC_ExeOutput> <DCC_ExeOutput>.</DCC_ExeOutput>
<DCC_UnitSearchPath>C:\RADTOOLS\FastMM4;$(DCC_UnitSearchPath)</DCC_UnitSearchPath> <DCC_UnitSearchPath>C:\RADTOOLS\FastMM4;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
<VerInfo_MajorVer>0</VerInfo_MajorVer>
<VerInfo_MinorVer>9</VerInfo_MinorVer>
<VerInfo_Release>2</VerInfo_Release>
<VerInfo_Keys>CompanyName=EM Systems;FileDescription=$(MSBuildProjectName);FileVersion=0.9.2.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Win64)'!=''"> <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
<AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode> <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
......
kgOrdersServer/kgOrdersServer.ini
[Settings] [Settings]
MemoLogLevel=4 MemoLogLevel=4
FileLogLevel=5 FileLogLevel=5
LogFileNum=310 LogFileNum=332
webClientVersion=1.0.0 webClientVersion=0.9.0
[Database] [Database]
--Server=192.168.159.132 --Server=192.168.159.132
......
kgOrdersServer/kgOrdersServer.json 0 → 100644
{
"url": "http://localhost:2004/emsys/kgOrders/",
"jwtTokenSecret": "super_secret0123super_secret4567",
"adminPassword": "whatisthisusedfor",
"webAppFolder": "static",
"reportsFolder": "reports/"
}
\ No newline at end of file
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