Added fnc grid and filtering

kgOrdersClient/View.OrderList.dfm

@@ -32,21 +32,6 @@ object FOrderList: TFOrderList
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
   end
-  object edtSearch: TWebEdit
-    Left = 8
-    Top = 384
-    Width = 121
-    Height = 22
-    HelpType = htKeyword
-    ChildOrder = 8
-    ElementClassName = 'form-control'
-    ElementID = 'edtsearch'
-    ElementFont = efCSS
-    HeightStyle = ssAuto
-    HeightPercent = 100.000000000000000000
-    HideSelection = False
-    WidthPercent = 100.000000000000000000
-  end
   object pnlMessage: TWebPanel
     Left = 24
     Top = 57
@@ -59,7 +44,7 @@ object FOrderList: TFOrderList
     ElementFont = efCSS
     ElementPosition = epRelative
     Role = 'alert'
-    TabOrder = 1
+    TabOrder = 0
     object lblMessage: TWebLabel
       Left = 28
       Top = 9
@@ -90,39 +75,6 @@ object FOrderList: TFOrderList
       WidthPercent = 100.000000000000000000
     end
   end
-  object WebDBTableControl: TWebDBTableControl
-    Left = 172
-    Top = 287
-    Width = 530
-    Height = 265
-    ElementClassName = 'table-responsive'
-    ElementId = 'customer_list'
-    BorderColor = clSilver
-    ChildOrder = 5
-    ColHeader = False
-    ElementTableClassName = 'table table-striped table-bordered table-hover dataTable'
-    Options.ResizeColumns = True
-    Columns = <
-      item
-        DataField = 'ID'
-        Title = 'ID'
-        Width = 24
-      end
-      item
-        DataField = 'NAME'
-        Title = 'NAME'
-        Width = 100
-      end
-      item
-        DataField = 'SHORT_NAME'
-        Title = 'SHORT_NAME'
-      end
-      item
-        DataField = 'ADDRESS'
-        Title = 'ADDRESS'
-      end>
-    DataSource = wdsCustomers
-  end
   object cbCorrugatedPlate: TWebCheckBox
     Left = 172
     Top = 210
@@ -176,6 +128,210 @@ object FOrderList: TFOrderList
     WidthPercent = 100.000000000000000000
     OnClick = btnConfirmClick
   end
