V4.1 with excel stats changes

AiQ_GUI.Designer.cs

@@ -270,7 +270,7 @@ namespace AiQ_GUI
             CbBxUserName.Font = new Font("Segoe UI Semibold", 10F, FontStyle.Bold);
             CbBxUserName.ForeColor = SystemColors.Control;
             CbBxUserName.FormattingEnabled = true;
-            CbBxUserName.Items.AddRange(new object[] { "Guest", "Clive", "Conor", "Charlie", "Henry", "Sam C", "Sam L", "Simon", "Toby", "Tom" });
+            CbBxUserName.Items.AddRange(new object[] { "Guest", "Clive", "Conor", "Charlie", "Henry", "Sam C", "Sam L", "Simon", "Sophie", "Toby", "Tom" });
             CbBxUserName.Location = new Point(10, 262);
             CbBxUserName.Margin = new Padding(4, 3, 4, 3);
             CbBxUserName.MaxDropDownItems = 20;

AiQ_GUI.cs

@@ -103,7 +103,7 @@ namespace AiQ_GUI
             CbBxIris.SelectedIndex = lds.Iris;
             CbBxGain.SelectedIndex = lds.Gain;
 
-            if (lds.User == "Bradley")
+            if (lds.User == "Bradley" || lds.User == "Sophie")
                 BtnTest.Visible = true;
 
             TxBxCheckValid(TxBxPsuIP); // Set save button color if valid
@@ -199,6 +199,7 @@ namespace AiQ_GUI
                 if (!LEDreply.Contains("Power levels set successfully"))
                     AddToActionsList($"LED level could not be set: {LEDreply}");
             }
+            await FlexiAPI.SetVaxtorMinMaxPlate(CamOnTest.IP);
 
             DateTime PCTime = DateTime.Now; // Grab PC time as close to the API as possible to pass onto PDF later
 
@@ -226,6 +227,69 @@ namespace AiQ_GUI
             await TestPassed(PCTime);
         }
 
+        public void Stats(string TypeOfTest)
+        {
+            Stats([TypeOfTest]);
+        }
+
+        public void Stats(string[] TypeOfTest)
+        {
+            using OleDbConnection conn = new(connString); // Opens connection to Access database
+            try
+            {
+                conn.Open(); // Opens DB
+                string modelNumber = CbBxCameraType.Text.Substring(0, 6); // Get model number from combobox and make sure it is only 6 characters.
+
+                foreach (string type in TypeOfTest)
+                {
+                    string query = $"UPDATE AiQ SET [{type}] = [{type}] + 1 WHERE [ModelNumber] = ?"; // Add one for every test ran of this type for this model number
+                    using OleDbCommand cmd = new(query, conn); // Create command
+                    cmd.Parameters.AddWithValue("?", modelNumber); // Add model number to prevent injection
+
+                    int rowsAffected = cmd.ExecuteNonQuery();
+                    // Execute the command and get the number of rows affected
+                    //if (rowsAffected > 0) // If one or more rows were updated
+                    //    AddToActionsList($"Updated {TypeOfTest} for {modelNumber}");
+                    //else
+                    //    AddToActionsList($"No rows found for {modelNumber}");
+                }
+            }
+            catch
+            {
+                AddToActionsList("Could not access Access in Google Drive. Is it running?");
+                return;
+            }
+        }
+
+        public void StatsDiags(string redDiagLabels, string RhTxBxActionsText, string IsRMA, int RMA)
+        {
+            using OleDbConnection conn = new(connString);
+            conn.Open();
+
+            // Null checks
+            string redVal = string.IsNullOrWhiteSpace(redDiagLabels) ? "-" : redDiagLabels;
+            string actVal = string.IsNullOrWhiteSpace(RhTxBxActionsText) ? "-" : RhTxBxActionsText;
+            string model = string.IsNullOrWhiteSpace(CamOnTest?.Model) ? "-" : CamOnTest.Model;
+
+            string sql = @"
+                INSERT INTO DiagsStats ([Date], [Model], [Red Diags Labels], [RhTxBxActions Contents],[IsRMA],[RMA])
+                VALUES (?, ?, ?, ?, ?, ?)";
+
+            using OleDbCommand cmd = new(sql, conn);
+
+            // OleDb uses positional parameters — order must match the VALUES list above
+            cmd.Parameters.Add(new OleDbParameter { OleDbType = OleDbType.Date, Value = DateTime.Now });
+            cmd.Parameters.Add(new OleDbParameter { OleDbType = OleDbType.VarWChar, Value = model });
+            cmd.Parameters.Add(new OleDbParameter { OleDbType = OleDbType.VarWChar, Value = redVal });
+            cmd.Parameters.Add(new OleDbParameter { OleDbType = OleDbType.VarWChar, Value = actVal });
+            cmd.Parameters.Add(new OleDbParameter { OleDbType = OleDbType.Boolean, Value = IsRMA });
+            cmd.Parameters.Add(new OleDbParameter { OleDbType = OleDbType.VarWChar, Value = RMA });
+
+            cmd.ExecuteNonQuery();
+        }
+
+
+
         private async void BtnPreTest_Click(object sender, EventArgs e)
         {
             // Show user test has started
@@ -273,8 +337,6 @@ namespace AiQ_GUI
                         await AllocateSerial();
                     else if (GoogleAPI.UpdateSpreadSheetRePreTest(CameraAccessInfo.SpreadsheetID, Vers) != "OK") // If rerun might be different values so update SS
                         AddToActionsList("Failed to write to spreadsheet, please check manually");
-                   // else if (Excel.UpdateSpreadSheetPreTest(CameraAccessInfo.SpreadsheetID, Vers, CamOnTest.GetCamDesc(), CamOnTest.Model) != "OK")
-                   //     AddToActionsList("Failed to write to spreadsheet, please check manually");
                 }
                 else // No serial or model so allocate one
                     await AllocateSerial();
