Server and client side web plate orders nearly finished.

Just need to finish setting up the dataset and it should be finished with adding and editting working. Fixed overlay bug where navbar was appearing below table.  fixed JWT Token issue where user id was not being properly saved.

kgOrdersClient/View.Main.pas

@@ -52,6 +52,7 @@ type
     procedure EditUser(  Mode, Username, Password, Name, Status, Email,
                                Access, Rights, Perspective, QB: string);
     procedure ViewOrderEntryCorrugated(orderInfo, customerInfo, mode: string);
+    procedure ViewOrderEntryWeb(orderInfo, customerInfo, mode: string);
     procedure ViewOrderEntryCuttingDie(orderInfo, customerInfo, mode: string);
     procedure ViewOrders(info: string);
     procedure ShowUserForm(Info: string);
@@ -72,7 +73,8 @@ uses
   View.EditUser,
   View.Orders,
   View.OrderEntryCorrugated,
-  View.OrderEntryCuttingDie;
+  View.OrderEntryCuttingDie,
+  View.OrderEntryWeb;
 
 {$R *.dfm}
 
@@ -237,6 +239,14 @@ begin
   FChildForm := TFOrderEntryCorrugated.CreateForm(WebPanel1.ElementID, orderInfo, customerInfo, mode);
 end;
 
+procedure TFViewMain.ViewOrderEntryWeb(orderInfo, customerInfo, mode: string);
+begin
+  lblAppTitle.Caption := 'Koehler-Gibson Order Entry';
+  if Assigned(FChildForm) then
+    FChildForm.Free;
+  FChildForm := TFOrderEntryWeb.CreateForm(WebPanel1.ElementID, orderInfo, customerInfo, mode);
+end;
+
 procedure TFViewMain.ViewOrderEntryCuttingDie(orderInfo, customerInfo, mode: string);
 begin
   lblAppTitle.Caption := 'Koehler-Gibson Order Entry';

kgOrdersClient/View.Orders.pas

@@ -646,7 +646,7 @@ begin
   if orderType = 'corrugated' then
     FViewMain.ViewOrderEntryCorrugated(orderInfo, customerInfo, mode)
   else if orderType = 'web' then
-    orderType := orderType
+    FViewMain.ViewOrderEntryWeb(orderInfo, customerInfo, mode)
   else
     FViewMain.ViewOrderEntryCuttingDie(orderInfo, customerInfo, mode);
 end;

kgOrdersClient/css/app.css

