errormodal fixes and console log to orderentrycuttingdie to see when datasource is updated

kgOrdersClient/AddCustomer.pas

@@ -265,7 +265,7 @@ procedure TFViewAddCustomer.btnDeleteClick(Sender: TObject);
 // Eventually will delete customers after a confirmation
 // TODO implement deleting customers
 begin
-  ShowMessage('Deleting Customers Is Not Yet Available');
+  ShowErrorModal('Deleting Customers Is Not Yet Available');
 end;
 
 procedure TFViewAddCustomer.btnEditClick(Sender: TObject);

kgOrdersClient/View.Main.html

@@ -49,10 +49,8 @@
     </nav>
     <!-- Toast wrapper directly under navbar -->
     <div id="toast-wrapper"
-         class="position-fixed top-0 start-0 mt-4 ms-4"
+         class="position-fixed top-0 start-0 mt-5 ms-4"
          style="z-index: 1080; min-width: 300px; max-width: 500px;">
-
-
       <div id="bootstrapToast"
            class="toast align-items-center text-white bg-success border-0 shadow"
            role="alert" aria-live="assertive" aria-atomic="true">

kgOrdersClient/View.Main.pas

@@ -130,7 +130,7 @@ begin
     //setActive('Home');
   end
   else
-    ShowMessage('Please Save or Cancel your changes');
+    ShowErrorModal('Please Save or Cancel your changes');
 end;
 
 procedure TFViewMain.lblordersClick(Sender: TObject);
@@ -143,7 +143,7 @@ begin
     setActive('Orders');
   end
   else
-    ShowMessage('Please Save or Cancel your changes');
+    ShowErrorModal('Please Save or Cancel your changes');
 end;
 
 procedure TFViewMain.lblQuickbooksClick(Sender: TObject);
@@ -155,7 +155,7 @@ begin
     setActive('QuickBooks');
   end
   else
-    ShowMessage('Please Save or Cancel your changes');
+    ShowErrorModal('Please Save or Cancel your changes');
 end;
 
 procedure TFViewMain.lblUsersClick(Sender: TObject);
@@ -166,7 +166,7 @@ begin
     lblAppTitle.Caption := 'Koehler-Gibson Users';
   end
   else
-    ShowMessage('Please Save or Cancel your changes');
+    ShowErrorModal('Please Save or Cancel your changes');
 end;
 
 procedure TFViewMain.lblItemsListClick(Sender: TObject);
@@ -178,7 +178,7 @@ begin
     setActive('Items');
   end
   else
-    ShowMessage('Please Save or Cancel your changes');
+    ShowErrorModal('Please Save or Cancel your changes');
 end;
 
 procedure TFViewMain.setActive(page: string);

kgOrdersClient/View.OrderEntryCuttingDie.dfm

@@ -363,14 +363,15 @@ object FOrderEntryCuttingDie: TFOrderEntryCuttingDie
   end
   object WebDataSource1: TWebDataSource
     DataSet = XDataWebDataSet1
-    Left = 22
-    Top = 10
+    OnDataChange = WebDataSource1DataChange
+    Left = 318
+    Top = 262
   end
   object XDataWebDataSet1: TXDataWebDataSet
     AfterEdit = XDataWebDataSet1AfterEdit
     Connection = DMConnection.ApiConnection
-    Left = 90
-    Top = 20
+    Left = 318
+    Top = 208
     object XDataWebDataSet1COMPANY_ID: TIntegerField
       FieldName = 'COMPANY_ID'
     end
@@ -434,8 +435,8 @@ object FOrderEntryCuttingDie: TFOrderEntryCuttingDie
   end
   object XDataWebClient1: TXDataWebClient
     Connection = DMConnection.ApiConnection
-    Left = 192
-    Top = 92
+    Left = 218
+    Top = 76
   end
   object tmrScrollTop: TWebTimer
     Interval = 100
@@ -450,21 +451,21 @@ object FOrderEntryCuttingDie: TFOrderEntryCuttingDie
   end
   object xdwdsShipTo: TXDataWebDataSet
     AfterEdit = xdwdsShipToAfterEdit