+  object btnFilter: TWebButton
+    Left = 564
+    Top = 195
+    Width = 96
+    Height = 25
+    Caption = 'Filter'
+    ChildOrder = 9
+    HeightPercent = 100.000000000000000000
+    WidthPercent = 100.000000000000000000
+    OnClick = btnFilterClick
+  end
+  object TMSFNCGrid1: TTMSFNCGrid
+    Left = 228
+    Top = 308
+    Width = 588
+    Height = 353
+    AdaptToStyle = True
+    ParentDoubleBuffered = False
+    DoubleBuffered = True
+    TabOrder = 7
+    DefaultRowHeight = 40.000000000000000000
+    FixedColumns = 0
+    ColumnCount = 0
+    RowCount = 1
+    Options.Bands.Enabled = True
+    Options.Editing.CalcFormat = '%g'
+    Options.Filtering.MultiColumn = True
+    Options.Grouping.CalcFormat = '%g'
+    Options.Grouping.GroupCountFormat = '(%d)'
+    Options.IO.XMLEncoding = 'ISO-8859-1'
+    Options.Mouse.ColumnSizing = True
+    Options.Mouse.ClickMargin = 0
+    Options.Mouse.ColumnSizeMargin = 6
+    Options.Mouse.RowSizing = True
+    Options.Mouse.RowSizeMargin = 6
+    Options.Mouse.FixedColumnSizing = True
+    Options.Mouse.FixedRowSizing = True
+    Columns = <
+      item
+        BorderWidth = 1
+        FixedFont.Charset = DEFAULT_CHARSET
+        FixedFont.Color = clWindowText
+        FixedFont.Height = -11
+        FixedFont.Name = 'Tahoma'
+        FixedFont.Style = []
+        Font.Charset = DEFAULT_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -11
+        Font.Name = 'Tahoma'
+        Font.Style = []
+        ID = ''
+        Width = 68.000000000000000000
+      end
+      item
+        BorderWidth = 1
+        FixedFont.Charset = DEFAULT_CHARSET
+        FixedFont.Color = clWindowText
+        FixedFont.Height = -11
+        FixedFont.Name = 'Tahoma'
+        FixedFont.Style = []
+        Font.Charset = DEFAULT_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -11
+        Font.Name = 'Tahoma'
+        Font.Style = []
+        ID = ''
+        Width = 68.000000000000000000
+      end
+      item
+        BorderWidth = 1
+        FixedFont.Charset = DEFAULT_CHARSET
+        FixedFont.Color = clWindowText
+        FixedFont.Height = -11
+        FixedFont.Name = 'Tahoma'
+        FixedFont.Style = []
+        Font.Charset = DEFAULT_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -11
+        Font.Name = 'Tahoma'
+        Font.Style = []
+        ID = ''
+        Width = 68.000000000000000000
+      end
+      item
+        BorderWidth = 1
+        FixedFont.Charset = DEFAULT_CHARSET
+        FixedFont.Color = clWindowText
+        FixedFont.Height = -11
+        FixedFont.Name = 'Tahoma'
+        FixedFont.Style = []
+        Font.Charset = DEFAULT_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -11
+        Font.Name = 'Tahoma'
+        Font.Style = []
+        ID = ''
+        Width = 68.000000000000000000
+      end
+      item
+        BorderWidth = 1
+        FixedFont.Charset = DEFAULT_CHARSET
+        FixedFont.Color = clWindowText
+        FixedFont.Height = -11
+        FixedFont.Name = 'Tahoma'
+        FixedFont.Style = []
+        Font.Charset = DEFAULT_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -11
+        Font.Name = 'Tahoma'
+        Font.Style = []
+        ID = ''
+        Width = 68.000000000000000000
+      end>
+    DefaultFont.Charset = DEFAULT_CHARSET
+    DefaultFont.Color = clBlack
+    DefaultFont.Height = -11
+    DefaultFont.Name = 'Segoe UI'
+    DefaultFont.Style = []
+    Stroke.Color = 15987699
+    TopRow = 1
+    Appearance.FixedLayout.Fill.Kind = gfkGradient
+    Appearance.FixedLayout.Fill.Color = 16382457
+    Appearance.FixedLayout.Fill.ColorTo = 16382457
+    Appearance.FixedLayout.Stroke.Color = 15987699
+    Appearance.FixedLayout.Font.Charset = DEFAULT_CHARSET
+    Appearance.FixedLayout.Font.Color = clBlack
+    Appearance.FixedLayout.Font.Height = -11
+    Appearance.FixedLayout.Font.Name = 'Tahoma'
+    Appearance.FixedLayout.Font.Style = [fsBold]
+    Appearance.NormalLayout.Fill.Color = -1
+    Appearance.NormalLayout.Stroke.Color = 15987699
+    Appearance.NormalLayout.Font.Charset = DEFAULT_CHARSET
+    Appearance.NormalLayout.Font.Color = clBlack
+    Appearance.NormalLayout.Font.Height = -11
+    Appearance.NormalLayout.Font.Name = 'Tahoma'
+    Appearance.NormalLayout.Font.Style = []
+    Appearance.GroupLayout.Fill.Kind = gfkGradient
+    Appearance.GroupLayout.Fill.Color = 15385233
+    Appearance.GroupLayout.Fill.ColorTo = 15385233
+    Appearance.GroupLayout.Stroke.Color = 15987699
+    Appearance.GroupLayout.Font.Charset = DEFAULT_CHARSET
+    Appearance.GroupLayout.Font.Color = clBlack
+    Appearance.GroupLayout.Font.Height = -11
+    Appearance.GroupLayout.Font.Name = 'Tahoma'
+    Appearance.GroupLayout.Font.Style = []
+    Appearance.SummaryLayout.Fill.Kind = gfkGradient
+    Appearance.SummaryLayout.Fill.Color = 15385233
+    Appearance.SummaryLayout.Fill.ColorTo = 15385233
+    Appearance.SummaryLayout.Stroke.Color = 15987699
+    Appearance.SummaryLayout.Font.Charset = DEFAULT_CHARSET
+    Appearance.SummaryLayout.Font.Color = clBlack
+    Appearance.SummaryLayout.Font.Height = -11
+    Appearance.SummaryLayout.Font.Name = 'Tahoma'
+    Appearance.SummaryLayout.Font.Style = []
+    Appearance.SelectedLayout.Fill.Kind = gfkGradient
+    Appearance.SelectedLayout.Fill.Color = 15385233
+    Appearance.SelectedLayout.Fill.ColorTo = 15385233
+    Appearance.SelectedLayout.Stroke.Color = 15987699
+    Appearance.SelectedLayout.Font.Charset = DEFAULT_CHARSET
+    Appearance.SelectedLayout.Font.Color = clBlack
+    Appearance.SelectedLayout.Font.Height = -11
+    Appearance.SelectedLayout.Font.Name = 'Tahoma'
+    Appearance.SelectedLayout.Font.Style = []
+    Appearance.FocusedLayout.Fill.Kind = gfkGradient
+    Appearance.FocusedLayout.Fill.Color = 15385233
+    Appearance.FocusedLayout.Fill.ColorTo = 15385233
+    Appearance.FocusedLayout.Stroke.Color = 15987699
+    Appearance.FocusedLayout.Font.Charset = DEFAULT_CHARSET
+    Appearance.FocusedLayout.Font.Color = clBlack
+    Appearance.FocusedLayout.Font.Height = -11
+    Appearance.FocusedLayout.Font.Name = 'Tahoma'
+    Appearance.FocusedLayout.Font.Style = []
+    Appearance.FixedSelectedLayout.Fill.Kind = gfkGradient
+    Appearance.FixedSelectedLayout.Fill.Color = 15385233
+    Appearance.FixedSelectedLayout.Fill.ColorTo = 15385233
+    Appearance.FixedSelectedLayout.Stroke.Color = 15987699
+    Appearance.FixedSelectedLayout.Font.Charset = DEFAULT_CHARSET
+    Appearance.FixedSelectedLayout.Font.Color = clBlack
+    Appearance.FixedSelectedLayout.Font.Height = -11
+    Appearance.FixedSelectedLayout.Font.Name = 'Tahoma'
+    Appearance.FixedSelectedLayout.Font.Style = []
+    Appearance.BandLayout.Fill.Color = clLightyellow
+    Appearance.BandLayout.Stroke.Color = 15987699
+    Appearance.BandLayout.Font.Charset = DEFAULT_CHARSET
+    Appearance.BandLayout.Font.Color = clWindowText
+    Appearance.BandLayout.Font.Height = -11
+    Appearance.BandLayout.Font.Name = 'Tahoma'
+    Appearance.BandLayout.Font.Style = []
+    Appearance.ProgressLayout.Color = 15385233
+    Appearance.ProgressLayout.Format = '%.0f%%'
+    LeftCol = 0
+    ScrollMode = scmItemScrolling
+    DesignTimeSampleData = True
+  end
+  object edtSearch: TWebEdit
+    Left = 437
+    Top = 198
+    Width = 121
+    Height = 22
+    ChildOrder = 8
+    HeightPercent = 100.000000000000000000
+    WidthPercent = 100.000000000000000000
+    OnChange = edtSearchChange
+  end
   object XDataWebClient1: TXDataWebClient
     Connection = DMConnection.ApiConnection
     Left = 88

