Commit c15c23b4 by Cam Hayes

Minor text changes

parent f1dcb569
object FViewAddAddress: TFViewAddAddress object FViewAddAddress: TFViewAddAddress
Width = 281 Width = 281
Height = 402 Height = 402
TabOrder = 0
object WebLabel1: TWebLabel object WebLabel1: TWebLabel
Left = 8 Left = 8
Top = 283 Top = 283
...@@ -120,10 +119,10 @@ object FViewAddAddress: TFViewAddAddress ...@@ -120,10 +119,10 @@ object FViewAddAddress: TFViewAddAddress
Top = 8 Top = 8
Width = 198 Width = 198
Height = 22 Height = 22
TabStop = False
ChildOrder = 12 ChildOrder = 12
Enabled = False Enabled = False
HeightPercent = 100.000000000000000000 HeightPercent = 100.000000000000000000
TabOrder = -1
WidthPercent = 100.000000000000000000 WidthPercent = 100.000000000000000000
end end
object btnSave: TWebButton object btnSave: TWebButton
...@@ -134,7 +133,7 @@ object FViewAddAddress: TFViewAddAddress ...@@ -134,7 +133,7 @@ object FViewAddAddress: TFViewAddAddress
Caption = 'Save' Caption = 'Save'
ChildOrder = 13 ChildOrder = 13
HeightPercent = 100.000000000000000000 HeightPercent = 100.000000000000000000
TabStop = False TabOrder = -1
WidthPercent = 100.000000000000000000 WidthPercent = 100.000000000000000000
OnClick = btnSaveClick OnClick = btnSaveClick
end end
...@@ -146,7 +145,7 @@ object FViewAddAddress: TFViewAddAddress ...@@ -146,7 +145,7 @@ object FViewAddAddress: TFViewAddAddress
Caption = 'Cancel' Caption = 'Cancel'
ChildOrder = 13 ChildOrder = 13
HeightPercent = 100.000000000000000000 HeightPercent = 100.000000000000000000
TabStop = False TabOrder = -1
WidthPercent = 100.000000000000000000 WidthPercent = 100.000000000000000000
OnClick = btnCancelClick OnClick = btnCancelClick
end end
......
...@@ -46533,7 +46533,7 @@ object FViewLogin: TFViewLogin ...@@ -46533,7 +46533,7 @@ object FViewLogin: TFViewLogin
Width = 72 Width = 72
Height = 13 Height = 13
Caption = 'lblClientVersion' Caption = 'lblClientVersion'
ElementID = 'lbl_client_version' ElementID = 'view.login.version'
ElementFont = efCSS ElementFont = efCSS
ElementPosition = epRelative ElementPosition = epRelative
HeightStyle = ssAuto HeightStyle = ssAuto
<nav class="navbar navbar-light bg-light login-navbar"> <nav class="navbar navbar-light bg-light login-navbar">
<div class="container-fluid"> <div class="d-flex align-items-center">
<a class="navbar-brand" href="#">Koehler-Gibson Orders</a> <a id="view.login.apptitle" class="navbar-brand ps-2" href="index.html"> Koehler-Gibson Orders</a>
<span id="view.login.version" class="small text-muted ms-2"></span>
</div> </div>
</nav> </nav>
<div class="container mt-5"> <div class="container mt-5">
......
...@@ -100,10 +100,9 @@ begin ...@@ -100,10 +100,9 @@ begin
lblCustomers.Enabled := false; lblCustomers.Enabled := false;
end; end;
ShowForm(TFViewOrders);
lblAppTitle.Caption := 'Koehler-Gibson Orders'; lblAppTitle.Caption := 'Koehler-Gibson Orders';
lblVersion.Caption := 'v' + DMConnection.clientVersion; lblVersion.Caption := 'v' + DMConnection.clientVersion;
ShowForm(TFViewOrders);
setActive('Orders'); setActive('Orders');
end; end;
...@@ -126,8 +125,9 @@ procedure TFViewMain.lblHomeClick(Sender: TObject); ...@@ -126,8 +125,9 @@ procedure TFViewMain.lblHomeClick(Sender: TObject);
begin begin
if ( not ( change ) ) then if ( not ( change ) ) then
begin begin
ShowForm(TFViewHome); ShowToast('Home page is not currently implemented', 'info');
lblAppTitle.Caption := 'Koehler-Gibson Home'; //ShowForm(TFViewHome);
//lblAppTitle.Caption := 'Koehler-Gibson Home';
//setActive('Home'); //setActive('Home');
end end
else else
......
...@@ -97,14 +97,14 @@ ...@@ -97,14 +97,14 @@
<label for="wdbe_first_name" style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Quantity:</label> <label for="wdbe_first_name" style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Quantity:</label>
<input id="edtquantity" class="form-control input-sm" style="width: 100px" type="number" min="1" required/> <input id="edtquantity" class="form-control input-sm" style="width: 100px" type="number" min="1" required/>
<div class="invalid-feedback" style="font-size: 15px;" required> <div class="invalid-feedback" style="font-size: 15px;" required>
Please Provide a Quantity. Please Provide a Valid Quantity.
</div> </div>
</div> </div>
<div class="col-auto"> <div class="col-auto">
<label for="wdbe_first_name" style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Price:</label> <label for="wdbe_first_name" style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Price:</label>
<input id="edtprice" class="form-control input-sm" style="width: 100px" type="number" min="1" required/> <input id="edtprice" class="form-control input-sm" style="width: 100px" type="number" min="1" required/>
<div class="invalid-feedback" style="font-size: 15px;"> <div class="invalid-feedback" style="font-size: 15px;">
Please Provide a Price. Please Provide a Valid Price.
</div> </div>
</div> </div>
<div> <div>
...@@ -358,7 +358,7 @@ ...@@ -358,7 +358,7 @@
</div> </div>
<div class="col-auto"> <div class="col-auto">
<input type="checkbox" id="cbartapprovedasis"> <input type="checkbox" id="cbartapprovedasis">
<label for="wdbe_first_name" style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Art Approved As Is:</label> <label for="wdbe_first_name" style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Art Approved As Is?</label>
</div> </div>
<div class="col-auto"> <div class="col-auto">
<label for="wdbe_first_name" style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Approved Date:</label> <label for="wdbe_first_name" style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Approved Date:</label>
......
...@@ -100,14 +100,14 @@ ...@@ -100,14 +100,14 @@
<label for="wdbe_first_name" style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Quantity:</label> <label for="wdbe_first_name" style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Quantity:</label>
<input id="edtquantity" class="form-control input-sm" style="width: 100px" type="number" min="1" required/> <input id="edtquantity" class="form-control input-sm" style="width: 100px" type="number" min="1" required/>
<div class="invalid-feedback" style="font-size: 15px;" required> <div class="invalid-feedback" style="font-size: 15px;" required>
Please Provide a Quantity. Please Provide a Valid Quantity.
</div> </div>
</div> </div>
<div class="col-auto"> <div class="col-auto">
<label for="wdbe_first_name" style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Price:</label> <label for="wdbe_first_name" style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Price:</label>
<input id="edtprice" class="form-control input-sm" style="width: 100px" type="number" min="1" required/> <input id="edtprice" class="form-control input-sm" style="width: 100px" type="number" min="1" required/>
<div class="invalid-feedback" style="font-size: 15px;"> <div class="invalid-feedback" style="font-size: 15px;">
Please Provide a Price. Please Provide a Valid Price.
</div> </div>
</div> </div>
<div> <div>
......
...@@ -97,14 +97,14 @@ ...@@ -97,14 +97,14 @@
<label for="wdbe_first_name" style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Quantity:</label> <label for="wdbe_first_name" style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Quantity:</label>
<input id="edtquantity" class="form-control input-sm" style="width: 100px" type="number" min="1" required/> <input id="edtquantity" class="form-control input-sm" style="width: 100px" type="number" min="1" required/>
<div class="invalid-feedback" style="font-size: 15px;" required> <div class="invalid-feedback" style="font-size: 15px;" required>
Please Provide a Quantity. Please Provide a Valid Quantity.
</div> </div>
</div> </div>
<div class="col-auto"> <div class="col-auto">
<label for="wdbe_first_name" style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Price:</label> <label for="wdbe_first_name" style="font-weight: 700; font-size: 15px;" class="form-label mt-2">Price:</label>
<input id="edtprice" class="form-control input-sm" style="width: 100px" type="number" min="1" required/> <input id="edtprice" class="form-control input-sm" style="width: 100px" type="number" min="1" required/>
<div class="invalid-feedback" style="font-size: 15px;"> <div class="invalid-feedback" style="font-size: 15px;">
Please Provide a Price. Please Provide a Valid Price.
</div> </div>
</div> </div>
<div> <div>
......
...@@ -1784,8 +1784,7 @@ begin ...@@ -1784,8 +1784,7 @@ begin
ordersDB.UniQuery1.FieldByName('STATUS').AsString := 'INACTIVE' ordersDB.UniQuery1.FieldByName('STATUS').AsString := 'INACTIVE'
end; end;
if not email.IsEmpty then ordersDB.UniQuery1.FieldByName('EMAIL').AsString := email;
ordersDB.UniQuery1.FieldByName('EMAIL').AsString := email;
if not access.IsEmpty then if not access.IsEmpty then
ordersDB.UniQuery1.FieldByName('ACCESS_TYPE').AsString := Access; ordersDB.UniQuery1.FieldByName('ACCESS_TYPE').AsString := Access;
...@@ -1796,8 +1795,7 @@ begin ...@@ -1796,8 +1795,7 @@ begin
if not perspective.IsEmpty then if not perspective.IsEmpty then
ordersDB.UniQuery1.FieldByName('PERSPECTIVE_ID').AsString := perspective; ordersDB.UniQuery1.FieldByName('PERSPECTIVE_ID').AsString := perspective;
if not QB.IsEmpty then ordersDB.UniQuery1.FieldByName('QB_ID').AsString := QB;
ordersDB.UniQuery1.FieldByName('QB_ID').AsString := QB;
if((not (Password = 'hidden')) and (not (Password.IsEmpty))) then if((not (Password = 'hidden')) and (not (Password.IsEmpty))) then
begin begin
......
[Settings] [Settings]
MemoLogLevel=4 MemoLogLevel=0
FileLogLevel=4 FileLogLevel=0
webClientVersion=0.9.11 webClientVersion=0.9.11
LogFileNum=183 LogFileNum=187
[Database] [Database]
--Server=192.168.116.132 --Server=192.168.116.132
......
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