Commit 0a10d405 by Cam Hayes

Finished adding the memory leak fix and the column width fix. Updated the loggers as well

parent d7f1e3db
...@@ -5,8 +5,9 @@ interface ...@@ -5,8 +5,9 @@ interface
uses uses
System.SysUtils, System.Classes, Web, WEBLib.Graphics, WEBLib.Controls, WEBLib.Forms, WEBLib.Dialogs, System.SysUtils, System.Classes, Web, WEBLib.Graphics, WEBLib.Controls, WEBLib.Forms, WEBLib.Dialogs,
Vcl.Controls, Vcl.StdCtrls, WEBLib.StdCtrls, WEBLib.JSON, Vcl.Controls, Vcl.StdCtrls, WEBLib.StdCtrls, WEBLib.JSON,
JS, XData.Web.Connection, WEBLib.ExtCtrls, XData.Web.Client, WEBLib.ExtCtrls, Vcl.Imaging.pngimage,
App.Types, ConnectionModule, XData.Web.Client, Vcl.Imaging.pngimage; JS, XData.Web.Connection,
App.Types, ConnectionModule;
type type
TFViewLogin = class(TWebForm) TFViewLogin = class(TWebForm)
...@@ -55,7 +56,8 @@ procedure TFViewLogin.btnLoginClick(Sender: TObject); ...@@ -55,7 +56,8 @@ procedure TFViewLogin.btnLoginClick(Sender: TObject);
begin begin
ShowNotification('Login Error: ' + AMsg); ShowNotification('Login Error: ' + AMsg);
end; end;
var
hashPW: string;
begin begin
AuthService.Login( AuthService.Login(
edtUsername.Text, edtPassword.Text, edtUsername.Text, edtPassword.Text,
......
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content shadow-lg"> <div class="modal-content shadow-lg">
<div class="modal-header"> <div class="modal-header">
<h5 class="modal-title" id="main_notification_modal">Error</h5> <h5 class="modal-title" id="main_notification_modal">Info</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button> <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div> </div>
<div class="modal-body fs-6 fw-bold" id="main_notification_modal_body"> <div class="modal-body fs-6 fw-bold" id="main_notification_modal_body">
......
...@@ -156,40 +156,50 @@ object FViewOrders: TFViewOrders ...@@ -156,40 +156,50 @@ object FViewOrders: TFViewOrders
Title = 'Proof Due' Title = 'Proof Due'
end end
item item
ElementClassName = 'tbl-min-120'
DataField = 'proofDone' DataField = 'proofDone'
Title = 'Proof Done' Title = 'Proof Done'
TitleElementClassName = 'tbl-min-120'
end end
item item
DataField = 'artDue' DataField = 'artDue'
Title = 'Art Due' Title = 'Art Due'
end end
item item
ElementClassName = 'tbl-min-120'
DataField = 'artDone' DataField = 'artDone'
Title = 'Art Done' Title = 'Art Done'
TitleElementClassName = 'tbl-min-120'
end end
item item
DataField = 'plateDue' DataField = 'plateDue'
Title = 'Plate Due' Title = 'Plate Due'
end end
item item
ElementClassName = 'tbl-min-120'
DataField = 'plateDone' DataField = 'plateDone'
Title = 'Plate Done' Title = 'Plate Done'
TitleElementClassName = 'tbl-min-120'
end end
item item
DataField = 'mountDue' DataField = 'mountDue'
Title = 'Mount Due' Title = 'Mount Due'
end end
item item
ElementClassName = 'tbl-min-120'
DataField = 'mountDone' DataField = 'mountDone'
Title = 'Mount Done' Title = 'Mount Done'
TitleElementClassName = 'tbl-min-120'
end end
item item
DataField = 'shipDue' DataField = 'shipDue'
Title = 'Ship Due' Title = 'Ship Due'
end end
item item
ElementClassName = 'tbl-min-120'
DataField = 'shipDone' DataField = 'shipDone'
Title = 'Ship Done' Title = 'Ship Done'
TitleElementClassName = 'tbl-min-120'
end end
item item
DataField = 'price' DataField = 'price'
...@@ -360,6 +370,7 @@ object FViewOrders: TFViewOrders ...@@ -360,6 +370,7 @@ object FViewOrders: TFViewOrders
FieldName = 'proofDue' FieldName = 'proofDue'
end end
object xdwdsOrdersproofDone: TStringField object xdwdsOrdersproofDone: TStringField
DisplayWidth = 40
FieldName = 'proofDone' FieldName = 'proofDone'
end end
object xdwdsOrdersartDue: TStringField object xdwdsOrdersartDue: TStringField
......
...@@ -165,7 +165,7 @@ begin ...@@ -165,7 +165,7 @@ begin
ShowToast(FMessage); ShowToast(FMessage);
edtUsername.Text := Username; edtUsername.Text := Username;
edtFullName.Text := FullName; edtFullName.Text := FullName;
if Mode = 'Edit' then if Mode = 'EDIT' then
begin begin
edtPassword.Text := 'hidden'; edtPassword.Text := 'hidden';
end; end;
......
...@@ -7,6 +7,10 @@ ...@@ -7,6 +7,10 @@
background-color: #fff; background-color: #fff;
} }
.tbl-min-120 {
min-width: 120px;
}
input[type="text"] { input[type="text"] {
min-width: 50px; min-width: 50px;
max-width: 100%; max-width: 100%;
......
...@@ -181,7 +181,7 @@ begin ...@@ -181,7 +181,7 @@ begin
begin begin
name := authDB.uq.FieldByName('NAME').AsString; name := authDB.uq.FieldByName('NAME').AsString;
checkString := THashSHA2.GetHashString(name + password, THashSHA2.TSHA2Version.SHA512).ToUpper; checkString := THashSHA2.GetHashString(name + password, THashSHA2.TSHA2Version.SHA512).ToUpper;
if authDB.uq.FieldByName('PASSWORD').AsString = checkString then if authDB.uq.FieldByName('PASSWORD').AsString = checkstring then
begin begin
Logger.Log(1, Format('AuthDB.SetLoginAuditEntry: "%s"', [user]) ); Logger.Log(1, Format('AuthDB.SetLoginAuditEntry: "%s"', [user]) );
Result := 3; // Succcess Result := 3; // Succcess
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
MemoLogLevel=4 MemoLogLevel=4
FileLogLevel=4 FileLogLevel=4
webClientVersion=0.9.11 webClientVersion=0.9.11
LogFileNum=171 LogFileNum=175
[Database] [Database]
--Server=192.168.116.132 --Server=192.168.116.132
......
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