kgOrdersClient/View.OrderList.pas

@@ -3,48 +3,48 @@ unit View.OrderList;
 interface
 
 uses
-  System.SysUtils, System.Generics.Collections, System.Classes, JS, Web, WEBLib.Graphics, WEBLib.Controls,
-  WEBLib.Forms, WEBLib.Dialogs, WEBLib.Menus, WEBLib.ExtCtrls, WEBLib.StdCtrls,
-  WEBLib.JSON, Auth.Service, XData.Web.Client, WebLib.Storage,
-  ConnectionModule, App.Types, Vcl.StdCtrls, Vcl.Controls, WEBLib.DBCtrls,
-  Data.DB, XData.Web.JsonDataset, XData.Web.Dataset, WEBLib.DB, WEBLib.Grids,
-  Vcl.Grids;
+  System.SysUtils, System.Classes, JS, Web, WEBLib.Graphics, WEBLib.Controls,
+  WEBLib.Forms, WEBLib.Dialogs, WEBLib.StdCtrls, XData.Web.Client, WEBLib.ExtCtrls,
+  Data.DB, XData.Web.Dataset, VCL.TMSFNCTypes, VCL.TMSFNCGrid, VCL.TMSFNCGridData,
+  VCL.TMSFNCUtils, VCL.TMSFNCGraphics, VCL.TMSFNCGraphicsTypes,
+  VCL.TMSFNCGridCell, VCL.TMSFNCGridOptions, VCL.TMSFNCCustomComponent,
+  VCL.TMSFNCCustomGrid, VCL.TMSFNCGridDatabaseAdapter, VCL.TMSFNCCustomControl,
+  VCL.TMSFNCCustomScrollControl, WEBLib.DB, XData.Web.JsonDataset, Vcl.StdCtrls,
+  Vcl.Controls, ConnectionModule;
 
 type
   TFOrderList = class(TWebForm)
     lblEntries: TWebLabel;
     lblEntries2: TWebLabel;
     edtSearch: TWebEdit;