@@ -352,15 +414,6 @@ namespace AiQ_GUI
             // Indicators to the user the test has failed
             Btn.BackColor = Color.Maroon;
             Btn.Text = "Test Failed";
-            if (!(CamOnTest.RMANum != 0)) // Yap to check if it is not a RMA
-            {
-                Access.Stats(["Final Tests Failed", ErrMssg], CamOnTest.Model);
-            }
-            else
-            {
-                Access.Stats("RMA Final Tests Failed", CamOnTest.Model);
-            }
-            AddToActionsList(ErrMssg);
 
             string RedLbls = string.Join(Environment.NewLine, PnlLbls.Controls
                     .OfType<Label>()
@@ -368,7 +421,18 @@ namespace AiQ_GUI
                     .Select(lbl => lbl.Text)); // Extract text
             string FullFailureValues = RhTxBxActions.Text + Environment.NewLine + RedLbls;
 
-            Access.StatsDiags(RedLbls, RhTxBxActions.Text, CamOnTest.Model); // Log to Access database
+
+            // Database logging \\
+            if (!(CamOnTest.RMANum != 0)) // Yap to check if it is not a RMA
+            {
+                Stats(["Final Tests Failed", ErrMssg]);
+                StatsDiags(RedLbls, RhTxBxActions.Text, "FALSE", CamOnTest.RMANum);
+            }
+            else
+            {
+                Stats("RMA Final Tests Failed");
+                StatsDiags(RedLbls, RhTxBxActions.Text, "TRUE", CamOnTest.RMANum);
+            }
 
 
             if (await DisplayQuestion("Test failed, appeal?" + Environment.NewLine + "See Actions textbox for details."))
@@ -388,7 +452,6 @@ namespace AiQ_GUI
                 Logging.LogErrorMessage(FullFailureValues);
 
 
-                Logging.LogErrorMessage(FullFailureValues);
 
                 IList<IList<object>> values = GoogleAPI.service.Spreadsheets.Values.Get(GoogleAPI.spreadsheetId_ModelInfo, "'Approval'!A1:A").Execute().Values;
 
