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
8419ad94
Commit
8419ad94
authored
7 months ago
by
cam
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed minor bugs and added company name to table
parent
f47d5190
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
4 deletions
+6
-4
View.Calls.pas
kgOrdersClient/View.Calls.pas
+3
-1
Lookup.ServiceImpl.pas
kgOrdersServer/Source/Lookup.ServiceImpl.pas
+2
-2
kgOrdersServer.ini
kgOrdersServer/kgOrdersServer.ini
+1
-1
No files found.
kgOrdersClient/View.Calls.pas
View file @
8419ad94
...
...
@@ -396,6 +396,7 @@ begin
asm
startSpinner
();
end
;
console
.
log
(
PageNumber
);
xdcResponse
:=
await
(
XDataWebClient1
.
RawInvokeAsync
(
'ILookupService.GetOrders'
,
[
searchOptions
]));
orderList
:=
TJSObject
(
xdcResponse
.
Result
);
...
...
@@ -416,6 +417,7 @@ begin
console.log(XDataWebDataSet1proofDue.Value);
console.log(XDataWebDataSet1ID.Value);}
AddRowToTable
(
tempString
);
XDataWebDataSet1
.
Next
;
end
;
TotalPages
:=
(
callListLength
+
PageSize
-
1
)
div
PageSize
;
if
(
PageNumber
*
PageSize
)
<
callListLength
then
...
...
@@ -498,7 +500,7 @@ function TFViewCalls.GenerateSearchOptions(): string;
var
searchOptions
:
string
;
begin
PageNumber
:=
1
;
//
PageNumber := 1;
PageSize
:=
StrToInt
(
wcbPageSize
.
Text
);
OrderBy
:=
wcbSortBy
.
Text
;
searchOptions
:=
'&pagenumber='
+
IntToStr
(
PageNumber
)
+
...
...
kgOrdersServer/Source/Lookup.ServiceImpl.pas
View file @
8419ad94
...
...
@@ -226,7 +226,7 @@ begin
offset
:=
IntToStr
((
PageNum
-
1
)
*
PageSize
);
limit
:=
IntToStr
(
PageSize
);
SQL
:=
'select * from web_plate_orders '
+
'limit '
+
limit
+
' offset '
+
offset
;
SQL
:=
'select * from web_plate_orders
inner join customers on web_plate_orders.COMPANY_ID = customers.CUSTOMER_ID
'
+
'limit '
+
limit
+
' offset '
+
offset
;
doQuery
(
callsDB
.
UniQuery1
,
SQL
);
...
...
@@ -240,7 +240,7 @@ begin
TXDataOperationContext
.
Current
.
Handler
.
ManagedObjects
.
Add
(
Order
);
Result
.
data
.
Add
(
Order
);
order
.
ID
:=
callsDB
.
UniQuery1
.
FieldByName
(
'ORDER_ID'
).
AsInteger
;
order
.
companyName
:=
'???'
;
order
.
companyName
:=
callsDB
.
UniQuery1
.
FieldByName
(
'NAME'
).
AsString
;
order
.
jobName
:=
callsDB
.
UniQuery1
.
FieldByName
(
'staff_fields_job_name'
).
AsString
;
order
.
orderDate
:=
callsDB
.
UniQuery1
.
FieldByName
(
'ORDER_DATE'
).
AsString
;
order
.
proofDue
:=
callsDB
.
UniQuery1
.
FieldByName
(
'staff_fields_proof_date'
).
AsString
;
...
...
kgOrdersServer/kgOrdersServer.ini
View file @
8419ad94
[Options]
LogFileNum
=
46
LogFileNum
=
51
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