+    edtCompanyName: TWebEdit;
+    edtID: TWebEdit;
     pnlMessage: TWebPanel;
     lblMessage: TWebLabel;
     btnCloseNotification: TWebButton;
+    btnFilter: TWebButton;
     XDataWebClient1: TXDataWebClient;
-    xdwdsCustomers: TXDataWebDataSet;
     wdsCustomers: TWebDataSource;
+    xdwdsCustomers: TXDataWebDataSet;
     xdwdsCustomersID: TIntegerField;
     xdwdsCustomersNAME: TStringField;
     xdwdsCustomersSHORT_NAME: TStringField;
     xdwdsCustomersADDRESS: TStringField;
-    WebDBTableControl: TWebDBTableControl;
+    TMSFNCGrid1: TTMSFNCGrid;
+    btnConfirm: TWebButton;
     cbCorrugatedPlate: TWebCheckBox;
     cbWebPlate: TWebCheckBox;
-    edtCompanyName: TWebEdit;
-    edtID: TWebEdit;
-    btnConfirm: TWebButton;
     procedure WebFormShow(Sender: TObject);
-    procedure WebDBTableControlGetCellChildren(Sender: TObject; ACol,
-      ARow: Integer; AField: TField; AValue: string;
-      AElement: TJSHTMLElementRecord);
+    procedure btnFilterClick(Sender: TObject);
     procedure cbCorrugatedPlateClick(Sender: TObject);
     procedure cbWebPlateClick(Sender: TObject);
     procedure btnConfirmClick(Sender: TObject);
+    procedure edtSearchChange(Sender: TObject);
   private
-    //FJSONProc: TJSONProc;
-    procedure AddRowToTable();
-    procedure ClearTable();
     [async] procedure getCustomers();
+    procedure PopulateGridManually;
+    procedure ApplyFilter;
   public
-    class function CreateForm(AElementID: string): TWebForm;
   end;
 
 var
@@ -54,129 +54,127 @@ implementation
 
 {$R *.dfm}
 
-class function TFOrderList.CreateForm(AElementID: string): TWebForm;
+procedure TFOrderList.WebFormShow(Sender: TObject);
 begin
-  Application.CreateForm(TFOrderList, AElementID, Result,
-    procedure(AForm: TObject)
-    begin
-      with TFOrderList(AForm) do
-      begin
-
-      end;
-    end
-  );
+  getCustomers(); // Fetch and populate the grid with customer data
 end;
 
-procedure TFOrderList.WebDBTableControlGetCellChildren(Sender: TObject; ACol,
-  ARow: Integer; AField: TField; AValue: string;
-  AElement: TJSHTMLElementRecord);
+[async]
+procedure TFOrderList.getCustomers();
+var
+  xdcResponse: TXDataClientResponse;
+  customerList: TJSObject;
 begin
