Skip to content

K
KGOrders
Commit 4fa14ae7 by emsys
Options

Merge remote-tracking branch 'origin/mac3' into cam3

parents 2412e6a9 6d54266c
Showing with 59 additions and 30 deletions
kgOrdersClient/ConnectionModule.pas
...@@ -19,7 +19,7 @@ type ...@@ -19,7 +19,7 @@ type
FUnauthorizedAccessProc: TUnauthorizedAccessProc; FUnauthorizedAccessProc: TUnauthorizedAccessProc;
public public
const clientVersion = '0.9.6'; const clientVersion = '0.9.7';
procedure InitApp(SuccessProc: TSuccessProc; procedure InitApp(SuccessProc: TSuccessProc;
UnauthorizedAccessProc: TUnauthorizedAccessProc); UnauthorizedAccessProc: TUnauthorizedAccessProc);
procedure SetClientConfig(Callback: TVersionCheckCallback); procedure SetClientConfig(Callback: TVersionCheckCallback);
......
kgOrdersClient/Utils.pas
...@@ -135,16 +135,15 @@ end; ...@@ -135,16 +135,15 @@ end;
// if confirmed then DeleteOrder(); // if confirmed then DeleteOrder();
// end); // end);
procedure ShowConfirmationModal(msg, leftLabel, rightLabel: string; ConfirmProc: TProc<Boolean>); procedure ShowConfirmationModal(msg, leftLabel, rightLabel: string; ConfirmProc: TProc<Boolean>);
var
modal, body, btnLeft, btnRight: TJSHTMLElement;
bsModal: JSValue;
begin begin
asm asm
modal = document.getElementById('main_confirmation_modal'); var modal = document.getElementById('main_confirmation_modal');
body = document.getElementById('main_modal_body'); var body = document.getElementById('main_modal_body');
btnLeft = document.getElementById('btn_confirm_left'); var btnLeft = document.getElementById('btn_confirm_left');
btnRight = document.getElementById('btn_confirm_right'); var btnRight = document.getElementById('btn_confirm_right');
var bsModal;
if (body) body.innerText = msg; if (body) body.innerText = msg;
if (btnLeft) btnLeft.innerText = leftLabel; if (btnLeft) btnLeft.innerText = leftLabel;
......
kgOrdersClient/View.AddOrder.html
<html> <div id="spinner" class="position-absolute top-50 start-50 translate-middle d-none">
<head> <div class="lds-roller">
<meta http-equiv="Content-type" content="text/html; charset=utf-8" /> <div></div><div></div><div></div><div></div>
<title>TMS Web Project</title> <div></div><div></div><div></div><div></div>
<style> </div>
</style> </div>
</head>
<body>
</body>
</html>
\ No newline at end of file
kgOrdersClient/View.OrderEntryWeb.dfm
...@@ -126,6 +126,7 @@ object FOrderEntryWeb: TFOrderEntryWeb ...@@ -126,6 +126,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
Top = 92 Top = 92
Width = 260 Width = 260
Height = 23 Height = 23
TabStop = False
AutoSize = True AutoSize = True
ChildOrder = 79 ChildOrder = 79
ElementID = 'edtcompanyname' ElementID = 'edtcompanyname'
...@@ -142,6 +143,7 @@ object FOrderEntryWeb: TFOrderEntryWeb ...@@ -142,6 +143,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
Top = 120 Top = 120
Width = 121 Width = 121
Height = 23 Height = 23
TabStop = False
AutoSize = True AutoSize = True
ChildOrder = 79 ChildOrder = 79
ElementID = 'edtaccountcompanyname' ElementID = 'edtaccountcompanyname'
...@@ -156,6 +158,7 @@ object FOrderEntryWeb: TFOrderEntryWeb ...@@ -156,6 +158,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
Top = 148 Top = 148
Width = 121 Width = 121
Height = 23 Height = 23
TabStop = False
AutoSize = True AutoSize = True
ChildOrder = 79 ChildOrder = 79
ElementID = 'edtinquickbooks' ElementID = 'edtinquickbooks'
...@@ -166,8 +169,8 @@ object FOrderEntryWeb: TFOrderEntryWeb ...@@ -166,8 +169,8 @@ object FOrderEntryWeb: TFOrderEntryWeb
DataSource = WebDataSource1 DataSource = WebDataSource1
end end
object dtpOrderDate: TWebDateTimePicker object dtpOrderDate: TWebDateTimePicker
Left = 22 Left = 24
Top = 218 Top = 215
Width = 170 Width = 170
Height = 22 Height = 22
ElementID = 'dtporderdate' ElementID = 'dtporderdate'
...@@ -177,6 +180,7 @@ object FOrderEntryWeb: TFOrderEntryWeb ...@@ -177,6 +180,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
Date = 45638.529943136570000000 Date = 45638.529943136570000000
Role = '' Role = ''
ShowFocus = False ShowFocus = False
TabStop = False
Text = '' Text = ''
end end
object dtpProofDate: TWebDateTimePicker object dtpProofDate: TWebDateTimePicker
...@@ -191,6 +195,7 @@ object FOrderEntryWeb: TFOrderEntryWeb ...@@ -191,6 +195,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
Date = 45638.529943136570000000 Date = 45638.529943136570000000
Role = '' Role = ''
ShowFocus = False ShowFocus = False
TabStop = False
Text = '' Text = ''
end end
object dtpShipDate: TWebDateTimePicker object dtpShipDate: TWebDateTimePicker
...@@ -205,6 +210,7 @@ object FOrderEntryWeb: TFOrderEntryWeb ...@@ -205,6 +210,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
Date = 45638.529943136570000000 Date = 45638.529943136570000000
Role = '' Role = ''
ShowFocus = False ShowFocus = False
TabStop = False
Text = '' Text = ''
end end
object dtpArtDue: TWebDateTimePicker object dtpArtDue: TWebDateTimePicker
...@@ -219,6 +225,7 @@ object FOrderEntryWeb: TFOrderEntryWeb ...@@ -219,6 +225,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
Date = 45638.529943136570000000 Date = 45638.529943136570000000
Role = '' Role = ''
ShowFocus = False ShowFocus = False
TabStop = False
Text = '' Text = ''
end end
object dtpPlateDue: TWebDateTimePicker object dtpPlateDue: TWebDateTimePicker
...@@ -233,6 +240,7 @@ object FOrderEntryWeb: TFOrderEntryWeb ...@@ -233,6 +240,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
Date = 45638.529943136570000000 Date = 45638.529943136570000000
Role = '' Role = ''
ShowFocus = False ShowFocus = False
TabStop = False
Text = '' Text = ''
end end
object edtShipVia: TWebDBEdit object edtShipVia: TWebDBEdit
...@@ -240,6 +248,7 @@ object FOrderEntryWeb: TFOrderEntryWeb ...@@ -240,6 +248,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
Top = 314 Top = 314
Width = 121 Width = 121
Height = 23 Height = 23
TabStop = False
AutoSize = True AutoSize = True
ChildOrder = 79 ChildOrder = 79
ElementID = 'edtshipvia' ElementID = 'edtshipvia'
...@@ -251,9 +260,10 @@ object FOrderEntryWeb: TFOrderEntryWeb ...@@ -251,9 +260,10 @@ object FOrderEntryWeb: TFOrderEntryWeb
end end
object edtQuantity: TWebDBEdit object edtQuantity: TWebDBEdit
Left = 24 Left = 24
Top = 346 Top = 345
Width = 121 Width = 121
Height = 23 Height = 23
TabStop = False
AutoSize = True AutoSize = True
ChildOrder = 79 ChildOrder = 79
ElementID = 'edtquantity' ElementID = 'edtquantity'
...@@ -268,6 +278,7 @@ object FOrderEntryWeb: TFOrderEntryWeb ...@@ -268,6 +278,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
Top = 374 Top = 374
Width = 121 Width = 121
Height = 22 Height = 22
TabStop = False
ChildOrder = 79 ChildOrder = 79
ElementID = 'edtprice' ElementID = 'edtprice'
HeightPercent = 100.000000000000000000 HeightPercent = 100.000000000000000000
...@@ -281,6 +292,7 @@ object FOrderEntryWeb: TFOrderEntryWeb ...@@ -281,6 +292,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
Top = 402 Top = 402
Width = 121 Width = 121
Height = 23 Height = 23
TabStop = False
AutoSize = True AutoSize = True
ChildOrder = 79 ChildOrder = 79
ElementID = 'edtinvoiceto' ElementID = 'edtinvoiceto'
...@@ -295,6 +307,7 @@ object FOrderEntryWeb: TFOrderEntryWeb ...@@ -295,6 +307,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
Top = 458 Top = 458
Width = 121 Width = 121
Height = 23 Height = 23
TabStop = False
AutoSize = True AutoSize = True
ChildOrder = 79 ChildOrder = 79
ElementID = 'edtponumber' ElementID = 'edtponumber'
...@@ -305,10 +318,11 @@ object FOrderEntryWeb: TFOrderEntryWeb ...@@ -305,10 +318,11 @@ object FOrderEntryWeb: TFOrderEntryWeb
DataSource = WebDataSource1 DataSource = WebDataSource1
end end
object edtJobName: TWebDBEdit object edtJobName: TWebDBEdit
Left = 26 Left = 30
Top = 486 Top = 487
Width = 121 Width = 121
Height = 23 Height = 23
TabStop = False
AutoSize = True AutoSize = True
ChildOrder = 79 ChildOrder = 79
ElementID = 'edtjobname' ElementID = 'edtjobname'
...@@ -326,6 +340,7 @@ object FOrderEntryWeb: TFOrderEntryWeb ...@@ -326,6 +340,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
ElementID = 'wcbshipto' ElementID = 'wcbshipto'
HeightPercent = 100.000000000000000000 HeightPercent = 100.000000000000000000
ShowFocus = False ShowFocus = False
TabStop = False
WidthPercent = 100.000000000000000000 WidthPercent = 100.000000000000000000
ItemIndex = -1 ItemIndex = -1
DataField = 'staff_fields_ship_to' DataField = 'staff_fields_ship_to'
...@@ -338,6 +353,7 @@ object FOrderEntryWeb: TFOrderEntryWeb ...@@ -338,6 +353,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
Top = 214 Top = 214
Width = 121 Width = 121
Height = 23 Height = 23
TabStop = False
AutoSize = True AutoSize = True
ChildOrder = 79 ChildOrder = 79
ElementID = 'edtbworcolorcopy' ElementID = 'edtbworcolorcopy'
...@@ -352,6 +368,7 @@ object FOrderEntryWeb: TFOrderEntryWeb ...@@ -352,6 +368,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
Top = 243 Top = 243
Width = 121 Width = 121
Height = 23 Height = 23
TabStop = False
AutoSize = True AutoSize = True
ChildOrder = 79 ChildOrder = 79
ElementID = 'edtplates' ElementID = 'edtplates'
...@@ -363,9 +380,10 @@ object FOrderEntryWeb: TFOrderEntryWeb ...@@ -363,9 +380,10 @@ object FOrderEntryWeb: TFOrderEntryWeb
end end
object edtDimensionalLayout: TWebDBEdit object edtDimensionalLayout: TWebDBEdit
Left = 276 Left = 276
Top = 314 Top = 311
Width = 121 Width = 121
Height = 23 Height = 23
TabStop = False
AutoSize = True AutoSize = True
ChildOrder = 79 ChildOrder = 79
ElementID = 'edtdimensionallayout' ElementID = 'edtdimensionallayout'
...@@ -380,6 +398,7 @@ object FOrderEntryWeb: TFOrderEntryWeb ...@@ -380,6 +398,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
Top = 281 Top = 281
Width = 121 Width = 121
Height = 23 Height = 23
TabStop = False
AutoSize = True AutoSize = True
ChildOrder = 79 ChildOrder = 79
ElementID = 'edtsample' ElementID = 'edtsample'
...@@ -394,6 +413,7 @@ object FOrderEntryWeb: TFOrderEntryWeb ...@@ -394,6 +413,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
Top = 346 Top = 346
Width = 121 Width = 121
Height = 23 Height = 23
TabStop = False
AutoSize = True AutoSize = True
ChildOrder = 79 ChildOrder = 79
ElementID = 'edtother' ElementID = 'edtother'
...@@ -408,6 +428,7 @@ object FOrderEntryWeb: TFOrderEntryWeb ...@@ -408,6 +428,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
Top = 379 Top = 379
Width = 121 Width = 121
Height = 23 Height = 23
TabStop = False
AutoSize = True AutoSize = True
ChildOrder = 79 ChildOrder = 79
ElementID = 'edtemail' ElementID = 'edtemail'
...@@ -422,6 +443,7 @@ object FOrderEntryWeb: TFOrderEntryWeb ...@@ -422,6 +443,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
Top = 442 Top = 442
Width = 121 Width = 121
Height = 23 Height = 23
TabStop = False
AutoSize = True AutoSize = True
ChildOrder = 79 ChildOrder = 79
ElementID = 'edttotalinchesused' ElementID = 'edttotalinchesused'
...@@ -436,6 +458,7 @@ object FOrderEntryWeb: TFOrderEntryWeb ...@@ -436,6 +458,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
Top = 408 Top = 408
Width = 121 Width = 121
Height = 23 Height = 23
TabStop = False
AutoSize = True AutoSize = True
ChildOrder = 79 ChildOrder = 79
ElementID = 'edtftp' ElementID = 'edtftp'
...@@ -450,6 +473,7 @@ object FOrderEntryWeb: TFOrderEntryWeb ...@@ -450,6 +473,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
Top = 471 Top = 471
Width = 121 Width = 121
Height = 23 Height = 23
TabStop = False
AutoSize = True AutoSize = True
ChildOrder = 79 ChildOrder = 79
ElementID = 'edtsheetsused' ElementID = 'edtsheetsused'
...@@ -464,6 +488,7 @@ object FOrderEntryWeb: TFOrderEntryWeb ...@@ -464,6 +488,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
Top = 504 Top = 504
Width = 121 Width = 121
Height = 23 Height = 23
TabStop = False
AutoSize = True AutoSize = True
ChildOrder = 79 ChildOrder = 79
ElementID = 'edtinitials' ElementID = 'edtinitials'
...@@ -1172,6 +1197,7 @@ object FOrderEntryWeb: TFOrderEntryWeb ...@@ -1172,6 +1197,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
ChildOrder = 79 ChildOrder = 79
ElementID = 'btnconfirm' ElementID = 'btnconfirm'
HeightPercent = 100.000000000000000000 HeightPercent = 100.000000000000000000
TabStop = False
WidthPercent = 100.000000000000000000 WidthPercent = 100.000000000000000000
OnClick = btnSaveClick OnClick = btnSaveClick
end end
...@@ -1184,6 +1210,7 @@ object FOrderEntryWeb: TFOrderEntryWeb ...@@ -1184,6 +1210,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
ChildOrder = 79 ChildOrder = 79
ElementID = 'btnpdf' ElementID = 'btnpdf'
HeightPercent = 100.000000000000000000 HeightPercent = 100.000000000000000000
TabStop = False
WidthPercent = 100.000000000000000000 WidthPercent = 100.000000000000000000
OnClick = btnPDFClick OnClick = btnPDFClick
end end
...@@ -1196,6 +1223,7 @@ object FOrderEntryWeb: TFOrderEntryWeb ...@@ -1196,6 +1223,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
ChildOrder = 79 ChildOrder = 79
ElementID = 'btncancel' ElementID = 'btncancel'
HeightPercent = 100.000000000000000000 HeightPercent = 100.000000000000000000
TabStop = False
WidthPercent = 100.000000000000000000 WidthPercent = 100.000000000000000000
OnClick = btnCancelClick OnClick = btnCancelClick
end end
...@@ -1207,6 +1235,7 @@ object FOrderEntryWeb: TFOrderEntryWeb ...@@ -1207,6 +1235,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
ElementID = 'wcbqbitem' ElementID = 'wcbqbitem'
HeightPercent = 100.000000000000000000 HeightPercent = 100.000000000000000000
ShowFocus = False ShowFocus = False
TabStop = False
WidthPercent = 100.000000000000000000 WidthPercent = 100.000000000000000000
ItemIndex = -1 ItemIndex = -1
DataField = 'staff_fields_quickbooks_item' DataField = 'staff_fields_quickbooks_item'
...@@ -1294,6 +1323,7 @@ object FOrderEntryWeb: TFOrderEntryWeb ...@@ -1294,6 +1323,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
ChildOrder = 91 ChildOrder = 91
ElementID = 'btncopy' ElementID = 'btncopy'
HeightPercent = 100.000000000000000000 HeightPercent = 100.000000000000000000
TabStop = False
WidthPercent = 100.000000000000000000 WidthPercent = 100.000000000000000000
OnClick = btnCopyClick OnClick = btnCopyClick
end end
...@@ -1306,6 +1336,7 @@ object FOrderEntryWeb: TFOrderEntryWeb ...@@ -1306,6 +1336,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
ChildOrder = 79 ChildOrder = 79
ElementID = 'btndelete' ElementID = 'btndelete'
HeightPercent = 100.000000000000000000 HeightPercent = 100.000000000000000000
TabStop = False
WidthPercent = 100.000000000000000000 WidthPercent = 100.000000000000000000
OnClick = btnDeleteClick OnClick = btnDeleteClick
end end
...@@ -1318,6 +1349,7 @@ object FOrderEntryWeb: TFOrderEntryWeb ...@@ -1318,6 +1349,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
ChildOrder = 80 ChildOrder = 80
ElementID = 'btnclose' ElementID = 'btnclose'
HeightPercent = 100.000000000000000000 HeightPercent = 100.000000000000000000
TabStop = False
WidthPercent = 100.000000000000000000 WidthPercent = 100.000000000000000000
OnClick = btnCloseClick OnClick = btnCloseClick
end end
...@@ -1326,6 +1358,7 @@ object FOrderEntryWeb: TFOrderEntryWeb ...@@ -1326,6 +1358,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
Top = 194 Top = 194
Width = 121 Width = 121
Height = 22 Height = 22
TabStop = False
ChildOrder = 81 ChildOrder = 81
ElementID = 'edtordernum' ElementID = 'edtordernum'
Enabled = False Enabled = False
...@@ -1342,6 +1375,7 @@ object FOrderEntryWeb: TFOrderEntryWeb ...@@ -1342,6 +1375,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
ChildOrder = 83 ChildOrder = 83
ElementID = 'btnedit' ElementID = 'btnedit'
HeightPercent = 100.000000000000000000 HeightPercent = 100.000000000000000000
TabStop = False
WidthPercent = 100.000000000000000000 WidthPercent = 100.000000000000000000
OnClick = btnEditClick OnClick = btnEditClick
end end
...@@ -1354,6 +1388,7 @@ object FOrderEntryWeb: TFOrderEntryWeb ...@@ -1354,6 +1388,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
ChildOrder = 84 ChildOrder = 84
ElementID = 'btnadd' ElementID = 'btnadd'
HeightPercent = 100.000000000000000000 HeightPercent = 100.000000000000000000
TabStop = False
WidthPercent = 100.000000000000000000 WidthPercent = 100.000000000000000000
OnClick = btnAddClick OnClick = btnAddClick
end end
......
kgOrdersClient/webKGOrders.dproj
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<FrameworkType>VCL</FrameworkType> <FrameworkType>VCL</FrameworkType>
<MainSource>webKGOrders.dpr</MainSource> <MainSource>webKGOrders.dpr</MainSource>
<Base>True</Base> <Base>True</Base>
<Config Condition="'$(Config)'==''">Debug</Config> <Config Condition="'$(Config)'==''">Release</Config>
<Platform Condition="'$(Platform)'==''">Win32</Platform> <Platform Condition="'$(Platform)'==''">Win32</Platform>
<TargetedPlatforms>1</TargetedPlatforms> <TargetedPlatforms>1</TargetedPlatforms>
<AppType>Application</AppType> <AppType>Application</AppType>
......
kgOrdersServer/Source/Main.dfm
...@@ -16,7 +16,7 @@ object FMain: TFMain ...@@ -16,7 +16,7 @@ object FMain: TFMain
597) 597)
TextHeight = 13 TextHeight = 13
object memoInfo: TMemo object memoInfo: TMemo
Left = 8 Left = 12
Top = 44 Top = 44
Width = 753 Width = 753
Height = 549 Height = 549
......
kgOrdersServer/kgOrdersServer.dproj
...@@ -116,8 +116,8 @@ ...@@ -116,8 +116,8 @@
<DCC_UnitSearchPath>C:\RADTOOLS\FastMM4;$(DCC_UnitSearchPath)</DCC_UnitSearchPath> <DCC_UnitSearchPath>C:\RADTOOLS\FastMM4;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
<VerInfo_MajorVer>0</VerInfo_MajorVer> <VerInfo_MajorVer>0</VerInfo_MajorVer>
<VerInfo_MinorVer>9</VerInfo_MinorVer> <VerInfo_MinorVer>9</VerInfo_MinorVer>
<VerInfo_Release>6</VerInfo_Release> <VerInfo_Release>7</VerInfo_Release>
<VerInfo_Keys>CompanyName=EM Systems;FileDescription=$(MSBuildProjectName);FileVersion=0.9.6.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=0.9.6.0;Comments=</VerInfo_Keys> <VerInfo_Keys>CompanyName=EM Systems;FileDescription=$(MSBuildProjectName);FileVersion=0.9.7.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=0.9.7.0;Comments=</VerInfo_Keys>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Win64)'!=''"> <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
<AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode> <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
......
kgOrdersServer/kgOrdersServer.ini
[Settings] [Settings]
MemoLogLevel=3 MemoLogLevel=3
FileLogLevel=5 FileLogLevel=5
webClientVersion=0.9.6 webClientVersion=0.9.7
LogFileNum=826 LogFileNum=826
[Database] [Database]
......
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