Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

C2025-048-Set-Quick-Print-overwrite-pdf-to-false #595

Closed
plarsen wants to merge 62 commits from C2025-048-Set-Quick-Print-overwrite-pdf-to-false into master
pull from: C2025-048-Set-Quick-Print-overwrite-pdf-to-false
merge into: Volian:master
Conversation 0 Commits 62 Files Changed 38 +2293 -1277
13 changed files with 2293 additions and 1277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1ebf67233b - Show all commits

1
PROMS/VEPROMS User Interface/DlgAnnotationsSelect.cs
View File

@@ -95,6 +95,7 @@ namespace VEPROMS
{ {
DataTable dt2 = coverToTable(); DataTable dt2 = coverToTable();
VEPROMS.CSLA.Library.AnnotationstypeSelections.Update(dt2, UserID); VEPROMS.CSLA.Library.AnnotationstypeSelections.Update(dt2, UserID);
this.Close();
} }
public class AnnotataionItem public class AnnotataionItem
{ {

9
PROMS/VEPROMS User Interface/PROMSFixes.Sql
View File

@@ -24075,10 +24075,6 @@ ELSE
GO GO
-- C2025-027 Annotation Type Filtering -- C2025-027 Annotation Type Filtering
IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[AnnotationTypeSelections]') AND type in (N'U'))
DROP TABLE [dbo].[AnnotationTypeSelections]
GO
/****** Object: Table [dbo].[AnnotationTypeSelections] Script Date: 7/10/2025 2:38:23 PM ******/ /****** Object: Table [dbo].[AnnotationTypeSelections] Script Date: 7/10/2025 2:38:23 PM ******/
SET ANSI_NULLS ON SET ANSI_NULLS ON
GO GO
@@ -24149,7 +24145,10 @@ AS
(SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[TypeID]= [TypeID]) [AnnotationCount], (SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[TypeID]= [TypeID]) [AnnotationCount],
[IsEPAnnotationType] [IsEPAnnotationType]
FROM [AnnotationTypes] --A FROM [AnnotationTypes] --A
WHERE TypeID NOT IN (SELECT TypeID FROM AnnotationTypeSelections ATS WHERE ATS.UserID = @UserID) LEFT OUTER JOIN AnnotationTypeSelections ON AnnotationTypeSelections.TypeID = AnnotationTypes.TypeID
WHERE AnnotationTypeSelections.UserID = @UserID
AND
AnnotationTypeSelections.ASTypeID IS NULL
GO GO
-- C2025-027 Annotation Type Filtering -- C2025-027 Annotation Type Filtering

23
PROMS/VEPROMS.CSLA.Library/Minimal/AnnotationstypeSections.cs
View File

@@ -150,15 +150,22 @@ namespace VEPROMS.CSLA.Library
{ {
using (SqlCommand cm = cn.CreateCommand()) using (SqlCommand cm = cn.CreateCommand())
{ {
cm.CommandType = CommandType.StoredProcedure; try
cm.CommandText = "UpdateAnnotationstypeSelections"; {
cm.CommandTimeout = Database.DefaultTimeout; cm.CommandType = CommandType.StoredProcedure;
cm.CommandText = "UpdateAnnotationstypeSelections";
cm.CommandTimeout = Database.DefaultTimeout;
//Pass table Valued parameter to Store Procedure //Pass table Valued parameter to Store Procedure
SqlParameter sqlParam = cm.Parameters.AddWithValue("@TempTable", dt); SqlParameter sqlParam = cm.Parameters.AddWithValue("@TempTable", dt);
sqlParam.SqlDbType = SqlDbType.Structured; sqlParam.SqlDbType = SqlDbType.Structured;
cm.Parameters.AddWithValue("@UserID", UserID); cm.Parameters.AddWithValue("@UserID", UserID);
cm.ExecuteNonQuery(); cm.ExecuteNonQuery();
}
catch (Exception ex)
{
throw new DbCslaException("Error in UpdateAnnotationstypeSelections: update failed", ex);
}
} }
} }
} }