Commit ad1fa378 by Mac Stephens

Merge branch 'mac3' into cam2

parents dd57ce63 d00d0c68
......@@ -172,7 +172,7 @@ object FData: TFData
SortSettings.HeaderColorTo = clWhite
SortSettings.HeaderMirrorColor = clWhite
SortSettings.HeaderMirrorColorTo = clWhite
Version = '2.8.3.2'
Version = '2.8.3.3'
AutoCreateColumns = True
AutoRemoveColumns = True
Columns = <
......@@ -753,7 +753,7 @@ object FData: TFData
SortSettings.HeaderColorTo = clWhite
SortSettings.HeaderMirrorColor = clWhite
SortSettings.HeaderMirrorColorTo = clWhite
Version = '2.8.3.2'
Version = '2.8.3.3'
AutoCreateColumns = True
AutoRemoveColumns = True
Columns = <
......@@ -1510,7 +1510,7 @@ object FData: TFData
Top = 459
end
object dsGrid2: TDataSource
DataSet = rptOrders.uqOrders
DataSet = rptOrderList.uqOrders
Left = 348
Top = 472
end
......
......@@ -3,7 +3,7 @@
// Authors:
// Cameron Hayes
// Elias Serraf
// Mac ...
// Mac Stephens
unit Data;
interface
......@@ -55,7 +55,7 @@ implementation
{$R *.dfm}
uses uLibrary, rOrders;
uses uLibrary, rOrderList;
procedure TFData.FormCreate(Sender: TObject);
begin
......@@ -100,14 +100,14 @@ end;
procedure TFData.RunOrdersReport(searchOptions: string);
var
rptOrders: TrptOrders;
rptOrderList: TrptOrderList;
begin
rptOrders := TrptOrders.Create(nil);
rptOrderList := TrptOrderList.Create(nil);
try
rptOrders.PrepareReport(searchOptions);
dsGrid2.DataSet := rptOrders.uqOrders;
rptOrderList.PrepareReport(searchOptions);
dsGrid2.DataSet := rptOrderList.uqOrders;
finally
rptOrders.Free;
rptOrderList.Free;
end;
end;
......
......@@ -339,7 +339,8 @@ type
[HttpGet] function GetWebOrder(orderInfo: string): TWebOrder;
[HttpGet] function GetCustomers(): TCustomerList;
[HttpGet] function GetCustomer(ID: string): TCustomerItem;
[HttpGet] function GenerateReportPDF(searchOptions: string): string;
[HttpGet] function GenerateOrderListPDF(searchOptions: string): string;
[HttpGet] function GenerateOrderCorrugatedPDF(orderID: string): string;
function AddUser(userInfo: string): string;
......
unit Main;
//Authors:
//Elias Sarraf
//Mac ...
//Mac Stephens
//Cameron Hayes
interface
......
unit rOrderCorrugated;
interface
uses
System.SysUtils, System.Classes, Data.DB, MemDS, DBAccess, Uni, Common.Logging,
frxClass, frxExportBaseDialog, frxExportPDF, frCoreClasses, frxDBSet;
type
TrptOrderCorrugated = class(TDataModule)
uqOrderCorrugated: TUniQuery;
ucKG: TUniConnection;
frxPDFExport1: TfrxPDFExport;
frxDBOrderCorrugated: TfrxDBDataset;
uqOrderCorrugatedORDER_ID: TIntegerField;
uqOrderCorrugatedCOMPANY_ID: TIntegerField;
uqOrderCorrugatedUSER_ID: TIntegerField;
uqOrderCorrugatedORDER_DATE: TDateTimeField;
uqOrderCorrugatedSTART_DATE: TDateField;
uqOrderCorrugatedEND_DATE: TDateField;
uqOrderCorrugatedORDER_STATUS: TStringField;
uqOrderCorrugatedSCHED_JSON: TStringField;
uqOrderCorrugatedstaff_fields_order_date: TDateField;
uqOrderCorrugatedstaff_fields_proof_date: TDateField;
uqOrderCorrugatedstaff_fields_ship_date: TDateField;
uqOrderCorrugatedstaff_fields_ship_via: TStringField;
uqOrderCorrugatedstaff_fields_price: TStringField;
uqOrderCorrugatedstaff_fields_invoice_to: TStringField;
uqOrderCorrugatedstaff_fields_invoice_attention: TStringField;
uqOrderCorrugatedstaff_fields_ship_to: TStringField;
uqOrderCorrugatedstaff_fields_ship_attention: TStringField;
uqOrderCorrugatedstaff_fields_po_number: TStringField;
uqOrderCorrugatedstaff_fields_job_name: TStringField;
uqOrderCorrugatedstaff_fields_art_due: TDateField;
uqOrderCorrugatedstaff_fields_plate_due: TDateField;
uqOrderCorrugatedstaff_fields_mount_due: TDateField;
uqOrderCorrugatedplates_job_number: TStringField;
uqOrderCorrugatedsupplied_by_customer_b_w_copy: TStringField;
uqOrderCorrugatedsupplied_by_customer_color_copy: TStringField;
uqOrderCorrugatedsupplied_by_customer_plates: TStringField;
uqOrderCorrugatedsupplied_by_customer_sample_ca: TStringField;
uqOrderCorrugatedsupplied_by_customer_dimension: TStringField;
uqOrderCorrugatedsupplied_by_customer_disk_or_cd: TStringField;
uqOrderCorrugatedsupplied_by_customer_e_mail: TStringField;
uqOrderCorrugatedsupplied_by_customer_ftp: TStringField;
uqOrderCorrugatedsupplied_by_customer_other: TStringField;
uqOrderCorrugatedsupplied_by_customer_existing_: TStringField;
uqOrderCorrugatedsupplied_by_customer_ref_art_p: TStringField;
uqOrderCorrugatedsupplied_by_customer_ref_art_a: TStringField;
uqOrderCorrugatedcut_die_cutdier: TStringField;
uqOrderCorrugatedcut_die_cutdieb: TStringField;
uqOrderCorrugatedcut_die_cutdief: TStringField;
uqOrderCorrugatedcut_die_cutdierkr: TStringField;
uqOrderCorrugatedcut_die_cutdiefkr: TStringField;
uqOrderCorrugatedcut_die_cad_file: TStringField;
uqOrderCorrugatedcut_die_attached: TStringField;
uqOrderCorrugatedcut_die_boxpol250: TStringField;
uqOrderCorrugatedcut_die_boxpol155: TStringField;
uqOrderCorrugatedcut_die_boxpol125: TStringField;
uqOrderCorrugatedcut_die_brub: TStringField;
uqOrderCorrugatedproofing_fax: TStringField;
uqOrderCorrugatedproofing_fax_attn: TStringField;
uqOrderCorrugatedproofing_e_mail: TStringField;
uqOrderCorrugatedproofing_e_mail_attn: TStringField;
uqOrderCorrugatedproofing_ship_to: TStringField;
uqOrderCorrugatedproofing_full_size_panel: TStringField;
uqOrderCorrugatedproofing_print_card: TStringField;
uqOrderCorrugatedproofing_wide_format: TStringField;
uqOrderCorrugatedproofing_pdf_file: TStringField;
uqOrderCorrugatedproofing_other: TStringField;
uqOrderCorrugatedproofing_art_approved_as_is: TStringField;
uqOrderCorrugatedproofing_approved_date: TDateField;
uqOrderCorrugatedproofing_changes_required: TStringField;
uqOrderCorrugatedproofing_changes_date: TDateField;
uqOrderCorrugatedlayout_rsc_l: TStringField;
uqOrderCorrugatedlayout_rcs_w: TStringField;
uqOrderCorrugatedlayout_rcs_d: TStringField;
uqOrderCorrugatedlayout_die_cut_no: TStringField;
uqOrderCorrugatedlayout_accross_no: TStringField;
uqOrderCorrugatedlayout_around_no: TStringField;
uqOrderCorrugatedlayout_cad_file: TStringField;
uqOrderCorrugatedlayout_excalibur_die: TStringField;
uqOrderCorrugatedmounting_loose: TStringField;
uqOrderCorrugatedmounting_sticky_bak: TStringField;
uqOrderCorrugatedmounting_full_mount: TStringField;
uqOrderCorrugatedmounting_strip_mount: TStringField;
uqOrderCorrugatedcolors_cylinder_size: TStringField;
uqOrderCorrugatedcolors_machine_ident: TStringField;
uqOrderCorrugatedmounting_standard_setup: TStringField;
uqOrderCorrugatedmounting_custom_backing: TStringField;
uqOrderCorrugatedmounting_custom_adhesive: TStringField;
uqOrderCorrugatedcolors_cross_hairs: TStringField;
uqOrderCorrugatedcolors_clemson: TStringField;
uqOrderCorrugatedplates_thickness: TStringField;
uqOrderCorrugatedplates_plate_material: TStringField;
uqOrderCorrugatedgeneral_special_instructions: TStringField;
uqOrderCorrugatedcolors_colors: TStringField;
uqOrderCorrugatedstaff_fields_quickbooks_item: TStringField;
uqOrderCorrugatedstaff_fields_quantity: TStringField;
uqOrderCorrugatedlayout_rsc_style: TStringField;
uqOrderCorrugatedstaff_fields_art_location: TStringField;
uqOrderCorrugatedCOMPANY_NAME: TStringField;
frxOrderCorrugated: TfrxReport;
private
{ Private declarations }
public
function PrepareReport(SQL: string): string;
end;
var
rptOrderCorrugated: TrptOrderCorrugated;
implementation
{%CLASSGROUP 'Vcl.Controls.TControl'}
{$R *.dfm}
function TrptOrderCorrugated.PrepareReport(SQL: string): string;
begin
Logger.Log(3, 'Generated SQL for Prepare Report: ' + SQL);
uqOrderCorrugated.Close;
uqOrderCorrugated.SQL.Text := SQL;
uqOrderCorrugated.Open;
// result := GeneratePDF;
Logger.Log(3, 'Report preparation complete.');
end;
end.
object rptOrders: TrptOrders
object rptOrderList: TrptOrderList
OnCreate = DataModuleCreate
Height = 480
Width = 640
object frxOrders: TfrxReport
object frxOrderList: TfrxReport
Version = '2024.2.1'
DotMatrixReport = False
IniFile = '\Software\Fast Reports'
......
unit rOrders;
unit rOrderList;
interface
......@@ -8,8 +8,8 @@ uses
MemDS, frxDBSet, frxTableObject, frCoreClasses, Common.Logging, System.IOUtils, JSON;
type
TrptOrders = class(TDataModule)
frxOrders: TfrxReport;
TrptOrderList = class(TDataModule)
frxOrderList: TfrxReport;
frxPDFExport1: TfrxPDFExport;
ucKG: TUniConnection;
uqOrders: TUniQuery;
......@@ -46,7 +46,7 @@ type
end;
var
rptOrders: TrptOrders;
rptOrderList: TrptOrderList;
implementation
......@@ -57,7 +57,7 @@ uses
{$R *.dfm}
procedure TrptOrders.DataModuleCreate(Sender: TObject);
procedure TrptOrderList.DataModuleCreate(Sender: TObject);
begin
Logger.Log( 3, 'TAuthDatabase.DataModuleCreate' );
LoadDatabaseSettings( ucKG, 'kgOrdersServer.ini' );
......@@ -66,15 +66,15 @@ begin
except
on E: Exception do
begin
Logger.Log(3, '--TrptOrders.DataModuleCreate -Error connecting to database: ' + E.Message);
Logger.Log(3, '--TrptOrderList.DataModuleCreate -Error connecting to database: ' + E.Message);
end;
end;
end;
function TrptOrders.PrepareReport(SQL: string): string;
function TrptOrderList.PrepareReport(SQL: string): string;
begin
Logger.Log(5, 'Generated SQL for Prepare Report: ' + SQL);
Logger.Log(3, 'Generated SQL for Prepare Report: ' + SQL);
uqOrders.Close;
uqOrders.SQL.Text := SQL;
......@@ -83,12 +83,12 @@ begin
result := GeneratePDF;
Logger.Log(5, 'Report preparation complete.');
Logger.Log(3, 'Report preparation complete.');
end;
procedure TrptOrders.uqOrdersCalcFields(DataSet: TDataSet);
procedure TrptOrderList.uqOrdersCalcFields(DataSet: TDataSet);
var
ColorType: string;
SQL: string;
......@@ -119,7 +119,7 @@ begin
end;
//create new field called color count
function TrptOrders.getColorCount(colors: string): string;
function TrptOrderList.getColorCount(colors: string): string;
var
colorObject: TJSONObject;
colorList: TJSONArray;
......@@ -133,12 +133,12 @@ begin
colorList := TJSONArray(colorObject.GetValue('items'));
result := IntToStr(colorList.Count);
finally
colorObject.Free; // Free TJSONObject to avoid leaks
colorObject.Free;
end;
end;
end;
function TrptOrders.GeneratePDF: string;
function TrptOrderList.GeneratePDF: string;
var
ReportDir, ReportFileName: string;
reportURL: string;
......@@ -157,11 +157,11 @@ begin
frxPDFExport1.FileName := ReportFileName;
frxPDFExport1.ShowDialog := False;
try
frxOrders.PrepareReport;
frxOrders.Export(frxPDFExport1);
frxOrderList.PrepareReport;
frxOrderList.Export(frxPDFExport1);
//frxOrders.ShowPreparedReport;
finally
frxOrders.Clear; // Clear the report to avoid memory bloat
frxOrderList.Clear; // Clears the report to avoid memory bloat
end;
Logger.Log(5, 'PDF saved to: ' + ReportFileName);
......
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<TfrxReport Version="2024.2.1" DataSet="frxDBOrderCorrugated" DataSetName="frxDBOrderCorrugated" DotMatrixReport="False" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="167935" PreviewOptions.Zoom="1" PrintOptions.Printer="Default" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="45691.3972217593" ReportOptions.Description.Text="" ReportOptions.LastChange="45691.4088532755" ScriptLanguage="PascalScript" ScriptText.Text="begin&#13;&#10;&#13;&#10;end.">
<Datasets>
<item DataSet="frxDBOrderCorrugated" DataSetName="frxDBOrderCorrugated"/>
</Datasets>
<TfrxDataPage Name="Data" HGuides.Text="" VGuides.Text="" Height="1000" Left="0" Top="0" Width="1000"/>
<TfrxReportPage Name="Page1" HGuides.Text="" VGuides.Text="" PaperWidth="215.9" PaperHeight="279.4" PaperSize="1" LeftMargin="10" RightMargin="10" TopMargin="10" BottomMargin="10" ColumnWidth="0" ColumnPositions.Text="" Frame.Typ="15" Frame.Width="3" MirrorMode="0">
<TfrxMemoView Name="Memo1" AllowVectorExport="True" Left="0" Top="0" Width="204.09461978" Height="22.67717977" ContentScaleOptions.Constraints.MaxIterationValue="0" ContentScaleOptions.Constraints.MinIterationValue="0" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Arial" Font.Style="1" Frame.Typ="13" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="Order Type: Corrugated Plate"/>
<TfrxMemoView Name="Memo2" AllowVectorExport="True" Left="204.09461975" Top="5E-8" Width="536.69324547" Height="22.67717929" ContentScaleOptions.Constraints.MaxIterationValue="0" ContentScaleOptions.Constraints.MinIterationValue="0" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Arial" Font.Style="1" Frame.Typ="14" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Order ID: [frxDBOrderCorrugated.&#34;ORDER_ID&#34;] "/>
<TfrxTableObject Name="TableObject1" AllowVectorExport="True" Left="8.13931519" Top="30.23624039">
<TfrxTableColumn Name="TableColumn1" Width="122.07874015748" MinWidth="0" MaxWidth="75.5906"/>
<TfrxTableColumn Name="TableColumn2" Width="122.07874015748" MinWidth="0" MaxWidth="75.5906"/>
<TfrxTableColumn Name="TableColumn3" Width="122.07874015748" MinWidth="0" MaxWidth="75.5906"/>
<TfrxTableColumn Name="TableColumn4" Width="122.07874015748" MinWidth="0" MaxWidth="75.5906"/>
<TfrxTableColumn Name="TableColumn5" Width="122.07874015748" MinWidth="0" MaxWidth="75.5906"/>
<TfrxTableColumn Name="TableColumn6" Width="56.6929133858268" MinWidth="0" MaxWidth="75.5906"/>
<TfrxTableColumn Name="TableColumn7" Width="56.6929133858268" MinWidth="0" MaxWidth="75.5906"/>
<TfrxTableRow Name="TableRow1" MinHeight="0" MaxHeight="0" Height="18.89765">
<TfrxTableCell Name="TableCell1" AllowVectorExport="True" Restrictions="8" ContentScaleOptions.Constraints.MaxIterationValue="0" ContentScaleOptions.Constraints.MinIterationValue="0" Font.Charset="1" Font.Color="536870911" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="15" Fill.BackColor="-16777194" ParentFont="False" VAlign="vaCenter" Text="Order Date"/>
<TfrxTableCell Name="TableCell2" AllowVectorExport="True" Restrictions="8" ContentScaleOptions.Constraints.MaxIterationValue="0" ContentScaleOptions.Constraints.MinIterationValue="0" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="15" Fill.BackColor="-16777194" ParentFont="False" VAlign="vaCenter" Text="Proof Date"/>
<TfrxTableCell Name="TableCell3" AllowVectorExport="True" Restrictions="8" ContentScaleOptions.Constraints.MaxIterationValue="0" ContentScaleOptions.Constraints.MinIterationValue="0" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="15" Fill.BackColor="-16777194" ParentFont="False" VAlign="vaCenter" Text="Ship Date"/>
<TfrxTableCell Name="TableCell4" AllowVectorExport="True" Restrictions="8" ContentScaleOptions.Constraints.MaxIterationValue="0" ContentScaleOptions.Constraints.MinIterationValue="0" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="15" Fill.BackColor="-16777194" ParentFont="False" VAlign="vaCenter" Text="Ship Via"/>
<TfrxTableCell Name="TableCell5" AllowVectorExport="True" Restrictions="8" ContentScaleOptions.Constraints.MaxIterationValue="0" ContentScaleOptions.Constraints.MinIterationValue="0" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="15" Fill.BackColor="-16777194" ParentFont="False" VAlign="vaCenter" Text="Quickbooks Item"/>
<TfrxTableCell Name="TableCell26" AllowVectorExport="True" Restrictions="8" ContentScaleOptions.Constraints.MaxIterationValue="0" ContentScaleOptions.Constraints.MinIterationValue="0" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="15" Fill.BackColor="-16777194" ParentFont="False" VAlign="vaCenter" Text="Quantity"/>
<TfrxTableCell Name="TableCell31" AllowVectorExport="True" Restrictions="8" ContentScaleOptions.Constraints.MaxIterationValue="0" ContentScaleOptions.Constraints.MinIterationValue="0" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="15" Fill.BackColor="-16777194" ParentFont="False" VAlign="vaCenter" Text="Price"/>
</TfrxTableRow>
<TfrxTableRow Name="TableRow2" MinHeight="0" MaxHeight="0" Height="18.89765">
<TfrxTableCell Name="TableCell6" AllowVectorExport="True" Restrictions="8" ContentScaleOptions.Constraints.MaxIterationValue="0" ContentScaleOptions.Constraints.MinIterationValue="0" Frame.Typ="15" Text=""/>
<TfrxTableCell Name="TableCell7" AllowVectorExport="True" Restrictions="8" Frame.Typ="15" Text=""/>
<TfrxTableCell Name="TableCell8" AllowVectorExport="True" Restrictions="8" ContentScaleOptions.Constraints.MaxIterationValue="0" ContentScaleOptions.Constraints.MinIterationValue="0" Frame.Typ="15" Text=""/>
<TfrxTableCell Name="TableCell9" AllowVectorExport="True" Restrictions="8" Frame.Typ="15" Text=""/>
<TfrxTableCell Name="TableCell10" AllowVectorExport="True" Restrictions="8" Frame.Typ="15" Text=""/>
<TfrxTableCell Name="TableCell27" AllowVectorExport="True" Restrictions="8" Frame.Typ="15" Text=""/>
<TfrxTableCell Name="TableCell32" AllowVectorExport="True" Restrictions="8" Frame.Typ="15" Text=""/>
</TfrxTableRow>
</TfrxTableObject>
</TfrxReportPage>
</TfrxReport>
......@@ -7,7 +7,6 @@ uses
procedure LoadDatabaseSettings( uc: TUniConnection; iniFilename: string );
procedure DoQuery( uq: TUniQuery; sql: string );
function CalculateAge( const dob, dt: TDateTime ): Integer;
implementation
......@@ -39,33 +38,5 @@ begin
uq.Open;
end;
function CalculateAge( const dob, dt: TDateTime): Integer;
var
age: Integer;
y1, m1, d1, y2, m2, d2: Word;
begin
Result := 0;
if dt < dob then
Exit;
DecodeDate( dob, y1, m1, d1);
DecodeDate( dt, y2, m2, d2);
age := y2 - y1;
// Feb 29
//if ( (m1=2) and (d1=29) ) and ( not IsLeapYear(y2) ) then
// d1 := 28;
if (m1 = 2) and (d1 = 29) and (not (IsLeapYear (y2))) then
begin
m1 := 3;
d1 := 1;
end;
if (m2 < m1) or ((m2 = m1) and (d2 < d1)) then
Dec(age);
Result := age
end;
end.
......@@ -22,7 +22,8 @@ uses
Lookup.ServiceImpl in 'Source\Lookup.ServiceImpl.pas',
App.Server.Module in 'Source\App.Server.Module.pas' {AppServerModule: TDataModule},
Data in 'Source\Data.pas' {FData},
rOrders in 'Source\rOrders.pas' {rptOrders: TDataModule};
rOrderList in 'Source\rOrderList.pas' {rptOrderList: TDataModule},
rOrderCorrugated in 'Source\rOrderCorrugated.pas' {rptOrderCorrugated: TDataModule};
type
TMemoLogAppender = class( TInterfacedObject, ILogAppender )
......
......@@ -165,8 +165,13 @@
<Form>FData</Form>
<FormType>dfm</FormType>
</DCCReference>
<DCCReference Include="Source\rOrders.pas">
<Form>rptOrders</Form>
<DCCReference Include="Source\rOrderList.pas">
<Form>rptOrderList</Form>
<FormType>dfm</FormType>
<DesignClass>TDataModule</DesignClass>
</DCCReference>
<DCCReference Include="Source\rOrderCorrugated.pas">
<Form>rptOrderCorrugated</Form>
<FormType>dfm</FormType>
<DesignClass>TDataModule</DesignClass>
</DCCReference>
......
[Settings]
MemoLogLevel=4
FileLogLevel=5
LogFileNum=146
LogFileNum=150
webClientVersion=1.0.0
[Database]
Server=192.168.159.132
--Server=192.168.102.130
--Server=192.168.159.132
Server=192.168.102.130
--Server=192.168.75.133
--Database=
--Username=
......
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