Minor bug fixes for deployment

kgOrdersClient/AddCustomer.dfm

@@ -296,6 +296,7 @@ object FViewAddCustomer: TFViewAddCustomer
     Header.ListItemElementClassName = 'page-item'
     Header.ListLinkElementClassName = 'page-link'
     WordWrap = True
+    OnClickCell = wdbtcAddressesDblClickCell
     OnDblClickCell = wdbtcAddressesDblClickCell
     Columns = <
       item

kgOrdersClient/AddCustomer.pas

@@ -480,6 +480,7 @@ begin
   if VerifyCustomer() then
   begin
     sendCustomerToServer();
+    GetCustomer();
     ViewMode();
   end;
 end;

kgOrdersClient/View.OrderEntryCorrugated.pas

@@ -580,6 +580,7 @@ begin
   jsObj := JS.TJSObject(Response.Result);
   if mode = 'ADD' then
     OrderID := String(jsObj.Properties['OrderID']);
+  edtOrderNum.Text := OrderID;
   mode := 'EDIT';
   console.log(jsObj);
   ShowNotification(string(jsObj.Properties['status']));
@@ -674,6 +675,7 @@ end;
 
 procedure TFOrderEntryCorrugated.btnAddColorClick(Sender: TObject);
 begin
+  EditMode();
   addColorRow('','','','');
 end;
 

kgOrdersClient/View.OrderEntryCuttingDie.pas

@@ -423,6 +423,7 @@ begin
     jsObj := JS.TJSObject(Response.Result);
     if mode = 'ADD' then
       OrderID := String(jsObj.Properties['OrderID']);
+    edtOrderNum.Text := OrderID;
     mode := 'EDIT';
   except
     on E: EXDataClientRequestException do

kgOrdersClient/View.OrderEntryWeb.html

@@ -404,32 +404,6 @@
             <textarea id="edtcomments" class="form-control" style=" width: 500px; height: 150px;"></textarea>
         </div>
     </div>
-    <div class="row">
-        <div class="col-auto">
-            <button id="btnconfirm" class="btn btn-primary btn-sm float-end my-2">Save</button>
-        </div>
-         <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 class="col-auto">
-                <button id="btnedit" class="btn btn-primary btn-sm float-end my-2">Edit</button>
-        </div>
-        <div class="col-auto">
-            <button id="btnadd" class="btn btn-primary btn-sm float-end my-2">Add</button>
-        </div>
-    </div>
 </div>
 <div class="modal fade" id="confirmation_modal" tabindex="-1" aria-labelledby="confirmation_modal_label" aria-hidden="true">
   <div class="modal-dialog">

kgOrdersClient/View.OrderEntryWeb.pas

@@ -620,7 +620,7 @@ begin
     jsObj := JS.TJSObject(Response.Result);
     if mode = 'ADD' then
       OrderID := String(jsObj.Properties['OrderID']);
-    console.log(OrderID);
+    edtOrderNum.Text := OrderID;
     mode := 'EDIT';
   except
     on E: EXDataClientRequestException do
@@ -705,6 +705,7 @@ end;
 
 procedure TFOrderEntryWeb.WebButton1Click(Sender: TObject);
 begin
+  EditMode();
   addColorRow('','','','');
 end;
 

kgOrdersClient/View.Orders.dfm

@@ -238,9 +238,7 @@ object FViewOrders: TFViewOrders
     ItemIndex = -1
     LookupValues = <
       item
-        Value = 
-          'COALESCE(cpo.staff_fields_order_date, wpo.staff_fields_order_dat' +
-          'e, cdo.staff_fields_order_date) DESC'
+        Value = 'o.ORDER_ID DESC'
         DisplayText = 'ID'
       end
       item
@@ -252,7 +250,9 @@ object FViewOrders: TFViewOrders
         DisplayText = 'Job Name'
       end
       item
-        Value = 'o.ORDER_DATE DESC'
+        Value = 
+          'COALESCE(cpo.staff_fields_order_date, wpo.staff_fields_order_dat' +
+          'e, cdo.staff_fields_order_date) DESC'
         DisplayText = 'Order Date'
       end
       item

kgOrdersClient/View.Orders.pas

@@ -271,6 +271,7 @@ end;
 
 procedure TFViewOrders.wlcbOrderByChange(Sender: TObject);
 begin
+  //console.log(wlcbOrderBy.Value);
   OrderBy := wlcbOrderBy.Value;
   getOrders(generateSearchOptions());
 end;

kgOrdersClient/View.Search.dfm

@@ -231,6 +231,7 @@ object FSearch: TFSearch
     TabStop = False
     Text = 'PROOF DONE'
     WidthPercent = 100.000000000000000000