-    Left = 288
-    Top = 370
+    Left = 438
+    Top = 208
     object xdwdsShipToADDRESS: TStringField
       FieldName = 'ADDRESS'
     end
   end
   object wdsQBItem: TWebDataSource
     DataSet = xdwdsQBItem
-    Left = 230
-    Top = 554
+    Left = 272
+    Top = 548
   end
   object xdwdsQBItem: TXDataWebDataSet
     AfterEdit = xdwdsQBItemAfterEdit
-    Left = 190
-    Top = 548
+    Left = 568
+    Top = 216
     object xdwdsQBItemname: TStringField
       FieldName = 'name'
     end

kgOrdersClient/View.OrderEntryCuttingDie.pas

-unit View.OrderEntryCuttingDie;
+unit View.OrderEntryCuttingDie;
 
 interface
 
@@ -93,13 +93,14 @@ type
     procedure xdwdsShipToAfterEdit(DataSet: TDataSet);
     procedure EditMode();
     procedure xdwdsQBItemAfterEdit(DataSet: TDataSet);
-    procedure XDataWebDataSet1AfterEdit(DataSet: TDataSet);
     procedure dtpOrderDateChange(Sender: TObject);
     procedure btnEditClick(Sender: TObject);
     procedure ViewMode();
     procedure WebButton2Click(Sender: TObject);
     procedure ShowAddAddressForm();
     [async] procedure SendAddressToServer(AddressJSON: TJSONObject);
+    procedure WebDataSource1DataChange(Sender: TObject; Field: TField);
+    procedure XDataWebDataSet1AfterEdit(DataSet: TDataSet);
   private
     FModalAction: string;
     FAgencyCode: string;
@@ -128,6 +129,20 @@ begin
   ShowAddAddressForm();
 end;
 
+
+
+procedure TFOrderEntryCuttingDie.WebDataSource1DataChange(Sender: TObject; Field: TField);
+begin
+  if Assigned(Field) then
+    console.log(
+      'Field.OnChange → ' + Field.FieldName +
+      ' is now: ' + Field.AsString
+    )
+  else
+    console.log('WebDataSource1.OnDataChange fired with no specific Field');
+end;
+
+
 procedure TFOrderEntryCuttingDie.SendAddressToServer(AddressJSON: TJSONObject);
 var
   Response: TXDataClientResponse;
@@ -143,6 +158,7 @@ begin
   xdwdsShipTo.Open;
 end;
 
+
 procedure TFOrderEntryCuttingDie.ShowAddAddressForm;
 // displays the search pop-up that allows the user to filter the order list
 var
@@ -190,6 +206,7 @@ begin
   );
 end;
 
+
 function TFOrderEntryCuttingDie.VerifyOrder: Boolean;
 var
   input: TJSHTMLInputElement;
@@ -246,6 +263,7 @@ begin
     input.classList.remove('is-invalid');
 end;
 
+
 procedure TFOrderEntryCuttingDie.SendOrderToServer;
 var
   orderJSON: TJSONObject;
@@ -301,6 +319,7 @@ begin
 
 end;
 
+
 procedure TFOrderEntryCuttingDie.btnSaveClick(Sender: TObject);
 // Converts all the information on the page into a JSON to then send to the server
 begin
@@ -312,6 +331,7 @@ begin
   window.scrollTo(0, 0);
 end;
 
+
 procedure TFOrderEntryCuttingDie.btnCopyClick(Sender: TObject);
 begin
   mode := 'ADD';
@@ -347,6 +367,7 @@ begin
   EditMode();
 end;
 
+
 procedure TFOrderEntryCuttingDie.DelOrder();
 var
   Response: TXDataClientResponse;
@@ -355,11 +376,13 @@ begin
               [OrderID, 'corrugated', JS.toString(AuthService.TokenPayload.Properties['user_id'])]));
 end;
 
+
 procedure TFOrderEntryCuttingDie.btnPDFClick(Sender: TObject);
 begin
   GenerateReportPDF;
 end;
 
+
 procedure TFOrderEntryCuttingDie.btn_confirm_deleteClick(Sender: TObject);
 begin
   if FModalAction = 'cancel' then