@@ -463,21 +526,25 @@ namespace AiQ_GUI
             BtnNo.Visible = false;
             Logging.LogMessage("Pre Test Failed");
 
-            if (CamOnTest.RMANum == 0) // Yap to check if it is not a RMA
-            {
-                Access.Stats(["Pre Tests Failed", ErrMssg], CamOnTest.Model);
-            }
-            else
-            {
-                Access.Stats("RMA Pre Tests Failed", CamOnTest.Model);
-            }
-
             string RedLbls = string.Join(Environment.NewLine, PnlLbls.Controls
                     .OfType<Label>()
                     .Where(lbl => lbl.ForeColor == Color.Red) // Only include red labels
                     .Select(lbl => lbl.Text)); // Extract text
             string FullFailureValues = RhTxBxActions.Text + Environment.NewLine + RedLbls;
 
+            if (CamOnTest.RMANum == 0) // Yap to check if it is not a RMA
+            {
+                Stats(["Pre Tests Failed", ErrMssg]);
+                StatsDiags(RedLbls, RhTxBxActions.Text, "FALSE", CamOnTest.RMANum);
+            }
+            else
+            {
+                Stats("RMA Pre Tests Failed");
+                StatsDiags(RedLbls, RhTxBxActions.Text, "TRUE", CamOnTest.RMANum);
+            }
+
+            // Log to Access database
+
             Access.StatsDiags(RedLbls, RhTxBxActions.Text, CamOnTest.Model); // Log to Access database
 
             if (await DisplayQuestion("Test failed, restart?" + Environment.NewLine + "See Actions textbox for details."))
@@ -1060,6 +1127,7 @@ namespace AiQ_GUI
             PnlInputValue.Visible = true;
 
             while (Flags.Done == false) // Waiting for user input in RMA Num panel
+            {
                 await Task.Delay(100); // Check every 100ms
 
             Flags.Done = false; // Reset flag
@@ -1722,36 +1790,37 @@ namespace AiQ_GUI
             //excelExporter.ExportDatabaseToExcel();
 
 
-            //FakeCamera fakeCamera = new FakeCamera(80); // Create an instance of FakeCamera
 
-            ////CamOnTest.IP = CbBxFoundCams.Text;
+            StatsExcel excelExporter = new();
-            //_ = fakeCamera.StartAsync(CAMTYPE.GOOD).ContinueWith(task =>
+            excelExporter.ExportDatabaseToExcel();
-            //{
-            //    //Network.Initialize("developer", "Pass123");
 
-            //    if (task.IsFaulted)
+            // FakeCamera fakeCamera = new FakeCamera(80); // Create an instance of FakeCamera
-            //    {
-            //        AddToActionsList("Error starting FakeCamera: " + task.Exception?.Message);
-            //    }
-            //    else
-            //    {
-            //        AddToActionsList($"FakeCamera started successfully. IP: {fakeCamera}", false);
-            //    }
-            //});
 
-            //await Task.Delay(3000); // Wait for server to start
+            // //CamOnTest.IP = CbBxFoundCams.Text;
-            //CbBxFoundCams.Text = "localhost"; // Should force update in creds an network reinit
+            // _ = fakeCamera.StartAsync(CAMTYPE.BAD).ContinueWith(task =>
-            //CmBoFoundCams_TextChanged(sender, e);
+            // {
-            //CbBxCameraType.SelectedIndex = CbBxCameraType.Items.Count - 1; // Selects AB12CD as model number
+            //     //Network.Initialize("developer", "Pass123");
 
-            //await Task.Delay(3000); // Wait for server to start
+            //     if (task.IsFaulted)
+            //     {
+            //         AddToActionsList("Error starting FakeCamera: " + task.Exception?.Message);
+            //     }
+            //     else
+            //     {
+            //         AddToActionsList($"FakeCamera started successfully. IP: {fakeCamera}", false);
+            //     }
+            // });
+
+            // await Task.Delay(3000); // Wait for server to start
+            // CbBxFoundCams.Text = "localhost"; // Should force update in creds an network reinit
+            // CmBoFoundCams_TextChanged(sender, e);
+            // CbBxCameraType.SelectedIndex = CbBxCameraType.Items.Count - 1; // Selects AB12CD as model number
+
+            // await Task.Delay(3000); // Wait for server to start
 
             //BtnPreTest_Click(sender, e);
 
 
-            Teams.SendMssg("10", "Test User");
-
-
             stopWatchTest.Stop();
             AddToActionsList("RunTime " + stopWatchTest.Elapsed.ToString(@"hh\:mm\:ss\.ff"));
         }

