Skip to content

K
KGOrders
Commit 702f0f4d by Cam Hayes
Options

Made changes discussed with Dave and send order ID back when adding an order

parent 3996bfbc
Showing with 351 additions and 105 deletions
kgOrdersClient/View.AddOrder.dfm
......@@ -12,7 +12,7 @@ object FAddOrder: TFAddOrder
WidthPercent = 100.000000000000000000
end
object WebLabel2: TWebLabel
Left = 482
Left = 461
Top = 56
Width = 58
Height = 15
......@@ -30,11 +30,12 @@ object FAddOrder: TFAddOrder
OnChange = edtSearchChange
end
object edtID: TWebEdit
Left = 482
Left = 461
Top = 82
Width = 69
Width = 142
Height = 22
ChildOrder = 1
Enabled = False
HeightPercent = 100.000000000000000000
WidthPercent = 100.000000000000000000
end
......@@ -59,7 +60,6 @@ object FAddOrder: TFAddOrder
Options.Mouse.ClickMargin = 0
Options.Mouse.ColumnSizeMargin = 6
Options.Mouse.RowSizeMargin = 6
OnSelectedCell = TMSFNCGrid1SelectedCell
Columns = <
item
BorderWidth = 1
......@@ -89,7 +89,7 @@ object FAddOrder: TFAddOrder
Font.Name = 'Segoe UI'
Font.Style = []
ID = ''
Width = 250.000000000000000000
Width = 200.000000000000000000
end
item
BorderWidth = 1
......@@ -104,7 +104,7 @@ object FAddOrder: TFAddOrder
Font.Name = 'Segoe UI'
Font.Style = []
ID = ''
Width = 100.000000000000000000
Width = 200.000000000000000000
end
item
BorderWidth = 1
......@@ -119,7 +119,7 @@ object FAddOrder: TFAddOrder
Font.Name = 'Segoe UI'
Font.Style = []
ID = ''
Width = 432.000000000000000000
Width = 382.000000000000000000
end
item
BorderWidth = 1
......@@ -194,6 +194,7 @@ object FAddOrder: TFAddOrder
LeftCol = 0
ScrollMode = scmItemScrolling
DesignTimeSampleData = True
OnCellClick = TMSFNCGrid1CellClick
end
object cbCorrugatedPlate: TWebCheckBox
Left = 4
......@@ -218,7 +219,7 @@ object FAddOrder: TFAddOrder
OnClick = cbWebPlateClick
end
object btnCancel: TWebButton
Left = 680
Left = 740
Top = 81
Width = 96
Height = 25
......@@ -229,7 +230,7 @@ object FAddOrder: TFAddOrder
OnClick = btnCancelClick
end
object btnConfirm: TWebButton
Left = 564
Left = 622
Top = 81
Width = 96
Height = 25
......@@ -290,9 +291,8 @@ object FAddOrder: TFAddOrder
object xdwdsCustomersSHORT_NAME: TStringField
FieldName = 'SHORT_NAME'
end
object xdwdsCustomersADDRESS: TStringField
FieldName = 'ADDRESS'
Size = 100
object xdwdsCustomersstaff_fields_invoice_to: TStringField
FieldName = 'staff_fields_invoice_to'
end
end
object wdsCustomers: TWebDataSource
......
kgOrdersClient/View.AddOrder.pas
......@@ -30,17 +30,17 @@ type
xdwdsCustomersNAME: TStringField;
xdwdsCustomersSHORT_NAME: TStringField;
wdsCustomers: TWebDataSource;
xdwdsCustomersADDRESS: TStringField;
cbCuttingDie: TWebCheckBox;
edtNotification: TWebEdit;
xdwdsCustomersstaff_fields_invoice_to: TStringField;
procedure WebFormShow(Sender: TObject);
procedure TMSFNCGrid1SelectedCell(Sender: TObject; ACol, ARow: Integer);
procedure edtSearchChange(Sender: TObject);
procedure cbCorrugatedPlateClick(Sender: TObject);
procedure cbWebPlateClick(Sender: TObject);
procedure btnConfirmClick(Sender: TObject);
procedure btnCancelClick(Sender: TObject);
procedure cbCuttingDieClick(Sender: TObject);
procedure TMSFNCGrid1CellClick(Sender: TObject; ACol, ARow: Integer);
private
[async] procedure getCustomers;
procedure PopulateGridManually;
......@@ -50,6 +50,7 @@ type
{ Public declarations }
var
confirm: boolean;
DBID: string;
end;
var
......@@ -138,8 +139,8 @@ begin
// Set up column headers
TMSFNCGrid1.ColumnCount := 4;
TMSFNCGrid1.RowCount := 1;
TMSFNCGrid1.Cells[0, 0] := 'ID';
TMSFNCGrid1.Cells[1, 0] := 'Short Name';
TMSFNCGrid1.Cells[0, 0] := 'DBID';
TMSFNCGrid1.Cells[1, 0] := 'ID';
TMSFNCGrid1.Cells[2, 0] := 'Name';
TMSFNCGrid1.Cells[3, 0] := 'Address';
......@@ -150,11 +151,10 @@ begin
while not xdwdsCustomers.EOF do
begin
TMSFNCGrid1.RowCount := RowIndex + 1;
TMSFNCGrid1.Cells[0, RowIndex] := xdwdsCustomers.FieldByName('ID').AsString;
TMSFNCGrid1.Cells[1, RowIndex] := xdwdsCustomers.FieldByName('SHORT_NAME').AsString;
TMSFNCGrid1.Cells[2, RowIndex] := xdwdsCustomers.FieldByName('NAME').AsString;
TMSFNCGrid1.Cells[3, RowIndex] := xdwdsCustomers.FieldByName('ADDRESS').AsString;
TMSFNCGrid1.Cells[3, RowIndex] := xdwdsCustomers.FieldByName('staff_fields_invoice_to').AsString;
Inc(RowIndex);
xdwdsCustomers.Next;
......@@ -167,11 +167,10 @@ end;
procedure TFAddOrder.TMSFNCGrid1SelectedCell(Sender: TObject; ACol,
ARow: Integer);
// When a cell is clicked it puts the ID in the text box
procedure TFAddOrder.TMSFNCGrid1CellClick(Sender: TObject; ACol, ARow: Integer);
begin
edtID.Text := TMSFNCGrid1.Cells[0, ARow];
edtID.Text := TMSFNCGrid1.Cells[1, ARow];
DBID := TMSFNCGrid1.Cells[0, ARow];
end;
procedure TFAddOrder.ApplyFilter;
......
kgOrdersClient/View.OrderEntryCorrugated.dfm
......@@ -104,7 +104,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
Top = 19
Width = 121
Height = 33
ElementID = 'pnl_message'
ElementID = 'view.login.message'
ChildOrder = 5
ElementPosition = epRelative
Role = 'null'
......@@ -131,6 +131,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
HeightPercent = 100.000000000000000000
Role = 'null'
WidthPercent = 100.000000000000000000
OnClick = btnCloseNotificationClick
end
end
object dtpOrderDate: TWebDateTimePicker
......@@ -142,6 +143,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
BorderStyle = bsSingle
ChildOrder = 4
Color = clWhite
Date = 45748.499176736110000000
ElementPosition = epRelative
Role = 'null'
Text = ''
......@@ -155,6 +157,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
BorderStyle = bsSingle
ChildOrder = 4
Color = clWhite
Date = 45748.499176770830000000
ElementPosition = epRelative
Role = 'null'
Text = ''
......@@ -168,6 +171,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
BorderStyle = bsSingle
ChildOrder = 4
Color = clWhite
Date = 45748.499176770830000000
ElementPosition = epRelative
Role = 'null'
Text = ''
......@@ -181,6 +185,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
BorderStyle = bsSingle
ChildOrder = 17
Color = clWhite
Date = 45748.499176770830000000
ElementPosition = epRelative
Role = 'null'
Text = ''
......@@ -194,6 +199,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
BorderStyle = bsSingle
ChildOrder = 17
Color = clWhite
Date = 45748.499176770830000000
ElementPosition = epRelative
Role = 'null'
Text = ''
......@@ -207,6 +213,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
BorderStyle = bsSingle
ChildOrder = 17
Color = clWhite
Date = 45748.499176770830000000
ElementPosition = epRelative
Role = 'null'
Text = ''
......@@ -234,6 +241,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
BorderStyle = bsSingle
ChildOrder = 72
Color = clWhite
Date = 45748.499176770830000000
ElementPosition = epRelative
Role = 'null'
Text = ''
......@@ -362,7 +370,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
object edtJobName: TWebDBEdit
Left = 26
Top = 486
Width = 121
Width = 200
Height = 22
AutoSize = True
ChildOrder = 79
......@@ -850,11 +858,11 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
DataSource = WebDataSource1
end
object btnConfirm: TWebButton
Left = 652
Left = 526
Top = 560
Width = 96
Height = 25
Caption = 'Confirm'
Caption = 'Save'
ChildOrder = 79
ElementID = 'btnconfirm'
ElementPosition = epRelative
......@@ -1129,6 +1137,41 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
WidthPercent = 100.000000000000000000
OnClick = btnPDFClick
end
object btnCopy: TWebButton
Left = 648
Top = 560
Width = 96
Height = 25
Caption = 'Copy'
ChildOrder = 78
ElementID = 'btncopy'
HeightPercent = 100.000000000000000000
WidthPercent = 100.000000000000000000
OnClick = btnCopyClick
end
object btnDelete: TWebButton
Left = 986
Top = 560
Width = 96
Height = 25
Caption = 'Delete'
ChildOrder = 79
ElementID = 'btndelete'
HeightPercent = 100.000000000000000000
WidthPercent = 100.000000000000000000
end
object btnClose: TWebButton
Left = 1094
Top = 560
Width = 96
Height = 25
Caption = 'Close'
ChildOrder = 80
ElementID = 'btnclose'
HeightPercent = 100.000000000000000000
WidthPercent = 100.000000000000000000
OnClick = btnCloseClick
end
object XDataWebClient1: TXDataWebClient
Connection = DMConnection.ApiConnection
Left = 1014
......@@ -1141,6 +1184,7 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
Top = 256
end
object XDataWebDataSet1: TXDataWebDataSet
AfterEdit = XDataWebDataSet1AfterEdit
Connection = DMConnection.ApiConnection
Left = 1060
Top = 182
......
kgOrdersClient/View.OrderEntryCorrugated.html
<div class="row mx-5">
<div class="col-12 col-md-8">
<div class="col-sm">
<div id="pnl_message" class="alert alert-danger mt-3">
<!-- Alert Section -->
<div class="row">
<div class=col-sm>
<div id="view.login.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>
<h4 class="custom-h4 mt-3">Company</h4>
<hr class="custom-hr">
<div class="row">
......@@ -65,7 +68,7 @@
</div>
<div class="col-auto">
<label for="wdbe_first_name" style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Job Name:</label>
<input id="edtjobname" class="form-control input-sm" width='50%'/>
<input id="edtjobname" class="form-control input-sm" style="width: 300px"/>
</div>
<div class="col-auto">
<label for="wdbe_first_name" style="font-weight: 700; font-size: 15px;" class="form-label mt-2">QuickBooks Item:</label>
......@@ -306,9 +309,18 @@
<div class="col-auto">
<button id="btncancel" class="btn btn-primary btn-sm float-end my-2">Cancel</button>
</div>
<div class="col-auto">
<button id="btncopy" class="btn btn-primary btn-sm float-end my-2">Copy</button>
</div>
<div class="col-auto">
<button id="btnpdf" class="btn btn-primary btn-sm float-end my-2">PDF</button>
</div>
<div class="col-auto">
<button id="btndelete" class="btn btn-primary btn-sm float-end my-2">Delete</button>
</div>
<div class="col-auto">
<button id="btnclose" class="btn btn-primary btn-sm float-end my-2">Close</button>
</div>
</div>
</div>
kgOrdersClient/View.OrderEntryCorrugated.pas
......@@ -194,6 +194,9 @@ type
WebDBComboBox3: TWebDBComboBox;
WebDBComboBox4: TWebDBComboBox;
btnPDF: TWebButton;
btnCopy: TWebButton;
btnDelete: TWebButton;
btnClose: TWebButton;
procedure WebFormCreate(Sender: TObject);
procedure HideNotification();
procedure ShowNotification(Notification: string);
......@@ -208,6 +211,11 @@ type
[async] procedure GenerateReportPDF;
procedure btnCancelClick(Sender: TObject);
procedure btnPDFClick(Sender: TObject);
procedure btnCopyClick(Sender: TObject);
procedure sendOrderToServer();
procedure XDataWebDataSet1AfterEdit(DataSet: TDataSet);
procedure btnCloseClick(Sender: TObject);
procedure btnCloseNotificationClick(Sender: TObject);
private
FAgencyCode: string;
FCurrentReportType: string;
......@@ -230,8 +238,7 @@ implementation
uses
View.Home, View.Main;
procedure TFOrderEntryCorrugated.btnConfirmClick(Sender: TObject);
// Converts all the information on the page into a JSON to then send to the server
procedure TFOrderEntryCorrugated.sendOrderToServer();
var
colorList: TJSONArray;
container: TJSElement;
......@@ -365,12 +372,33 @@ begin
if mode = 'EDIT' then
orderJSON.AddPair('ORDER_ID', orderID);
AddCorrugatedOrder(orderJSON);
FViewMain.ViewOrders('Order added successfully!');
if mode = 'ADD' then
ShowNotification('Success:Order Added Successfully!')
else
ShowNotification('Success:Order Edited Successfully')
end;
procedure TFOrderEntryCorrugated.btnConfirmClick(Sender: TObject);
// Converts all the information on the page into a JSON to then send to the server
begin
//When confirm is clicked should we then switch to edit mode with the ID? should the server send back an OrderID?
sendOrderToServer();
end;
procedure TFOrderEntryCorrugated.btnCopyClick(Sender: TObject);
begin
mode := 'ADD';
sendOrderToServer();
// Should we then open the "new" order.
end;
procedure TFOrderEntryCorrugated.btnPDFClick(Sender: TObject);
begin
GenerateReportPDF
if mode = 'EDIT' then
GenerateReportPDF
else
showNotification('Failure:Cannot Generate PDF when Adding an Order');
end;
[async] procedure TFOrderEntryCorrugated.GenerateReportPDF;
......@@ -395,10 +423,16 @@ end;
procedure TFOrderEntryCorrugated.AddCorrugatedOrder(orderJSON: TJSONObject);
// sends the order JSON object to the server
var
Response: TXDataClientResponse;
Response: TXDataClientResponse;
jsObj: TJSObject;
begin
Response := await(XDataWebClient1.RawInvokeAsync('ILookupService.AddCorrugatedOrder',
[orderJSON.ToString]));
jsObj := JS.TJSObject(Response.Result);
OrderID := JS.toString(jsObj.Properties['OrderID']);
mode := 'EDIT';
console.log(mode);
console.log(OrderID);
end;
class function TFOrderEntryCorrugated.CreateForm(AElementID, orderInfo, customerInfo, mode: string): TWebForm;
......@@ -481,9 +515,25 @@ end;
procedure TFOrderEntryCorrugated.btnCancelClick(Sender: TObject);
begin
If mode = 'EDIT' then
begin
getOrder(OrderID);
ShowNotification('Failure:Changes Discarded');
end
else
FViewMain.ViewOrderEntryCorrugated('', CustomerID, 'ADD');
end;
procedure TFOrderEntryCorrugated.btnCloseClick(Sender: TObject);
begin
FViewMain.ViewOrders('');
end;
procedure TFOrderEntryCorrugated.btnCloseNotificationClick(Sender: TObject);
begin
hideNotification();
end;
procedure TFOrderEntryCorrugated.WebFormCreate(Sender: TObject);
begin
if not DMConnection.ApiConnection.Connected then
......@@ -683,16 +733,41 @@ begin
HideNotification();
end;
procedure TFOrderEntryCorrugated.XDataWebDataSet1AfterEdit(DataSet: TDataSet);
begin
//this only works for the first time it is changed
console.log('change');
end;
procedure TFOrderEntryCorrugated.HideNotification;
begin
pnlMessage.ElementHandle.hidden := True;
end;
procedure TFOrderEntryCorrugated.ShowNotification(Notification: string);
var
splitNotification: TArray<string>;
begin
if Notification <> '' then
begin
lblMessage.Caption := Notification;
splitNotification := Notification.Split([':']);
if(splitNotification[0] = 'Success') then
begin
asm
var messageDiv = document.getElementById('view.login.message');
messageDiv.classList.remove('alert-danger');
messageDiv.classList.add('alert-success');
end;
end
else
begin
asm
var messageDiv = document.getElementById('view.login.message');
messageDiv.classList.remove('alert-success');
messageDiv.classList.add('alert-danger');
end;
end;
lblMessage.Caption := splitNotification[1];
pnlMessage.ElementHandle.hidden := False;
end;
end;
......
kgOrdersClient/View.OrderEntryCuttingDie.html
......@@ -64,7 +64,7 @@
</div>
<div class="col-auto">
<label for="wdbe_first_name" style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Job Name:</label>
<input id="edtjobname" class="form-control input-sm" width='50%'/>
<input id="edtjobname" class="form-control input-sm" style="width: 300px"/>
</div>
<div class="col-auto">
<label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">QuickBooks Item:</label>
......
kgOrdersClient/View.OrderEntryCuttingDie.pas
......@@ -148,7 +148,7 @@ begin
console.log(orderJSON.GetValue('ORDER_ID'));
console.log(orderJSON);
AddCuttingDieOrder(orderJSON);
FViewMain.ViewOrders('Success');
FViewMain.ViewOrders('Success:Order added successfully!');
end;
procedure TFOrderEntryCuttingDie.btnPDFClick(Sender: TObject);
......
kgOrdersClient/View.OrderEntryWeb.html
......@@ -64,7 +64,7 @@
</div>
<div class="col-auto">
<label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Job Name:</label>
<input id="edtjobname" class="form-control input-sm" width='50%'/>
<input id="edtjobname" class="form-control input-sm" style="width: 300px"/>
</div>
<div class="col-auto">
<label style="font-weight: 700; font-size: 15px;" class="form-label mt-2">QuickBooks Item:</label>
......
kgOrdersClient/View.Orders.dfm
......@@ -124,6 +124,9 @@ object FViewOrders: TFViewOrders
OnDblClickCell = wdbtcOrdersDblClickCell
Columns = <
item
DataField = 'DBID'
end
item
DataField = 'ID'
Title = 'ID'
end
......@@ -340,6 +343,9 @@ object FViewOrders: TFViewOrders
Connection = DMConnection.ApiConnection
Left = 70
Top = 410
object xdwdsOrdersDBID: TStringField
FieldName = 'DBID'
end
object xdwdsOrdersID: TStringField
FieldName = 'ID'
end
......
kgOrdersClient/View.Orders.pas
......@@ -59,6 +59,7 @@ type
pnlMessage: TWebPanel;
lblMessage: TWebLabel;
btnCloseNotification: TWebButton;
xdwdsOrdersDBID: TStringField;
procedure WebFormCreate(Sender: TObject);
procedure btnAddOrderClick(Sender: TObject);
procedure btnSearchClick(Sender: TObject);
......@@ -139,7 +140,7 @@ var
searchOptions, pdfURL: string;
jsObject: TJSObject;
begin
searchOptions := GenerateSearchOptions;
searchOptions := edtSearch.Text;
// Call the server method to generate the PDF
xdcResponse := await(XDataWebClient1.RawInvokeAsync('ILookupService.GenerateOrderListPDF', [searchOptions]));
......@@ -256,7 +257,7 @@ begin
orderType := 'web'
else
orderType := 'cutting';
orderEntry('', newForm.edtID.Text, 'ADD', orderType);
orderEntry('', newForm.DBID, 'ADD', orderType);
end;
end
);
......@@ -300,7 +301,7 @@ begin
jobName := newform.edtJobName.Text;
orderID := newform.edtOrderID.Text;
companyID := newform.edtCompanyID.Text;
companyID := newform.DBID;
orderType := newform.wcbOrderType.Text;
searchOptions := generateSearchOptions();
......@@ -316,32 +317,30 @@ procedure TFViewOrders.ShowSetStatusForm();
var
newform: TFSetStatus;
begin
console.log('set status');
newform := TFSetStatus.CreateNew;
newform.Caption := 'Input Search Options';
newForm.Popup := True;
newForm.Border := fbDialog;
newForm.OrderID := OrderID;
newForm.JobName := wdbtcOrders.Cells[2, row];
if wdbtcOrders.Cells[13, row] <> '' then
newForm.ShipDue := StrToDateTime(wdbtcOrders.Cells[13, row])
newForm.JobName := wdbtcOrders.Cells[3, row];
if wdbtcOrders.Cells[14, row] <> '' then
newForm.ShipDue := StrToDateTime(wdbtcOrders.Cells[14, row])
else
newForm.MountDue := 0;
if wdbtcOrders.Cells[11, row] <> '' then
newForm.MountDue := StrToDateTime(wdbtcOrders.Cells[11, row])
if wdbtcOrders.Cells[12, row] <> '' then
newForm.MountDue := StrToDateTime(wdbtcOrders.Cells[12, row])
else
newForm.MountDue := 0;
if wdbtcOrders.Cells[9, row] <> '' then
newForm.PlateDue := StrToDateTime(wdbtcOrders.Cells[9, row])
if wdbtcOrders.Cells[10, row] <> '' then
newForm.PlateDue := StrToDateTime(wdbtcOrders.Cells[10, row])
else
newForm.PlateDue := 0;
if wdbtcOrders.Cells[7, row] <> '' then
newForm.ArtDue := StrToDateTime(wdbtcOrders.Cells[7, row])
if wdbtcOrders.Cells[8, row] <> '' then
newForm.ArtDue := StrToDateTime(wdbtcOrders.Cells[8, row])
else
newForm.ArtDue := 0 ;
newForm.OrderType := OrderType;
console.log(OrderType);
// used to manage Back button handling to close subform
window.location.hash := 'subform';
......@@ -393,7 +392,7 @@ procedure TFViewOrders.wdbtcOrdersClickCell(Sender: TObject; ACol,
ARow: Integer);
begin
OrderID := wdbtcOrders.Cells[0, ARow];
OrderType := wdbtcOrders.Cells[3, ARow];
OrderType := wdbtcOrders.Cells[4, ARow];
row := ARow;
end;
......@@ -401,7 +400,7 @@ procedure TFViewOrders.wdbtcOrdersDblClickCell(Sender: TObject; ACol,
ARow: Integer);
begin
OrderID := wdbtcOrders.Cells[0, ARow];
orderType := wdbtcOrders.Cells[3, ARow].Split([' '])[0];
orderType := wdbtcOrders.Cells[4, ARow].Split([' '])[0];
orderEntry(OrderID, '', 'EDIT', orderType);
end;
......@@ -625,6 +624,7 @@ begin
xdwdsOrders.Close;
xdwdsOrders.SetJsonData(orderList['data']);
xdwdsOrders.Open;
wdbtcOrders.HideColumn(0);
asm
endSpinner();
......@@ -743,6 +743,7 @@ begin
if orderID <> '' then
searchOptions := searchOptions + '&orderID=' + orderID;
edtSearch.text := searchOptions;
Result := searchOptions;
end;
......
kgOrdersClient/View.Search.dfm
......@@ -611,6 +611,7 @@ object FSearch: TFSearch
ChildOrder = 8
ElementClassName = 'form-control'
ElementFont = efCSS
Enabled = False
Font.Charset = ANSI_CHARSET
Font.Color = clBlack
Font.Height = -8
......
kgOrdersClient/View.Search.pas
......@@ -69,13 +69,12 @@ type
[async] procedure getCustomers;
procedure PopulateGridManually;
procedure ApplyFilter;
var
temp: string;
public
class function CreateForm(AElementID: string): TWebForm;
var
confirm: boolean;
searchOptions: string;
DBID: string;
end;
var
......@@ -261,8 +260,10 @@ end;
procedure TFSearch.TMSFNCGrid1CellClick(Sender: TObject; ACol, ARow: Integer);
begin
edtCompanyID.Text := TMSFNCGrid1.Cells[0, ARow];
edtCompanyID.Text := TMSFNCGrid1.Cells[1, ARow];
edtCompanyName.Text := TMSFNCGrid1.Cells[2, ARow];
DBID := TMSFNCGrid1.Cells[0, ARow];
end;
procedure TFSearch.PopulateGridManually;
......
kgOrdersServer/Source/Lookup.Service.pas
......@@ -57,6 +57,7 @@ type
TOrderItem = class
public
DBID,
ID,
companyName,
jobName,
......
kgOrdersServer/Source/Lookup.ServiceImpl.pas
......@@ -419,29 +419,7 @@ begin
offset := IntToStr((PageNum - 1) * PageSize);
limit := IntToStr(PageSize);
{ SQL := 'SELECT o.ORDER_ID, o.LOCATION AS Loc, c.NAME AS COMPANY_NAME, o.JOB_NAME, ' +
'o.ORDER_DATE, o.ORDER_TYPE, oss_proof.STATUS_DATE AS PROOF_DUE, oss_art.STATUS_DATE AS ART_DUE, ' +
'oss_plate.STATUS_DATE AS PLATE_DUE, oss_mount.STATUS_DATE AS MOUNT_DUE, oss_ship.STATUS_DATE AS SHIP_DUE, ' +
'os_proof.STATUS_DATE AS PROOF_DONE, os_art.STATUS_DATE AS ART_DONE, os_plate.STATUS_DATE AS PLATE_DONE, ' +
'os_mount.STATUS_DATE AS MOUNT_DONE, os_ship.STATUS_DATE AS SHIP_DONE, ' +
'o.PRICE, qb.QB_REF_NUM, coalesce( cpo.staff_fields_po_number, wpo.staff_fields_po_number, cdo.staff_fields_po_number ) AS po_number, ' +
'coalesce( cpo.staff_fields_quickbooks_item, wpo.staff_fields_quickbooks_item, cdo.staff_fields_quickbooks_item ) AS quickbooks_item ' +
'FROM orders o JOIN customers c ON c.CUSTOMER_ID = o.COMPANY_ID LEFT JOIN qb_sales_orders qb ON qb.ORDER_ID = o.ORDER_ID ' +
'LEFT JOIN ORDERS_status_schedule oss_proof ON o.ORDER_ID = oss_proof.Order_id AND oss_proof.order_status = ' + quotedStr('PROOF') +
' LEFT JOIN ORDERS_status_schedule oss_art ON o.ORDER_ID = oss_art.Order_id AND oss_art.order_status = ' + quotedStr('ART') +
' LEFT JOIN orders_status_schedule oss_plate ON o.ORDER_ID = oss_plate.Order_id AND oss_plate.order_status = ' + quotedStr('PLATE') +
' LEFT JOIN orders_status_schedule oss_mount ON o.ORDER_ID = oss_mount.Order_id AND oss_mount.order_status = ' + quotedStr('MOUNT') +
' LEFT JOIN orders_status_schedule oss_ship ON o.ORDER_ID = oss_ship.Order_id AND oss_ship.order_status = ' + quotedStr('SHIP') +
'LEFT JOIN ORDERS_status os_proof ON o.ORDER_ID = os_proof.Order_id AND os_proof.order_status = ' + quotedStr('PROOF') +
' LEFT JOIN ORDERS_status os_art ON o.ORDER_ID = os_art.Order_id AND os_art.order_status = ' + quotedStr('ART') +
' LEFT JOIN orders_status os_plate ON o.ORDER_ID = os_plate.Order_id AND os_plate.order_status = ' + quotedStr('PLATE') +
' LEFT JOIN orders_status os_mount ON o.ORDER_ID = os_mount.Order_id AND os_mount.order_status = ' + quotedStr('MOUNT') +
' LEFT JOIN orders_status os_ship ON o.ORDER_ID = os_ship.Order_id AND os_ship.order_status = ' + quotedStr('SHIP') +
' LEFT JOIN corrugated_plate_orders cpo ON o.ORDER_ID = cpo.ORDER_ID ' +
'LEFT JOIN web_plate_orders wpo ON o.ORDER_ID = wpo.ORDER_ID ' +
'LEFT JOIN cutting_die_orders cdo ON o.ORDER_ID = cdo.ORDER_ID '; }
SQL := 'SELECT o.ORDER_ID, o.LOCATION AS Loc, c.NAME AS COMPANY_NAME, o.JOB_NAME, o.ORDER_DATE, o.ORDER_TYPE, ';
SQL := 'SELECT o.ORDER_ID, c.SHORT_NAME, o.LOCATION AS Loc, c.NAME AS COMPANY_NAME, o.JOB_NAME, o.ORDER_DATE, o.ORDER_TYPE, ';
// Generate the subqueries that get the Status Dates(Due and Done)
SQL := SQL + generateSubquery('PROOF');
......@@ -478,7 +456,7 @@ begin
whereSQL := whereSQL + ' AND c.CUSTOMER_ID = ' + companyID;
if jobName <> '' then
whereSQL := whereSQL + ' AND o.JOB_NAME = ' + quotedStr(jobName);
whereSQL := whereSQL + ' AND o.JOB_NAME LIKE ' + quotedStr('%' + jobName + '%');
......@@ -555,7 +533,8 @@ begin
TXDataOperationContext.Current.Handler.ManagedObjects.Add(Order);
Result.data.Add(Order);
Order.ID := ordersDB.UniQuery1.FieldByName('ORDER_ID').AsString;
Order.DBID := ordersDB.UniQuery1.FieldByName('ORDER_ID').AsString;
Order.ID := ordersDB.UniQuery1.FieldByName('SHORT_NAME').AsString;
Order.companyName := ordersDB.UniQuery1.FieldByName('COMPANY_NAME').AsString;
Order.jobName := ordersDB.UniQuery1.FieldByName('JOB_NAME').AsString;
Order.orderDate := ordersDB.UniQuery1.FieldByName('ORDER_DATE').AsString;
......@@ -576,12 +555,12 @@ begin
if ordersDB.UniQuery1.FieldByName('ORDER_TYPE').AsString = 'web_plate' then
begin
ColorType := 'quantity_and_colors_qty_colors';
SQL := 'Select quantity_and_colors_qty_colors from web_plate_orders where order_id = ' + Order.ID;
SQL := 'Select quantity_and_colors_qty_colors from web_plate_orders where order_id = ' + Order.DBID;
end
else
begin
ColorType := 'colors_colors';
SQL := 'Select colors_colors from corrugated_plate_orders where order_id = ' + Order.ID;
SQL := 'Select colors_colors from corrugated_plate_orders where order_id = ' + Order.DBID;
end;
doQuery(ordersDB.UniQuery2, SQL);
......@@ -1226,7 +1205,7 @@ begin
ordersDB.UniQuery1.FieldByName('JOB_NAME').AsString := JSONData.GetValue<string>('staff_fields_job_name');
ordersDB.UniQuery1.FieldByName('USER_ID').AsString := JSONData.GetValue<string>('USER_ID');
ordersDB.UniQuery1.FieldByName('LOCATION').AsString := '';//JSONData.GetValue<string>('staff_fields_art_location');
ordersDB.UniQuery1.FieldByName('LOCATION').AsString := '';
ordersDB.UniQuery1.Post;
......@@ -1304,14 +1283,17 @@ begin
AddStatusSchedule('ART', JSONData, ORDER_ID);
if JSONData.GetValue<string>('staff_fields_plate_due') <> '' then
AddStatusSchedule('PLATE', JSONData, ORDER_ID);
if JSONData.GetValue<string>('staff_fields_mount_due') <> '' then
AddStatusSchedule('MOUNT', JSONData, ORDER_ID);
Result := TJSONObject.Create.AddPair('status', 'success');
Result.AddPair('OrderID', ORDER_ID);
TXDataOperationContext.Current.Handler.ManagedObjects.Add(Result);
except
on E: Exception do
begin
Result := TJSONObject.Create.AddPair('error', E.Message);
end;
end
end;
end;
......@@ -1660,7 +1642,9 @@ begin
on E: Exception do
begin
Result := TJSONObject.Create.AddPair('error', E.Message);
end;
end
else
result := TJSONObject.Create.AddPair('OrderID', ORDER_ID);
end;
end;
......@@ -1732,12 +1716,14 @@ begin
AddStatusSchedule('SHIP', JSONData, ORDER_ID);
Result := TJSONObject.Create.AddPair('status', 'success');
Result.AddPair('OrderID', ORDER_ID);
TXDataOperationContext.Current.Handler.ManagedObjects.Add(Result);
except
on E: Exception do
begin
Result := TJSONObject.Create.AddPair('error', E.Message);
end;
end
end;
end;
......
kgOrdersServer/Source/rOrderList.dfm
......@@ -11,7 +11,7 @@ object rptOrderList: TrptOrderList
PrintOptions.Printer = 'Default'
PrintOptions.PrintOnSheet = 0
ReportOptions.CreateDate = 45642.449265416700000000
ReportOptions.LastChange = 45712.518936585650000000
ReportOptions.LastChange = 45749.484246388890000000
ScriptLanguage = 'PascalScript'
ScriptText.Strings = (
'begin'
......@@ -170,7 +170,7 @@ object rptOrderList: TrptOrderList
AllowVectorExport = True
Top = 7.559060000000000000
Width = 39.784533360000000000
Height = 30.236220472440940000
Height = 30.236220472440900000
StretchMode = smActualHeight
ContentScaleOptions.Constraints.MaxIterationValue = 0
ContentScaleOptions.Constraints.MinIterationValue = 0
......@@ -192,7 +192,7 @@ object rptOrderList: TrptOrderList
AllowVectorExport = True
Left = 52.535408660000000000
Top = 7.559060000000000000
Width = 75.590551181102360000
Width = 75.590551181102400000
Height = 30.236220470000000000
StretchMode = smActualHeight
ContentScaleOptions.Constraints.MaxIterationValue = 0
......@@ -215,7 +215,7 @@ object rptOrderList: TrptOrderList
AllowVectorExport = True
Left = 127.370049450000000000
Top = 7.559060000000000000
Width = 147.401574800000000000
Width = 143.622047244094000000
Height = 30.236220470000000000
StretchMode = smActualHeight
ContentScaleOptions.Constraints.MaxIterationValue = 0
......@@ -400,7 +400,7 @@ object rptOrderList: TrptOrderList
Left = 941.480349130000000000
Top = 7.559060000000000000
Width = 45.354330710000000000
Height = 30.236220472440940000
Height = 30.236220472440900000
StretchMode = smActualHeight
ContentScaleOptions.Constraints.MaxIterationValue = 0
ContentScaleOptions.Constraints.MinIterationValue = 0
......@@ -423,7 +423,7 @@ object rptOrderList: TrptOrderList
Left = 40.062979920000000000
Top = 7.559060000000000000
Width = 12.094488190000000000
Height = 30.236220472440940000
Height = 30.236220472440900000
StretchMode = smActualHeight
ContentScaleOptions.Constraints.MaxIterationValue = 0
ContentScaleOptions.Constraints.MinIterationValue = 0
......@@ -465,9 +465,9 @@ object rptOrderList: TrptOrderList
end
object Memo75: TfrxMemoView
AllowVectorExport = True
Left = 275.905690000000000000
Left = 272.126160000000000000
Top = 7.559060000000000000
Width = 37.795275590551180000
Width = 41.574803150000000000
Height = 30.236220470000000000
ContentScaleOptions.Constraints.MaxIterationValue = 0
ContentScaleOptions.Constraints.MinIterationValue = 0
......@@ -715,7 +715,7 @@ object rptOrderList: TrptOrderList
AllowVectorExport = True
Left = 127.371714230000000000
Top = 3.779530000000000000
Width = 147.401574800000000000
Width = 143.622047244094000000
Height = 30.236234660000000000
ContentScaleOptions.Constraints.MaxIterationValue = 0
ContentScaleOptions.Constraints.MinIterationValue = 0
......@@ -896,7 +896,7 @@ object rptOrderList: TrptOrderList
AllowVectorExport = True
Left = 313.700990000000000000
Top = 3.779530000000000000
Width = 35.905511811023620000
Width = 35.905511811023600000
Height = 30.236234660000000000
ContentScaleOptions.Constraints.MaxIterationValue = 0
ContentScaleOptions.Constraints.MinIterationValue = 0
......@@ -912,9 +912,9 @@ object rptOrderList: TrptOrderList
end
object Memo74: TfrxMemoView
AllowVectorExport = True
Left = 275.905690000000000000
Left = 272.126160000000000000
Top = 3.779530000000000000
Width = 37.795275590551180000
Width = 41.574803150000000000
Height = 30.236234660000000000
ContentScaleOptions.Constraints.MaxIterationValue = 0
ContentScaleOptions.Constraints.MinIterationValue = 0
......@@ -1281,6 +1281,126 @@ object rptOrderList: TrptOrderList
DataSetOptions = []
Left = 444
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
object uqColors: TUniQuery
Connection = ucKG
......
kgOrdersServer/Source/rOrderList.pas
......@@ -208,7 +208,7 @@ begin
if not DirectoryExists(ReportDir) then
begin
ForceDirectories(ReportDir);
Logger.Log(5, 'Reports directory created: ' + ReportDir);
Logger.Log(3, 'Reports directory created: ' + ReportDir);
end;
reportURL := 'reports/' + FormatDateTime('yyyymmdd_hhnnss', Now) + '.pdf';
......@@ -224,7 +224,7 @@ begin
frxOrderList.Clear; // Clears the report to avoid memory bloat
end;
Logger.Log(5, 'PDF saved to: ' + ReportFileName);
Logger.Log(3, 'PDF saved to: ' + ReportFileName);
result := reportURL;
end;
......
kgOrdersServer/kgOrdersServer.ini
......@@ -2,11 +2,11 @@
MemoLogLevel=3
FileLogLevel=5
webClientVersion=0.9.2
LogFileNum=345
LogFileNum=366
[Database]
--Server=192.168.159.132
Server=192.168.102.130
Server=192.168.159.132
--Server=192.168.102.130
--Server=192.168.75.133
Database=kg_order_entry
Username=root
......
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