From 55d3a96228373b4e881516b8dc513b4aa067a30f Mon Sep 17 00:00:00 2001 From: "Phares Mike (CSC FI SPS MESLEO)" Date: Wed, 5 Mar 2025 19:27:20 +0100 Subject: [PATCH] Merged PR 12196: Alphabetize Category List -ECN Module Moved pipeline to align with other projects in same repo Changed MSBuild task to be specific and added new MSBuild Release task Sort GetCategories on CategoryName Added comments back from feature 135470 Added ItemGroup to allow testing internal methods Testing for internal methods Related work items: #135470, #238416 --- .vscode/tasks.json | 17 ++++++++++++++++- Fab2ApprovalMKLink/Fab2ApprovalMKLink.csproj | 5 +++++ Fab2ApprovalSystem/DMO/ECN_DMO.cs | 2 +- .../EmailTemplates/TECNCancelled.txt | 2 +- .../EmailTemplates/TECNReturnedToProcess.txt | 2 +- .../pipelines.yml | 0 .../DMO/EngineeringChangeNoticeDMOTests.cs | 12 ++++++++++++ 7 files changed, 36 insertions(+), 4 deletions(-) rename azure-pipelines.yml => Fab2ApprovalSystem/pipelines.yml (100%) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index a882968..1f0acfb 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -2,7 +2,7 @@ "version": "2.0.0", "tasks": [ { - "label": "MSBuild", + "label": "MSBuild-Debug", "command": "C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe", "type": "process", "args": [ @@ -16,6 +16,21 @@ ], "problemMatcher": "$msCompile" }, + { + "label": "MSBuild-Release", + "command": "C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe", + "type": "process", + "args": [ + "/target:Build", + "/restore:True", + "/p:RestoreSources=https://artifactory.intra.infineon.com/artifactory/api/nuget/ngt-fi-package-main-vir/%3Bhttps://packagemanagement.eu.infineon.com:4430/api/v2/%3Bhttps://api.nuget.org/v3/index.json", + "/detailedsummary", + "/consoleloggerparameters:PerformanceSummary;ErrorsOnly;", + "/property:Configuration=Release;TargetFrameworkVersion=v4.8", + "Fab2ApprovalSystem/Fab2ApprovalSystem.csproj" + ], + "problemMatcher": "$msCompile" + }, { "label": "Fab2ApprovalMKLink-User Secrets Init", "command": "dotnet", diff --git a/Fab2ApprovalMKLink/Fab2ApprovalMKLink.csproj b/Fab2ApprovalMKLink/Fab2ApprovalMKLink.csproj index 1296406..5538bfe 100644 --- a/Fab2ApprovalMKLink/Fab2ApprovalMKLink.csproj +++ b/Fab2ApprovalMKLink/Fab2ApprovalMKLink.csproj @@ -18,6 +18,11 @@ NET8 + + + <_Parameter1>Fab2ApprovalTests + + diff --git a/Fab2ApprovalSystem/DMO/ECN_DMO.cs b/Fab2ApprovalSystem/DMO/ECN_DMO.cs index db903d8..b953fe2 100644 --- a/Fab2ApprovalSystem/DMO/ECN_DMO.cs +++ b/Fab2ApprovalSystem/DMO/ECN_DMO.cs @@ -390,7 +390,7 @@ public class ECN_DMO { internal List GetCategories() { List r = db.Query("ECNGetCategories", null, commandType: CommandType.StoredProcedure).ToList(); - return r; + return r.OrderBy(l => l.CategoryName).ToList(); } internal List GetECNAreas() { diff --git a/Fab2ApprovalSystem/EmailTemplates/TECNCancelled.txt b/Fab2ApprovalSystem/EmailTemplates/TECNCancelled.txt index 0092356..6b91fa5 100644 --- a/Fab2ApprovalSystem/EmailTemplates/TECNCancelled.txt +++ b/Fab2ApprovalSystem/EmailTemplates/TECNCancelled.txt @@ -2,7 +2,7 @@ *****Please DO NOT reply to this email*****

{3}# {0} has been Cancelled. Please remove posted TECN from point of use. The cancellation date is {4} -Please review the cancelled TECN form in the attachment. +Please review comments below and ensure process has been returned to normal.

https://messa016ec.infineon.com/ECN/Edit?issueID={1}

diff --git a/Fab2ApprovalSystem/EmailTemplates/TECNReturnedToProcess.txt b/Fab2ApprovalSystem/EmailTemplates/TECNReturnedToProcess.txt index 701b8ff..e67ee6b 100644 --- a/Fab2ApprovalSystem/EmailTemplates/TECNReturnedToProcess.txt +++ b/Fab2ApprovalSystem/EmailTemplates/TECNReturnedToProcess.txt @@ -2,7 +2,7 @@ *****Please DO NOT reply to this email*****

{3}# {0} has been returned to process. Please remove posted TECN from point of use. The returned to process date is {4} -Please review the returned to process TECN form in the attachment. +Please review comments below and ensure process has been returned to normal.

https://messa016ec.infineon.com/ECN/Edit?issueID={1}

diff --git a/azure-pipelines.yml b/Fab2ApprovalSystem/pipelines.yml similarity index 100% rename from azure-pipelines.yml rename to Fab2ApprovalSystem/pipelines.yml diff --git a/Fab2ApprovalTests/DMO/EngineeringChangeNoticeDMOTests.cs b/Fab2ApprovalTests/DMO/EngineeringChangeNoticeDMOTests.cs index e0ce35c..a85903a 100644 --- a/Fab2ApprovalTests/DMO/EngineeringChangeNoticeDMOTests.cs +++ b/Fab2ApprovalTests/DMO/EngineeringChangeNoticeDMOTests.cs @@ -85,6 +85,18 @@ public class EngineeringChangeNoticeDMOTests { // int SubmitTECNExtensionDocument(int issueID, appSettings.UserId, int documentType, DateTime extensionDate); // void TECNExtensionLog(int ecnNumber, DateTime extensionDate); // void UpdateECNType(int ecnNumber, string ecnType); + // ECN InsertECN(ECN ecn) + // void UpdateECN(ECN ecn) + // ECN GetECN(int ecnNumber, out int isITAR, int userID) + // ECN GetECNForRead(int ecnNumber, out int isITAR, int userID) + // ECNPdf GetECNPdf(int ecnNumber) + ECNAffectedDeparmtent[] departments = ecnDMO.GetDepartments().ToArray(); + ECNAffectedModule[] modules = ecnDMO.GetModules().ToArray(); + ECNCategory[] categories = ecnDMO.GetCategories().ToArray(); + ECNArea[] eCNAreas = ecnDMO.GetECNAreas().ToArray(); + ECNTechnology[] eCNTechnologies = ecnDMO.GetECNTechnologies().ToArray(); + ECNAcknowledgementTrainingBy[] eCNAcknowledgementTrainingBy = ecnDMO.GetECNAcknowledgementTrainingBy().ToArray(); + ProductFamilies[] productFamilies = ecnDMO.GetProductFamilies().ToArray(); if (ecnDMO is null) { } #pragma warning restore IDE0059 }