Commit 5be931b6 by Cam Hayes

Cleaned up warnings on server side

parent e9209347
...@@ -17,7 +17,6 @@ type ...@@ -17,7 +17,6 @@ type
TAuthService = class(TInterfacedObject, IAuthService) TAuthService = class(TInterfacedObject, IAuthService)
strict private strict private
authDB: TAuthDatabase; authDB: TAuthDatabase;
function GetQuery: TUniQuery;
private private
userName: string; userName: string;
userFullName: string; userFullName: string;
...@@ -28,12 +27,12 @@ type ...@@ -28,12 +27,12 @@ type
userEmail: string; userEmail: string;
userStatus: string; userStatus: string;
qbEnabled: boolean; qbEnabled: boolean;
procedure AfterConstruction; override;
procedure BeforeDestruction; override;
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(ClientVersion: string): TJSONObject; function VerifyVersion(ClientVersion: string): TJSONObject;
procedure AfterConstruction; override;
procedure BeforeDestruction; override;
end; end;
implementation implementation
...@@ -72,11 +71,6 @@ begin ...@@ -72,11 +71,6 @@ begin
inherited; inherited;
end; end;
function TAuthService.GetQuery: TUniQuery;
begin
Result := authDB.uq;
end;
function TAuthService.VerifyVersion(ClientVersion: string): TJSONObject; function TAuthService.VerifyVersion(ClientVersion: string): TJSONObject;
var var
iniFile: TIniFile; iniFile: TIniFile;
...@@ -115,8 +109,6 @@ var ...@@ -115,8 +109,6 @@ var
JWT: TJWT; JWT: TJWT;
begin begin
Logger.Log(3, Format( 'AuthService.Login - User: "%s"', [User])); Logger.Log(3, Format( 'AuthService.Login - User: "%s"', [User]));
userState := CheckUser( user, password );
try try
userState := CheckUser(user, password); userState := CheckUser(user, password);
except except
...@@ -174,12 +166,10 @@ end; ...@@ -174,12 +166,10 @@ end;
function TAuthService.CheckUser(const user, password: string): Integer; function TAuthService.CheckUser(const user, password: string): Integer;
var var
userStr: string;
SQL: string; SQL: string;
name: string; name: string;
checkString: string; checkString: string;
begin begin
Result := 0;
Logger.Log(1, Format('AuthService.CheckUser - User: "%s"', [user]) ); Logger.Log(1, Format('AuthService.CheckUser - User: "%s"', [user]) );
SQL := 'select * from users where USER_NAME = ' + QuotedStr(user); SQL := 'select * from users where USER_NAME = ' + QuotedStr(user);
DoQuery(authDB.uq, SQL); DoQuery(authDB.uq, SQL);
......
...@@ -43,8 +43,6 @@ object FData: TFData ...@@ -43,8 +43,6 @@ object FData: TFData
Lines.Strings = ( Lines.Strings = (
'Memo1') 'Memo1')
TabOrder = 1 TabOrder = 1
ExplicitLeft = -2
ExplicitTop = 435
end end
object DBAdvGrid1: TDBAdvGrid object DBAdvGrid1: TDBAdvGrid
Left = 6 Left = 6
...@@ -174,7 +172,7 @@ object FData: TFData ...@@ -174,7 +172,7 @@ object FData: TFData
SortSettings.HeaderColorTo = clWhite SortSettings.HeaderColorTo = clWhite
SortSettings.HeaderMirrorColor = clWhite SortSettings.HeaderMirrorColor = clWhite
SortSettings.HeaderMirrorColorTo = clWhite SortSettings.HeaderMirrorColorTo = clWhite
Version = '2.8.3.3' Version = '2.8.3.8'
AutoCreateColumns = True AutoCreateColumns = True
AutoRemoveColumns = True AutoRemoveColumns = True
Columns = < Columns = <
...@@ -755,7 +753,7 @@ object FData: TFData ...@@ -755,7 +753,7 @@ object FData: TFData
SortSettings.HeaderColorTo = clWhite SortSettings.HeaderColorTo = clWhite
SortSettings.HeaderMirrorColor = clWhite SortSettings.HeaderMirrorColor = clWhite
SortSettings.HeaderMirrorColorTo = clWhite SortSettings.HeaderMirrorColorTo = clWhite
Version = '2.8.3.3' Version = '2.8.3.8'
AutoCreateColumns = True AutoCreateColumns = True
AutoRemoveColumns = True AutoRemoveColumns = True
Columns = < Columns = <
......
...@@ -130,8 +130,6 @@ type ...@@ -130,8 +130,6 @@ type
procedure Button1Click(Sender: TObject); procedure Button1Click(Sender: TObject);
private private
kgDB: TApiDatabase; kgDB: TApiDatabase;
accountSID: string;
authHeader: string;
public public
procedure RunOrdersReport(searchOptions: string); procedure RunOrdersReport(searchOptions: string);
end; end;
...@@ -190,7 +188,6 @@ procedure TFData.btnFindClick(Sender: TObject); ...@@ -190,7 +188,6 @@ procedure TFData.btnFindClick(Sender: TObject);
// whereSQL: where section of the SQL that is built in the function // whereSQL: where section of the SQL that is built in the function
var var
SQL: string; SQL: string;
whereSQL: string;
begin begin
Memo1.Lines.Add(uqUsers.Connection.Server); Memo1.Lines.Add(uqUsers.Connection.Server);
SQL := 'select * from users'; SQL := 'select * from users';
......
...@@ -5,7 +5,7 @@ interface ...@@ -5,7 +5,7 @@ interface
uses uses
System.SysUtils, System.Classes, Data.DB, MemDS, DBAccess, Uni, Common.Logging, System.SysUtils, System.Classes, Data.DB, MemDS, DBAccess, Uni, Common.Logging,
frxClass, frxExportBaseDialog, frxExportPDF, frCoreClasses, frxDBSet, JS, JSON, frxClass, frxExportBaseDialog, frxExportPDF, frCoreClasses, frxDBSet, JS, JSON,
frxTableObject, frxUtils; frxTableObject, frxUtils, System.Generics.Collections;
type type
TrptOrderCorrugated = class(TDataModule) TrptOrderCorrugated = class(TDataModule)
...@@ -156,8 +156,7 @@ var ...@@ -156,8 +156,7 @@ var
colorArray: TJSONArray; colorArray: TJSONArray;
colorsObject, colorObject: TJSONObject; colorsObject, colorObject: TJSONObject;
colorsString: string; colorsString: string;
i, rowIndex: Integer; i: Integer;
temp: TObject;
begin begin
logger.Log(5, 'Adding Color Rows'); logger.Log(5, 'Adding Color Rows');
...@@ -181,31 +180,13 @@ end; ...@@ -181,31 +180,13 @@ end;
function TrptOrderCorrugated.PrepareReport(SQL: string): string; function TrptOrderCorrugated.PrepareReport(SQL: string): string;
var
orderList : TJSObject;
i: integer;
data: TJSArray;
order: TJSObject;
callListLength: integer;
tempString, strColorList: string;
colorObject: TJSONObject;
colorList: TJSArray;
colorLength: integer;
color: TJSObject;
colorJSON: TJSONObject;
colorListJSON: TJSONArray;
items: TJSObject;
begin begin
Logger.Log(5, 'Generated SQL for Prepare Report: ' + SQL); Logger.Log(5, 'Generated SQL for Prepare Report: ' + SQL);
doQuery(uqOrderCorrugated, SQL); doQuery(uqOrderCorrugated, SQL);
if ( string( uqOrderCorrugated.FieldByName('colors_colors').AsString ) ) <> '' then if ( string( uqOrderCorrugated.FieldByName('colors_colors').AsString ) ) <> '' then
begin begin
PopulateColorTable(); PopulateColorTable();
end; end;
result := GeneratePDF; result := GeneratePDF;
Logger.Log(5, 'Report preparation complete.'); Logger.Log(5, 'Report preparation complete.');
......
...@@ -82,29 +82,11 @@ end; ...@@ -82,29 +82,11 @@ end;
function TrptOrderCutting.PrepareReport(SQL: string): string; function TrptOrderCutting.PrepareReport(SQL: string): string;
var
orderList : TJSObject;
i: integer;
data: TJSArray;
order: TJSObject;
callListLength: integer;
tempString, strColorList: string;
colorObject: TJSONObject;
colorList: TJSArray;
colorLength: integer;
color: TJSObject;
colorJSON: TJSONObject;
colorListJSON: TJSONArray;
items: TJSObject;
begin begin
Logger.Log(3, 'Generated SQL for Prepare Report: ' + SQL); Logger.Log(3, 'Generated SQL for Prepare Report: ' + SQL);
//SQL := 'select * from corrugated_plate_orders where ORDER_ID = 18381';
doQuery(uqOrderCutting, SQL); doQuery(uqOrderCutting, SQL);
result := GeneratePDF; result := GeneratePDF;
Logger.Log(5, 'Report preparation complete.'); Logger.Log(5, 'Report preparation complete.');
end; end;
......
...@@ -3,7 +3,7 @@ object rptOrderList: TrptOrderList ...@@ -3,7 +3,7 @@ object rptOrderList: TrptOrderList
Height = 480 Height = 480
Width = 640 Width = 640
object frxOrderList: TfrxReport object frxOrderList: TfrxReport
Version = '2025.1.4' Version = '2025.2.4'
DotMatrixReport = False DotMatrixReport = False
IniFile = '\Software\Fast Reports' IniFile = '\Software\Fast Reports'
PreviewOptions.Buttons = [pbPrint, pbLoad, pbSave, pbExport, pbZoom, pbFind, pbOutline, pbPageSetup, pbTools, pbEdit, pbNavigator, pbExportQuick, pbCopy, pbSelection] PreviewOptions.Buttons = [pbPrint, pbLoad, pbSave, pbExport, pbZoom, pbFind, pbOutline, pbPageSetup, pbTools, pbEdit, pbNavigator, pbExportQuick, pbCopy, pbSelection]
...@@ -26,6 +26,7 @@ object rptOrderList: TrptOrderList ...@@ -26,6 +26,7 @@ object rptOrderList: TrptOrderList
end> end>
Variables = <> Variables = <>
Style = <> Style = <>
Watermarks = <>
object Data: TfrxDataPage object Data: TfrxDataPage
Height = 1000.000000000000000000 Height = 1000.000000000000000000
Width = 1000.000000000000000000 Width = 1000.000000000000000000
...@@ -1065,6 +1066,7 @@ object rptOrderList: TrptOrderList ...@@ -1065,6 +1066,7 @@ object rptOrderList: TrptOrderList
PdfA = False PdfA = False
PDFStandard = psNone PDFStandard = psNone
PDFVersion = pv17 PDFVersion = pv17
PDFColorSpace = csDeviceRGB
Left = 288 Left = 288
Top = 166 Top = 166
end end
......
...@@ -83,9 +83,7 @@ end; ...@@ -83,9 +83,7 @@ end;
function TrptOrderList.PrepareReport(SQL, CompanyName: string): string; function TrptOrderList.PrepareReport(SQL, CompanyName: string): string;
var var
memo: TFrxMemoView; memo: TFrxMemoView;
temp: TDateTime;
DateFormat: TFormatSettings; DateFormat: TFormatSettings;
tempStr: string;
begin begin
Logger.Log(5, 'Generated SQL for Prepare Report: ' + SQL); Logger.Log(5, 'Generated SQL for Prepare Report: ' + SQL);
...@@ -103,9 +101,6 @@ begin ...@@ -103,9 +101,6 @@ begin
DateFormat.TimeSeparator := ':'; DateFormat.TimeSeparator := ':';
DateFormat.ShortTimeFormat := 'HH:nn'; DateFormat.ShortTimeFormat := 'HH:nn';
tempStr := FormatDateTime('m/d/yyyy HH:nn', uqOrdersORDER_DATE.AsDateTime);
temp := StrToDateTime(FormatDateTime('m/d/yyyy HH:nn', uqOrdersORDER_DATE.AsDateTime), DateFormat);
uqOrdersORDER_DATE.AsDateTime := RecodeSecond(uqOrdersORDER_DATE.AsDateTime, 0); uqOrdersORDER_DATE.AsDateTime := RecodeSecond(uqOrdersORDER_DATE.AsDateTime, 0);
uqOrders.Post; uqOrders.Post;
......
...@@ -5,7 +5,7 @@ interface ...@@ -5,7 +5,7 @@ interface
uses uses
System.SysUtils, System.Classes, Data.DB, MemDS, DBAccess, Uni, Common.Logging, System.SysUtils, System.Classes, Data.DB, MemDS, DBAccess, Uni, Common.Logging,
frxClass, frxExportBaseDialog, frxExportPDF, frCoreClasses, frxDBSet, JS, JSON, frxClass, frxExportBaseDialog, frxExportPDF, frCoreClasses, frxDBSet, JS, JSON,
frxTableObject, frxUtils; frxTableObject, frxUtils, System.Generics.Collections;
type type
TrptOrderWeb = class(TDataModule) TrptOrderWeb = class(TDataModule)
...@@ -155,8 +155,7 @@ var ...@@ -155,8 +155,7 @@ var
colorArray: TJSONArray; colorArray: TJSONArray;
colorsObject, colorObject: TJSONObject; colorsObject, colorObject: TJSONObject;
colorsString: string; colorsString: string;
i, rowIndex: Integer; i: Integer;
temp: TObject;
begin begin
logger.Log(5, 'Adding Color Rows'); logger.Log(5, 'Adding Color Rows');
...@@ -180,32 +179,14 @@ end; ...@@ -180,32 +179,14 @@ end;
function TrptOrderWeb.PrepareReport(SQL: string): string; function TrptOrderWeb.PrepareReport(SQL: string): string;
var
orderList : TJSObject;
i: integer;
data: TJSArray;
order: TJSObject;
callListLength: integer;
tempString, strColorList: string;
colorObject: TJSONObject;
colorList: TJSArray;
colorLength: integer;
color: TJSObject;
colorJSON: TJSONObject;
colorListJSON: TJSONArray;
items: TJSObject;
begin begin
Logger.Log(3, 'Generated SQL for Prepare Report: ' + SQL); Logger.Log(3, 'Generated SQL for Prepare Report: ' + SQL);
//SQL := 'select * from corrugated_plate_orders where ORDER_ID = 18381';
doQuery(uqOrderWeb, SQL); doQuery(uqOrderWeb, SQL);
if ( string( uqOrderWeb.FieldByName('quantity_and_colors_qty_colors').AsString ) ) <> '' then if ( string( uqOrderWeb.FieldByName('quantity_and_colors_qty_colors').AsString ) ) <> '' then
begin begin
PopulateColorTable(); PopulateColorTable();
end; end;
result := GeneratePDF; result := GeneratePDF;
Logger.Log(3, 'Report preparation complete.'); Logger.Log(3, 'Report preparation complete.');
...@@ -233,7 +214,6 @@ begin ...@@ -233,7 +214,6 @@ begin
try try
frxOrderWeb.PrepareReport; frxOrderWeb.PrepareReport;
frxOrderWeb.Export(frxPDFExport1); frxOrderWeb.Export(frxPDFExport1);
//frxOrderWeb.ShowPreparedReport;
finally finally
frxOrderWeb.Clear; // Clears the report to avoid memory bloat frxOrderWeb.Clear; // Clears the report to avoid memory bloat
end; end;
......
...@@ -26,9 +26,7 @@ uses ...@@ -26,9 +26,7 @@ uses
rOrderCorrugated in 'Source\rOrderCorrugated.pas' {rptOrderCorrugated: TDataModule}, rOrderCorrugated in 'Source\rOrderCorrugated.pas' {rptOrderCorrugated: TDataModule},
rOrderWeb in 'Source\rOrderWeb.pas' {rptOrderWeb: TDataModule}, rOrderWeb in 'Source\rOrderWeb.pas' {rptOrderWeb: TDataModule},
rOrderCutting in 'Source\rOrderCutting.pas' {rptOrderCutting: TDataModule}, rOrderCutting in 'Source\rOrderCutting.pas' {rptOrderCutting: TDataModule},
qbAPI in 'Source\qbAPI.pas' {fQB}, qbAPI in 'Source\qbAPI.pas' {fQB};
QBService in 'Source\QBService.pas',
QBServiceImplementation in 'Source\QBServiceImplementation.pas';
type type
TMemoLogAppender = class( TInterfacedObject, ILogAppender ) TMemoLogAppender = class( TInterfacedObject, ILogAppender )
......
...@@ -205,8 +205,6 @@ ...@@ -205,8 +205,6 @@
<Form>fQB</Form> <Form>fQB</Form>
<FormType>dfm</FormType> <FormType>dfm</FormType>
</DCCReference> </DCCReference>
<DCCReference Include="Source\QBService.pas"/>
<DCCReference Include="Source\QBServiceImplementation.pas"/>
<BuildConfiguration Include="Base"> <BuildConfiguration Include="Base">
<Key>Base</Key> <Key>Base</Key>
</BuildConfiguration> </BuildConfiguration>
...@@ -235,13 +233,13 @@ ...@@ -235,13 +233,13 @@
</Excluded_Packages> </Excluded_Packages>
</Delphi.Personality> </Delphi.Personality>
<Deployment Version="5"> <Deployment Version="5">
<DeployFile LocalName="kgOrdersServer.exe" Configuration="Debug" Class="ProjectOutput"/> <DeployFile LocalName="bin\kgOrdersServer.exe" Configuration="Debug" Class="ProjectOutput">
<DeployFile LocalName="kgOrdersServer.exe" Configuration="Debug" Class="ProjectOutput">
<Platform Name="Win32"> <Platform Name="Win32">
<RemoteName>kgOrdersServer.exe</RemoteName> <RemoteName>kgOrdersServer.exe</RemoteName>
<Overwrite>true</Overwrite> <Overwrite>true</Overwrite>
</Platform> </Platform>
</DeployFile> </DeployFile>
<DeployFile LocalName="kgOrdersServer.exe" Configuration="Debug" Class="ProjectOutput"/>
<DeployClass Name="AdditionalDebugSymbols"> <DeployClass Name="AdditionalDebugSymbols">
<Platform Name="iOSSimulator"> <Platform Name="iOSSimulator">
<Operation>1</Operation> <Operation>1</Operation>
......
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