@@ -386,6 +409,7 @@ begin
   end;
 end;
 
+
 [async] procedure TFOrderEntryCuttingDie.GenerateReportPDF;
 // sends the search to the server which then sends back a pdf of the results
 var
@@ -450,6 +474,7 @@ begin
   );
 end;
 
+
 procedure TFOrderEntryCuttingDie.btnAddClick(Sender: TObject);
 var
   newform: TFAddOrder;
@@ -488,6 +513,7 @@ begin
   );
 end;
 
+
 procedure TFOrderEntryCuttingDie.btnCancelClick(Sender: TObject);
 begin
   FModalAction := 'cancel';
@@ -512,13 +538,11 @@ end;
 
 procedure TFOrderEntryCuttingDie.WebFormCreate(Sender: TObject);
 begin
-   if not DMConnection.ApiConnection.Connected then
-   begin
+  if not DMConnection.ApiConnection.Connected then
     DMConnection.ApiConnection.OpenAsync;
-    console.log('report requirements connection open')
-   end;
 end;
 
+
 procedure TFOrderEntryCuttingDie.getCuttingDieOrder(Order_ID: string);
 // retrieves an order from the server then loads the info into the page
 var
@@ -645,6 +669,7 @@ begin
   window.scrollTo(0, 0);
 end;
 
+
 procedure TFOrderEntryCuttingDie.EditMode;
 begin
   FViewMain.change := true;
@@ -658,26 +683,30 @@ begin
   btnAdd.Enabled := false;
 end;
 
-procedure TFOrderEntryCuttingDie.xdwdsQBItemAfterEdit(DataSet: TDataSet);
+procedure TFOrderEntryCuttingDie.XDataWebDataSet1AfterEdit(DataSet: TDataSet);
 begin
   EditMode();
 end;
 
-procedure TFOrderEntryCuttingDie.xdwdsShipToAfterEdit(DataSet: TDataSet);
+
+procedure TFOrderEntryCuttingDie.xdwdsQBItemAfterEdit(DataSet: TDataSet);
 begin
   EditMode();
 end;
 
-procedure TFOrderEntryCuttingDie.XDataWebDataSet1AfterEdit(DataSet: TDataSet);
+
+procedure TFOrderEntryCuttingDie.xdwdsShipToAfterEdit(DataSet: TDataSet);
 begin
   EditMode();
 end;
 
+
 procedure TFOrderEntryCuttingDie.dtpOrderDateChange(Sender: TObject);
 begin
   EditMode();
 end;
 
+
 procedure TFOrderEntryCuttingDie.ViewMode;
 begin
   btnPDF.Enabled := true;
@@ -691,6 +720,7 @@ begin
   FViewMain.change := false;
 end;
 
+
 initialization
   RegisterClass(TFOrderEntryCuttingDie);
 

kgOrdersClient/View.OrderEntryWeb.dfm

@@ -825,6 +825,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ChildOrder = 79
     ElementID = 'edtaround'
     HeightPercent = 100.000000000000000000
+    ShowFocus = False
     WidthPercent = 100.000000000000000000
     DataField = 'layout_around'
     DataSource = WebDataSource1
@@ -838,6 +839,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ChildOrder = 79
     ElementID = 'edtaccross'
     HeightPercent = 100.000000000000000000
+    ShowFocus = False
     WidthPercent = 100.000000000000000000
     DataField = 'layout_accross'
     DataSource = WebDataSource1
@@ -851,6 +853,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ChildOrder = 79
     ElementID = 'edtreverseprint'
     HeightPercent = 100.000000000000000000
+    ShowFocus = False
     WidthPercent = 100.000000000000000000
     DataField = 'layout_reverse_print'
     DataSource = WebDataSource1
@@ -864,6 +867,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ChildOrder = 79
     ElementID = 'edtsurfaceprint'
     HeightPercent = 100.000000000000000000
+    ShowFocus = False
     WidthPercent = 100.000000000000000000
     DataField = 'layout_surface_print'
     DataSource = WebDataSource1
@@ -877,6 +881,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ChildOrder = 79
     ElementID = 'edtcutoffdimension'
     HeightPercent = 100.000000000000000000
