Commit 7b720317 by cam

stepping off point for order entry form

parent 6ec6e6bb
......@@ -51,9 +51,9 @@ object FViewMain: TFViewMain
object lblAppTitle: TWebLabel
Left = 57
Top = 31
Width = 74
Width = 82
Height = 15
Caption = 'Kohler Gibson'
Caption = 'Koehler-Gibson'
ElementID = 'view.main.apptitle'
HeightPercent = 100.000000000000000000
Transparent = False
......
......@@ -46,6 +46,7 @@ type
procedure ShowForm( AFormClass: TWebFormClass );
procedure EditUser( Mode, Username, Password, Name, Status, Email,
Access, Rights, Perspective, QB: string);
procedure ViewOrderEntry( orderInfo: string);
procedure ShowUserForm(Info: string);
end;
......@@ -62,7 +63,8 @@ uses
View.Items,
View.Users,
View.EditUser,
View.Orders;
View.Orders,
View.ReportRequirements;
{$R *.dfm}
......@@ -169,6 +171,13 @@ begin
Password, Name, Status, Email, Access, Rights, Perspective, QB);
end;
procedure TFViewMain.ViewOrderEntry( orderInfo: string);
begin
if Assigned(FChildForm) then
FChildForm.Free;
FChildForm := TFReportRequirements.CreateForm(WebPanel1.ElementID, orderInfo);
end;
procedure TFViewMain.ShowUserForm(Info: string);
begin
if Assigned(FChildForm) then
......
......@@ -87,6 +87,21 @@ object FViewOrders: TFViewOrders
HideSelection = False
WidthPercent = 100.000000000000000000
end
object btnaddOrder: TWebButton
Left = 236
Top = 166
Width = 96
Height = 25
Caption = 'Add Order'
ChildOrder = 5
ElementClassName = 'btn btn-light'
ElementID = 'btnaddorder'
ElementFont = efCSS
HeightStyle = ssAuto
HeightPercent = 100.000000000000000000
WidthPercent = 100.000000000000000000
OnClick = btnaddOrderClick
end
object XDataWebClient1: TXDataWebClient
Connection = DMConnection.ApiConnection
Left = 426
......
......@@ -24,6 +24,9 @@
<div class="col-sm-2">
<button class= "ps-3" id="btnapply"></button>
</div>
<div class="col-sm-2">
<button class= "ps-3" id="btnaddorder"></button>
</div>
</div>
</form>
</div>
......
......@@ -39,15 +39,18 @@ type
XDataWebDataSet1ID: TStringField;
XDataWebDataSet1qbRefNum: TStringField;
XDataWebDataSet1colors: TStringField;
btnaddOrder: TWebButton;
procedure WebFormCreate(Sender: TObject);
procedure btnApplyClick(Sender: TObject);
procedure btnSearchClick(Sender: TObject);
procedure btnaddOrderClick(Sender: TObject);
private
FChildForm: TWebForm;
procedure AddRowToTable(temp: string);
procedure ClearTable();
procedure GeneratePagination(TotalPages: Integer);
function GenerateSearchOptions(): string;
procedure orderEntry();
[async] procedure Search(searchOptions: string);
[async] procedure GetOrders(searchOptions: string);
[async] procedure getUser();
......@@ -70,7 +73,7 @@ implementation
uses
JS, XData.Model.Classes,
ConnectionModule, Auth.Service;
ConnectionModule, Auth.Service, View.Main;
{$R *.dfm}
......@@ -486,6 +489,16 @@ begin
end;
end;
procedure TFViewOrders.btnaddOrderClick(Sender: TObject);
begin
orderEntry();
end;
procedure TFViewOrders.orderEntry();
begin
FViewMain.ViewOrderEntry('');
end;
procedure TFViewOrders.btnApplyClick(Sender: TObject);
// Button that effectively functions as a GetOrders() button
var
......
unit View.ReportRequirements;
interface
uses
System.SysUtils, System.Classes, JS, Web, WEBLib.Graphics, WEBLib.Controls,
WEBLib.Forms, WEBLib.Dialogs, WEBLib.Menus, WEBLib.ExtCtrls, WEBLib.StdCtrls,
WEBLib.JSON, Auth.Service, XData.Web.Client, WebLib.Storage,
ConnectionModule, App.Types, Vcl.StdCtrls, Vcl.Controls;
type
TFReportRequirements = class(TWebForm)
tmrScrollTop: TWebTimer;
clntReportRequirements: TXDataWebClient;
pnlMessage: TWebPanel;
lblMessage: TWebLabel;
btnCloseNotification: TWebButton;
edtCompanyAccountName: TWebEdit;
edtInQuickBooks: TWebEdit;
edtCompanyName: TWebEdit;
dtpOrderDate: TWebDateTimePicker;
dtpProofDate: TWebDateTimePicker;
dtpShipDate: TWebDateTimePicker;
WebLabel1: TWebLabel;
WebLabel2: TWebLabel;
edtShipVia: TWebEdit;
edtQuantity: TWebEdit;
edtPrice: TWebEdit;
edtInvoiceTo: TWebEdit;
edtShipTo: TWebEdit;
edtPONumber: TWebEdit;
edtJobName: TWebEdit;
edtQuickbooksItem: TWebEdit;
dtpArtDue: TWebDateTimePicker;
dtpPlateDue: TWebDateTimePicker;
dtpMountDue: TWebDateTimePicker;
edtArtLocation: TWebEdit;
WebLabel3: TWebLabel;
cbBWCopy: TWebCheckBox;
cbColorCopy: TWebCheckBox;
cbPlates: TWebCheckBox;
cbDiskOrCD: TWebCheckBox;
cbSampleCarton: TWebCheckBox;
edtDimensionalLayout: TWebEdit;
edtEmail: TWebEdit;
edtFTP: TWebEdit;
edtExistingCuttingDie: TWebEdit;
edtOther: TWebEdit;
edtRefArtPrintCard: TWebEdit;
edtRefArtAPDF: TWebEdit;
WebLabel4: TWebLabel;
edtRSCL: TWebEdit;
edtRSCW: TWebEdit;
edtRSCD: TWebEdit;
edtDieCutNo: TWebEdit;
edtAcrossNo: TWebEdit;
edtAroundNo: TWebEdit;
edtCADFile: TWebEdit;
edtRSCStyle: TWebEdit;
cbExcaliburDie: TWebCheckBox;
WebLabel5: TWebLabel;
cbLoose: TWebCheckBox;
cbStickyBak: TWebCheckBox;
cbFullMount: TWebCheckBox;
cbStripMount: TWebCheckBox;
edtLoose: TWebEdit;
edtStripMount: TWebEdit;
edtStantdardSetup: TWebEdit;
edtCustomBacking: TWebEdit;
edtCustomAdhesive: TWebEdit;
WebLabel6: TWebLabel;
edtCylinderSize: TWebEdit;
edtMachineIndent: TWebEdit;
edtClemson: TWebEdit;
edtCrossHairs: TWebEdit;
WebButton1: TWebButton;
WebLabel7: TWebLabel;
edtFax: TWebEdit;
edtProofOther: TWebEdit;
edtProofShipTo: TWebEdit;
edtProofEmail: TWebEdit;
edtEmailAttn: TWebEdit;
edtFaxAttn: TWebEdit;
cbFullSizePanel: TWebCheckBox;
cbPrintCard: TWebCheckBox;
cbWideFormat: TWebCheckBox;
cbPDFFile: TWebCheckBox;
cbArtApprovedAsIs: TWebCheckBox;
dtpApprovedDate: TWebDateTimePicker;
WebLabel8: TWebLabel;
WebLabel9: TWebLabel;
edtThickness: TWebEdit;
edtPlateMaterial: TWebEdit;
edtJobNumber: TWebEdit;
edtSpecialInstructions: TWebEdit;
procedure WebFormCreate(Sender: TObject);
procedure HideNotification();
procedure ShowNotification(Notification: string);
private
FAgencyCode: string;
FCurrentReportType: string;
FSelectProc: TSelectProc;
//FJSONProc1: TJSONProc1;
public
class function CreateForm(AElementID, orderInfo: string): TWebForm;
end;
var
FReportRequirements: TFReportRequirements;
implementation
{$R *.dfm}
uses
View.Home;
class function TFReportRequirements.CreateForm(AElementID, orderInfo: string): TWebForm;
begin
Application.CreateForm(TFReportRequirements, AElementID, Result,
procedure(AForm: TObject)
begin
with TFReportRequirements(AForm) do
begin
HideNotification;
end;
end
);
end;
procedure TFReportRequirements.WebFormCreate(Sender: TObject);
begin
if not DMConnection.ApiConnection.Connected then
begin
DMConnection.ApiConnection.OpenAsync;
console.log('report requirements connection open')
end;
end;
procedure TFReportRequirements.HideNotification;
begin
pnlMessage.ElementHandle.hidden := True;
end;
procedure TFReportRequirements.ShowNotification(Notification: string);
begin
if Notification <> '' then
begin
lblMessage.Caption := Notification;
pnlMessage.ElementHandle.hidden := False;
end;
end;
initialization
RegisterClass(TFReportRequirements);
end.
......@@ -23,6 +23,15 @@
margin-right: 0.5rem;
}
.custom-h4 {
margin-bottom: 5px;
}
.custom-hr {
margin-top: 5px;
margin-bottom: 10px;
}
.custom-select-large {
font-size: 1.25rem;
padding: 0.5rem;
......
program webKGOrders;
uses
Vcl.Forms,
XData.Web.Connection,
......@@ -18,7 +16,8 @@ uses
View.Home in 'View.Home.pas' {FViewHome: TWebForm} {*.html},
View.Users in 'View.Users.pas' {FViewUsers: TWebForm} {*.html},
View.EditUser in 'View.EditUser.pas' {FViewEditUser: TWebForm} {*.html},
View.Orders in 'View.Orders.pas' {FViewOrders: TWebForm} {*.html};
View.Orders in 'View.Orders.pas' {FViewOrders: TWebForm} {*.html},
View.ReportRequirements in 'View.ReportRequirements.pas' {FReportRequirements: TWebForm} {*.html};
{$R *.res}
......
......@@ -166,6 +166,11 @@
<FormType>dfm</FormType>
<DesignClass>TWebForm</DesignClass>
</DCCReference>
<DCCReference Include="View.ReportRequirements.pas">
<Form>FReportRequirements</Form>
<FormType>dfm</FormType>
<DesignClass>TWebForm</DesignClass>
</DCCReference>
<None Include="index.html"/>
<None Include="template\css\app.css"/>
<BuildConfiguration Include="Base">
......
[Options]
LogFileNum=98
LogFileNum=100
UpdateTimerLength=0
......
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