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
0b8080eb
Commit
0b8080eb
authored
Sep 27, 2024
by
cam
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
all minor bugs previously discussed are now fixed
parent
06a2b66b
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
34 additions
and
5 deletions
+34
-5
View.Orders.dfm
kgOrdersClient/View.Orders.dfm
+18
-0
View.Orders.html
kgOrdersClient/View.Orders.html
+10
-3
View.Orders.pas
kgOrdersClient/View.Orders.pas
+0
-0
Lookup.Service.pas
kgOrdersServer/Source/Lookup.Service.pas
+2
-0
Lookup.ServiceImpl.pas
kgOrdersServer/Source/Lookup.ServiceImpl.pas
+3
-1
kgOrdersServer.ini
kgOrdersServer/kgOrdersServer.ini
+1
-1
No files found.
kgOrdersClient/View.Orders.dfm
View file @
0b8080eb
...
@@ -22,6 +22,18 @@ object FViewOrders: TFViewOrders
...
@@ -22,6 +22,18 @@ object FViewOrders: TFViewOrders
HeightPercent = 100.000000000000000000
HeightPercent = 100.000000000000000000
WidthPercent = 100.000000000000000000
WidthPercent = 100.000000000000000000
end
end
object lblEntries2: TWebLabel
Left = 8
Top = 358
Width = 49
Height = 13
Caption = 'lblEntries2'
ElementID = 'lblentries2'
ElementFont = efCSS
HeightStyle = ssAuto
HeightPercent = 100.000000000000000000
WidthPercent = 100.000000000000000000
end
object wcbPageSize: TWebComboBox
object wcbPageSize: TWebComboBox
Left = -4
Left = -4
Top = 52
Top = 52
...
@@ -206,6 +218,12 @@ object FViewOrders: TFViewOrders
...
@@ -206,6 +218,12 @@ object FViewOrders: TFViewOrders
object XDataWebDataSet1colors: TStringField
object XDataWebDataSet1colors: TStringField
FieldName = 'colors'
FieldName = 'colors'
end
end
object XDataWebDataSet1plateDue: TStringField
FieldName = 'plateDue'
end
object XDataWebDataSet1plateDone: TStringField
FieldName = 'plateDone'
end
end
end
object WebDataSource1: TWebDataSource
object WebDataSource1: TWebDataSource
DataSet = XDataWebDataSet1
DataSet = XDataWebDataSet1
...
...
kgOrdersClient/View.Orders.html
View file @
0b8080eb
...
@@ -21,8 +21,10 @@
...
@@ -21,8 +21,10 @@
<input
class=
"form-control input-sm"
id=
"dtpenddate"
type=
"date"
>
<input
class=
"form-control input-sm"
id=
"dtpenddate"
type=
"date"
>
</div>
</div>
<div
class=
"col-auto"
>
<div
class=
"col-auto"
>
<label
class=
"py-2"
style=
"font-weight: 700;"
>
Status Type:
</label>
<label
style=
"font-weight: 700;"
>
Status Type:
</label>
<select
class=
"custom-select"
id=
"wcbsortby"
style=
"font-size: 1.00rem;"
></select>
<div>
<select
class=
"custom-select"
id=
"wcbsortby"
style=
"font-size: 1.00rem;"
></select>
</div>
</div>
</div>
</div>
</div>
<div
class =
"row mt-2"
>
<div
class =
"row mt-2"
>
...
@@ -48,6 +50,9 @@
...
@@ -48,6 +50,9 @@
</div>
</div>
</form>
</form>
</div>
</div>
<div
class=
"row"
>
<label
id=
"lblentries"
></label>
</div>
<table
class=
"table table-responsive table-striped table-bordered"
id=
"tblPhoneGrid"
>
<table
class=
"table table-responsive table-striped table-bordered"
id=
"tblPhoneGrid"
>
<thead
class=
"thead-dark"
>
<thead
class=
"thead-dark"
>
<tr>
<tr>
...
@@ -59,6 +64,8 @@
...
@@ -59,6 +64,8 @@
<th
scope=
"col"
>
Proof Date
</th>
<th
scope=
"col"
>
Proof Date
</th>
<th
scope=
"col"
>
Art Due
</th>
<th
scope=
"col"
>
Art Due
</th>
<th
scope=
"col"
>
Art Done
</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 Due
</th>
<th
scope=
"col"
>
Mount Done
</th>
<th
scope=
"col"
>
Mount Done
</th>
<th
scope=
"col"
>
Ship Due
</th>
<th
scope=
"col"
>
Ship Due
</th>
...
@@ -72,7 +79,7 @@
...
@@ -72,7 +79,7 @@
<!-- Rows will be added dynamically via Delphi code -->
<!-- Rows will be added dynamically via Delphi code -->
</tbody>
</tbody>
</table>
</table>
<label
id=
"lblentries"
></label>
<label
id=
"lblentries
2
"
></label>
<nav
aria-label=
"Page navigation"
>
<nav
aria-label=
"Page navigation"
>
<ul
class=
"pagination justify-content-center"
id=
"pagination"
>
<ul
class=
"pagination justify-content-center"
id=
"pagination"
>
<!-- Pagination items will be added dynamically via Delphi code -->
<!-- Pagination items will be added dynamically via Delphi code -->
...
...
kgOrdersClient/View.Orders.pas
View file @
0b8080eb
This diff is collapsed.
Click to expand it.
kgOrdersServer/Source/Lookup.Service.pas
View file @
0b8080eb
...
@@ -65,6 +65,8 @@ type
...
@@ -65,6 +65,8 @@ type
proofDone
:
string
;
proofDone
:
string
;
artDue
:
string
;
artDue
:
string
;
artDone
:
string
;
artDone
:
string
;
plateDue
:
string
;
plateDone
:
string
;
mountDue
:
string
;
mountDue
:
string
;
mountDone
:
string
;
mountDone
:
string
;
shipDue
:
string
;
shipDue
:
string
;
...
...
kgOrdersServer/Source/Lookup.ServiceImpl.pas
View file @
0b8080eb
...
@@ -371,7 +371,7 @@ begin
...
@@ -371,7 +371,7 @@ begin
' AND '
+
quotedStr
(
startDate
)
+
' <= oss.STATUS_DATE AND '
+
' AND '
+
quotedStr
(
startDate
)
+
' <= oss.STATUS_DATE AND '
+
quotedStr
(
endDate
)
+
' >= oss.STATUS_DATE'
;
quotedStr
(
endDate
)
+
' >= oss.STATUS_DATE'
;
SQL
:=
SQL
+
'o.PRICE, qb.QB_REF_NUM '
+
whereSQL
+
' ORDER BY '
+
filterType
+
'_DUE DESC
'
;
SQL
:=
SQL
+
'o.PRICE, qb.QB_REF_NUM '
+
whereSQL
+
' ORDER BY '
+
filterType
+
'_DUE DESC
LIMIT '
+
limit
+
' OFFSET '
+
offset
;
end
end
else
else
begin
begin
...
@@ -399,6 +399,8 @@ begin
...
@@ -399,6 +399,8 @@ begin
order
.
proofDone
:=
ordersDB
.
UniQuery1
.
FieldByName
(
'PROOF_DONE'
).
AsString
;
order
.
proofDone
:=
ordersDB
.
UniQuery1
.
FieldByName
(
'PROOF_DONE'
).
AsString
;
order
.
artDue
:=
ordersDB
.
UniQuery1
.
FieldByName
(
'ART_DUE'
).
AsString
;
order
.
artDue
:=
ordersDB
.
UniQuery1
.
FieldByName
(
'ART_DUE'
).
AsString
;
order
.
artDone
:=
ordersDB
.
UniQuery1
.
FieldByName
(
'ART_DONE'
).
AsString
;
order
.
artDone
:=
ordersDB
.
UniQuery1
.
FieldByName
(
'ART_DONE'
).
AsString
;
order
.
plateDue
:=
ordersDB
.
UniQuery1
.
FieldByName
(
'PLATE_DUE'
).
AsString
;
order
.
plateDone
:=
ordersDB
.
UniQuery1
.
FieldByName
(
'PLATE_DONE'
).
AsString
;
order
.
mountDue
:=
ordersDB
.
UniQuery1
.
FieldByName
(
'MOUNT_DUE'
).
AsString
;
order
.
mountDue
:=
ordersDB
.
UniQuery1
.
FieldByName
(
'MOUNT_DUE'
).
AsString
;
order
.
mountDone
:=
ordersDB
.
UniQuery1
.
FieldByName
(
'MOUNT_DONE'
).
AsString
;
order
.
mountDone
:=
ordersDB
.
UniQuery1
.
FieldByName
(
'MOUNT_DONE'
).
AsString
;
order
.
shipDue
:=
ordersDB
.
UniQuery1
.
FieldByName
(
'SHIP_DUE'
).
AsString
;
order
.
shipDue
:=
ordersDB
.
UniQuery1
.
FieldByName
(
'SHIP_DUE'
).
AsString
;
...
...
kgOrdersServer/kgOrdersServer.ini
View file @
0b8080eb
[Options]
[Options]
LogFileNum
=
1
29
LogFileNum
=
1
34
UpdateTimerLength
=
0
UpdateTimerLength
=
0
...
...
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