Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
KGOrders
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Cam Hayes
KGOrders
Commits
1511d5c1
Commit
1511d5c1
authored
Dec 06, 2024
by
Mac Stephens
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
changed styling for orders form
parent
af90a3ab
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
165 additions
and
199 deletions
+165
-199
View.AddOrder.dfm
kgOrdersClient/View.AddOrder.dfm
+0
-0
View.AddOrder.html
kgOrdersClient/View.AddOrder.html
+2
-27
View.AddOrder.pas
kgOrdersClient/View.AddOrder.pas
+31
-25
View.Main.dfm
kgOrdersClient/View.Main.dfm
+4
-0
View.Main.html
kgOrdersClient/View.Main.html
+2
-2
View.Orders.dfm
kgOrdersClient/View.Orders.dfm
+16
-45
View.Orders.html
kgOrdersClient/View.Orders.html
+88
-67
View.Orders.pas
kgOrdersClient/View.Orders.pas
+16
-28
app.css
kgOrdersClient/template/css/app.css
+1
-0
Main.dfm
kgOrdersServer/Source/Main.dfm
+2
-2
kgOrdersServer.ini
kgOrdersServer/kgOrdersServer.ini
+3
-3
No files found.
kgOrdersClient/View.AddOrder.dfm
View file @
1511d5c1
This diff is collapsed.
Click to expand it.
kgOrdersClient/View.AddOrder.html
View file @
1511d5c1
<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>
kgOrdersClient/View.AddOrder.pas
View file @
1511d5c1
...
@@ -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
;
...
...
kgOrdersClient/View.Main.dfm
View file @
1511d5c1
...
@@ -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
...
...
kgOrdersClient/View.Main.html
View file @
1511d5c1
...
@@ -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>
...
...
kgOrdersClient/View.Orders.dfm
View file @
1511d5c1
...
@@ -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 = 34
4
Left = 34
6
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
...
...
kgOrdersClient/View.Orders.html
View file @
1511d5c1
<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=
"col-12 col-md-8"
>
<div
class=
"row"
>
<div
class=
"row"
>
<div
class=
"col-sm"
>
<div
class=
"col-sm"
>
<div
id=
"pnl_message"
class=
"alert alert-danger"
>
<div
id=
"pnl_message"
class=
"alert alert-danger"
>
...
@@ -11,107 +9,129 @@
...
@@ -11,107 +9,129 @@
</div>
</div>
</div>
</div>
</div>
</div>
<div
class=
"mb-3"
id=
"filter_info"
style=
"display: none;"
>
<div
class=
"row"
>
<!-- Filters Section -->
<!-- Search Input Field -->
<div
class=
"container mb-3"
>
<!-- Filters Row (Hidden Initially) -->
<div
id=
"filter_info"
style=
"display: none;"
>
<div
class=
"row justify-content-center"
>
<div
class=
"col-auto"
>
<div
class=
"col-auto"
>
<label
class=
'pe-2'
style=
"font-weight: 700;
"
>
Search:
</label>
<label
for=
"edtsearch"
class=
"fw-bold
"
>
Search:
</label>
<input
class=
"form-control input-sm"
id=
"edtsearch
"
>
<input
type=
"text"
id=
"edtsearch"
class=
"form-control
"
>
</div>
</div>
<!-- Start Date Input Field -->
<div
class=
"col-auto"
>
<div
class=
"col-auto"
>
<label
class=
'pe-2'
style=
"font-weight: 700;
"
>
Start Date:
</label>
<label
for=
"dtpstartdate"
class=
"fw-bold
"
>
Start Date:
</label>
<input
class=
"form-control input-sm"
id=
"dtpstartdate"
type=
"date
"
>
<input
type=
"date"
id=
"dtpstartdate"
class=
"form-control
"
>
</div>
</div>
<!-- End Date Input Field -->
<div
class=
"col-auto"
>
<div
class=
"col-auto"
>
<label
class=
'pe-2'
style=
"font-weight: 700;
"
>
End Date:
</label>
<label
for=
"dtpenddate"
class=
"fw-bold
"
>
End Date:
</label>
<input
class=
"form-control input-sm"
id=
"dtpenddate"
type=
"date
"
>
<input
type=
"date"
id=
"dtpenddate"
class=
"form-control
"
>
</div>
</div>
<!-- Status Type Dropdown -->
<div
class=
"col-auto"
>
<div
class=
"col-auto"
>
<label
style=
"font-weight: 700;"
>
Status Type:
</label>
<label
for=
"wcbsortby"
class=
"fw-bold"
>
Property Type*
</label>
<div>
<select
class=
"form-select"
id=
"wcbsortby"
></select>
<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>
</div>
<!-- Button (Align this with the inputs) -->
<div
class=
"col-auto d-flex align-items-end"
>
<div
class=
"col-auto d-flex align-items-end"
>
<label
style=
"font-weight: 700;"
>
</label>
<button
id=
"btnapply"
class=
"btn btn-primary"
>
Apply
</button>
<button
class=
"btn btn-primary btn-sm"
id=
"btnapply"
>
Apply
</button>
</div>
</div>
</div>
</div>
</div>
</div>
<form
class=
"form-inline"
>
<div
class=
"row"
>
<!-- Actions Row -->
<div
class=
"col-sm-3"
>
<div
class=
"row mt-3 justify-content-center"
>
<label
class=
"py-2"
style=
"font-weight: 700;"
>
Show
<select
class=
"custom-select"
id=
"wcbpagesize"
style=
"font-size: 1.00rem;"
></select>
entries
</label>
<div
class=
"col-auto"
>
</div>
<button
id=
"btnaddorder"
class=
"btn btn-secondary"
>
Add Order
</button>
<div
class=
"col-sm-2"
>
<button
class=
"ps-3"
id=
"btnaddorder"
></button>
</div>
</div>
<div
class=
"col-sm-2
"
>
<div
class=
"col-auto
"
>
<button
class=
"ps-3"
id=
"btnsetstatus"
>
</button>
<button
id=
"btnsetstatus"
class=
"btn btn-secondary"
>
Set Status
</button>
</div>
</div>
<div
class=
"col-sm-2
"
>
<div
class=
"col-auto
"
>
<button
class=
"ps-3"
id=
"btngeneratepdf"
>
</button>
<button
id=
"btngeneratepdf"
class=
"btn btn-secondary"
>
Generate PDF
</button>
</div>
</div>
<div
class=
"col-sm-2
"
>
<div
class=
"col-auto
"
>
<button
class=
"ps-3"
id=
"btnfilters"
>
</button>
<button
id=
"btnfilters"
class=
"btn btn-secondary"
>
Filters
</button>
</div>
</div>
</div>
</div>
</form>
</div>
</div>
<!-- Entries Label Section -->
<div
class=
"container mt-3"
>
<div
class=
"row"
>
<div
class=
"row"
>
<div
class=
"col"
>
<label
id=
"lblentries"
></label>
<label
id=
"lblentries"
></label>
</div>
</div>
<table
class=
"table table-responsive table-striped table-bordered"
id=
"tblPhoneGrid"
>
</div>
<thead
class=
"thead-dark"
>
</div>
<!-- Table Section -->
<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>
<tr>
<th
scope=
"col"
>
Order ID
</th>
<th
>
Order ID
</th>
<th
scope=
"col"
>
Company Name
</th>
<th
>
Company Name
</th>
<th
scope=
"col"
>
Job Name
</th>
<th
>
Job Name
</th>
<th
scope=
"col"
>
Order Date
</th>
<th
>
Order Date
</th>
<th
scope=
"col"
>
Proof Due
</th>
<th
>
Proof Due
</th>
<th
scope=
"col"
>
Proof Date
</th>
<th
>
Proof Date
</th>
<th
scope=
"col"
>
Art Due
</th>
<th
>
Art Due
</th>
<th
scope=
"col"
>
Art Done
</th>
<th
>
Art Done
</th>
<th
scope=
"col"
>
Plate Due
</th>
<th
>
Plate Due
</th>
<th
scope=
"col"
>
Plate Done
</th>
<th
>
Plate Done
</th>
<th
scope=
"col"
>
Mount Due
</th>
<th
>
Mount Due
</th>
<th
scope=
"col"
>
Mount Done
</th>
<th
>
Mount Done
</th>
<th
scope=
"col"
>
Ship Due
</th>
<th
>
Ship Due
</th>
<th
scope=
"col"
>
Ship Done
</th>
<th
>
Ship Done
</th>
<th
scope=
"col"
>
Price
</th>
<th
>
Price
</th>
<th
scope=
"col"
>
Quickbooks Reference
Number
</th>
<th>
QuickBooks Ref
Number
</th>
<th
scope=
"col"
>
Colors
</th>
<th
>
Colors
</th>
</tr>
</tr>
</thead>
</thead>
<tbody>
<tbody>
<!-- Rows will be added dynamically via Delphi code
-->
<!-- Rows will be dynamically added
-->
</tbody>
</tbody>
</table>
</table>
</div>
<!-- Entries Label Section (Below Table) -->
<div
class=
"container mt-3"
>
<div
class=
"row"
>
<div
class=
"col"
>
<label
id=
"lblentries2"
></label>
<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"
>
<nav
aria-label=
"Page navigation"
>
<ul
class=
"pagination justify-content-center"
id
=
"pagination"
>
<ul
id=
"pagination"
class
=
"pagination"
>
<!-- Pagination items will be added dynamically via Delphi code
-->
<!-- Pagination items added dynamically
-->
</ul>
</ul>
</nav>
</nav>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- Modal -->
<!-- Floating Panel -->
<div
class=
"modal fade"
id=
"confirmation_modal"
tabindex=
"-1"
aria-labelledby=
"confirmation_modal_label"
aria-hidden=
"true"
>
<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-dialog"
>
<div
class=
"modal-content"
>
<div
class=
"modal-content"
>
<div
class=
"modal-header"
>
<div
class=
"modal-header"
>
<h5
class=
"modal-title"
id=
"confirmation_modal_label
"
>
Select Customer
</h5>
<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>
<button
type=
"button"
class=
"btn-close"
data-bs-dismiss=
"modal"
aria-label=
"Close"
></button>
</div>
</div>
<div
class=
"modal-body"
>
<div
class=
"modal-body"
>
<select
class=
"form-control input-sm"
id=
"wcbcustomer
"
></select>
<select
id=
"wcbcustomer"
class=
"form-control input-sm
"
></select>
</div>
</div>
<div
class=
"modal-footer"
>
<div
class=
"modal-footer"
>
<button
type=
"button"
class=
"btn btn-secondary"
data-bs-dismiss=
"modal"
>
Cancel
</button>
<button
type=
"button"
class=
"btn btn-secondary"
data-bs-dismiss=
"modal"
>
Cancel
</button>
...
@@ -120,3 +140,4 @@
...
@@ -120,3 +140,4 @@
</div>
</div>
</div>
</div>
</div>
</div>
kgOrdersClient/View.Orders.pas
View file @
1511d5c1
...
@@ -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
.
kgOrdersClient/template/css/app.css
View file @
1511d5c1
...
@@ -282,3 +282,4 @@ input[type="text"] {
...
@@ -282,3 +282,4 @@ input[type="text"] {
kgOrdersServer/Source/Main.dfm
View file @
1511d5c1
...
@@ -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 = 4
0
Top = 4
4
Width = 744
Width = 744
Height = 549
Height = 549
Anchors = [akLeft, akTop, akRight, akBottom]
Anchors = [akLeft, akTop, akRight, akBottom]
...
...
kgOrdersServer/kgOrdersServer.ini
View file @
1511d5c1
[Options]
[Options]
LogFileNum
=
2
2
LogFileNum
=
2
8
[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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment