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
b6149d62
Commit
b6149d62
authored
Jun 25, 2025
by
emsys
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed issue where empty values weren't able to be added to the database
parent
8a90f791
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
8 deletions
+22
-8
View.OrderEntryCorrugated.dfm
kgOrdersClient/View.OrderEntryCorrugated.dfm
+1
-0
View.OrderEntryCorrugated.pas
kgOrdersClient/View.OrderEntryCorrugated.pas
+14
-2
webKGOrders.dproj
kgOrdersClient/webKGOrders.dproj
+1
-0
Lookup.ServiceImpl.pas
kgOrdersServer/Source/Lookup.ServiceImpl.pas
+3
-3
kgOrdersServer.ini
kgOrdersServer/kgOrdersServer.ini
+3
-3
No files found.
kgOrdersClient/View.OrderEntryCorrugated.dfm
View file @
b6149d62
...
@@ -350,6 +350,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
...
@@ -350,6 +350,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
HeightPercent = 100.000000000000000000
HeightPercent = 100.000000000000000000
HideSelection = False
HideSelection = False
WidthPercent = 100.000000000000000000
WidthPercent = 100.000000000000000000
OnChange = edtJobNameChange
DataField = 'staff_fields_job_name'
DataField = 'staff_fields_job_name'
DataSource = WebDataSource1
DataSource = WebDataSource1
end
end
...
...
kgOrdersClient/View.OrderEntryCorrugated.pas
View file @
b6149d62
...
@@ -236,6 +236,7 @@ type
...
@@ -236,6 +236,7 @@ type
procedure
WebButton2Click
(
Sender
:
TObject
);
procedure
WebButton2Click
(
Sender
:
TObject
);
procedure
ShowAddAddressForm
();
procedure
ShowAddAddressForm
();
[
async
]
procedure
SendAddressToServer
(
AddressJSON
:
TJSONObject
);
[
async
]
procedure
SendAddressToServer
(
AddressJSON
:
TJSONObject
);
procedure
edtJobNameChange
(
Sender
:
TObject
);
private
private
FModalAction
:
string
;
FModalAction
:
string
;
FAgencyCode
:
string
;
FAgencyCode
:
string
;
...
@@ -380,7 +381,11 @@ begin
...
@@ -380,7 +381,11 @@ begin
if
Field
is
TStringField
then
if
Field
is
TStringField
then
begin
begin
if
Field
.
AsString
=
''
then
if
Field
.
AsString
=
''
then
orderJSON
.
AddPair
(
Field
.
FieldName
,
''
)
begin
orderJSON
.
AddPair
(
Field
.
FieldName
,
''
);
console
.
log
(
Field
.
FieldName
);
console
.
log
(
Field
.
AsString
);
end
else
else
orderJSON
.
AddPair
(
Field
.
FieldName
,
Field
.
AsString
);
// Add all other fields
orderJSON
.
AddPair
(
Field
.
FieldName
,
Field
.
AsString
);
// Add all other fields
end
end
...
@@ -577,6 +582,7 @@ var
...
@@ -577,6 +582,7 @@ var
Response
:
TXDataClientResponse
;
Response
:
TXDataClientResponse
;
jsObj
:
TJSObject
;
jsObj
:
TJSObject
;
begin
begin
console
.
log
(
orderJSON
);
Response
:=
await
(
XDataWebClient1
.
RawInvokeAsync
(
'ILookupService.AddCorrugatedOrder'
,
Response
:=
await
(
XDataWebClient1
.
RawInvokeAsync
(
'ILookupService.AddCorrugatedOrder'
,
[
orderJSON
.
ToString
]));
[
orderJSON
.
ToString
]));
jsObj
:=
JS
.
TJSObject
(
Response
.
Result
);
jsObj
:=
JS
.
TJSObject
(
Response
.
Result
);
...
@@ -584,7 +590,6 @@ begin
...
@@ -584,7 +590,6 @@ begin
OrderID
:=
String
(
jsObj
.
Properties
[
'OrderID'
]);
OrderID
:=
String
(
jsObj
.
Properties
[
'OrderID'
]);
edtOrderNum
.
Text
:=
OrderID
;
edtOrderNum
.
Text
:=
OrderID
;
mode
:=
'EDIT'
;
mode
:=
'EDIT'
;
console
.
log
(
jsObj
);
ShowToast
(
string
(
jsObj
.
Properties
[
'status'
]));
ShowToast
(
string
(
jsObj
.
Properties
[
'status'
]));
end
;
end
;
...
@@ -1019,6 +1024,7 @@ begin
...
@@ -1019,6 +1024,7 @@ begin
XDataWebDataSet1
.
Close
;
XDataWebDataSet1
.
Close
;
XDataWebDataSet1
.
SetJsonData
(
customer
);
XDataWebDataSet1
.
SetJsonData
(
customer
);
XDataWebDataSet1
.
Open
;
XDataWebDataSet1
.
Open
;
XDataWebDataSet1
.
Edit
;
xdwdsShipTo
.
Close
;
xdwdsShipTo
.
Close
;
xdwdsShipTo
.
SetJSONData
(
customer
[
'ADDRESS_LIST'
]);
xdwdsShipTo
.
SetJSONData
(
customer
[
'ADDRESS_LIST'
]);
...
@@ -1109,6 +1115,12 @@ begin
...
@@ -1109,6 +1115,12 @@ begin
btnAdd
.
Enabled
:=
false
;
btnAdd
.
Enabled
:=
false
;
end
;
end
;
procedure
TFOrderEntryCorrugated
.
edtJobNameChange
(
Sender
:
TObject
);
begin
EditMode
();
console
.
log
(
'onChange'
);
end
;
procedure
TFOrderEntryCorrugated
.
dtpApprovedDateChange
(
Sender
:
TObject
);
procedure
TFOrderEntryCorrugated
.
dtpApprovedDateChange
(
Sender
:
TObject
);
begin
begin
EditMode
();
EditMode
();
...
...
kgOrdersClient/webKGOrders.dproj
View file @
b6149d62
...
@@ -101,6 +101,7 @@
...
@@ -101,6 +101,7 @@
<TMSWebSingleInstance>1</TMSWebSingleInstance>
<TMSWebSingleInstance>1</TMSWebSingleInstance>
<TMSUseJSDebugger>2</TMSUseJSDebugger>
<TMSUseJSDebugger>2</TMSUseJSDebugger>
<VerInfo_Release>5</VerInfo_Release>
<VerInfo_Release>5</VerInfo_Release>
<TMSWebBrowser>3</TMSWebBrowser>
</PropertyGroup>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2)'!=''">
<PropertyGroup Condition="'$(Cfg_2)'!=''">
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
...
...
kgOrdersServer/Source/Lookup.ServiceImpl.pas
View file @
b6149d62
...
@@ -1666,7 +1666,7 @@ begin
...
@@ -1666,7 +1666,7 @@ begin
else
else
TDateTimeField
(
Field
).
AsDateTime
:=
StrToDate
(
Pair
.
JsonValue
.
Value
);
TDateTimeField
(
Field
).
AsDateTime
:=
StrToDate
(
Pair
.
JsonValue
.
Value
);
end
end
else
if
Pair
.
JsonValue
.
Value
<>
''
then
else
Field
.
AsString
:=
Pair
.
JsonValue
.
Value
;
Field
.
AsString
:=
Pair
.
JsonValue
.
Value
;
end
;
end
;
end
;
end
;
...
@@ -2105,7 +2105,7 @@ begin
...
@@ -2105,7 +2105,7 @@ begin
else
else
TDateTimeField
(
Field
).
AsDateTime
:=
StrToDate
(
Pair
.
JsonValue
.
Value
);
TDateTimeField
(
Field
).
AsDateTime
:=
StrToDate
(
Pair
.
JsonValue
.
Value
);
end
end
else
if
Pair
.
JsonValue
.
Value
<>
''
then
else
Field
.
AsString
:=
Pair
.
JsonValue
.
Value
;
Field
.
AsString
:=
Pair
.
JsonValue
.
Value
;
end
;
end
;
end
;
end
;
...
@@ -2200,7 +2200,7 @@ begin
...
@@ -2200,7 +2200,7 @@ begin
else
else
TDateTimeField
(
Field
).
AsDateTime
:=
StrToDate
(
Pair
.
JsonValue
.
Value
);
TDateTimeField
(
Field
).
AsDateTime
:=
StrToDate
(
Pair
.
JsonValue
.
Value
);
end
end
else
if
Pair
.
JsonValue
.
Value
<>
''
then
else
Field
.
AsString
:=
Pair
.
JsonValue
.
Value
;
Field
.
AsString
:=
Pair
.
JsonValue
.
Value
;
end
;
end
;
end
;
end
;
...
...
kgOrdersServer/kgOrdersServer.ini
View file @
b6149d62
...
@@ -2,11 +2,11 @@
...
@@ -2,11 +2,11 @@
MemoLogLevel
=
3
MemoLogLevel
=
3
FileLogLevel
=
5
FileLogLevel
=
5
webClientVersion
=
0.9.6
webClientVersion
=
0.9.6
LogFileNum
=
7
43
LogFileNum
=
7
56
[Database]
[Database]
--Server
=
192.168.159.13
1
Server
=
192.168.159.15
1
Server
=
192.168.102.130
--
Server
=
192.168.102.130
--Server
=
192.168.75.133
--Server
=
192.168.75.133
Database
=
kg_order_entry
Database
=
kg_order_entry
Username
=
root
Username
=
root
...
...
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