@@ -57,6 +57,7 @@ input[type="text"] {
 /* Navbar items - keep them aligned and spaced out */
 .navbar-nav .nav-item {
     padding: 0 15px; /* Adjust spacing between navbar items */
+    z-index: 9999;
 }
 
 /* Flexbox for the entire navbar */

kgOrdersClient/webKGOrders.dpr

@@ -21,7 +21,8 @@ uses
   View.AddOrder in 'View.AddOrder.pas' {FAddOrder: TWebForm} {*.html},
   View.Search in 'View.Search.pas' {FSearch: TWebForm} {*.html},
   View.SetStatus in 'View.SetStatus.pas' {FSetStatus: TWebForm} {*.html},
-  View.OrderEntryCuttingDie in 'View.OrderEntryCuttingDie.pas' {FOrderEntryCuttingDie: TWebForm} {*.html};
+  View.OrderEntryCuttingDie in 'View.OrderEntryCuttingDie.pas' {FOrderEntryCuttingDie: TWebForm} {*.html},
+  View.OrderEntryWeb in 'View.OrderEntryWeb.pas' {FOrderEntryWeb: TWebForm} {*.html};
 
 {$R *.res}
 

kgOrdersClient/webKGOrders.dproj

@@ -190,6 +190,11 @@
             <FormType>dfm</FormType>
             <DesignClass>TWebForm</DesignClass>
         </DCCReference>
+        <DCCReference Include="View.OrderEntryWeb.pas">
+            <Form>FOrderEntryWeb</Form>
+            <FormType>dfm</FormType>
+            <DesignClass>TWebForm</DesignClass>
+        </DCCReference>
         <None Include="index.html"/>
         <None Include="css\app.css"/>
         <None Include="config\config.json"/>

kgOrdersServer/Source/Auth.ServiceImpl.pas

@@ -22,9 +22,11 @@ type
     userName: string;
     userFullName: string;
     userId: string;
-    userAdmin: boolean;
-    userPhone: string;
+    userPerspectiveID: string;
+    userQBID: string;
+    userAccessType: string;
     userEmail: string;
+    userStatus: string;
     procedure AfterConstruction; override;
     procedure BeforeDestruction; override;
     property Query: TUniQuery read GetQuery;
@@ -106,9 +108,12 @@ begin
     JWT.Claims.SetClaimOfType<string>('user_name', userName);
     JWT.Claims.SetClaimOfType<string>('user_fullname', userFullName);
     JWT.Claims.SetClaimOfType<string>('user_id', userId);
-    JWT.Claims.SetClaimOfType<boolean>('user_admin', userAdmin);
-    JWT.Claims.SetClaimOfType<string>('user_phone', userPhone);
+    JWT.Claims.SetClaimOfType<string>('user_perspective_id', userPerspectiveID);
+    JWT.Claims.SetClaimOfType<string>('user_status', userStatus);
     JWT.Claims.SetClaimOfType<string>('user_email', userEmail);
+    JWT.Claims.SetClaimOfType<string>('user_qb_id', userQBID);
+    JWT.Claims.SetClaimOfType<string>('user_access_type', userAccessType);
+
     Result := TJOSE.SHA256CompactToken(serverConfig.jwtTokenSecret, JWT);
   finally
     JWT.Free;
@@ -139,17 +144,15 @@ begin
     //checkString := THashSHA2.GetHashString(date_created + password, THashSHA2.TSHA2Version.SHA512).ToUpper;
     if password = authDB.uq.FieldByName('PASSWORD').AsString then
     begin
-      {userName := user;
-      userFullName:= authDB.uq.FieldByName('full_name').AsString;;
-      userId := authDB.uq.FieldByName('user_id').AsString;
-      userAdmin := authDB.uq.FieldByName('admin').AsBoolean;
-      userPhone := authDB.uq.FieldByName('phone_number').AsString;
-      userEmail := authDB.uq.FieldByName('email').AsString;
-
-      userStr := '?username=' + userName;
-      userStr := userStr + '&fullname=' + userFullName;
-      userStr := userStr + '&userid=' + userId;
-      userStr := userStr + '&useradmin=' + BoolToStr(userAdmin);}
+      userName := user;
+      userFullName:= authDB.uq.FieldByName('NAME').AsString;;
+      userId := authDB.uq.FieldByName('USER_ID').AsString;
+      userStatus := authDB.uq.FieldByName('STATUS').AsString;
+      userPerspectiveID := authDB.uq.FieldByName('PERSPECTIVE_ID').AsString;
+      userEmail := authDB.uq.FieldByName('EMAIL').AsString;
+      userQBID := authDB.uq.FieldByName('QB_ID').AsString;
+      userAccessType := authDB.uq.FieldByName('ACCESS_TYPE').AsString;
+
       //Logger.Log( 3, Format('AuthDB.SetLoginAuditEntry: "%s"', [user]) );
       //AuthDB.SetLoginAuditEntry( userStr );
       Result := 3; // Succcess

kgOrdersServer/Source/Lookup.ServiceImpl.pas

@@ -41,6 +41,7 @@ type
     function DelUser(username: string): string;
     function GenerateSubQuery(currStatus: string): string;
     function AddCorrugatedOrder(orderInfo: string): TJSONObject;
+    function AddWebOrder(orderInfo: string): TJSONObject;
     function AddStatusSchedule(StatusType: string; order: TJSONObject; ORDER_ID: integer): string;
     function GenerateOrdersSQL(searchOptions: string): TSQLQuery;
     function GetColorCount(colors: string): string;
@@ -1209,6 +1210,117 @@ begin
 end;
 
 
+function TLookupService.AddWebOrder(orderInfo: string): TJSONObject;
+// Adds corrugated order to the database. This process is done in 3 different
+// tables so if any changes are made make sure to check orders, corrugated_plate_orders
+// and orders_status_schedule. This also functions as an edit function.
+// orderInfo - all the inputted order information from client side.
+var
+  JSONData, ResponseData: TJSONObject;
+  SQL: string;
+  Pair: TJSONPair;
+  Field: TField;
+  DateFormat: TFormatSettings;
+  CurrDate: TDateTime;
+  ORDER_ID: integer;
+  mode: string;
+  temp: string;
+begin
+  DateFormat := TFormatSettings.Create;
+  DateFormat.ShortDateFormat := 'yyyy-mm-dd';
+  DateFormat.DateSeparator := '-';
+  JSONData := TJSONObject.ParseJSONValue(orderInfo) as TJSONObject;
+  if JSONData = nil then
+    raise Exception.Create('Invalid JSON format');  // If parsing fails, raise an exception
+  mode := JSONData.GetValue<string>('mode');
+  if mode = 'ADD' then
+    SQL := 'select * from web_plate_orders where ORDER_ID = 0 and ORDER_ID <> 0'
+  else
+  begin
+    ORDER_ID := JSONData.GetValue<integer>('ORDER_ID');
+    SQL := 'select * from web_plate_orders where ORDER_ID = ' + IntToStr(ORDER_ID);
+  end;
+  doQuery(ordersDB.UniQuery1, SQL);
+  try
+    if mode = 'ADD' then
+      ordersDB.UniQuery1.Insert
+    else
+      ordersDB.UniQuery1.Edit;
+
+    for Pair in JSONData do
+    begin
+      Field := ordersDB.UniQuery1.FindField(Pair.JsonString.Value); // Checks if the field exists in the dataset
+      if Assigned(Field) then
+      begin
+      // handles any dates or datetimes
+        if (Field is TDateTimeField) and (Pair.JsonValue.Value <> '') then
+          TDateTimeField(Field).AsDateTime := StrToDate(Pair.JsonValue.Value)
+        else if Pair.JsonValue.Value <> '' then
+          Field.AsString := Pair.JsonValue.Value;
+      end;
+    end;
+
+    // Post the record to the database
+    ordersDB.UniQuery1.Post;
+
+    if mode = 'ADD' then
+    begin
+      SQL := 'select * from orders where ORDER_ID = 0 and ORDER_ID <> 0';
+      doQuery(ordersDB.UniQuery1, SQL);
+      ordersDB.UniQuery1.Insert;
+    end
+    else
+    begin
+      SQL := 'select * from orders where ORDER_ID = ' + IntToStr(ORDER_ID);
+      doQuery(ordersDB.UniQuery1, SQL);
+      ordersDB.UniQuery1.Edit;
+    end;
+
+    temp :=  JSONData.GetValue<string>('COMPANY_ID');
+    ordersDB.UniQuery1.FieldByName('COMPANY_ID').AsString := JSONData.GetValue<string>('COMPANY_ID');
+    ordersDB.UniQuery1.FieldByName('ORDER_TYPE').AsString := 'web_plate';
+
+    if mode = 'ADD' then
+      ordersDB.UniQuery1.FieldByName('ORDER_DATE').AsDateTime := Now;
+
+    if JSONData.GetValue<string>('staff_fields_price') = '' then
+      ordersDB.UniQuery1.FieldByName('PRICE').AsString := '0'
+    else
+      ordersDB.UniQuery1.FieldByName('PRICE').AsString := JSONData.GetValue<string>('staff_fields_price');
+
+    ordersDB.UniQuery1.FieldByName('JOB_NAME').AsString := JSONData.GetValue<string>('staff_fields_job_name');
+    ordersDB.UniQuery1.FieldByName('USER_ID').AsString := JSONData.GetValue<string>('USER_ID');
+    ordersDB.UniQuery1.FieldByName('LOCATION').AsString := JSONData.GetValue<string>('staff_fields_art_location');
+
+    ordersDB.UniQuery1.Post;
+
+    ordersDB.UniQuery1.Close;
+    if mode = 'ADD' then
+    begin
+      ordersDB.UniQuery1.SQL.Text := 'SELECT LAST_INSERT_ID() AS OrderID'; // Use database's method to get the last inserted ID
+      ordersDB.UniQuery1.Open;
+      ORDER_ID := ordersDB.UniQuery1.FieldByName('OrderID').AsInteger;
+    end;
+
+    if JSONData.GetValue<string>('staff_fields_proof_date') <> '' then
+      AddStatusSchedule('PROOF', JSONData, ORDER_ID);
+    if JSONData.GetValue<string>('staff_fields_ship_date') <> '' then
+      AddStatusSchedule('SHIP', JSONData, ORDER_ID);
+    if JSONData.GetValue<string>('staff_fields_art_due') <> '' then
+      AddStatusSchedule('ART', JSONData, ORDER_ID);
+    if JSONData.GetValue<string>('staff_fields_plate_due') <> '' then
+      AddStatusSchedule('PLATE', JSONData, ORDER_ID);
+
+    Result := TJSONObject.Create.AddPair('status', 'success');
+    TXDataOperationContext.Current.Handler.ManagedObjects.Add(Result);
+    except
+    on E: Exception do
+    begin
+      Result := TJSONObject.Create.AddPair('error', E.Message);
+    end;
+  end;
+end;
+
 initialization
   RegisterServiceType(TLookupService);
 

kgOrdersServer/kgOrdersServer.ini

 [Settings]
 MemoLogLevel=4
 FileLogLevel=5
-LogFileNum=123
+LogFileNum=125
 webClientVersion=1.0.0
 
 [Database]