Skip to content

K
KGOrders
Commit 6d54266c by Mac Stephens
Options

updated version, quick change to confirmation modal to work correctly on… 

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