-  //WebDBTableControl.WidthStyle := TSizeStyle.ssAuto;
-  console.log(AValue);
-  WebDBTableControl.ColWidths[ACol] := AValue.Length * 12;
+  // Fetch data from XData service
+  xdcResponse := await(XDataWebClient1.RawInvokeAsync('ILookupService.GetCustomers', []));
+  customerList := TJSObject(xdcResponse.Result);
+
+  // Load data into TXDataWebDataset
+  xdwdsCustomers.Close;
+  xdwdsCustomers.SetJsonData(customerList['data']);
+  xdwdsCustomers.Open;
+
+  // Manually populate the grid
+  PopulateGridManually;
 end;
 
-procedure TFOrderList.WebFormShow(Sender: TObject);
+procedure TFOrderList.PopulateGridManually;
+var
+  RowIndex: Integer;
 begin
- getCustomers();
+  TMSFNCGrid1.BeginUpdate;
+  try
+    TMSFNCGrid1.Clear; // Clear any existing data
+
+    // Set up column headers
+    TMSFNCGrid1.ColumnCount := 4;
+    TMSFNCGrid1.RowCount := 1;
+    TMSFNCGrid1.Cells[0, 0] := 'ID';
+    TMSFNCGrid1.Cells[1, 0] := 'Name';
+    TMSFNCGrid1.Cells[2, 0] := 'Short Name';
+    TMSFNCGrid1.Cells[3, 0] := 'Address';
+
+    // Populate the grid with data from the dataset
+    xdwdsCustomers.First;
+    RowIndex := 1;
+
+    while not xdwdsCustomers.EOF do
+    begin
+      TMSFNCGrid1.RowCount := RowIndex + 1;
+
+      TMSFNCGrid1.Cells[0, RowIndex] := xdwdsCustomers.FieldByName('ID').AsString;
+      TMSFNCGrid1.Cells[1, RowIndex] := xdwdsCustomers.FieldByName('NAME').AsString;
+      TMSFNCGrid1.Cells[2, RowIndex] := xdwdsCustomers.FieldByName('SHORT_NAME').AsString;
+      TMSFNCGrid1.Cells[3, RowIndex] := xdwdsCustomers.FieldByName('ADDRESS').AsString;
+
+      Inc(RowIndex);
+      xdwdsCustomers.Next;
+    end;
+
+    // Auto-size columns
+    TMSFNCGrid1.AutoSizeColumns;
+  finally
+    TMSFNCGrid1.EndUpdate;
+  end;
 end;
 
-procedure TFOrderList.btnConfirmClick(Sender: TObject);
+procedure TFOrderList.ApplyFilter;
+var
+  fd: TTMSFNCGridFilterData;
+  i: Integer;
+  SearchText: string;
 begin
-  Close;
+  SearchText := Trim(edtSearch.Text);
+
+  // Remove any existing filters
+  TMSFNCGrid1.RemoveFilter;
+
+
+  TMSFNCGrid1.Filter.Clear;
+
+  // Add a filter for each column
+  for i := 0 to TMSFNCGrid1.ColumnCount - 1 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;
 
-procedure TFOrderList.cbCorrugatedPlateClick(Sender: TObject);
+
+procedure TFOrderList.btnFilterClick(Sender: TObject);
 begin
-  cbWebPlate.Checked := false;
+  ApplyFilter;
 end;
 
-procedure TFOrderList.cbWebPlateClick(Sender: TObject);
+procedure TFOrderList.cbCorrugatedPlateClick(Sender: TObject);
 begin
-  cbCorrugatedPlate.Checked := false;
+  cbWebPlate.Checked := False;
 end;
 
-procedure TFOrderList.ClearTable();
-// clears the table
-var
-  tbody: TJSHTMLElement;
+procedure TFOrderList.cbWebPlateClick(Sender: TObject);
 begin
-  tbody := TJSHTMLElement(document.getElementById('tblCustomerGrid').getElementsByTagName('tbody')[0]);
-  tbody.innerHTML := '';
+  cbCorrugatedPlate.Checked := False;
 end;
 
-procedure TFOrderList.getCustomers();
-var
-  xdcResponse: TXDataClientResponse;
-  customerList: TJSObject;
-  data: TJSArray;
-  i, count: integer;
-  temp: TJSONObject;
-  customer: TJSObject;
+procedure TFOrderList.btnConfirmClick(Sender: TObject);
 begin