Camera/FlexiAPI.cs

@@ -161,6 +161,37 @@ namespace AiQ_GUI
                 return null; // If it fails to parse the JSON
             }
         }
+        public static async Task<bool> SetVaxtorMinMaxPlate(string IP)
+        {
+            try
+            {
+                // Build JSON array for Vaxtor min/max plate configuration
+                string[,] Vaxtor_JSON = { { "propMinCharHeight", "18" }, { "propMinGlobalConfidence", "30" } };
+                string response = await HTTP_Update("RaptorOCR".Trim(), IP, Vaxtor_JSON);
+
+                // Treat "operation was canceled" as a successful apply
+                if (response.Contains("The operation was canceled", StringComparison.OrdinalIgnoreCase))
+                {
+                    Logging.LogMessage("SetVaxtorMinMaxPlate: Camera applied config but closed connection early (safe to ignore).");
+                    return true;
+                }
+
+                if (response.Contains("error", StringComparison.OrdinalIgnoreCase))
+                {
+                    MainForm.Instance.DisplayQuestion($"SetVaxtorMinMaxPlate: failed - Please set manually");
+                    return false;
+                }
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                MainForm.Instance.AddToActionsList($"Could not set Vaxtor Plate height and min confidence: {ex.Message}");
+                return false;
+            }
+        }
+
+
 
         public static async Task<bool> SetZoomLockOn(string IP)
         {
@@ -406,5 +437,13 @@ namespace AiQ_GUI
     public class Property
     {
         public string Value { get; set; } = string.Empty;
+        public string datatype { get; set; }
+    }
+    public class VaxtorConfig
+    {
+        public string id { get; set; }
+        public long configHash { get; set; }
+        public Property propMinCharHeight { get; set; }
+        public Property propMinGlobalConfidence { get; set; }
     }
 }

LDS.cs

@@ -35,7 +35,9 @@ namespace AiQ_GUI
             }
             catch // If file can't deserialise
             {
+                MainForm.Instance.AddToActionsList("Error loading Local Data Store");
                 return null; // Return null to indicate failure
+
             }
         }
 

Microsoft/StatsExcel.cs

