Skip to content

K
KGOrders
Commit 342290a5 by Cam Hayes
Options

Commit and push to sync work with Mac

parent 5647a1d3
Showing with 234 additions and 291 deletions
kgOrdersClient/View.OrderEntryCorrugated.pas
...@@ -403,10 +403,6 @@ begin ...@@ -403,10 +403,6 @@ begin
if mode = 'EDIT' then if mode = 'EDIT' then
orderJSON.AddPair('ORDER_ID', orderID); orderJSON.AddPair('ORDER_ID', orderID);
if mode = 'ADD' then
ShowNotification('Success:Order Added Successfully!')
else
ShowNotification('Success:Order Edited Successfully');
AddCorrugatedOrder(orderJSON); AddCorrugatedOrder(orderJSON);
end; end;
...@@ -499,16 +495,9 @@ begin ...@@ -499,16 +495,9 @@ begin
document.getElementById('btn_confirm_cancel').innerText := 'Cancel'; document.getElementById('btn_confirm_cancel').innerText := 'Cancel';
document.getElementById('btn_confirm_delete').innerText := 'Delete'; document.getElementById('btn_confirm_delete').innerText := 'Delete';
asm asm
var modal = document.getElementById('confirmation_modal'); var confirmationModal = new bootstrap.Modal(document.getElementById('confirmation_modal'), {
// ensure the modal lives directly under <body> keyboard: false });
if (modal && modal.parentNode !== document.body) { confirmationModal.show();
document.body.appendChild(modal);
}
var bsModal = new bootstrap.Modal(modal, {
keyboard: false
});
bsModal.show();
end; end;
end; end;
...@@ -587,6 +576,9 @@ begin ...@@ -587,6 +576,9 @@ begin
if mode = 'ADD' then if mode = 'ADD' then
OrderID := String(jsObj.Properties['OrderID']); OrderID := String(jsObj.Properties['OrderID']);
mode := 'EDIT'; mode := 'EDIT';
console.log(jsObj);
ShowNotification(string(jsObj.Properties['status']));
end; end;
procedure TFOrderEntryCorrugated.DelOrder(); procedure TFOrderEntryCorrugated.DelOrder();
...@@ -781,20 +773,14 @@ end; ...@@ -781,20 +773,14 @@ end;
procedure TFOrderEntryCorrugated.btnCancelClick(Sender: TObject); procedure TFOrderEntryCorrugated.btnCancelClick(Sender: TObject);
begin begin
console.log('click');
document.getElementById('modal_body').innerHTML := 'Are you sure you want to cancel all changes?'; document.getElementById('modal_body').innerHTML := 'Are you sure you want to cancel all changes?';
document.getElementById('btn_confirm_cancel').innerText := 'No'; document.getElementById('btn_confirm_cancel').innerText := 'No';
document.getElementById('btn_confirm_delete').innerText := 'Yes'; document.getElementById('btn_confirm_delete').innerText := 'Yes';
asm asm
var modal = document.getElementById('confirmation_modal'); var confirmationModal = new bootstrap.Modal(document.getElementById('confirmation_modal'), {
// ensure the modal is directly under <body> keyboard: false });
if (modal && modal.parentNode !== document.body) { confirmationModal.show();
document.body.appendChild(modal);
}
var bsModal = new bootstrap.Modal(modal, {
keyboard: false
});
bsModal.show();
end; end;
end; end;
......
kgOrdersClient/View.OrderEntryCuttingDie.pas
...@@ -328,17 +328,13 @@ end; ...@@ -328,17 +328,13 @@ end;
procedure TFOrderEntryCuttingDie.btnDeleteClick(Sender: TObject); procedure TFOrderEntryCuttingDie.btnDeleteClick(Sender: TObject);
begin begin
document.getElementById('modal_body').innerHTML := 'Are you sure you want to delete this order?';
document.getElementById('btn_confirm_cancel').innerText := 'Cancel';
document.getElementById('btn_confirm_delete').innerText := 'Delete';
asm asm
var modal = document.getElementById('confirmation_modal'); var confirmationModal = new bootstrap.Modal(document.getElementById('confirmation_modal'), {
// ensure the modal is directly under <body> keyboard: false });
if (modal && modal.parentNode !== document.body) { confirmationModal.show();
document.body.appendChild(modal);
}
var bsModal = new bootstrap.Modal(modal, {
keyboard: false
});
bsModal.show();
end; end;
end; end;
procedure TFOrderEntryCuttingDie.btnEditClick(Sender: TObject); procedure TFOrderEntryCuttingDie.btnEditClick(Sender: TObject);
...@@ -484,20 +480,13 @@ end; ...@@ -484,20 +480,13 @@ end;
procedure TFOrderEntryCuttingDie.btnCancelClick(Sender: TObject); procedure TFOrderEntryCuttingDie.btnCancelClick(Sender: TObject);
begin begin
document.getElementById('modal_body').innerHTML := 'Are you sure you want to cancel all changes?'; document.getElementById('modal_body').innerHTML := 'Are you sure you want to cancel all changes to the customer?';
document.getElementById('btn_confirm_cancel').innerText := 'No'; document.getElementById('btn_confirm_cancel').innerText := 'No';
document.getElementById('btn_confirm_delete').innerText := 'Yes'; document.getElementById('btn_confirm_delete').innerText := 'Yes';
asm asm
var modal = document.getElementById('confirmation_modal'); var confirmationModal = new bootstrap.Modal(document.getElementById('confirmation_modal'), {
// ensure the modal is directly under <body> keyboard: false });
if (modal && modal.parentNode !== document.body) { confirmationModal.show();
document.body.appendChild(modal);
}
var bsModal = new bootstrap.Modal(modal, {
keyboard: false
});
bsModal.show();
end; end;
end; end;
......
kgOrdersClient/View.OrderEntryWeb.pas
...@@ -418,17 +418,13 @@ end; ...@@ -418,17 +418,13 @@ end;
procedure TFOrderEntryWeb.btnDeleteClick(Sender: TObject); procedure TFOrderEntryWeb.btnDeleteClick(Sender: TObject);
begin begin
document.getElementById('modal_body').innerHTML := 'Are you sure you want to delete this order?';
document.getElementById('btn_confirm_cancel').innerText := 'Cancel';
document.getElementById('btn_confirm_delete').innerText := 'Delete';
asm asm
var modal = document.getElementById('confirmation_modal'); var confirmationModal = new bootstrap.Modal(document.getElementById('confirmation_modal'), {
// ensure the modal is directly under <body> keyboard: false });
if (modal && modal.parentNode !== document.body) { confirmationModal.show();
document.body.appendChild(modal);
}
var bsModal = new bootstrap.Modal(modal, {
keyboard: false
});
bsModal.show();
end; end;
end; end;
...@@ -741,20 +737,13 @@ end; ...@@ -741,20 +737,13 @@ end;
procedure TFOrderEntryWeb.btnCancelClick(Sender: TObject); procedure TFOrderEntryWeb.btnCancelClick(Sender: TObject);
begin begin
document.getElementById('modal_body').innerHTML := 'Are you sure you want to cancel all changes?'; document.getElementById('modal_body').innerHTML := 'Are you sure you want to cancel all changes to the customer?';
document.getElementById('btn_confirm_cancel').innerText := 'No'; document.getElementById('btn_confirm_cancel').innerText := 'No';
document.getElementById('btn_confirm_delete').innerText := 'Yes'; document.getElementById('btn_confirm_delete').innerText := 'Yes';
asm asm
var modal = document.getElementById('confirmation_modal'); var confirmationModal = new bootstrap.Modal(document.getElementById('confirmation_modal'), {
// ensure the modal is directly under <body> keyboard: false });
if (modal && modal.parentNode !== document.body) { confirmationModal.show();
document.body.appendChild(modal);
}
var bsModal = new bootstrap.Modal(modal, {
keyboard: false
});
bsModal.show();
end; end;
end; end;
......
kgOrdersClient/View.SelectCustomer.pas
...@@ -100,7 +100,6 @@ begin ...@@ -100,7 +100,6 @@ begin
// Fetch data from XData service // Fetch data from XData service
xdcResponse := await(XDataWebClient1.RawInvokeAsync('ILookupService.getQBCustomers', [])); xdcResponse := await(XDataWebClient1.RawInvokeAsync('ILookupService.getQBCustomers', []));
customerList := TJSObject(xdcResponse.Result); customerList := TJSObject(xdcResponse.Result);
//console.log(customerList);
// Load data into TXDataWebDataset // Load data into TXDataWebDataset
......
kgOrdersServer/Source/Lookup.ServiceImpl.pas
...@@ -1527,7 +1527,7 @@ var ...@@ -1527,7 +1527,7 @@ var
DateFormat: TFormatSettings; DateFormat: TFormatSettings;
ORDER_ID: integer; ORDER_ID: integer;
mode: string; mode: string;
temp: string; msg: string;
begin begin
DateFormat := TFormatSettings.Create; DateFormat := TFormatSettings.Create;
DateFormat.ShortDateFormat := 'yyyy-mm-dd'; DateFormat.ShortDateFormat := 'yyyy-mm-dd';
...@@ -1581,26 +1581,27 @@ begin ...@@ -1581,26 +1581,27 @@ begin
// Post the record to the database // Post the record to the database
ordersDB.UniQuery1.Post; ordersDB.UniQuery1.Post;
temp := JSONData.GetValue<string>('staff_fields_proof_date');
if ( JSONData.GetValue<string>('staff_fields_proof_date') <> '' ) and ( JSONData.GetValue<string>('staff_fields_proof_date') <> '12/30/1899' ) then if ( JSONData.GetValue<string>('staff_fields_proof_date') <> '' ) and ( JSONData.GetValue<string>('staff_fields_proof_date') <> '12/30/1899' ) then
AddStatusSchedule('PROOF', JSONData, ORDER_ID); AddStatusSchedule('PROOF', JSONData, ORDER_ID);
temp := JSONData.GetValue<string>('staff_fields_ship_date');
if ( JSONData.GetValue<string>('staff_fields_ship_date') <> '' ) and ( JSONData.GetValue<string>('staff_fields_ship_date') <> '12/30/1899' ) then if ( JSONData.GetValue<string>('staff_fields_ship_date') <> '' ) and ( JSONData.GetValue<string>('staff_fields_ship_date') <> '12/30/1899' ) then
AddStatusSchedule('SHIP', JSONData, ORDER_ID); AddStatusSchedule('SHIP', JSONData, ORDER_ID);
temp := JSONData.GetValue<string>('staff_fields_art_due');
if ( JSONData.GetValue<string>('staff_fields_art_due') <> '' ) and ( JSONData.GetValue<string>('staff_fields_art_due') <> '12/30/1899' ) then if ( JSONData.GetValue<string>('staff_fields_art_due') <> '' ) and ( JSONData.GetValue<string>('staff_fields_art_due') <> '12/30/1899' ) then
AddStatusSchedule('ART', JSONData, ORDER_ID); AddStatusSchedule('ART', JSONData, ORDER_ID);
temp := JSONData.GetValue<string>('staff_fields_plate_due');
if ( JSONData.GetValue<string>('staff_fields_plate_due') <> '' ) and ( JSONData.GetValue<string>('staff_fields_plate_due') <> '12/30/1899' ) then if ( JSONData.GetValue<string>('staff_fields_plate_due') <> '' ) and ( JSONData.GetValue<string>('staff_fields_plate_due') <> '12/30/1899' ) then
AddStatusSchedule('PLATE', JSONData, ORDER_ID); AddStatusSchedule('PLATE', JSONData, ORDER_ID);
temp := JSONData.GetValue<string>('staff_fields_mount_due');
if ( JSONData.GetValue<string>('staff_fields_mount_due') <> '' ) and ( JSONData.GetValue<string>('staff_fields_mount_due') <> '12/30/1899' ) then if ( JSONData.GetValue<string>('staff_fields_mount_due') <> '' ) and ( JSONData.GetValue<string>('staff_fields_mount_due') <> '12/30/1899' ) then
AddStatusSchedule('MOUNT', JSONData, ORDER_ID); AddStatusSchedule('MOUNT', JSONData, ORDER_ID);
addToRevisionsTable(intToStr(ORDER_ID), 'corrugated_plate_orders_revisions', JSONData); addToRevisionsTable(intToStr(ORDER_ID), 'corrugated_plate_orders_revisions', JSONData);
Result := TJSONObject.Create.AddPair('status', 'success'); if mode = 'ADD' then
msg := 'Success:Customer Successfully Added'
else
msg := 'Success:Customer Successfully Edited';
Result := TJSONObject.Create.AddPair('status', msg);
Result.AddPair('OrderID', ORDER_ID); Result.AddPair('OrderID', ORDER_ID);
TXDataOperationContext.Current.Handler.ManagedObjects.Add(Result); TXDataOperationContext.Current.Handler.ManagedObjects.Add(Result);
except except
on E: Exception do on E: Exception do
...@@ -1953,7 +1954,7 @@ var ...@@ -1953,7 +1954,7 @@ var
CurrDate: TDateTime; CurrDate: TDateTime;
ORDER_ID: integer; ORDER_ID: integer;
mode: string; mode: string;
temp: string; msg: string;
begin begin
DateFormat := TFormatSettings.Create; DateFormat := TFormatSettings.Create;
DateFormat.ShortDateFormat := 'yyyy-mm-dd'; DateFormat.ShortDateFormat := 'yyyy-mm-dd';
...@@ -2020,7 +2021,12 @@ begin ...@@ -2020,7 +2021,12 @@ begin
AddToRevisionsTable(IntToStr(ORDER_ID), 'web_plate_orders_revisions', JSONData); AddToRevisionsTable(IntToStr(ORDER_ID), 'web_plate_orders_revisions', JSONData);
Result := TJSONObject.Create.AddPair('status', 'success'); if mode = 'ADD' then
msg := 'Success:Customer Successfully Added'
else
msg := 'Success:Customer Successfully Edited';
Result := TJSONObject.Create.AddPair('status', msg);
Result.AddPair('OrderID', ORDER_ID); Result.AddPair('OrderID', ORDER_ID);
TXDataOperationContext.Current.Handler.ManagedObjects.Add(Result); TXDataOperationContext.Current.Handler.ManagedObjects.Add(Result);
except except
...@@ -2041,7 +2047,7 @@ var ...@@ -2041,7 +2047,7 @@ var
CurrDate: TDateTime; CurrDate: TDateTime;
ORDER_ID: integer; ORDER_ID: integer;
mode: string; mode: string;
temp: string; msg: string;
begin begin
DateFormat := TFormatSettings.Create; DateFormat := TFormatSettings.Create;
DateFormat.ShortDateFormat := 'yyyy-mm-dd'; DateFormat.ShortDateFormat := 'yyyy-mm-dd';
...@@ -2104,7 +2110,12 @@ begin ...@@ -2104,7 +2110,12 @@ begin
AddToRevisionsTable(IntToStr(ORDER_ID), 'cutting_die_orders_revisions', JSONData); AddToRevisionsTable(IntToStr(ORDER_ID), 'cutting_die_orders_revisions', JSONData);
Result := TJSONObject.Create.AddPair('status', 'success'); if mode = 'ADD' then
msg := 'Success:Customer Successfully Added'
else
msg := 'Success:Customer Successfully Edited';
Result := TJSONObject.Create.AddPair('status', msg);
Result.AddPair('OrderID', ORDER_ID); Result.AddPair('OrderID', ORDER_ID);
TXDataOperationContext.Current.Handler.ManagedObjects.Add(Result); TXDataOperationContext.Current.Handler.ManagedObjects.Add(Result);
except except
......
kgOrdersServer/Source/qbAPI.dfm
...@@ -13,6 +13,24 @@ object fQB: TfQB ...@@ -13,6 +13,24 @@ object fQB: TfQB
OnCreate = FormCreate OnCreate = FormCreate
OnDestroy = FormDestroy OnDestroy = FormDestroy
TextHeight = 15 TextHeight = 15
object Splitter1: TSplitter
Left = 0
Top = 472
Width = 982
Height = 6
Cursor = crVSplit
Align = alBottom
end
object Splitter2: TSplitter
Left = 0
Top = 281
Width = 982
Height = 3
Cursor = crVSplit
Align = alBottom
ExplicitTop = 0
ExplicitWidth = 284
end
object Button2: TButton object Button2: TButton
Left = 4 Left = 4
Top = 32 Top = 32
...@@ -22,17 +40,94 @@ object fQB: TfQB ...@@ -22,17 +40,94 @@ object fQB: TfQB
TabOrder = 0 TabOrder = 0
OnClick = Button2Click OnClick = Button2Click
end end
object asgData: TAdvStringGrid object Button3: TButton
Left = 121
Top = 5
Width = 139
Height = 25
Caption = 'Get Customer By ID'
TabOrder = 1
OnClick = Button3Click
end
object Button4: TButton
Left = 266
Top = 5
Width = 95
Height = 25
Caption = 'Add Estimate'
TabOrder = 2
OnClick = Button4Click
end
object Button5: TButton
Left = 367
Top = 5
Width = 169
Height = 25
Caption = 'Show Customers with Orders'
TabOrder = 3
OnClick = Button5Click
end
object Memo1: TMemo
Left = 0 Left = 0
Top = 482 Top = 53
Width = 982 Width = 982
Height = 179 Height = 228
Align = alBottom Align = alBottom
Lines.Strings = (
'')
ScrollBars = ssVertical
TabOrder = 4
ExplicitTop = 56
end
object Button6: TButton
Left = 538
Top = 5
Width = 108
Height = 25
Caption = 'Match Customers'
TabOrder = 5
OnClick = Button6Click
end
object Button7: TButton
Left = 652
Top = 5
Width = 186
Height = 25
Caption = 'Show Customers without Orders'
TabOrder = 6
OnClick = Button7Click
end
object Button1: TButton
Left = 4
Top = 5
Width = 111
Height = 25
Caption = 'Get KG Customers'
TabOrder = 7
OnClick = Button1Click
end
object Panel1: TPanel
Left = 0
Top = 478
Width = 982
Height = 183
Align = alBottom
Caption = 'Panel1'
TabOrder = 8
OnResize = Panel1Resize
ExplicitLeft = -16
ExplicitTop = 182
object asgData2: TAdvStringGrid
Left = 0
Top = 0
Width = 982
Height = 183
DrawingStyle = gdsClassic DrawingStyle = gdsClassic
FixedColor = clWhite FixedColor = clWhite
TabOrder = 1 TabOrder = 0
GridLineColor = 13948116 GridLineColor = 13948116
GridFixedLineColor = 11250603 GridFixedLineColor = 11250603
OnClickCell = asgData2ClickCell
ActiveCellFont.Charset = DEFAULT_CHARSET ActiveCellFont.Charset = DEFAULT_CHARSET
ActiveCellFont.Color = 4474440 ActiveCellFont.Color = 4474440
ActiveCellFont.Height = -12 ActiveCellFont.Height = -12
...@@ -148,9 +243,6 @@ object fQB: TfQB ...@@ -148,9 +243,6 @@ object fQB: TfQB
SortSettings.HeaderMirrorColor = clWhite SortSettings.HeaderMirrorColor = clWhite
SortSettings.HeaderMirrorColorTo = clWhite SortSettings.HeaderMirrorColorTo = clWhite
Version = '9.1.4.1' Version = '9.1.4.1'
ExplicitLeft = -40
ExplicitTop = 316
ExplicitWidth = 962
ColWidths = ( ColWidths = (
64 64
64 64
...@@ -169,57 +261,28 @@ object fQB: TfQB ...@@ -169,57 +261,28 @@ object fQB: TfQB
22 22
22) 22)
end end
object Button3: TButton
Left = 121
Top = 5
Width = 139
Height = 25
Caption = 'Get Customer By ID'
TabOrder = 2
OnClick = Button3Click
end
object Button4: TButton
Left = 266
Top = 5
Width = 95
Height = 25
Caption = 'Add Estimate'
TabOrder = 3
OnClick = Button4Click
end
object Button5: TButton
Left = 367
Top = 5
Width = 169
Height = 25
Caption = 'Show Customers with Orders'
TabOrder = 4
OnClick = Button5Click
end end
object Memo1: TMemo object Panel2: TPanel
Left = 0 Left = 0
Top = 60 Top = 284
Width = 982 Width = 982
Height = 228 Height = 188
Align = alBottom Align = alBottom
Lines.Strings = ( Caption = 'Panel2'
'') TabOrder = 9
ScrollBars = ssVertical OnResize = Panel2Resize
TabOrder = 5 object asgData: TAdvStringGrid
ExplicitWidth = 962 Left = 1
end Top = 1
object asgData2: TAdvStringGrid Width = 980
Left = 0 Height = 186
Top = 288
Width = 982
Height = 194
Align = alBottom Align = alBottom
DrawingStyle = gdsClassic DrawingStyle = gdsClassic
FixedColor = clWhite FixedColor = clWhite
TabOrder = 6 TabOrder = 0
GridLineColor = 13948116 GridLineColor = 13948116
GridFixedLineColor = 11250603 GridFixedLineColor = 11250603
OnClickCell = asgData2ClickCell OnClickCell = asgDataClickCell
ActiveCellFont.Charset = DEFAULT_CHARSET ActiveCellFont.Charset = DEFAULT_CHARSET
ActiveCellFont.Color = 4474440 ActiveCellFont.Color = 4474440
ActiveCellFont.Height = -12 ActiveCellFont.Height = -12
...@@ -230,6 +293,7 @@ object fQB: TfQB ...@@ -230,6 +293,7 @@ object fQB: TfQB
BorderColor = 11250603 BorderColor = 11250603
ControlLook.FixedGradientFrom = clWhite ControlLook.FixedGradientFrom = clWhite
ControlLook.FixedGradientTo = clWhite ControlLook.FixedGradientTo = clWhite
ControlLook.FixedGradientHoverFrom = clGray
ControlLook.FixedGradientHoverTo = clWhite ControlLook.FixedGradientHoverTo = clWhite
ControlLook.FixedGradientHoverMirrorFrom = clWhite ControlLook.FixedGradientHoverMirrorFrom = clWhite
ControlLook.FixedGradientHoverMirrorTo = clWhite ControlLook.FixedGradientHoverMirrorTo = clWhite
...@@ -334,34 +398,27 @@ object fQB: TfQB ...@@ -334,34 +398,27 @@ object fQB: TfQB
SortSettings.HeaderMirrorColor = clWhite SortSettings.HeaderMirrorColor = clWhite
SortSettings.HeaderMirrorColorTo = clWhite SortSettings.HeaderMirrorColorTo = clWhite
Version = '9.1.4.1' Version = '9.1.4.1'
ExplicitWidth = 962 ExplicitLeft = 0
end ExplicitTop = 2
object Button6: TButton ExplicitWidth = 982
Left = 538 ColWidths = (
Top = 5 64
Width = 108 64
Height = 25 64
Caption = 'Match Customers' 64
TabOrder = 7 64)
OnClick = Button6Click RowHeights = (
end 22
object Button7: TButton 22
Left = 652 22
Top = 5 22
Width = 186 22
Height = 25 22
Caption = 'Show Customers without Orders' 22
TabOrder = 8 22
OnClick = Button7Click 22
22)
end end
object Button1: TButton
Left = 4
Top = 5
Width = 111
Height = 25
Caption = 'Get KG Customers'
TabOrder = 9
OnClick = Button1Click
end end
object uq: TUniQuery object uq: TUniQuery
Connection = ApiDatabase.ucKG Connection = ApiDatabase.ucKG
......
kgOrdersServer/Source/qbAPI.pas
...@@ -17,7 +17,6 @@ uses ...@@ -17,7 +17,6 @@ uses
type type
TfQB = class(TForm) TfQB = class(TForm)
Button2: TButton; Button2: TButton;
asgData: TAdvStringGrid;
Button3: TButton; Button3: TButton;
Button4: TButton; Button4: TButton;
Button5: TButton; Button5: TButton;
...@@ -108,10 +107,15 @@ type ...@@ -108,10 +107,15 @@ type
uqupc_distortion_amount: TStringField; uqupc_distortion_amount: TStringField;
uqstaff_fields_art_location: TStringField; uqstaff_fields_art_location: TStringField;
Memo1: TMemo; Memo1: TMemo;
asgData2: TAdvStringGrid;
Button6: TButton; Button6: TButton;
Button7: TButton; Button7: TButton;
Button1: TButton; Button1: TButton;
Panel1: TPanel;
asgData2: TAdvStringGrid;
Panel2: TPanel;
Splitter1: TSplitter;
asgData: TAdvStringGrid;
Splitter2: TSplitter;
procedure Button1Click(Sender: TObject); procedure Button1Click(Sender: TObject);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
procedure Button2Click(Sender: TObject); procedure Button2Click(Sender: TObject);
...@@ -122,6 +126,9 @@ type ...@@ -122,6 +126,9 @@ type
procedure Button6Click(Sender: TObject); procedure Button6Click(Sender: TObject);
procedure Button7Click(Sender: TObject); procedure Button7Click(Sender: TObject);
procedure asgData2ClickCell(Sender: TObject; ARow, ACol: Integer); procedure asgData2ClickCell(Sender: TObject; ARow, ACol: Integer);
procedure asgDataClickCell(Sender: TObject; ARow, ACol: Integer);
procedure Panel1Resize(Sender: TObject);
procedure Panel2Resize(Sender: TObject);
private private
{ Private declarations } { Private declarations }
strict private strict private
...@@ -157,10 +164,20 @@ procedure TfQB.asgData2ClickCell(Sender: TObject; ARow, ACol: Integer); ...@@ -157,10 +164,20 @@ procedure TfQB.asgData2ClickCell(Sender: TObject; ARow, ACol: Integer);
var var
point, origin: TPoint; point, origin: TPoint;
begin begin
origin := TPoint.Create(0,0); origin := TPoint.Create(1,1);
Memo1.Lines.Add( asgData2.Cells[2, ARow]);
point := asgData.find(origin, asgData2.Cells[2, ARow], []); point := asgData.find(origin, asgData2.Cells[2, ARow], []);
asgData.Row := point.Y; asgData.Row := point.Y;
asgData.Col := point.X;
end;
procedure TfQB.asgDataClickCell(Sender: TObject; ARow, ACol: Integer);
var
point, origin: TPoint;
begin
origin := TPoint.Create(1,1);
point := asgData2.find(origin, asgData.Cells[2, ARow], []);
asgData2.Row := point.Y;
asgData2.Col := point.X;
end; end;
procedure TfQB.Button1Click(Sender: TObject); procedure TfQB.Button1Click(Sender: TObject);
...@@ -229,7 +246,6 @@ begin ...@@ -229,7 +246,6 @@ begin
f.Free; f.Free;
end; end;
procedure TfQB.Button2Click(Sender: TObject); procedure TfQB.Button2Click(Sender: TObject);
begin begin
GetCustomers(); GetCustomers();
...@@ -868,6 +884,18 @@ begin ...@@ -868,6 +884,18 @@ begin
asgData2.AutoSizeColumns(true); asgData2.AutoSizeColumns(true);
end; end;
procedure TfQB.Panel1Resize(Sender: TObject);
begin
AsgData2.Width := Panel1.ClientWidth;
AsgData2.Height := Panel1.ClientHeight;
end;
procedure TfQB.Panel2Resize(Sender: TObject);
begin
AsgData.Width := Panel2.ClientWidth;
AsgData.Height := Panel2.ClientHeight;
end;
procedure tfQB.findMatches(CustomerList: TJSONArray; JSONfield, DBField: string); procedure tfQB.findMatches(CustomerList: TJSONArray; JSONfield, DBField: string);
var var
I: integer; I: integer;
......
kgOrdersServer/Source/rOrderCorrugated.pas
...@@ -212,7 +212,7 @@ begin ...@@ -212,7 +212,7 @@ begin
ForceDirectories(ReportDir); ForceDirectories(ReportDir);
Logger.Log(5, 'Reports directory created: ' + ReportDir); Logger.Log(5, 'Reports directory created: ' + ReportDir);
end; end;
reportURL := FormatDateTime('yyyymmdd_hhnnss', Now) + '.pdf'; reportURL := 'reports/' + FormatDateTime('yyyymmdd_hhnnss', Now) + '.pdf';
ReportFileName := reportDir + reportUrl; ReportFileName := reportDir + reportUrl;
......
kgOrdersServer/Source/rOrderList.dfm
...@@ -1168,10 +1168,6 @@ object rptOrderList: TrptOrderList ...@@ -1168,10 +1168,6 @@ object rptOrderList: TrptOrderList
Required = True Required = True
Size = 128 Size = 128
end end
object uqOrdersORDER_DATE: TDateTimeField
FieldName = 'ORDER_DATE'
Required = True
end
object uqOrdersORDER_TYPE: TStringField object uqOrdersORDER_TYPE: TStringField
FieldName = 'ORDER_TYPE' FieldName = 'ORDER_TYPE'
Required = True Required = True
...@@ -1272,6 +1268,9 @@ object rptOrderList: TrptOrderList ...@@ -1272,6 +1268,9 @@ object rptOrderList: TrptOrderList
FieldName = 'NEW_SHIP_DONE' FieldName = 'NEW_SHIP_DONE'
Calculated = True Calculated = True
end end
object uqOrdersORDER_DATE: TDateField
FieldName = 'ORDER_DATE'
end
end end
object frxDBOrders: TfrxDBDataset object frxDBOrders: TfrxDBDataset
UserName = 'frxDBOrders' UserName = 'frxDBOrders'
...@@ -1281,126 +1280,6 @@ object rptOrderList: TrptOrderList ...@@ -1281,126 +1280,6 @@ object rptOrderList: TrptOrderList
DataSetOptions = [] DataSetOptions = []
Left = 444 Left = 444
Top = 232 Top = 232
FieldDefs = <
item
FieldName = 'ORDER_ID'
end
item
FieldName = 'Loc'
FieldType = fftString
Size = 16
end
item
FieldName = 'COMPANY_NAME'
FieldType = fftString
Size = 90
end
item
FieldName = 'JOB_NAME'
FieldType = fftString
Size = 128
end
item
FieldName = 'ORDER_DATE'
FieldType = fftDateTime
end
item
FieldName = 'ORDER_TYPE'
FieldType = fftString
Size = 45
end
item
FieldName = 'PROOF_DUE'
FieldType = fftDateTime
end
item
FieldName = 'PROOF_DONE'
FieldType = fftDateTime
end
item
FieldName = 'ART_DUE'
FieldType = fftDateTime
end
item
FieldName = 'ART_DONE'
FieldType = fftDateTime
end
item
FieldName = 'PLATE_DUE'
FieldType = fftDateTime
end
item
FieldName = 'PLATE_DONE'
FieldType = fftDateTime
end
item
FieldName = 'MOUNT_DUE'
FieldType = fftDateTime
end
item
FieldName = 'MOUNT_DONE'
FieldType = fftDateTime
end
item
FieldName = 'SHIP_DUE'
FieldType = fftDateTime
end
item
FieldName = 'SHIP_DONE'
FieldType = fftDateTime
end
item
FieldName = 'PRICE'
end
item
FieldName = 'QB_REF_NUM'
FieldType = fftString
Size = 24
end
item
FieldName = 'COLORS'
FieldType = fftString
end
item
FieldName = 'po_number'
FieldType = fftString
Size = 16
end
item
FieldName = 'quickbooks_item'
FieldType = fftString
Size = 45
end
item
FieldName = 'NEW_ORDER_DATE'
FieldType = fftString
Size = 20
end
item
FieldName = 'NEW_PROOF_DONE'
FieldType = fftString
Size = 20
end
item
FieldName = 'NEW_ART_DONE'
FieldType = fftString
Size = 20
end
item
FieldName = 'NEW_PLATE_DONE'
FieldType = fftString
Size = 20
end
item
FieldName = 'NEW_MOUNT_DONE'
FieldType = fftString
Size = 20
end
item
FieldName = 'NEW_SHIP_DONE'
FieldType = fftString
Size = 20
end>
end end
object uqColors: TUniQuery object uqColors: TUniQuery
Connection = ucKG Connection = ucKG
......
kgOrdersServer/Source/rOrderList.pas
...@@ -18,7 +18,6 @@ type ...@@ -18,7 +18,6 @@ type
uqOrdersLoc: TStringField; uqOrdersLoc: TStringField;
uqOrdersCOMPANY_NAME: TStringField; uqOrdersCOMPANY_NAME: TStringField;
uqOrdersJOB_NAME: TStringField; uqOrdersJOB_NAME: TStringField;
uqOrdersORDER_DATE: TDateTimeField;
uqOrdersORDER_TYPE: TStringField; uqOrdersORDER_TYPE: TStringField;
uqOrdersPROOF_DUE: TDateField; uqOrdersPROOF_DUE: TDateField;
uqOrdersPROOF_DONE: TDateTimeField; uqOrdersPROOF_DONE: TDateTimeField;
...@@ -42,6 +41,7 @@ type ...@@ -42,6 +41,7 @@ type
uqOrdersNEW_PLATE_DONE: TStringField; uqOrdersNEW_PLATE_DONE: TStringField;
uqOrdersNEW_MOUNT_DONE: TStringField; uqOrdersNEW_MOUNT_DONE: TStringField;
uqOrdersNEW_SHIP_DONE: TStringField; uqOrdersNEW_SHIP_DONE: TStringField;
uqOrdersORDER_DATE: TDateField;
procedure DataModuleCreate(Sender: TObject); procedure DataModuleCreate(Sender: TObject);
procedure uqOrdersCalcFields(DataSet: TDataSet); procedure uqOrdersCalcFields(DataSet: TDataSet);
...@@ -125,6 +125,7 @@ var ...@@ -125,6 +125,7 @@ var
OrderID: LongWord; OrderID: LongWord;
jsonStr: string; jsonStr: string;
begin begin
OrderID := uqOrdersORDER_ID.AsInteger; OrderID := uqOrdersORDER_ID.AsInteger;
if uqOrdersORDER_TYPE.AsString = 'web_plate' then if uqOrdersORDER_TYPE.AsString = 'web_plate' then
begin begin
...@@ -147,6 +148,10 @@ begin ...@@ -147,6 +148,10 @@ begin
uqColors.Close; // Ensure it is closed uqColors.Close; // Ensure it is closed
end; end;
//uqOrdersORD.AsDateTime := uqOrdersORDER_DATE.AsDateTime;
//logger.Log(3, uqOrders.FieldByName('ORDER_DATE').AsString);
if uqOrdersORDER_DATE.AsString <> '' then if uqOrdersORDER_DATE.AsString <> '' then
uqOrdersNEW_ORDER_DATE.AsString := FormatDateTime('m/d/yyyy HH:nn', uqOrdersORDER_DATE.AsDateTime) uqOrdersNEW_ORDER_DATE.AsString := FormatDateTime('m/d/yyyy HH:nn', uqOrdersORDER_DATE.AsDateTime)
else else
......
kgOrdersServer/kgOrdersServer.ini
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
MemoLogLevel=3 MemoLogLevel=3
FileLogLevel=5 FileLogLevel=5
webClientVersion=0.9.4 webClientVersion=0.9.4
LogFileNum=661 LogFileNum=701
[Database] [Database]
--Server=192.168.159.131 Server=192.168.159.131
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
...@@ -17,6 +17,6 @@ Password=emsys01 ...@@ -17,6 +17,6 @@ Password=emsys01
CompanyID=9341454272655710 CompanyID=9341454272655710
ClientID=ABgO14uvjh8XqLud7spQ8lkb98AUpcdA7HbyMJfCAtl65sQ5yy ClientID=ABgO14uvjh8XqLud7spQ8lkb98AUpcdA7HbyMJfCAtl65sQ5yy
ClientSecret=bQ06TRemHeAGFzVHRaTUvUoBU9jpU9itK6MOMgqN ClientSecret=bQ06TRemHeAGFzVHRaTUvUoBU9jpU9itK6MOMgqN
RefreshToken=RT1-136-H0-1757775400coc1hvsehylf0uejgm7f RefreshToken=RT1-60-H0-1758811104981v5rmhboxz6ul6wqho
AccessToken=eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwieC5vcmciOiJIMCJ9..Cqnj0xScf85NYKa6g4lanA.LN1AIU3ZlnDDbIMt-J4vl8V_gvcTfynSjGKYsmbhbfBJovq5IfZU4dHt6cqDAwUfnfOm42l-OpbwN9hWrZvUGlVx8x_3MA-vdtxIOByp7neq5vL2t4XcR5svPKIkX-CqlTsTb2ylBARiXehgk3tVHBysbHcnp0Ka0Ic_Waj64wQMYvE3Z-D19gCu-Xn9WFQwDICn8HSgJmHL2huLvRX-OrcxH6uERzLcQqRLsgT7fx9j68UWDW-KL_KRnzE43ieXlxXCwiCDnaF39Ei5iPHstnh19lGMgo1Z1mlF6tVZ9-8Z1prZutpiX8rzaPzS7Wdqo8pKtYaUqQZP6AGa6ZCqWR2BlF3y-R_FtheERNpafRiXWIDW68jOOrgp8QXc1uKA0sxDMjiLE7Bd0t9QAsIzln-0WiWIXFSlLGLimMd2oxxLoR7fpQvgB851I50b4S3V-c891WA8bHfuzScmjVwp40JxofhviFXwAevLNzRYvGkvIyz4oS9d6U6K_ZWKDB3iYxEgJzkFFwnfuPybWX7iNHwnmvFfAXz61jdaL9KRJM-lCChGuaQuv8_df9z_az_sbUtXJw2I8ivEppmDEQVxv49ZwzJlb6bFbqtnhy6ILO7_ecx3G1d4Utg-BrtgvzsR.oFJV6VBShL1-cERGZEqqkw AccessToken=eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwieC5vcmciOiJIMCJ9..KXZ2aHmt3JzwsJaoKRo_BA.GUVXmUIAgHt28CVuT1CDpBWLVxzhkpXwoUhIxfUvWlSzzc5HBrtOUd7GRQtij2NciITS4W_Gsyc5J_SLNjayFfrTPuZDfFFTmfnfkCOEvzw_dWgXLshTSFX9kkLdHH7IMIuRwNsvH907ECdWMazzY0r0wuGWcU4c1EphwYXqAeorH43ONIBtl0JTbiNtCUVdptn5UCF2VgN74bO3MbfSTtQIN8lKFJgGAKsnXolpK71D4OYS2-YW9dH8XFL1K8FD5fauNWb-pn4MxwQ1Y_vOEIB_bF26IM7Pdh7uG-mQSO-ljhXWTEqYmWjK-Z9P_Igznwcqy6RIhtEu216dGpF43JIuGgHxta_yRJLGYsdWjnQbIqW6VvZ4x8jwuLGX0cCu2mKcxkjgghABol6D34lWQcov3Q32oa5ZlIkTzolOxTnlYZ-hhtQBcY-X08CfnPJ3y2Yq4FKAFiu7wBRQ5V0l1RzyPHCkGDJKNNv-yY5aTpRkPwsjdko9xgIAB4gWSyGV-PKoSURNu5jodxQkAcMMIh59y7QuKM5WytAfAtpklGfqEj-vn-d2cWY9-zWfmw0D1KVakH0da5xxdnqr5qO4a1w_b2RT6zVfNvfJRApSlMpes1DZ6Bo_K0yo5rxzUpg0.kkYUlFG-TCl21bRQWpVMaA
LastRefresh=5/28/2025 10:46:30 AM LastRefresh=6/16/2025 10:38:38 AM
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