Commit 1511d5c1 by Mac Stephens

changed styling for orders form

parent af90a3ab
object FAddOrder: TFAddOrder object FAddOrder: TFAddOrder
Width = 1016 Width = 982
Height = 637 Height = 633
Font.Charset = ANSI_CHARSET Font.Charset = ANSI_CHARSET
Font.Color = clBlack Font.Color = clBlack
Font.Height = -11 Font.Height = -11
Font.Name = 'Arial' Font.Name = 'Arial'
Font.Style = [] Font.Style = []
ParentFont = False ParentFont = False
OnShow = WebFormShow
object lblEntries: TWebLabel object lblEntries: TWebLabel
Left = 0 Left = 61
Top = 336 Top = 79
Width = 77 Width = 77
Height = 14 Height = 14
Caption = 'Showing 0 of ...' Caption = 'Showing 0 of ...'
...@@ -21,8 +20,8 @@ object FAddOrder: TFAddOrder ...@@ -21,8 +20,8 @@ object FAddOrder: TFAddOrder
WidthPercent = 100.000000000000000000 WidthPercent = 100.000000000000000000
end end
object lblEntries2: TWebLabel object lblEntries2: TWebLabel
Left = 8 Left = 177
Top = 358 Top = 79
Width = 49 Width = 49
Height = 14 Height = 14
Caption = 'lblEntries2' Caption = 'lblEntries2'
...@@ -32,331 +31,298 @@ object FAddOrder: TFAddOrder ...@@ -32,331 +31,298 @@ object FAddOrder: TFAddOrder
HeightPercent = 100.000000000000000000 HeightPercent = 100.000000000000000000
WidthPercent = 100.000000000000000000 WidthPercent = 100.000000000000000000
end end
object WebLabel1: TWebLabel object WebLabel2: TWebLabel
Left = 447 Left = 296
Top = 169 Top = 41
Width = 53 Width = 95
Height = 14 Height = 14
Caption = 'Selected Id' Caption = 'Enter Customer Info'
ElementID = 'lblentries2' ElementID = 'lblentries2'
ElementFont = efCSS ElementFont = efCSS
HeightStyle = ssAuto HeightStyle = ssAuto
HeightPercent = 100.000000000000000000 HeightPercent = 100.000000000000000000
WidthPercent = 100.000000000000000000 WidthPercent = 100.000000000000000000
end end
object WebLabel2: TWebLabel object WebLabel1: TWebLabel
Left = 278 Left = 473
Top = 169 Top = 41
Width = 95 Width = 53
Height = 14 Height = 14
Caption = 'Enter Customer Info' Caption = 'Selected Id'
ElementID = 'lblentries2' ElementID = 'lblentries2'
ElementFont = efCSS ElementFont = efCSS
HeightStyle = ssAuto HeightStyle = ssAuto
HeightPercent = 100.000000000000000000 HeightPercent = 100.000000000000000000
WidthPercent = 100.000000000000000000 WidthPercent = 100.000000000000000000
end end
object pnlMessage: TWebPanel object cbWebPlate: TWebCheckBox
Left = 212 Left = 58
Top = 41 Top = 53
Width = 121 Width = 113
Height = 33 Height = 22
ElementClassName = 'card' Caption = 'Web Plate'
ElementID = 'pnl_message'
ChildOrder = 5 ChildOrder = 5
ElementBodyClassName = 'card-body'
ElementFont = efCSS ElementFont = efCSS
ElementPosition = epRelative ElementPosition = epIgnore
Role = 'alert' HeightStyle = ssAuto
TabOrder = 0 HeightPercent = 100.000000000000000000
object lblMessage: TWebLabel WidthStyle = ssAuto
Left = 28 WidthPercent = 100.000000000000000000
Top = 9 OnClick = cbWebPlateClick
Width = 44
Height = 14
Caption = 'Message'
ElementID = 'pnl_message'
ElementFont = efCSS
ElementPosition = epRelative
HeightStyle = ssAuto
HeightPercent = 100.000000000000000000
WidthPercent = 100.000000000000000000
end
object btnCloseNotification: TWebButton
Left = 96
Top = 3
Width = 22
Height = 25
ChildOrder = 1
ElementClassName = 'btn btn-light'
ElementID = 'view.login.message.button'
ElementFont = efCSS
ElementPosition = epRelative
HeightStyle = ssAuto
HeightPercent = 100.000000000000000000
Role = 'button'
WidthStyle = ssAuto
WidthPercent = 100.000000000000000000
end
end end
object cbCorrugatedPlate: TWebCheckBox object cbCorrugatedPlate: TWebCheckBox
Left = 430 Left = 177
Top = 123 Top = 53
Width = 113 Width = 113
Height = 22 Height = 22
Caption = 'Corrugated Plate' Caption = 'Corrugated Plate'
Checked = True Checked = True
ChildOrder = 5 ChildOrder = 5
ElementFont = efCSS
ElementPosition = epIgnore
HeightStyle = ssAuto
HeightPercent = 100.000000000000000000 HeightPercent = 100.000000000000000000
State = cbChecked State = cbChecked
WidthStyle = ssAuto
WidthPercent = 100.000000000000000000 WidthPercent = 100.000000000000000000
OnClick = cbCorrugatedPlateClick OnClick = cbCorrugatedPlateClick
end end
object cbWebPlate: TWebCheckBox object edtSearch: TWebEdit
Left = 562 Left = 296
Top = 123 Top = 55
Width = 113 Width = 146
Height = 22 Height = 22
Caption = 'Web Plate' ChildOrder = 8
ChildOrder = 5 ElementFont = efCSS
ElementPosition = epIgnore
HeightStyle = ssAuto
HeightPercent = 100.000000000000000000 HeightPercent = 100.000000000000000000
WidthStyle = ssAuto
WidthPercent = 100.000000000000000000 WidthPercent = 100.000000000000000000
OnClick = cbWebPlateClick OnChange = edtSearchChange
end end
object edtID: TWebEdit object edtID: TWebEdit
Left = 447 Left = 475
Top = 183 Top = 55
Width = 121 Width = 121
Height = 22 Height = 22
ChildOrder = 8 ChildOrder = 8
ElementFont = efCSS
ElementPosition = epIgnore
HeightStyle = ssAuto
HeightPercent = 100.000000000000000000 HeightPercent = 100.000000000000000000
WidthStyle = ssAuto
WidthPercent = 100.000000000000000000 WidthPercent = 100.000000000000000000
end end
object btnConfirm: TWebButton object btnConfirm: TWebButton
Left = 574 Left = 610
Top = 180 Top = 52
Width = 96 Width = 96
Height = 25 Height = 25
Caption = 'Confirm' Caption = 'Confirm'
ChildOrder = 9 ChildOrder = 9
ElementFont = efCSS
ElementPosition = epIgnore
HeightStyle = ssAuto
HeightPercent = 100.000000000000000000 HeightPercent = 100.000000000000000000
WidthStyle = ssAuto
WidthPercent = 100.000000000000000000 WidthPercent = 100.000000000000000000
OnClick = btnConfirmClick OnClick = btnConfirmClick
end end
object btnCancel: TWebButton object btnCancel: TWebButton
Left = 682 Left = 768
Top = 180 Top = 52
Width = 96 Width = 96
Height = 25 Height = 25
Caption = 'Cancel' Caption = 'Cancel'
ChildOrder = 9 ChildOrder = 9
ElementFont = efCSS
ElementPosition = epIgnore
HeightStyle = ssAuto
HeightPercent = 100.000000000000000000 HeightPercent = 100.000000000000000000
WidthStyle = ssAuto
WidthPercent = 100.000000000000000000 WidthPercent = 100.000000000000000000
OnClick = btnCancelClick OnClick = btnCancelClick
end end
object TMSFNCGrid1: TTMSFNCGrid object pnlFNCGrid: TWebPanel
Left = 132 Left = 0
Top = 227 Top = 124
Width = 803 Width = 982
Height = 353 Height = 509
AdaptToStyle = True Align = alBottom
ParentDoubleBuffered = False ChildOrder = 10
DoubleBuffered = True ElementPosition = epRelative
TabOrder = 6 TabOrder = 6
DefaultRowHeight = 40.000000000000000000 ExplicitTop = 128
FixedColumns = 0 ExplicitWidth = 1016
ColumnCount = 0 object TMSFNCGrid1: TTMSFNCGrid
RowCount = 1 Left = 0
Options.Bands.Enabled = True Top = 0
Options.Editing.CalcFormat = '%g' Width = 982
Options.Filtering.MultiColumn = True Height = 509
Options.Grouping.CalcFormat = '%g' Align = alClient
Options.Grouping.GroupCountFormat = '(%d)' ParentDoubleBuffered = False
Options.IO.XMLEncoding = 'ISO-8859-1' DoubleBuffered = True
Options.Mouse.ColumnSizing = True TabOrder = 0
Options.Mouse.ClickMargin = 0 DefaultRowHeight = 40.000000000000000000
Options.Mouse.ColumnSizeMargin = 6 FixedColumns = 0
Options.Mouse.RowSizing = True ColumnCount = 0
Options.Mouse.RowSizeMargin = 6 RowCount = 1
Options.Mouse.FixedColumnSizing = True Options.Bands.Enabled = True
Options.Mouse.FixedRowSizing = True Options.ColumnSize.Stretch = True
OnSelectedCell = TMSFNCGrid1SelectedCell Options.Editing.CalcFormat = '%g'
Columns = < Options.Filtering.MultiColumn = True
item Options.Grouping.CalcFormat = '%g'
BorderWidth = 1 Options.Grouping.GroupCountFormat = '(%d)'
FixedFont.Charset = DEFAULT_CHARSET Options.IO.XMLEncoding = 'ISO-8859-1'
FixedFont.Color = clWindowText Options.Mouse.ColumnSizing = True
FixedFont.Height = -11 Options.Mouse.ClickMargin = 0
FixedFont.Name = 'Tahoma' Options.Mouse.ColumnSizeMargin = 6
FixedFont.Style = [] Options.Mouse.RowSizing = True
Font.Charset = DEFAULT_CHARSET Options.Mouse.RowSizeMargin = 6
Font.Color = clWindowText Options.Mouse.FixedColumnSizing = True
Font.Height = -11 Options.Mouse.FixedRowSizing = True
Font.Name = 'Tahoma' OnSelectedCell = TMSFNCGrid1SelectedCell
Font.Style = [] Columns = <
ID = '' item
Width = 68.000000000000000000 BorderWidth = 1
end FixedFont.Charset = DEFAULT_CHARSET
item FixedFont.Color = clWindowText
BorderWidth = 1 FixedFont.Height = -11
FixedFont.Charset = DEFAULT_CHARSET FixedFont.Name = 'Tahoma'
FixedFont.Color = clWindowText FixedFont.Style = []
FixedFont.Height = -11 Font.Charset = DEFAULT_CHARSET
FixedFont.Name = 'Tahoma' Font.Color = clWindowText
FixedFont.Style = [] Font.Height = -11
Font.Charset = DEFAULT_CHARSET Font.Name = 'Tahoma'
Font.Color = clWindowText Font.Style = []
Font.Height = -11 ID = ''
Font.Name = 'Tahoma' Width = 68.000000000000000000
Font.Style = [] end
ID = '' item
Width = 68.000000000000000000 BorderWidth = 1
end FixedFont.Charset = DEFAULT_CHARSET
item FixedFont.Color = clWindowText
BorderWidth = 1 FixedFont.Height = -11
FixedFont.Charset = DEFAULT_CHARSET FixedFont.Name = 'Tahoma'
FixedFont.Color = clWindowText FixedFont.Style = []
FixedFont.Height = -11 Font.Charset = DEFAULT_CHARSET
FixedFont.Name = 'Tahoma' Font.Color = clWindowText
FixedFont.Style = [] Font.Height = -11
Font.Charset = DEFAULT_CHARSET Font.Name = 'Tahoma'
Font.Color = clWindowText Font.Style = []
Font.Height = -11 ID = ''
Font.Name = 'Tahoma' Width = 68.000000000000000000
Font.Style = [] end
ID = '' item
Width = 68.000000000000000000 BorderWidth = 1
end FixedFont.Charset = DEFAULT_CHARSET
item FixedFont.Color = clWindowText
BorderWidth = 1 FixedFont.Height = -11
FixedFont.Charset = DEFAULT_CHARSET FixedFont.Name = 'Tahoma'
FixedFont.Color = clWindowText FixedFont.Style = []
FixedFont.Height = -11 Font.Charset = DEFAULT_CHARSET
FixedFont.Name = 'Tahoma' Font.Color = clWindowText
FixedFont.Style = [] Font.Height = -11
Font.Charset = DEFAULT_CHARSET Font.Name = 'Tahoma'
Font.Color = clWindowText Font.Style = []
Font.Height = -11 ID = ''
Font.Name = 'Tahoma' Width = 68.000000000000000000
Font.Style = [] end
ID = '' item
Width = 68.000000000000000000 BorderWidth = 1
end FixedFont.Charset = DEFAULT_CHARSET
item FixedFont.Color = clWindowText
BorderWidth = 1 FixedFont.Height = -11
FixedFont.Charset = DEFAULT_CHARSET FixedFont.Name = 'Tahoma'
FixedFont.Color = clWindowText FixedFont.Style = []
FixedFont.Height = -11 Font.Charset = DEFAULT_CHARSET
FixedFont.Name = 'Tahoma' Font.Color = clWindowText
FixedFont.Style = [] Font.Height = -11
Font.Charset = DEFAULT_CHARSET Font.Name = 'Tahoma'
Font.Color = clWindowText Font.Style = []
Font.Height = -11 ID = ''
Font.Name = 'Tahoma' Width = 68.000000000000000000
Font.Style = [] end>
ID = '' DefaultFont.Charset = DEFAULT_CHARSET
Width = 68.000000000000000000 DefaultFont.Color = clBlack
end> DefaultFont.Height = -11
DefaultFont.Charset = DEFAULT_CHARSET DefaultFont.Name = 'Segoe UI'
DefaultFont.Color = clBlack DefaultFont.Style = []
DefaultFont.Height = -11 TopRow = 1
DefaultFont.Name = 'Segoe UI' Appearance.FixedLayout.Fill.Color = 16380654
DefaultFont.Style = [] Appearance.FixedLayout.Fill.ColorTo = 16382457
Stroke.Color = 15987699 Appearance.FixedLayout.Font.Charset = DEFAULT_CHARSET
TopRow = 1 Appearance.FixedLayout.Font.Color = 4539717
Appearance.FixedLayout.Fill.Kind = gfkGradient Appearance.FixedLayout.Font.Height = -13
Appearance.FixedLayout.Fill.Color = 16382457 Appearance.FixedLayout.Font.Name = 'Tahoma'
Appearance.FixedLayout.Fill.ColorTo = 16382457 Appearance.FixedLayout.Font.Style = [fsBold]
Appearance.FixedLayout.Stroke.Color = 15987699 Appearance.NormalLayout.Fill.Color = 16578806
Appearance.FixedLayout.Font.Charset = DEFAULT_CHARSET Appearance.NormalLayout.Font.Charset = DEFAULT_CHARSET
Appearance.FixedLayout.Font.Color = clBlack Appearance.NormalLayout.Font.Color = 8026746
Appearance.FixedLayout.Font.Height = -11 Appearance.NormalLayout.Font.Height = -11
Appearance.FixedLayout.Font.Name = 'Tahoma' Appearance.NormalLayout.Font.Name = 'Tahoma'
Appearance.FixedLayout.Font.Style = [fsBold] Appearance.NormalLayout.Font.Style = []
Appearance.NormalLayout.Fill.Color = -1 Appearance.GroupLayout.Fill.Color = 12817262
Appearance.NormalLayout.Stroke.Color = 15987699 Appearance.GroupLayout.Fill.ColorTo = 15385233
Appearance.NormalLayout.Font.Charset = DEFAULT_CHARSET Appearance.GroupLayout.Stroke.Color = 15987699
Appearance.NormalLayout.Font.Color = clBlack Appearance.GroupLayout.Font.Charset = DEFAULT_CHARSET
Appearance.NormalLayout.Font.Height = -11 Appearance.GroupLayout.Font.Color = clBlack
Appearance.NormalLayout.Font.Name = 'Tahoma' Appearance.GroupLayout.Font.Height = -11
Appearance.NormalLayout.Font.Style = [] Appearance.GroupLayout.Font.Name = 'Tahoma'
Appearance.GroupLayout.Fill.Kind = gfkGradient Appearance.GroupLayout.Font.Style = []
Appearance.GroupLayout.Fill.Color = 15385233 Appearance.SummaryLayout.Fill.Color = 14009785
Appearance.GroupLayout.Fill.ColorTo = 15385233 Appearance.SummaryLayout.Fill.ColorTo = 15385233
Appearance.GroupLayout.Stroke.Color = 15987699 Appearance.SummaryLayout.Stroke.Color = 15987699
Appearance.GroupLayout.Font.Charset = DEFAULT_CHARSET Appearance.SummaryLayout.Font.Charset = DEFAULT_CHARSET
Appearance.GroupLayout.Font.Color = clBlack Appearance.SummaryLayout.Font.Color = clBlack
Appearance.GroupLayout.Font.Height = -11 Appearance.SummaryLayout.Font.Height = -11
Appearance.GroupLayout.Font.Name = 'Tahoma' Appearance.SummaryLayout.Font.Name = 'Tahoma'
Appearance.GroupLayout.Font.Style = [] Appearance.SummaryLayout.Font.Style = []
Appearance.SummaryLayout.Fill.Kind = gfkGradient Appearance.SelectedLayout.Fill.Color = 16441019
Appearance.SummaryLayout.Fill.Color = 15385233 Appearance.SelectedLayout.Fill.ColorTo = 15385233
Appearance.SummaryLayout.Fill.ColorTo = 15385233 Appearance.SelectedLayout.Font.Charset = DEFAULT_CHARSET
Appearance.SummaryLayout.Stroke.Color = 15987699 Appearance.SelectedLayout.Font.Color = 4539717
Appearance.SummaryLayout.Font.Charset = DEFAULT_CHARSET Appearance.SelectedLayout.Font.Height = -11
Appearance.SummaryLayout.Font.Color = clBlack Appearance.SelectedLayout.Font.Name = 'Tahoma'
Appearance.SummaryLayout.Font.Height = -11 Appearance.SelectedLayout.Font.Style = []
Appearance.SummaryLayout.Font.Name = 'Tahoma' Appearance.FocusedLayout.Fill.Color = 16039284
Appearance.SummaryLayout.Font.Style = [] Appearance.FocusedLayout.Fill.ColorTo = 15385233
Appearance.SelectedLayout.Fill.Kind = gfkGradient Appearance.FocusedLayout.Font.Charset = DEFAULT_CHARSET
Appearance.SelectedLayout.Fill.Color = 15385233 Appearance.FocusedLayout.Font.Color = 4539717
Appearance.SelectedLayout.Fill.ColorTo = 15385233 Appearance.FocusedLayout.Font.Height = -11
Appearance.SelectedLayout.Stroke.Color = 15987699 Appearance.FocusedLayout.Font.Name = 'Tahoma'
Appearance.SelectedLayout.Font.Charset = DEFAULT_CHARSET Appearance.FocusedLayout.Font.Style = []
Appearance.SelectedLayout.Font.Color = clBlack Appearance.FixedSelectedLayout.Fill.Color = clLightsteelblue
Appearance.SelectedLayout.Font.Height = -11 Appearance.FixedSelectedLayout.Fill.ColorTo = 15385233
Appearance.SelectedLayout.Font.Name = 'Tahoma' Appearance.FixedSelectedLayout.Font.Charset = DEFAULT_CHARSET
Appearance.SelectedLayout.Font.Style = [] Appearance.FixedSelectedLayout.Font.Color = clBlack
Appearance.FocusedLayout.Fill.Kind = gfkGradient Appearance.FixedSelectedLayout.Font.Height = -11
Appearance.FocusedLayout.Fill.Color = 15385233 Appearance.FixedSelectedLayout.Font.Name = 'Tahoma'
Appearance.FocusedLayout.Fill.ColorTo = 15385233 Appearance.FixedSelectedLayout.Font.Style = []
Appearance.FocusedLayout.Stroke.Color = 15987699 Appearance.BandLayout.Fill.Color = 16711679
Appearance.FocusedLayout.Font.Charset = DEFAULT_CHARSET Appearance.BandLayout.Font.Charset = DEFAULT_CHARSET
Appearance.FocusedLayout.Font.Color = clBlack Appearance.BandLayout.Font.Color = 8026746
Appearance.FocusedLayout.Font.Height = -11 Appearance.BandLayout.Font.Height = -11
Appearance.FocusedLayout.Font.Name = 'Tahoma' Appearance.BandLayout.Font.Name = 'Tahoma'
Appearance.FocusedLayout.Font.Style = [] Appearance.BandLayout.Font.Style = []
Appearance.FixedSelectedLayout.Fill.Kind = gfkGradient Appearance.ProgressLayout.Color = 15385233
Appearance.FixedSelectedLayout.Fill.Color = 15385233 Appearance.ProgressLayout.Format = '%.0f%%'
Appearance.FixedSelectedLayout.Fill.ColorTo = 15385233 LeftCol = 0
Appearance.FixedSelectedLayout.Stroke.Color = 15987699 ScrollMode = scmItemScrolling
Appearance.FixedSelectedLayout.Font.Charset = DEFAULT_CHARSET DesignTimeSampleData = True
Appearance.FixedSelectedLayout.Font.Color = clBlack ExplicitWidth = 1016
Appearance.FixedSelectedLayout.Font.Height = -11 end
Appearance.FixedSelectedLayout.Font.Name = 'Tahoma'
Appearance.FixedSelectedLayout.Font.Style = []
Appearance.BandLayout.Fill.Color = clLightyellow
Appearance.BandLayout.Stroke.Color = 15987699
Appearance.BandLayout.Font.Charset = DEFAULT_CHARSET
Appearance.BandLayout.Font.Color = clWindowText
Appearance.BandLayout.Font.Height = -11
Appearance.BandLayout.Font.Name = 'Tahoma'
Appearance.BandLayout.Font.Style = []
Appearance.ProgressLayout.Color = 15385233
Appearance.ProgressLayout.Format = '%.0f%%'
LeftCol = 0
ScrollMode = scmItemScrolling
DesignTimeSampleData = True
end
object edtSearch: TWebEdit
Left = 278
Top = 183
Width = 146
Height = 22
ChildOrder = 8
HeightPercent = 100.000000000000000000
WidthPercent = 100.000000000000000000
OnChange = edtSearchChange
end end
object XDataWebClient1: TXDataWebClient object XDataWebClient1: TXDataWebClient
Connection = DMConnection.ApiConnection Connection = DMConnection.ApiConnection
Left = 88 Left = 382
Top = 434 Top = 576
end end
object xdwdsCustomers: TXDataWebDataSet object xdwdsCustomers: TXDataWebDataSet
Connection = DMConnection.ApiConnection Connection = DMConnection.ApiConnection
Left = 84 Left = 288
Top = 490 Top = 578
object xdwdsCustomersID: TIntegerField object xdwdsCustomersID: TIntegerField
FieldName = 'ID' FieldName = 'ID'
end end
......
<div class="row"> <div>
<div class="col-12"> </div>
<div class="container mt-4">
<div class="row justify-content-center">
<div class="col-12 col-md-8">
<div class="row">
<div class="col-sm">
<div id="pnl_message" class="alert alert-danger">
<button id="view.login.message.button" type="button" class="btn-close" aria-label="Close"></button>
<span id="view.login.message.label"></span>
</div>
</div>
</div>
<div class="row">
<label id="lblentries"></label>
</div>
<label id="lblentries2"></label>
<nav aria-label="Page navigation">
<ul class="pagination justify-content-center" id="pagination">
<!-- Pagination items will be added dynamically via Delphi code -->
</ul>
</nav>
</div>
</div>
</div>
</div>
...@@ -10,18 +10,10 @@ uses ...@@ -10,18 +10,10 @@ uses
VCL.TMSFNCGridCell, VCL.TMSFNCGridOptions, VCL.TMSFNCCustomComponent, VCL.TMSFNCGridCell, VCL.TMSFNCGridOptions, VCL.TMSFNCCustomComponent,
VCL.TMSFNCCustomGrid, VCL.TMSFNCGridDatabaseAdapter, VCL.TMSFNCCustomControl, VCL.TMSFNCCustomGrid, VCL.TMSFNCGridDatabaseAdapter, VCL.TMSFNCCustomControl,
VCL.TMSFNCCustomScrollControl, WEBLib.DB, XData.Web.JsonDataset, Vcl.StdCtrls, VCL.TMSFNCCustomScrollControl, WEBLib.DB, XData.Web.JsonDataset, Vcl.StdCtrls,
Vcl.Controls, ConnectionModule; Vcl.Controls, ConnectionModule, WEBLib.WebCtrls;
type type
TFAddOrder = class(TWebForm) TFAddOrder = class(TWebForm)
lblEntries: TWebLabel;
lblEntries2: TWebLabel;
edtSearch: TWebEdit;
edtID: TWebEdit;
pnlMessage: TWebPanel;
lblMessage: TWebLabel;
btnCloseNotification: TWebButton;
btnCancel: TWebButton;
XDataWebClient1: TXDataWebClient; XDataWebClient1: TXDataWebClient;
wdsCustomers: TWebDataSource; wdsCustomers: TWebDataSource;
xdwdsCustomers: TXDataWebDataSet; xdwdsCustomers: TXDataWebDataSet;
...@@ -29,13 +21,18 @@ type ...@@ -29,13 +21,18 @@ type
xdwdsCustomersNAME: TStringField; xdwdsCustomersNAME: TStringField;
xdwdsCustomersSHORT_NAME: TStringField; xdwdsCustomersSHORT_NAME: TStringField;
xdwdsCustomersADDRESS: TStringField; xdwdsCustomersADDRESS: TStringField;
TMSFNCGrid1: TTMSFNCGrid;
btnConfirm: TWebButton;
cbCorrugatedPlate: TWebCheckBox;
cbWebPlate: TWebCheckBox; cbWebPlate: TWebCheckBox;
WebLabel1: TWebLabel; lblEntries: TWebLabel;
cbCorrugatedPlate: TWebCheckBox;
lblEntries2: TWebLabel;
edtSearch: TWebEdit;
WebLabel2: TWebLabel; WebLabel2: TWebLabel;
procedure WebFormShow(Sender: TObject); WebLabel1: TWebLabel;
edtID: TWebEdit;
btnConfirm: TWebButton;
btnCancel: TWebButton;
pnlFNCGrid: TWebPanel;
TMSFNCGrid1: TTMSFNCGrid;
procedure cbCorrugatedPlateClick(Sender: TObject); procedure cbCorrugatedPlateClick(Sender: TObject);
procedure cbWebPlateClick(Sender: TObject); procedure cbWebPlateClick(Sender: TObject);
procedure btnConfirmClick(Sender: TObject); procedure btnConfirmClick(Sender: TObject);
...@@ -47,6 +44,7 @@ type ...@@ -47,6 +44,7 @@ type
procedure PopulateGridManually; procedure PopulateGridManually;
procedure ApplyFilter; procedure ApplyFilter;
public public
class function CreateForm(AElementID: string): TWebForm;
end; end;
var var
...@@ -56,13 +54,23 @@ implementation ...@@ -56,13 +54,23 @@ implementation
{$R *.dfm} {$R *.dfm}
procedure TFAddOrder.WebFormShow(Sender: TObject);
class function TFAddOrder.CreateForm(AElementID: string): TWebForm;
begin begin
getCustomers(); // Fetch and populate the grid with customer data Application.CreateForm(TFAddOrder, AElementID, Result,
procedure(AForm: TObject)
begin
with TFAddOrder(AForm) do
begin
GetCustomers();
end;
end
);
end; end;
[async]
procedure TFAddOrder.getCustomers(); [async] procedure TFAddOrder.getCustomers();
var var
xdcResponse: TXDataClientResponse; xdcResponse: TXDataClientResponse;
customerList: TJSObject; customerList: TJSObject;
...@@ -80,6 +88,7 @@ begin ...@@ -80,6 +88,7 @@ begin
PopulateGridManually; PopulateGridManually;
end; end;
procedure TFAddOrder.PopulateGridManually; procedure TFAddOrder.PopulateGridManually;
var var
RowIndex: Integer; RowIndex: Integer;
...@@ -89,17 +98,15 @@ begin ...@@ -89,17 +98,15 @@ begin
TMSFNCGrid1.Clear; // Clear any existing data TMSFNCGrid1.Clear; // Clear any existing data
// Set up column headers // Set up column headers
TMSFNCGrid1.ColumnCount := 4; TMSFNCGrid1.ColumnCount := 3;
TMSFNCGrid1.RowCount := 1; TMSFNCGrid1.RowCount := 1;
TMSFNCGrid1.Cells[0, 0] := 'ID'; TMSFNCGrid1.Cells[0, 0] := 'ID';
TMSFNCGrid1.Cells[1, 0] := 'Short Name'; TMSFNCGrid1.Cells[1, 0] := 'Short Name';
TMSFNCGrid1.Cells[2, 0] := 'Name'; TMSFNCGrid1.Cells[2, 0] := 'Name';
TMSFNCGrid1.Cells[3, 0] := 'Address';
TMSFNCGrid1.ColumnWidths[0] := 40; // TMSFNCGrid1.ColumnWidths[0] := 40;
TMSFNCGrid1.ColumnWidths[1] := 80; // TMSFNCGrid1.ColumnWidths[1] := 80;
TMSFNCGrid1.ColumnWidths[2] := 250; // TMSFNCGrid1.ColumnWidths[2] := 250;
TMSFNCGrid1.ColumnWidths[3] := 400;
// Populate the grid with data from the dataset // Populate the grid with data from the dataset
xdwdsCustomers.First; xdwdsCustomers.First;
...@@ -112,7 +119,6 @@ begin ...@@ -112,7 +119,6 @@ begin
TMSFNCGrid1.Cells[0, RowIndex] := xdwdsCustomers.FieldByName('ID').AsString; TMSFNCGrid1.Cells[0, RowIndex] := xdwdsCustomers.FieldByName('ID').AsString;
TMSFNCGrid1.Cells[1, RowIndex] := xdwdsCustomers.FieldByName('SHORT_NAME').AsString; TMSFNCGrid1.Cells[1, RowIndex] := xdwdsCustomers.FieldByName('SHORT_NAME').AsString;
TMSFNCGrid1.Cells[2, RowIndex] := xdwdsCustomers.FieldByName('NAME').AsString; TMSFNCGrid1.Cells[2, RowIndex] := xdwdsCustomers.FieldByName('NAME').AsString;
TMSFNCGrid1.Cells[3, RowIndex] := xdwdsCustomers.FieldByName('ADDRESS').AsString;
Inc(RowIndex); Inc(RowIndex);
xdwdsCustomers.Next; xdwdsCustomers.Next;
......
...@@ -128,7 +128,11 @@ object FViewMain: TFViewMain ...@@ -128,7 +128,11 @@ object FViewMain: TFViewMain
Width = 471 Width = 471
Height = 369 Height = 369
ElementID = 'main.webpanel' ElementID = 'main.webpanel'
HeightStyle = ssAuto
WidthStyle = ssAuto
ChildOrder = 3 ChildOrder = 3
ElementFont = efCSS
ElementPosition = epIgnore
TabOrder = 0 TabOrder = 0
end end
object WebMessageDlg1: TWebMessageDlg object WebMessageDlg1: TWebMessageDlg
......
...@@ -45,13 +45,13 @@ ...@@ -45,13 +45,13 @@
</div> </div>
</nav> </nav>
<div id="page-wrapper" class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div id="main.webpanel" class="col-12"></div> <div id="main.webpanel" class="col-12"></div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<div class="form-outline mb-4"> <div class="form-outline">
<textarea class="form-control" id="main.debugmemo" rows="4"></textarea> <textarea class="form-control" id="main.debugmemo" rows="4"></textarea>
</div> </div>
</div> </div>
......
...@@ -35,30 +35,11 @@ object FViewOrders: TFViewOrders ...@@ -35,30 +35,11 @@ object FViewOrders: TFViewOrders
HeightPercent = 100.000000000000000000 HeightPercent = 100.000000000000000000
WidthPercent = 100.000000000000000000 WidthPercent = 100.000000000000000000
end end
object wcbPageSize: TWebComboBox
Left = -4
Top = 52
Width = 145
Height = 21
ElementClassName = 'custom-select'
ElementID = 'wcbpagesize'
ElementFont = efCSS
HeightStyle = ssAuto
HeightPercent = 100.000000000000000000
Text = '10'
WidthPercent = 100.000000000000000000
ItemIndex = -1
Items.Strings = (
'10'
'25'
'50')
end
object wcbSortBy: TWebComboBox object wcbSortBy: TWebComboBox
Left = 0 Left = 0
Top = 18 Top = 18
Width = 145 Width = 145
Height = 21 Height = 21
ElementClassName = 'custom-select'
ElementID = 'wcbsortby' ElementID = 'wcbsortby'
ElementFont = efCSS ElementFont = efCSS
HeightStyle = ssAuto HeightStyle = ssAuto
...@@ -85,7 +66,6 @@ object FViewOrders: TFViewOrders ...@@ -85,7 +66,6 @@ object FViewOrders: TFViewOrders
Height = 25 Height = 25
Caption = 'Apply' Caption = 'Apply'
ChildOrder = 7 ChildOrder = 7
ElementClassName = 'btn btn-light'
ElementID = 'btnapply' ElementID = 'btnapply'
ElementFont = efCSS ElementFont = efCSS
HeightStyle = ssAuto HeightStyle = ssAuto
...@@ -94,8 +74,8 @@ object FViewOrders: TFViewOrders ...@@ -94,8 +74,8 @@ object FViewOrders: TFViewOrders
OnClick = btnApplyClick OnClick = btnApplyClick
end end
object edtSearch: TWebEdit object edtSearch: TWebEdit
Left = 48 Left = 162
Top = 382 Top = 44
Width = 121 Width = 121
Height = 22 Height = 22
HelpType = htKeyword HelpType = htKeyword
...@@ -115,7 +95,6 @@ object FViewOrders: TFViewOrders ...@@ -115,7 +95,6 @@ object FViewOrders: TFViewOrders
Height = 25 Height = 25
Caption = 'Add Order' Caption = 'Add Order'
ChildOrder = 5 ChildOrder = 5
ElementClassName = 'btn btn-light'
ElementID = 'btnaddorder' ElementID = 'btnaddorder'
ElementFont = efCSS ElementFont = efCSS
HeightStyle = ssAuto HeightStyle = ssAuto
...@@ -130,7 +109,6 @@ object FViewOrders: TFViewOrders ...@@ -130,7 +109,6 @@ object FViewOrders: TFViewOrders
Height = 25 Height = 25
Caption = 'Show Filters' Caption = 'Show Filters'
ChildOrder = 6 ChildOrder = 6
ElementClassName = 'btn btn-light'
ElementID = 'btnfilters' ElementID = 'btnfilters'
ElementFont = efCSS ElementFont = efCSS
HeightStyle = ssAuto HeightStyle = ssAuto
...@@ -143,7 +121,6 @@ object FViewOrders: TFViewOrders ...@@ -143,7 +121,6 @@ object FViewOrders: TFViewOrders
Top = 16 Top = 16
Width = 170 Width = 170
Height = 22 Height = 22
ElementClassName = 'form-control'
ElementID = 'dtpstartdate' ElementID = 'dtpstartdate'
HeightStyle = ssAuto HeightStyle = ssAuto
BorderStyle = bsSingle BorderStyle = bsSingle
...@@ -159,7 +136,6 @@ object FViewOrders: TFViewOrders ...@@ -159,7 +136,6 @@ object FViewOrders: TFViewOrders
Top = 16 Top = 16
Width = 170 Width = 170
Height = 22 Height = 22
ElementClassName = 'form-control'
ElementID = 'dtpenddate' ElementID = 'dtpenddate'
HeightStyle = ssAuto HeightStyle = ssAuto
BorderStyle = bsSingle BorderStyle = bsSingle
...@@ -182,7 +158,7 @@ object FViewOrders: TFViewOrders ...@@ -182,7 +158,7 @@ object FViewOrders: TFViewOrders
ElementFont = efCSS ElementFont = efCSS
ElementPosition = epRelative ElementPosition = epRelative
Role = 'alert' Role = 'alert'
TabOrder = 8 TabOrder = 7
object lblMessage: TWebLabel object lblMessage: TWebLabel
Left = 28 Left = 28
Top = 9 Top = 9
...@@ -221,7 +197,6 @@ object FViewOrders: TFViewOrders ...@@ -221,7 +197,6 @@ object FViewOrders: TFViewOrders
Height = 25 Height = 25
Caption = 'Set Status' Caption = 'Set Status'
ChildOrder = 11 ChildOrder = 11
ElementClassName = 'btn btn-light'
ElementID = 'btnsetstatus' ElementID = 'btnsetstatus'
ElementFont = efCSS ElementFont = efCSS
HeightStyle = ssAuto HeightStyle = ssAuto
...@@ -229,13 +204,12 @@ object FViewOrders: TFViewOrders ...@@ -229,13 +204,12 @@ object FViewOrders: TFViewOrders
WidthPercent = 100.000000000000000000 WidthPercent = 100.000000000000000000
end end
object WebButton2: TWebButton object WebButton2: TWebButton
Left = 344 Left = 346
Top = 79 Top = 79
Width = 96 Width = 96
Height = 25 Height = 25
Caption = 'PDF' Caption = 'PDF'
ChildOrder = 12 ChildOrder = 12
ElementClassName = 'btn btn-light'
ElementID = 'btngeneratepdf' ElementID = 'btngeneratepdf'
ElementFont = efCSS ElementFont = efCSS
HeightStyle = ssAuto HeightStyle = ssAuto
...@@ -257,22 +231,19 @@ object FViewOrders: TFViewOrders ...@@ -257,22 +231,19 @@ object FViewOrders: TFViewOrders
WidthPercent = 100.000000000000000000 WidthPercent = 100.000000000000000000
OnClick = btnConfirmClick OnClick = btnConfirmClick
end end
object wcbCustomers: TWebDBLookupComboBox object pnlOrders: TWebPanel
Left = 550 Left = 128
Top = 286 Top = 160
Width = 145 Width = 343
Height = 22 Height = 187
ElementClassName = 'custom-select' ElementClassName = 'card'
ElementID = 'wcbcustomer' ElementID = 'pnl_orders'
Caption = 'pnlOrders'
ChildOrder = 15
ElementBodyClassName = 'card-body'
ElementFont = efCSS ElementFont = efCSS
HeightPercent = 100.000000000000000000 TabOrder = 11
WidthPercent = 100.000000000000000000 Visible = False
OnChange = wcbCustomersChange
DataField = 'CURR_ID'
DataSource = wdsSave
KeyField = 'ID'
ListField = 'NAME'
ListSource = wdsCustomers
end end
object XDataWebClient1: TXDataWebClient object XDataWebClient1: TXDataWebClient
Connection = DMConnection.ApiConnection Connection = DMConnection.ApiConnection
......
<div class="row"> <div class="container vh-100 d-flex flex-column pb-5" style="max-width: 80%;">
<div class="col-12">
<div class="container mt-4"> <!-- Alert Section -->
<div class="row justify-content-center"> <div class="row">
<div class="col-12 col-md-8"> <div class="col-sm">
<div class="row"> <div id="pnl_message" class="alert alert-danger">
<div class="col-sm"> <button id="view.login.message.button" type="button" class="btn-close" aria-label="Close"></button>
<div id="pnl_message" class="alert alert-danger"> <span id="view.login.message.label"></span>
<button id="view.login.message.button" type="button" class="btn-close" aria-label="Close"></button> </div>
<span id="view.login.message.label"></span> </div>
</div> </div>
</div>
</div>
<div class="mb-3" id="filter_info" style="display: none;">
<div class="row">
<!-- Search Input Field -->
<div class="col-auto">
<label class='pe-2' style="font-weight: 700;">Search:</label>
<input class="form-control input-sm" id="edtsearch">
</div>
<!-- Start Date Input Field -->
<div class="col-auto">
<label class='pe-2' style="font-weight: 700;">Start Date:</label>
<input class="form-control input-sm" id="dtpstartdate" type="date">
</div>
<!-- End Date Input Field -->
<div class="col-auto">
<label class='pe-2' style="font-weight: 700;">End Date:</label>
<input class="form-control input-sm" id="dtpenddate" type="date">
</div>
<!-- Status Type Dropdown -->
<div class="col-auto">
<label style="font-weight: 700;">Status Type:</label>
<div>
<select class="form-control input-sm" id="wcbsortby" style="font-size: 1.00rem; height: calc(2.25rem + 2px); padding-top: 0.375rem; padding-bottom: 0.375rem;"></select>
</div>
</div> <!-- Filters Section -->
<!-- Button (Align this with the inputs) --> <div class="container mb-3">
<div class="col-auto d-flex align-items-end"> <!-- Filters Row (Hidden Initially) -->
<label style="font-weight: 700;"> </label> <div id="filter_info" style="display: none;">
<button class="btn btn-primary btn-sm" id="btnapply">Apply</button> <div class="row justify-content-center">
</div> <div class="col-auto">
</div> <label for="edtsearch" class="fw-bold">Search:</label>
</div> <input type="text" id="edtsearch" class="form-control">
<form class="form-inline"> </div>
<div class= "row"> <div class="col-auto">
<div class="col-sm-3"> <label for="dtpstartdate" class="fw-bold">Start Date:</label>
<label class="py-2" style="font-weight: 700;">Show <select class="custom-select" id="wcbpagesize" style="font-size: 1.00rem;"></select> entries</label> <input type="date" id="dtpstartdate" class="form-control">
</div> </div>
<div class="col-sm-2"> <div class="col-auto">
<button class= "ps-3" id="btnaddorder"></button> <label for="dtpenddate" class="fw-bold">End Date:</label>
</div> <input type="date" id="dtpenddate" class="form-control">
<div class="col-sm-2"> </div>
<button class= "ps-3" id="btnsetstatus"></button> <div class="col-auto">
</div> <label for="wcbsortby" class="fw-bold">Property Type*</label>
<div class="col-sm-2"> <select class="form-select" id="wcbsortby"></select>
<button class= "ps-3" id="btngeneratepdf"></button> </div>
</div> <div class="col-auto d-flex align-items-end">
<div class="col-sm-2"> <button id="btnapply" class="btn btn-primary">Apply</button>
<button class= "ps-3" id="btnfilters"></button>
</div>
</div>
</form>
</div>
<div class="row">
<label id="lblentries"></label>
</div>
<table class="table table-responsive table-striped table-bordered" id="tblPhoneGrid">
<thead class="thead-dark">
<tr>
<th scope="col">Order ID</th>
<th scope="col">Company Name</th>
<th scope="col">Job Name</th>
<th scope="col">Order Date</th>
<th scope="col">Proof Due</th>
<th scope="col">Proof Date</th>
<th scope="col">Art Due</th>
<th scope="col">Art Done</th>
<th scope="col">Plate Due</th>
<th scope="col">Plate Done</th>
<th scope="col">Mount Due</th>
<th scope="col">Mount Done</th>
<th scope="col">Ship Due</th>
<th scope="col">Ship Done</th>
<th scope="col">Price</th>
<th scope="col">Quickbooks Reference Number</th>
<th scope="col">Colors</th>
</tr>
</thead>
<tbody>
<!-- Rows will be added dynamically via Delphi code -->
</tbody>
</table>
<label id="lblentries2"></label>
<nav aria-label="Page navigation">
<ul class="pagination justify-content-center" id="pagination">
<!-- Pagination items will be added dynamically via Delphi code -->
</ul>
</nav>
</div> </div>
</div> </div>
</div> </div>
<!-- Actions Row -->
<div class="row mt-3 justify-content-center">
<div class="col-auto">
<button id="btnaddorder" class="btn btn-secondary">Add Order</button>
</div>
<div class="col-auto">
<button id="btnsetstatus" class="btn btn-secondary">Set Status</button>
</div>
<div class="col-auto">
<button id="btngeneratepdf" class="btn btn-secondary">Generate PDF</button>
</div>
<div class="col-auto">
<button id="btnfilters" class="btn btn-secondary">Filters</button>
</div>
</div>
</div> </div>
<!-- Modal -->
<div class="modal fade" id="confirmation_modal" tabindex="-1" aria-labelledby="confirmation_modal_label" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header"> <!-- Entries Label Section -->
<h5 class="modal-title" id="confirmation_modal_label">Select Customer</h5> <div class="container mt-3">
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button> <div class="row">
</div> <div class="col">
<div class="modal-body"> <label id="lblentries"></label>
<select class="form-control input-sm" id="wcbcustomer"></select> </div>
</div> </div>
<div class="modal-footer"> </div>
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-primary" data-bs-dismiss="modal" id="btn_confirm_order">Confirm</button> <!-- Table Section -->
</div> <div id="order_table_section" class="overflow-auto mt-3 flex-grow-1">
<table id="tblPhoneGrid" class="table table-striped table-bordered">
<thead style="position: sticky; top: 0; z-index: 1; background-color: white; border-bottom: 2px solid #dee2e6;">
<tr>
<th>Order ID</th>
<th>Company Name</th>
<th>Job Name</th>
<th>Order Date</th>
<th>Proof Due</th>
<th>Proof Date</th>
<th>Art Due</th>
<th>Art Done</th>
<th>Plate Due</th>
<th>Plate Done</th>
<th>Mount Due</th>
<th>Mount Done</th>
<th>Ship Due</th>
<th>Ship Done</th>
<th>Price</th>
<th>QuickBooks Ref Number</th>
<th>Colors</th>
</tr>
</thead>
<tbody>
<!-- Rows will be dynamically added -->
</tbody>
</table>
</div>
<!-- Entries Label Section (Below Table) -->
<div class="container mt-3">
<div class="row">
<div class="col">
<label id="lblentries2"></label>
</div>
</div>
</div>
<!-- Pagination Section -->
<div class="container mt-4">
<div class="row justify-content-center">
<nav aria-label="Page navigation">
<ul id="pagination" class="pagination">
<!-- Pagination items added dynamically -->
</ul>
</nav>
</div>
</div> </div>
</div>
</div> </div>
<!-- Floating Panel -->
<div id="pnl_orders" class="position-fixed top-50 start-50 translate-middle bg-white shadow rounded-sm p-4 d-none" style="z-index: 1050; width: 75%;">
<!-- Content dynamically added -->
</div>
<!-- Confirmation Modal -->
<div id="confirmation_modal" class="modal fade" tabindex="-1" aria-labelledby="confirmation_modal_label" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h5 id="confirmation_modal_label" class="modal-title">Select Customer</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<select id="wcbcustomer" class="form-control input-sm"></select>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-primary" data-bs-dismiss="modal" id="btn_confirm_order">Confirm</button>
</div>
</div>
</div>
</div>
...@@ -13,14 +13,13 @@ uses ...@@ -13,14 +13,13 @@ uses
WEBLib.Forms, WEBLib.Dialogs, WEBLib.Menus, WEBLib.ExtCtrls, WEBLib.StdCtrls, WEBLib.Forms, WEBLib.Dialogs, WEBLib.Menus, WEBLib.ExtCtrls, WEBLib.StdCtrls,
WEBLib.JSON, Auth.Service, XData.Web.Client, WebLib.Storage, WEBLib.JSON, Auth.Service, XData.Web.Client, WebLib.Storage,
ConnectionModule, App.Types, Vcl.StdCtrls, Vcl.Controls, WEBLib.DBCtrls, ConnectionModule, App.Types, Vcl.StdCtrls, Vcl.Controls, WEBLib.DBCtrls,
Data.DB, XData.Web.JsonDataset, XData.Web.Dataset, WEBLib.DB; XData.Web.JsonDataset, WEBLib.DB, Data.DB, XData.Web.Dataset, View.AddOrder;
type type
TFViewOrders = class(TWebForm) TFViewOrders = class(TWebForm)
XDataWebClient1: TXDataWebClient; XDataWebClient1: TXDataWebClient;
XDataWebDataSet1: TXDataWebDataSet; XDataWebDataSet1: TXDataWebDataSet;
lblEntries: TWebLabel; lblEntries: TWebLabel;
wcbPageSize: TWebComboBox;
wcbSortBy: TWebComboBox; wcbSortBy: TWebComboBox;
btnApply: TWebButton; btnApply: TWebButton;
edtSearch: TWebEdit; edtSearch: TWebEdit;
...@@ -55,7 +54,6 @@ type ...@@ -55,7 +54,6 @@ type
WebButton2: TWebButton; WebButton2: TWebButton;
btnConfirm: TWebButton; btnConfirm: TWebButton;
wdsCustomers: TWebDataSource; wdsCustomers: TWebDataSource;
wcbCustomers: TWebDBLookupComboBox;
xdwdsCustomers: TXDataWebDataSet; xdwdsCustomers: TXDataWebDataSet;
xdwdsCustomersNAME: TStringField; xdwdsCustomersNAME: TStringField;
xdwdsCustomersID: TIntegerField; xdwdsCustomersID: TIntegerField;
...@@ -63,6 +61,7 @@ type ...@@ -63,6 +61,7 @@ type
xdwdsSave: TXDataWebDataSet; xdwdsSave: TXDataWebDataSet;
wdsSave: TWebDataSource; wdsSave: TWebDataSource;
xdwdsSaveCURR_ID: TIntegerField; xdwdsSaveCURR_ID: TIntegerField;
pnlOrders: TWebPanel;
procedure WebFormCreate(Sender: TObject); procedure WebFormCreate(Sender: TObject);
procedure btnApplyClick(Sender: TObject); procedure btnApplyClick(Sender: TObject);
procedure btnSearchClick(Sender: TObject); procedure btnSearchClick(Sender: TObject);
...@@ -71,7 +70,6 @@ type ...@@ -71,7 +70,6 @@ type
procedure btnCloseNotificationClick(Sender: TObject); procedure btnCloseNotificationClick(Sender: TObject);
procedure WebFormShow(Sender: TObject); procedure WebFormShow(Sender: TObject);
procedure btnConfirmClick(Sender: TObject); procedure btnConfirmClick(Sender: TObject);
procedure wcbCustomersChange(Sender: TObject);
private private
FChildForm: TWebForm; FChildForm: TWebForm;
procedure AddRowToTable(temp: string); procedure AddRowToTable(temp: string);
...@@ -106,7 +104,7 @@ var ...@@ -106,7 +104,7 @@ var
implementation implementation
uses uses
XData.Model.Classes, View.Main, View.AddOrder; XData.Model.Classes, View.Main;
{$R *.dfm} {$R *.dfm}
...@@ -121,7 +119,6 @@ begin ...@@ -121,7 +119,6 @@ begin
DMConnection.ApiConnection.Connected := True; DMConnection.ApiConnection.Connected := True;
PageNumber := 1; PageNumber := 1;
TotalPages := 1; // Initial total pages TotalPages := 1; // Initial total pages
wcbPageSize.Text := '10';
wcbSortBy.Text := 'PROOF'; wcbSortBy.Text := 'PROOF';
//today := TDateTime.Today; //today := TDateTime.Today;
dtpStartDate.Date := 0; dtpStartDate.Date := 0;
...@@ -169,25 +166,21 @@ end; ...@@ -169,25 +166,21 @@ end;
procedure TFViewOrders.ShowOrderListForm(); procedure TFViewOrders.ShowOrderListForm();
var var
newform: TFAddOrder; OrdersPanel: TJSHTMLElement;
begin begin
newform := TFAddOrder.CreateNew; // Get the panel element for orders
OrdersPanel := TJSHTMLElement(document.getElementById('pnl_orders'));
newform.Caption := 'Select Customer and Order Type'; // Hide the panel before loading the form
newForm.Popup := True; if Assigned(OrdersPanel) then
newForm.Border := fbDialog; OrdersPanel.style.setProperty('display', 'none');
console.log(newForm.GetElementHandle);
// used to manage Back button handling to close subform // Create the order list form, passing the ElementID
window.location.hash := 'subform'; TFAddOrder.CreateForm(pnlOrders.ElementID);
newform.ShowModal( // Show the panel after the form is created
procedure(AValue: TModalResult) if Assigned(OrdersPanel) then
begin OrdersPanel.style.setProperty('display', 'block');
if newform.edtID.Text <> '' then
orderEntry('', newForm.edtID.Text, 'ADD');
end
);
end; end;
procedure TFViewOrders.AddRowToTable(temp: string); procedure TFViewOrders.AddRowToTable(temp: string);
...@@ -657,7 +650,7 @@ var ...@@ -657,7 +650,7 @@ var
searchOptions: string; searchOptions: string;
begin begin
PageNumber := 1; PageNumber := 1;
PageSize := StrToInt(wcbPageSize.Text); PageSize := 50;
OrderBy := wcbSortBy.Text; OrderBy := wcbSortBy.Text;
searchOptions := '&pagenumber=' + IntToStr(PageNumber) + searchOptions := '&pagenumber=' + IntToStr(PageNumber) +
'&pagesize=' + IntToStr(PageSize) + '&pagesize=' + IntToStr(PageSize) +
...@@ -749,7 +742,7 @@ var ...@@ -749,7 +742,7 @@ var
searchOptions: string; searchOptions: string;
begin begin
//PageNumber := 1; //PageNumber := 1;
PageSize := StrToInt(wcbPageSize.Text); PageSize := 50;
OrderBy := wcbSortBy.Text; OrderBy := wcbSortBy.Text;
searchOptions := '&pagenumber=' + IntToStr(PageNumber) + searchOptions := '&pagenumber=' + IntToStr(PageNumber) +
'&pagesize=' + IntToStr(PageSize) + '&pagesize=' + IntToStr(PageSize) +
...@@ -780,10 +773,5 @@ begin ...@@ -780,10 +773,5 @@ begin
end; end;
end; end;
procedure TFViewOrders.wcbCustomersChange(Sender: TObject);
begin
console.log(wcbCustomers.Value);
end;
end. end.
...@@ -282,3 +282,4 @@ input[type="text"] { ...@@ -282,3 +282,4 @@ input[type="text"] {
...@@ -16,8 +16,8 @@ object FMain: TFMain ...@@ -16,8 +16,8 @@ object FMain: TFMain
597) 597)
TextHeight = 13 TextHeight = 13
object memoInfo: TMemo object memoInfo: TMemo
Left = 8 Left = 20
Top = 40 Top = 44
Width = 744 Width = 744
Height = 549 Height = 549
Anchors = [akLeft, akTop, akRight, akBottom] Anchors = [akLeft, akTop, akRight, akBottom]
......
[Options] [Options]
LogFileNum=22 LogFileNum=28
[Database] [Database]
--Server=192.168.159.132 --Server=192.168.159.132
Server=192.168.198.129 --Server=192.168.198.129
--Server=192.168.75.133 Server=192.168.102.130
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