@@ -8,6 +8,9 @@ namespace AiQ_GUI
     {
         private const string exportPath = @"G:\Shared drives\MAV Production GUI's\AiQ\GUI's\AiQ_Test_Stats.xlsx";
 
+        private readonly string exportPath =
+            @"C:\Users\BradleyBorn\OneDrive - MAV Systems Ltd\Desktop\AiQ_Test_Stats.xlsx";
+
         public void ExportDatabaseToExcel()
         {
             try
@@ -20,32 +23,52 @@ namespace AiQ_GUI
                     MainForm.Instance.AddToActionsList("Connected to Access database.");
                     DateTime now = DateTime.Now;
 
+                    // Read LastStatsRun from UniversalData (if any)
+                    DateTime? lastStatsRun = null;
+                    try
+                    {
+                        using (var cmdPeriod = new OleDbCommand("SELECT LastStatsRun FROM UniversalData", conn))
+                        {
+                            object res = cmdPeriod.ExecuteScalar();
+                            if (res != null && res != DBNull.Value)
+                                lastStatsRun = (DateTime)res;
+                        }
+                        MainForm.Instance.AddToActionsList($"Fetched LastStatsRun: {(lastStatsRun.HasValue ? lastStatsRun.Value.ToString("yyyy-MM-dd HH:mm:ss") : "none")}");
+                    }
+                    catch (Exception periodEx)
+                    {
+                        MainForm.Instance.AddToActionsList($"Warning: could not read LastStatsRun. Details: {periodEx.Message}");
+                    }
+
                     // ==================== MAIN STATS EXPORT ====================
                     string selectColumns = @"
-                            ModelNumber,
+                                ModelNumber,
-                            [Total Tests Run],
+                                [Total Tests Run],
-                            [Pre Tests Passed],
+                                [Pre Tests Passed],
-                            [Pre Tests Failed],
+                                [Pre Tests Failed],
-                            [Final Tests Passed],
+                                [Final Tests Passed],
-                            [Final Tests Failed],
+                                [Final Tests Failed],
-                            [RMA Total Tests Run],
+                                [RMA Total Tests Run],
-                            [RMA Pre Tests Passed],
+                                [RMA Pre Tests Passed],
-                            [RMA Pre Tests Failed],
+                                [RMA Pre Tests Failed],
-                            [RMA Final Tests Passed], 
+                                [RMA Final Tests Passed], 
-                            [RMA Final Tests Failed],
+                                [RMA Final Tests Failed],
-                            [Diagnostic Failure],
+                                [Diagnostic Failure],
-                            [Failed To Set Model Or Serial Number],
+                                [Failed To Set Model Or Serial Number],
-                            [Camera Not In Test Tube],
+                                [Camera Not In Test Tube],
-                            [Could Not Zoom Modules To 8000],
+                                [Could Not Zoom Modules To 8000],
-                            [Could Not Zoom Modules To Full Wide],
+                                [Could Not Zoom Modules To Full Wide],
-                            [Please Get RMA Number From Operations Team Before Continuing],
+                                [Please Get RMA Number From Operations Team Before Continuing],
-                            [Please Get A Valid Vaxtor Product Key Before Continuing],  
+                                [Please Get A Valid Vaxtor Product Key Before Continuing],  
-                            [Visual Test Fail - Sleeve Not Aligned],  
+                                [Visual Test Fail - Sleeve Not Aligned],  
-                            [Visual Test Fail - Not All Front Screws Fitted],
+                                [Visual Test Fail - Not All Front Screws Fitted],
-                            [Visual Test Fail - Not All Rear Screws Fitted],
+                                [Visual Test Fail - Not All Rear Screws Fitted],
-                            [Visual Test Fail - Unit rattles]";
+                                [Visual Test Fail - Unit rattles]";
 
-                    string query = $@"SELECT {selectColumns} FROM AiQ";
+                    string query = $@"
+                        SELECT 
+                            {selectColumns}
+                        FROM AiQ";
 
                     OleDbDataAdapter adapter = new(query, conn);
                     DataTable dataTable = new();
@@ -84,8 +107,21 @@ namespace AiQ_GUI
                     ws.Cell(1, 1).InsertTable(dataTable, "AiQ_Stats", true);
                     ws.Columns().AdjustToContents();
 
-                    ws.Cell(1, dataTable.Columns.Count + 2).Value = "Exported:";
+                    // Write Data Period label and computed period string to the right of the table
-                    ws.Cell(2, dataTable.Columns.Count + 2).Value = now.ToString("yyyy-MM-dd HH:mm:ss");
+                    int infoCol = dataTable.Columns.Count + 2;
+                    ws.Cell(1, infoCol).Value = "Data Period";
+
+                    string periodText;
+                    if (lastStatsRun.HasValue)
+                    {
+                        periodText = $"{lastStatsRun.Value:yyyy-MM-dd HH:mm:ss} - {now:yyyy-MM-dd HH:mm:ss}";
+                    }
+                    else
+                    {
+                        periodText = $"Up to {now:yyyy-MM-dd HH:mm:ss}";
+                    }
+
+                    ws.Cell(2, infoCol).Value = periodText;
 
                     // ==================== DIAGS STATS EXPORT (CURRENT MONTH ONLY) ====================
                     MainForm.Instance.AddToActionsList("Exporting DiagsStats for current month...");
@@ -98,33 +134,36 @@ namespace AiQ_GUI
                             [Date],
                             [Model],
                             [Red Diags Labels],
-                            [RhTxBxActions Contents]
+                            [RhTxBxActions Contents],
+                            [IsRma],
+                            [RMA]
                         FROM DiagsStats
                         WHERE [Date] >= ? AND [Date] < ?";
 
-                    OleDbDataAdapter diagsAdapter = new(diagsQuery, conn);
+                    using (var diagsCmd = new OleDbCommand(diagsQuery, conn))
-                    diagsAdapter.SelectCommand.Parameters.Add(new OleDbParameter { OleDbType = OleDbType.Date, Value = monthStart });
-                    diagsAdapter.SelectCommand.Parameters.Add(new OleDbParameter { OleDbType = OleDbType.Date, Value = nextMonth });
-
-                    DataTable diagsTable = new();
-                    diagsAdapter.Fill(diagsTable);
-
-                    if (diagsTable.Rows.Count > 0)
                     {
-                        int startRow = ws.LastRowUsed().RowNumber() + 3;
+                        diagsCmd.Parameters.Add(new OleDbParameter { OleDbType = OleDbType.Date, Value = monthStart });
+                        diagsCmd.Parameters.Add(new OleDbParameter { OleDbType = OleDbType.Date, Value = nextMonth });
 
-                        ws.Cell(startRow, 1).Value = "Diags Stats (Current Month)";
+                        using (var diagsAdapter = new OleDbDataAdapter(diagsCmd))
-                        ws.Cell(startRow, 1).Style.Font.Bold = true;
+                        {
-                        ws.Cell(startRow, 1).Style.Font.FontSize = 12;
+                            DataTable diagsTable = new();
+                            diagsAdapter.Fill(diagsTable);
 
-                        ws.Cell(startRow + 1, 1).InsertTable(diagsTable, "Diags_Stats", true);
+                            if (diagsTable.Rows.Count > 0)
-                        ws.Columns().AdjustToContents();
+                            {
+                                int startRow = (ws.LastRowUsed()?.RowNumber() ?? 0) + 3;
 
-                        MainForm.Instance.AddToActionsList($"Added DiagsStats ({diagsTable.Rows.Count} rows) starting at row {startRow}.");
+                                ws.Cell(startRow, 1).Value = "Diags Stats (Current Month)";
-                    }
+                                ws.Cell(startRow, 1).Style.Font.Bold = true;
-                    else
+                                ws.Cell(startRow, 1).Style.Font.FontSize = 12;
-                    {
+
-                        MainForm.Instance.AddToActionsList("No DiagsStats data found for current month.");
+                                ws.Cell(startRow + 1, 1).InsertTable(diagsTable, "Diags_Stats", true);
+                                ws.Columns().AdjustToContents();
+
+                                MainForm.Instance.AddToActionsList($"Added DiagsStats ({diagsTable.Rows.Count} rows) starting at row {startRow}.");
+                            }
+                        }
                     }
 
                     // ==================== SAVE MAIN SHEET ====================
@@ -145,7 +184,6 @@ namespace AiQ_GUI
                             {selectColumns}
                         INTO [{backupTableName}]
                         FROM AiQ";
-
                     try
                     {
                         using (OleDbCommand cmdBackup = new(backupSql, conn))
@@ -161,10 +199,11 @@ namespace AiQ_GUI
                         return;
                     }
 
-                    using OleDbTransaction tx = conn.BeginTransaction();
+                    using (var tx = conn.BeginTransaction())
-                    try
                     {
-                        string resetSql = @"
+                        try
+                        {
+                            string resetSql = @"
                                 UPDATE AiQ SET
                                     [Total Tests Run] = 0,
                                     [Pre Tests Passed] = 0,