Compare commits
9 Commits
C2025-049-
...
B2025-042
Author | SHA1 | Date | |
---|---|---|---|
ca0ae279e0 | |||
adf1120436 | |||
7879391de0 | |||
11ba9ea418 | |||
0fe84ca17c | |||
1009ca5111 | |||
2c973fb0be | |||
dba1f4e71c | |||
46fe124fe1 |
@@ -735,10 +735,13 @@ namespace RODBInterface
|
|||||||
else
|
else
|
||||||
parentValue = nd.InnerText;
|
parentValue = nd.InnerText;
|
||||||
|
|
||||||
|
if (parentName != "#whitespace")
|
||||||
|
{
|
||||||
//applicValues = "";
|
//applicValues = "";
|
||||||
applicValues = string.Format("<APL DefaultVal={0}", parentValue);
|
applicValues = string.Format("<APL DefaultVal={0}", parentValue);
|
||||||
int pcChildIdx = 0;
|
int pcChildIdx = 0;
|
||||||
//C2022-001 only save the child ro value in the RO.FST if it is different than the parent (default) value
|
//C2022-001 only save the child ro value in the RO.FST if it is different than the parent (default) value
|
||||||
|
|
||||||
foreach (string c in pcChildern)
|
foreach (string c in pcChildern)
|
||||||
{
|
{
|
||||||
//string csufx = CvtUserFldToFld(c);
|
//string csufx = CvtUserFldToFld(c);
|
||||||
@@ -754,6 +757,7 @@ namespace RODBInterface
|
|||||||
applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, cn.InnerText);
|
applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, cn.InnerText);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
applicValues += " /APL>";
|
applicValues += " /APL>";
|
||||||
}
|
}
|
||||||
return applicValues;
|
return applicValues;
|
||||||
|
@@ -66,6 +66,12 @@ namespace VEPROMS
|
|||||||
set { _prtSectID = value; }
|
set { _prtSectID = value; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private bool _OverwritePDF;
|
||||||
|
public bool OverwritePDF
|
||||||
|
{
|
||||||
|
get { return cbxOverwritePDF2.Checked; }
|
||||||
|
set { cbxOverwritePDF2.Checked = value; }
|
||||||
|
}
|
||||||
|
|
||||||
// C2018-033 Used to turn off using the date/time PDF file prefix and suffix when doing batch file autmatic baseline print testing (frmVEPROMS.cs RunAutomatic())
|
// C2018-033 Used to turn off using the date/time PDF file prefix and suffix when doing batch file autmatic baseline print testing (frmVEPROMS.cs RunAutomatic())
|
||||||
// This is needed so the the automatic baselines can compare results from different runs of PROMS
|
// This is needed so the the automatic baselines can compare results from different runs of PROMS
|
||||||
|
@@ -17320,7 +17320,7 @@ GO
|
|||||||
[RofstID] [int] NOT NULL,
|
[RofstID] [int] NOT NULL,
|
||||||
[roid] [varchar](50) NOT NULL,
|
[roid] [varchar](50) NOT NULL,
|
||||||
[value] [varchar](max) NOT NULL,
|
[value] [varchar](max) NOT NULL,
|
||||||
[AccPageID] [varchar](max) NULL,
|
[AccPageID] [varchar](100) NULL,
|
||||||
CONSTRAINT [PK_RofstDefaultValue] PRIMARY KEY CLUSTERED
|
CONSTRAINT [PK_RofstDefaultValue] PRIMARY KEY CLUSTERED
|
||||||
(
|
(
|
||||||
[RofstID] ASC,
|
[RofstID] ASC,
|
||||||
@@ -24293,6 +24293,56 @@ Go
|
|||||||
--- end changes for:
|
--- end changes for:
|
||||||
---C2025-023 - Electronic Procedures - Modifications to PROMS
|
---C2025-023 - Electronic Procedures - Modifications to PROMS
|
||||||
|
|
||||||
|
/*
|
||||||
|
==========================================================================================================
|
||||||
|
Begin: C2025-045: Improve Performance loading procedures with Alarms
|
||||||
|
==========================================================================================================
|
||||||
|
*/
|
||||||
|
|
||||||
|
IF Exists(SELECT 1 from information_schema.columns where character_maximum_length=-1 and column_name = 'AccPageID' and table_name = 'RofstDefaultValue')
|
||||||
|
Begin
|
||||||
|
ALTER TABLE RofstDefaultValue ALTER COLUMN AccPageID varchar(100)
|
||||||
|
END
|
||||||
|
GO
|
||||||
|
|
||||||
|
IF (@@Error = 0) PRINT 'Updating size of RofstDefaultValue.AccPageID Succeeded'
|
||||||
|
ELSE PRINT 'Updating size of RofstDefaultValue.AccPageID Failed to Execute'
|
||||||
|
GO
|
||||||
|
|
||||||
|
EXEC sp_refreshview [dbo.vwRofstData_RofstDefaultValues]
|
||||||
|
EXEC sp_refreshview [dbo.vwRofstData_RofstBaseRoids]
|
||||||
|
GO
|
||||||
|
|
||||||
|
IF (@@Error = 0) PRINT 'Refreshing views: (vwRofstData_RofstDefaultValues,vwRofstData_RofstBaseRoids) Succeeded'
|
||||||
|
ELSE PRINT 'Refreshing views: (vwRofstData_RofstDefaultValues,vwRofstData_RofstBaseRoids) Failed to Execute'
|
||||||
|
GO
|
||||||
|
|
||||||
|
IF NOT EXISTS (SELECT * FROM dbo.sysindexes WHERE name = 'IX_RofstDefaultValue_RofstID_AccPageID')
|
||||||
|
BEGIN
|
||||||
|
CREATE NONCLUSTERED INDEX [IX_RofstDefaultValue_RofstID_AccPageID] ON [dbo].[RofstDefaultValue]
|
||||||
|
(
|
||||||
|
[RofstID] ASC,
|
||||||
|
[AccPageID] ASC
|
||||||
|
)
|
||||||
|
INCLUDE
|
||||||
|
(
|
||||||
|
[roid]
|
||||||
|
,[value]
|
||||||
|
)
|
||||||
|
WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
|
||||||
|
|
||||||
|
END
|
||||||
|
GO
|
||||||
|
|
||||||
|
IF (@@Error = 0) PRINT 'Adding Index IX_RofstDefaultValue_RofstID_AccPageID Succeeded'
|
||||||
|
ELSE PRINT 'Adding Index IX_RofstDefaultValue_RofstID_AccPageID Failed to Execute'
|
||||||
|
GO
|
||||||
|
|
||||||
|
/*
|
||||||
|
==========================================================================================================
|
||||||
|
End: C2025-045: Improve Performance loading procedures with Alarms
|
||||||
|
==========================================================================================================
|
||||||
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
---------------------------------------------------------------------------
|
---------------------------------------------------------------------------
|
||||||
@@ -24327,8 +24377,8 @@ BEGIN TRY -- Try Block
|
|||||||
DECLARE @RevDate varchar(255)
|
DECLARE @RevDate varchar(255)
|
||||||
DECLARE @RevDescription varchar(255)
|
DECLARE @RevDescription varchar(255)
|
||||||
|
|
||||||
set @RevDate = '08/12/2025 4:12 PM'
|
set @RevDate = '08/13/2025 8:07 AM'
|
||||||
set @RevDescription = 'Updated Fix Hyphen Characters'
|
set @RevDescription = 'Improve Performance loading procedures with Alarms'
|
||||||
|
|
||||||
Select cast(@RevDate as datetime) RevDate, @RevDescription RevDescription
|
Select cast(@RevDate as datetime) RevDate, @RevDescription RevDescription
|
||||||
PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription
|
PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription
|
||||||
|
@@ -1309,7 +1309,7 @@ namespace VEPROMS
|
|||||||
pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
|
pi.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
|
||||||
if (si.IsApproved == 1)
|
if (si.IsApproved == 1)
|
||||||
{
|
{
|
||||||
dlgExportImport dlg = new dlgExportImport("Export", pi, MyFrmVEPROMS, (E_UCFImportOptions)0); // "true tell export to convert ROs and Transitions to text
|
dlgExportImport dlg = new dlgExportImport("Export", pi, MyFrmVEPROMS, (E_UCFImportOptions)0, selectedSlave); // "true tell export to convert ROs and Transitions to text
|
||||||
dlg.DocReplace = frm.DocReplace; // this tells approval to prepare an export file with resolved transitions and ROs, word sections are saved with resolved ROs during approval PDF creation and saved in DocReplace
|
dlg.DocReplace = frm.DocReplace; // this tells approval to prepare an export file with resolved transitions and ROs, word sections are saved with resolved ROs during approval PDF creation and saved in DocReplace
|
||||||
System.Xml.XmlDocument xd = new System.Xml.XmlDocument();
|
System.Xml.XmlDocument xd = new System.Xml.XmlDocument();
|
||||||
dlg.ExportItem(xd, pi, "procedure");
|
dlg.ExportItem(xd, pi, "procedure");
|
||||||
|
@@ -1602,6 +1602,7 @@ namespace VEPROMS
|
|||||||
{
|
{
|
||||||
using (DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi))
|
using (DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi))
|
||||||
{
|
{
|
||||||
|
prnDlg.OverwritePDF = false; // turn off overwriting of PDFs.
|
||||||
prnDlg.SelectedSlave = pi.ProcedureConfig.SelectedSlave == 0 ? -1 : pi.ProcedureConfig.SelectedSlave; //added by jcb 20130718 to support create pdf button when multi-unit and user selects a unit
|
prnDlg.SelectedSlave = pi.ProcedureConfig.SelectedSlave == 0 ? -1 : pi.ProcedureConfig.SelectedSlave; //added by jcb 20130718 to support create pdf button when multi-unit and user selects a unit
|
||||||
prnDlg.MySessionInfo = MySessionInfo;
|
prnDlg.MySessionInfo = MySessionInfo;
|
||||||
prnDlg.SetupForProcedure(); // Setup filename
|
prnDlg.SetupForProcedure(); // Setup filename
|
||||||
|
Reference in New Issue
Block a user