+    OnChange = wcbFilterType1Change
     ItemIndex = -1
     Items.Strings = (
       'NONE'
@@ -365,6 +366,7 @@ object FSearch: TFSearch
     TabStop = False
     Text = 'PROOF DONE'
     WidthPercent = 100.000000000000000000
+    OnChange = wcbFilterType2Change
     ItemIndex = -1
     Items.Strings = (
       'NONE'

kgOrdersClient/View.Search.pas

@@ -64,6 +64,8 @@ type
     procedure btnClearClick(Sender: TObject);
     procedure cbNull1Click(Sender: TObject);
     procedure cbNull2Click(Sender: TObject);
+    procedure wcbFilterType1Change(Sender: TObject);
+    procedure wcbFilterType2Change(Sender: TObject);
   private
     //FJSONProc: TJSONProc;
     [async] procedure getCustomers;
@@ -118,8 +120,8 @@ begin
   DateFormatSettings.ShortDateFormat := 'yyyy/mm/dd';
   wcbOrderType.Text := UpperCase(Copy(params.Values['orderType'], 1, 1)) + LowerCase(Copy(params.Values['orderType'], 2, MaxInt));
   edtOrderID.Text := params.Values['orderID'];
-  edtCompanyID.Text := params.Values['companyID'];
   edtJobName.Text := params.Values['jobName'];
+  DBID := params.Values['companyID'];
 
   // Status 1
   if params.Values['filterType1'] <> '' then
@@ -175,9 +177,9 @@ begin
     end;
   end;
 
+  getCustomers();
 
   params.Free;
-  getCustomers();
 end;
 
 procedure TFSearch.btnCancelClick(Sender: TObject);
@@ -257,6 +259,13 @@ begin
 
   // Manually populate the grid
   PopulateGridManually;
+
+  if DBID <> '' then
+  begin
+    xdwdsCustomers.Locate('CUSTOMER_ID', DBID, []);
+    edtCompanyID.Text := xdwdsCustomers.FieldByName('SHORT_NAME').AsString;
+    edtCompanyName.Text := xdwdsCustomers.FieldByName('NAME').AsString;
+  end;
 end;
 
 procedure TFSearch.TMSFNCGrid1CellClick(Sender: TObject; ACol, ARow: Integer);
@@ -267,6 +276,39 @@ begin
 
 end;
 
+procedure TFSearch.wcbFilterType1Change(Sender: TObject);
+begin
+  if wcbFilterType1.Text = 'NONE' then
+  begin
+    dtpStartDate1.Visible := false;
+    dtpEndDate1.Visible := false;
+    cbNull1.Visible := false;
+  end
+  else
+  begin
+    dtpStartDate1.Visible := True;
+    dtpEndDate1.Visible := True;
+    cbNull1.Visible := True;
+  end;
+
+end;
+
+procedure TFSearch.wcbFilterType2Change(Sender: TObject);
+begin
+  if wcbFilterType2.Text = 'NONE' then
+  begin
+    dtpStartDate2.Visible := false;
+    dtpEndDate2.Visible := false;
+    cbNull2.Visible := false;
+  end
+  else
+  begin
+    dtpStartDate2.Visible := True;
+    dtpEndDate2.Visible := True;
+    cbNull2.Visible := True;
+  end;
+end;
+
 procedure TFSearch.PopulateGridManually;
 var
   RowIndex: Integer;

kgOrdersClient/View.SelectCustomer.dfm

@@ -38,6 +38,7 @@ object FSelectCustomer: TFSelectCustomer
     ChildOrder = 2
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
+    OnChange = edtSearchChange
   end
   object edtName: TWebEdit
     Left = 279

kgOrdersClient/View.SelectCustomer.pas

@@ -46,11 +46,13 @@ type
     procedure TMSFNCGrid1CellDblClick(Sender: TObject; ACol, ARow: Integer);
     procedure btnConfirmClick(Sender: TObject);
     procedure TMSFNCGrid1CellClick(Sender: TObject; ACol, ARow: Integer);
+    procedure edtSearchChange(Sender: TObject);
   private
     { Private declarations }
     [Async] procedure GetCustomers();
     [Async] procedure SendCustomerToServer();
     procedure PopulateGridManually();
+    procedure ApplyFilter();
   public
     { Public declarations }
   end;
@@ -90,7 +92,12 @@ begin
   end;
 end;
 
-[async] procedure TFSelectCustomer.getCustomers();
+procedure TFSelectCustomer.edtSearchChange(Sender: TObject);
+begin
+  ApplyFilter();
+end;
+
+procedure TFSelectCustomer.getCustomers();
 // retrieves customer list from server
 var
   xdcResponse: TXDataClientResponse;
@@ -206,4 +213,35 @@ begin
 
 end;
 
+procedure TFSelectCustomer.ApplyFilter;
+// filters the grid based on search textbox contents.
+var
+  fd: TTMSFNCGridFilterData;
+  i: Integer;
+  SearchText: string;
+begin
+  SearchText := Trim(edtSearch.Text);
+
+  TMSFNCGrid1.RemoveFilter;
+  TMSFNCGrid1.Filter.Clear;
+
+  // match on first 3 columns
+  for i := 0 to 2 do
+  begin
+    fd := TMSFNCGrid1.Filter.Add;
+    fd.Column := i;
+    fd.Condition := '*' + SearchText + '*'; // Match text anywhere in the cell
+    fd.CaseSensitive := False; // Make the filter case-insensitive
+
+    // Use foOR for "match any column" logic
+    if i > 0 then
+      fd.Operation := foOR
+    else
+      fd.Operation := foNONE; // First filter has no logical operation
+  end;
+
+  // Apply the filters to the grid
+  TMSFNCGrid1.ApplyFilter;
+end;
+
 end.
\ No newline at end of file

kgOrdersServer/kgOrdersServer.ini

@@ -18,5 +18,5 @@ CompanyID=9341454272655710
 ClientID=ABgO14uvjh8XqLud7spQ8lkb98AUpcdA7HbyMJfCAtl65sQ5yy
 ClientSecret=bQ06TRemHeAGFzVHRaTUvUoBU9jpU9itK6MOMgqN
 RefreshToken=RT1-7-H0-1758919884sgbdvdaawcewm26l9f9k
-AccessToken=eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwieC5vcmciOiJIMCJ9..5Uv-0kfuVDyI0DHwQrGfIA.yz4mQ8OjrVdyjALb6BRBz_OahGdn7Xn0JnLK3CnuYmieFwj_qkXDzlD9V9-R3CkGfkPhjprCowkYeWbzbRve055teEAj90qGoR_OuzRfJMsI6GRbWHZXlAGHzmbDWSQD1lwbj3MCx3YZ8h_BZSCF3ojF6HH7ggyLmlEcr1UZMRH5wykRtuRH9WQPbL7OUuEx__fnB25EbyQF6fu8tRjOfyt_IaWqXa_9N_sIdjrjcBwMOo-z3-xCPSCp2TU15hF13U2_IF9_RNJDvFANXrhy5Pv9ENe9vvJxU5seJe709X9ko0yh_N5AFwZoE3-xf63XziRyvBCpdkriMBSGKSVwuMoTJdx6KqDDKitf4kWXl56gtJ9wJGl_gTp54HW5luSZPDxLCmVKDf2UXsakDmXhZe6LyQcdTkJlaWqguUyDM9O-6o3AgnzJ_5PGW_7AklSXGagxMS34xyD4NH9O0YQIhlFzaWVkrLv5giyw5IP2NFlxnKybxsjfLTKgxEqFpJqgG2YovLNxPLNzl7zieVAaK8VbzonKBae6AfIQVVuDqnM__KeKjgtb0N0XV1r3vLB1wDAa9N8_3nvKDqXjQVfW_xwhETxrE_fNRBwu5cQ63MoQpMctLu2tdJwu5zTpKSBR.AmloWkat-1tymc9Aebazxg
-LastRefresh=6/18/2025 10:27:34 AM
+AccessToken=eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwieC5vcmciOiJIMCJ9..PLd51yew2irHDBrcsT_EpA.iOyzK2ssY_1bRGAyxZIrqJyl2wvT70A6JrZt-oaBITJUTUp9NLql9g06PxuhgKB8t-ajFDCXtqyZEbtLx0T9-XntK5IkGuXXW5KZcWLGYAUm-T7ZDwiAVS3nyQhGkUr_yMqcPkktvCizQZjA7WscP1hWMHWSc9dMW2qfZc-fZartku7ffZXWlaJK03__8iRSBciZz4uRhVj6UAsGyE9QdBSemLmnZgXtB_v2iKoJk0Fh4Y-X-6u2yUVxM7fpBpx6QM93I0Ckjf_grK1Q_wNecc7QsBrNF1O13vW3q52viI0vuhTmLjZLNq9lrMqm3dX088ZgSnASkmgvLV-dg8zBK4J50GeTNngSHDYIMD7_xTgRCc9Vhmw7sACVPgmlVDO55B8w7AbF2VZGoJMk4XmZwR4Biie3cyQLZZ9cLR7KRb3uLRDI_exehnhsyDf4qzTk9SXYgs9TIfIWX8vyaHxXS-rvDElJ2BYr99wavTs1p9b8qwuWEqnfL08VYeZbuzxuTTNX2EqiIkIk-g-fRPuUcyu853co4YdY8yXs97aX9LDGlTl1Qv8U7IEaLHgeB6mRUmpC_uSuYjxMNsSmpBPVNH-mXrKINHodfrOXcvljPxqe48E9oFcplc0EApX0LYJ6.JgN4KV7iDxMEOK1otv66xA
+LastRefresh=6/18/2025 1:45:15 PM