+    ShowFocus = False
     WidthPercent = 100.000000000000000000
     DataField = 'layout_cutoff_dimension'
     DataSource = WebDataSource1
@@ -890,6 +895,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ChildOrder = 79
     ElementID = 'edtcylinderrepeat'
     HeightPercent = 100.000000000000000000
+    ShowFocus = False
     WidthPercent = 100.000000000000000000
     DataField = 'layout_cylinder_repeat'
     DataSource = WebDataSource1
@@ -903,6 +909,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ChildOrder = 79
     ElementID = 'edtpitch'
     HeightPercent = 100.000000000000000000
+    ShowFocus = False
     WidthPercent = 100.000000000000000000
     DataField = 'layout_pitch'
     DataSource = WebDataSource1
@@ -916,6 +923,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ChildOrder = 79
     ElementID = 'edtbleed'
     HeightPercent = 100.000000000000000000
+    ShowFocus = False
     WidthPercent = 100.000000000000000000
     DataField = 'layout_bleed'
     DataSource = WebDataSource1
@@ -929,6 +937,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ChildOrder = 79
     ElementID = 'edtteeth'
     HeightPercent = 100.000000000000000000
+    ShowFocus = False
     WidthPercent = 100.000000000000000000
     DataField = 'layout_teeth'
     DataSource = WebDataSource1
@@ -942,6 +951,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ChildOrder = 79
     ElementID = 'edtcutback'
     HeightPercent = 100.000000000000000000
+    ShowFocus = False
     WidthPercent = 100.000000000000000000
     DataField = 'layout_cutback'
     DataSource = WebDataSource1
@@ -955,6 +965,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ChildOrder = 79
     ElementID = 'edtminimumtrapdimension'
     HeightPercent = 100.000000000000000000
+    ShowFocus = False
     WidthPercent = 100.000000000000000000
     DataField = 'layout_minimum_trap_dim'
     DataSource = WebDataSource1
@@ -968,6 +979,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ChildOrder = 79
     ElementID = 'edtmaximumtrapdimension'
     HeightPercent = 100.000000000000000000
+    ShowFocus = False
     WidthPercent = 100.000000000000000000
     DataField = 'layout_maximum_trap_dim'
     DataSource = WebDataSource1
@@ -981,6 +993,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     ChildOrder = 79
     ElementID = 'edtsize'
     HeightPercent = 100.000000000000000000
+    ShowFocus = False
     WidthPercent = 100.000000000000000000
     DataField = 'upc_size'
     DataSource = WebDataSource1
@@ -990,10 +1003,12 @@ object FOrderEntryWeb: TFOrderEntryWeb
     Top = 452
     Width = 121
     Height = 23
+    TabStop = False
     AutoSize = True
     ChildOrder = 79
     ElementID = 'edtbarwidthreduction'
     HeightPercent = 100.000000000000000000
+    ShowFocus = False
     WidthPercent = 100.000000000000000000
     DataField = 'upc_bar_width_reduction'
     DataSource = WebDataSource1
@@ -1003,10 +1018,12 @@ object FOrderEntryWeb: TFOrderEntryWeb
     Top = 523
     Width = 121
     Height = 23
+    TabStop = False
     AutoSize = True
     ChildOrder = 79
     ElementID = 'edtdistortionamount'
     HeightPercent = 100.000000000000000000
+    ShowFocus = False
     WidthPercent = 100.000000000000000000
     DataField = 'upc_distortion_amount'
     DataSource = WebDataSource1
@@ -1016,6 +1033,7 @@ object FOrderEntryWeb: TFOrderEntryWeb
     Top = 490
     Width = 121
     Height = 23
+    TabStop = False
     AutoSize = True
     ChildOrder = 79
     ElementID = 'edtdistortionpercent'

kgOrdersClient/webKGOrders.dpr

-
 program webKGOrders;
 
 uses

kgOrdersServer/kgOrdersServer.ini

@@ -2,7 +2,7 @@
 MemoLogLevel=3
 FileLogLevel=5
 webClientVersion=0.9.6
-LogFileNum=743
+LogFileNum=748
 
 [Database]
 --Server=192.168.159.131