-    xdcResponse := await(XDataWebClient1.RawInvokeAsync('ILookupService.GetCustomers',
-        []));
-    customerList :=  TJSObject(xdcResponse.Result);
-    data := TJSArray(customerList['data']);
-    count := integer(customerList['count']);
-    xdwdsCustomers.Close;
-    xdwdsCustomers.SetJsonData(customerList['data']);
-    xdwdsCustomers.Open;
+  Close;
 end;
 
-procedure TFOrderList.AddRowToTable();
-var
-  NewRow, Cell, P, Button, Audio: TJSHTMLElement;
-  ClickHandler: TJSFunction;
-  //strColorList: string;
-  id: integer;
+procedure TFOrderList.edtSearchChange(Sender: TObject);
 begin
-  NewRow := TJSHTMLElement(document.createElement('tr'));
-  //NewRow.Attrs['orderType'] := XDataWebDataSet1orderType.Value;
-  NewRow.addEventListener('click', procedure
-  begin
-    //orderEntry(NewRow.Attrs['id'], 'EDIT');
-  end);
-
-  // Company ID Cell
-  NewRow.Attrs['id'] := xdwdsCustomersID.AsString;
-  Cell := TJSHTMLElement(document.createElement('td'));
-  Cell.setAttribute('data-label', 'Order ID');
-  if xdwdsCustomersID.AsString = '' then
-    Cell.innerText := 'None'
-  else
-    Cell.innerText := xdwdsCustomersID.AsString;
-  NewRow.appendChild(Cell);
-
-  // Company Name Cell
-  Cell := TJSHTMLElement(document.createElement('td'));
-  Cell.setAttribute('data-label', 'Company Name');
-  if xdwdsCustomersNAME.Value = '' then
-    Cell.innerText := 'None'
-  else
-    Cell.innerText := xdwdsCustomersNAME.Value;
-  NewRow.appendChild(Cell);
-
-  // Short Name Cell
-  Cell := TJSHTMLElement(document.createElement('td'));
-  Cell.setAttribute('data-label', 'Job Name');
-  if xdwdsCustomersSHORT_NAME.Value = '' then
-    Cell.innerText := 'None'
-  else
-    Cell.innerText := xdwdsCustomersSHORT_NAME.Value;
-  NewRow.appendChild(Cell);
-
-  // Address Cell
-  Cell := TJSHTMLElement(document.createElement('td'));
-  Cell.setAttribute('data-label', 'Order Date');
-  if xdwdsCustomersADDRESS.Value = '' then
-    Cell.innerText := 'None'
-  else
-    Cell.innerText := xdwdsCustomersADDRESS.Value;
-  NewRow.appendChild(Cell);
-
-  // Appends new rows to the table body
-  TJSHTMLElement(document.getElementById('tblCustomerGrid').getElementsByTagName('tbody')[0]).appendChild(NewRow);
+  ApplyFilter;
 end;
 
 end.

kgOrdersServer/Source/Auth.Database.dfm

@@ -22,8 +22,6 @@ object AuthDatabase: TAuthDatabase
     SpecificOptions.Strings = (
       'PostgreSQL.Schema=envoy')
     Username = 'root'
-    Server = '192.168.159.132'
-    Connected = True
     LoginPrompt = False
     Left = 67
     Top = 131

kgOrdersServer/Source/Database.dfm

@@ -8,8 +8,6 @@ object FDatabaseModule: TFDatabaseModule
     SpecificOptions.Strings = (
       'PostgreSQL.Schema=envoy')
     Username = 'root'
-    Server = '192.168.159.132'
-    Connected = True
     LoginPrompt = False
     Left = 75
     Top = 139

kgOrdersServer/kgOrdersServer.ini

 [Options]
 
-LogFileNum=230
+LogFileNum=234
 
 UpdateTimerLength=0
 
 [Database]
-Server=192.168.159.132
+--Server=192.168.159.132
 --Server=192.168.102.129
+Server=192.168.102.130
 
 [Twilio]
 AccountSID=AC37aeef9c36a2cccbaecbadafc172b2ff