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

C2025-022-Remove-UCF-2 #606

Merged
mschill merged 14 commits from C2025-022-Remove-UCF-2 into Development 2025-09-04 06:55:26 -04:00
Conversation 5 Commits 14 Files Changed 38
+1159 -1603
30 changed files with 1159 additions and 1603 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 525173bc9f - Show all commits
PROMS/Formats/fmtall/BASEall.xml
BIN
View File
Binary file not shown.
PROMS/VEPROMS User Interface/App.config
+10 -4
View File
@@ -135,10 +135,10 @@
<value>True</value> <value>True</value>
</setting> </setting>
<setting name="QATItems" serializeAs="String"> <setting name="QATItems" serializeAs="String">
<value/> <value />
</setting> </setting>
<setting name="DefaultDB" serializeAs="String"> <setting name="DefaultDB" serializeAs="String">
<value/> <value />
</setting> </setting>
<setting name="LastVersion" serializeAs="String"> <setting name="LastVersion" serializeAs="String">
<value>0.0</value> <value>0.0</value>
@@ -150,14 +150,17 @@
<value>True</value> <value>True</value>
</setting> </setting>
<setting name="SMTPServer" serializeAs="String"> <setting name="SMTPServer" serializeAs="String">
<value/> <value />
</setting> </setting>
<setting name="SMTPUser" serializeAs="String"> <setting name="SMTPUser" serializeAs="String">
<value/> <value />
</setting> </setting>
<setting name="UpdateSettings" serializeAs="String"> <setting name="UpdateSettings" serializeAs="String">
<value>True</value> <value>True</value>
</setting> </setting>
<setting name="cbShwRplWrdsColor" serializeAs="String">
mschill marked this conversation as resolved Outdated
mschill commented 2025-09-03 09:14:31 -04:00
Outdated
Review
Copy Link
Copy Source

Not sure why there are any changes to App.config

Changes to this do not appear to be connected to removing UCF.

Not sure why there are any changes to App.config Changes to this do not appear to be connected to removing UCF.
mschill commented 2025-09-03 12:40:12 -04:00
Outdated
Review
Copy Link
Copy Source

still valid issue.

still valid issue.
<value>False</value>
</setting>
<setting name="PasteNoReturns" serializeAs="String"> <setting name="PasteNoReturns" serializeAs="String">
<value>False</value> <value>False</value>
</setting> </setting>
@@ -170,6 +173,9 @@
<setting name="SeparateWindows" serializeAs="String"> <setting name="SeparateWindows" serializeAs="String">
<value>False</value> <value>False</value>
</setting> </setting>
<setting name="VisioPath" serializeAs="String">
<value />
</setting>
</VEPROMS.Properties.Settings> </VEPROMS.Properties.Settings>
<UISampleNetBar1.Properties.Settings> <UISampleNetBar1.Properties.Settings>
<setting name="ShowDefaultFolderProp" serializeAs="String"> <setting name="ShowDefaultFolderProp" serializeAs="String">
PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs
+15 -2
View File
2
 @@ -44,8 +44,21 @@ using System.Runtime.InteropServices;
// Revision DHH (day - no leading zero, two digit hour - military time // Revision DHH (day - no leading zero, two digit hour - military time
// //
// ********* REMEMBER TO CHECK THE AssemblyConfiguration SETTING (ABOVE) ******** // ********* REMEMBER TO CHECK THE AssemblyConfiguration SETTING (ABOVE) ********
[assembly: AssemblyVersion("2.2.2508.2100")] [assembly: AssemblyVersion("2.2.2508.2621")]
[assembly: AssemblyFileVersion("2.2.2508.2100")] [assembly: AssemblyFileVersion("2.2.2508.2621")]
PROMS/VEPROMS User Interface/Properties/Settings.Designer.cs
Generated
-12
View File
@@ -410,17 +410,5 @@ namespace VEPROMS.Properties {
this["VisioPath"] = value; this["VisioPath"] = value;
} }
} }
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("0")]
public int UCFImportOpt {
get {
return ((int)(this["UCFImportOpt"]));
}
set {
this["UCFImportOpt"] = value;
}
}
} }
} }
PROMS/VEPROMS User Interface/Properties/Settings.settings
-5
View File
@@ -80,11 +80,9 @@
<Setting Name="UpdateSettings" Type="System.Boolean" Scope="User"> <Setting Name="UpdateSettings" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value> <Value Profile="(Default)">True</Value>
</Setting> </Setting>
<Setting Name="cbShwRplWrdsColor" Type="System.Boolean" Scope="User"> <Setting Name="cbShwRplWrdsColor" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value> <Value Profile="(Default)">False</Value>
</Setting> </Setting>
<Setting Name="PasteNoReturns" Type="System.Boolean" Scope="User"> <Setting Name="PasteNoReturns" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value> <Value Profile="(Default)">False</Value>
</Setting> </Setting>
@@ -103,8 +101,5 @@
<Setting Name="VisioPath" Type="System.String" Scope="User"> <Setting Name="VisioPath" Type="System.String" Scope="User">
<Value Profile="(Default)" /> <Value Profile="(Default)" />
</Setting> </Setting>
<Setting Name="UCFImportOpt" Type="System.Int32" Scope="User">
<Value Profile="(Default)">0</Value>
</Setting>
</Settings> </Settings>
</SettingsFile> </SettingsFile>
PROMS/VEPROMS User Interface/VEPROMS_UI.csproj
-11
View File
@@ -244,12 +244,6 @@
<Compile Include="dlgTransitionReport.designer.cs"> <Compile Include="dlgTransitionReport.designer.cs">
<DependentUpon>dlgTransitionReport.cs</DependentUpon> <DependentUpon>dlgTransitionReport.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="dlgUCFDetail.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="dlgUCFDetail.Designer.cs">
<DependentUpon>dlgUCFDetail.cs</DependentUpon>
</Compile>
<Compile Include="frmAnnotationsCleanup.cs"> <Compile Include="frmAnnotationsCleanup.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
@@ -368,9 +362,6 @@
<EmbeddedResource Include="dlgSetChangeBarStartDate.resx"> <EmbeddedResource Include="dlgSetChangeBarStartDate.resx">
<DependentUpon>dlgSetChangeBarStartDate.cs</DependentUpon> <DependentUpon>dlgSetChangeBarStartDate.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="dlgUCFDetail.resx">
<DependentUpon>dlgUCFDetail.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmAnnotationsCleanup.resx"> <EmbeddedResource Include="frmAnnotationsCleanup.resx">
<DependentUpon>frmAnnotationsCleanup.cs</DependentUpon> <DependentUpon>frmAnnotationsCleanup.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
@@ -586,8 +577,6 @@
<Content Include="Resources\Save.png" /> <Content Include="Resources\Save.png" />
<Content Include="Resources\SaveAllHS.png" /> <Content Include="Resources\SaveAllHS.png" />
<Content Include="Resources\SaveAs.png" /> <Content Include="Resources\SaveAs.png" />
<Content Include="UCFDetails.xsl" />
<Content Include="UCFSummary.xsl" />
<Content Include="VEicon.ico" /> <Content Include="VEicon.ico" />
<Content Include="veproms.ico" /> <Content Include="veproms.ico" />
<Content Include="Vicon.ico" /> <Content Include="Vicon.ico" />
PROMS/VEPROMS User Interface/VEPROMS_UI.csproj_bak_2
+655
View File
@@ -0,0 +1,655 @@
<?xml version="1.0" encoding="utf-8"?>
mschill marked this conversation as resolved Outdated
mschill commented 2025-09-03 09:59:29 -04:00
Outdated
Review
Copy Link
Copy Source

Not sure why this file was added?

Not sure why this file was added?
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{8D1C47B4-F302-4C5A-87CC-24FDC5529872}</ProjectGuid>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>VEPROMS</RootNamespace>
<AssemblyName>VEPROMS</AssemblyName>
<ApplicationIcon>veproms.ico</ApplicationIcon>
<SccProjectName>
</SccProjectName>
<SccLocalPath>
</SccLocalPath>
<SccAuxPath>
</SccAuxPath>
<SccProvider>
</SccProvider>
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>2.0</OldToolsVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Demo|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\Demo\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>bin\debug\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Demo|x86' ">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\Demo\</OutputPath>
<DefineConstants>TRACE;DEMO</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="C1.Win.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=944ae1ea0e47ca04" />
<Reference Include="C1.Win.C1Command.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=e808566f358766d8" />
<Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL" />
<Reference Include="C1.Win.C1Input.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=7e7ff60f0c214f9a, processorArchitecture=MSIL" />
<Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\3rdPartyLibraries\CSLA\CSLA20cs_DLL_Net_4.8.1_Build\Csla.dll</HintPath>
</Reference>
<Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\3rdPartyLibraries\DotNetBar\DotNetBar4.6Build\DevComponents.DotNetBar2.dll</HintPath>
</Reference>
<Reference Include="Ionic.Zip, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\3rdPartyLibraries\Ionic\Ionic.Zip.dll</HintPath>
</Reference>
<Reference Include="Itenso.Rtf.Interpreter">
<HintPath>..\..\..\..\3rdPartyLibraries\RtfConverter\bin\Debug\Itenso.Rtf.Interpreter.dll</HintPath>
</Reference>
<Reference Include="Itenso.Rtf.Parser">
<HintPath>..\..\..\..\3rdPartyLibraries\RtfConverter\bin\Debug\Itenso.Rtf.Parser.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\3rdPartyLibraries\Log4Net\log4net.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
<Reference Include="System.Data">
<Private>True</Private>
</Reference>
<Reference Include="System.Deployment" />
<Reference Include="System.Design" />
<Reference Include="System.Drawing" />
<Reference Include="System.Runtime.Remoting" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="UIAutomationProvider" />
<Reference Include="VEPROMS.CSLA.Library, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\VEPROMS.CSLA.Library\bin\Debug\VEPROMS.CSLA.Library.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="AboutVEPROMS.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="AboutVEPROMS.Designer.cs">
<DependentUpon>AboutVEPROMS.cs</DependentUpon>
</Compile>
<Compile Include="BookMarks.cs" />
<Compile Include="dlgAnnotationsSelect.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="dlgAnnotationsSelect.Designer.cs">
<DependentUpon>dlgAnnotationsSelect.cs</DependentUpon>
</Compile>
<Compile Include="dlgAnnotationsSelect.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>dlgAnnotationsSelect.resx</DependentUpon>
</Compile>
<Compile Include="dlgApproveProcedure.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="dlgApproveProcedure.Designer.cs">
<DependentUpon>dlgApproveProcedure.cs</DependentUpon>
</Compile>
<Compile Include="dlgCheckedOutProcedure.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="dlgCheckedOutProcedure.designer.cs">
<DependentUpon>dlgCheckedOutProcedure.cs</DependentUpon>
</Compile>
<Compile Include="dlgExportImportEP.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="dlgMSWordMessage.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="dlgMSWordMessage.Designer.cs">
<DependentUpon>dlgMSWordMessage.cs</DependentUpon>
</Compile>
<Compile Include="dlgCheckOpenTabs.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="dlgCheckOpenTabs.Designer.cs">
<DependentUpon>dlgCheckOpenTabs.cs</DependentUpon>
</Compile>
<Compile Include="DlgCloseTabsOrExit.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="DlgCloseTabsOrExit.Designer.cs">
<DependentUpon>DlgCloseTabsOrExit.cs</DependentUpon>
</Compile>
<Compile Include="dlgExportImport.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="dlgExportImport.designer.cs">
<DependentUpon>dlgExportImport.cs</DependentUpon>
</Compile>
<Compile Include="dlgImpHowToHandleROs.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="dlgImpHowToHandleROs.Designer.cs">
<DependentUpon>dlgImpHowToHandleROs.cs</DependentUpon>
</Compile>
<Compile Include="dlgManageSecurity.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="dlgManageSecurity.designer.cs">
<DependentUpon>dlgManageSecurity.cs</DependentUpon>
</Compile>
<Compile Include="dlgPhoneList.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="dlgPhoneList.Designer.cs">
<DependentUpon>dlgPhoneList.cs</DependentUpon>
</Compile>
<Compile Include="dlgPickROFolder.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="dlgPickROFolder.designer.cs">
<DependentUpon>dlgPickROFolder.cs</DependentUpon>
</Compile>
<Compile Include="DlgPrintProcedure.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="DlgPrintProcedure.designer.cs">
<DependentUpon>DlgPrintProcedure.cs</DependentUpon>
</Compile>
<Compile Include="dlgSetChangeBarStartDate.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="dlgSetChangeBarStartDate.Designer.cs">
<DependentUpon>dlgSetChangeBarStartDate.cs</DependentUpon>
</Compile>
<Compile Include="dlgTransitionReport.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="dlgTransitionReport.designer.cs">
<DependentUpon>dlgTransitionReport.cs</DependentUpon>
</Compile>
<Compile Include="dlgUCFDetail.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="dlgUCFDetail.Designer.cs">
<DependentUpon>dlgUCFDetail.cs</DependentUpon>
</Compile>
<Compile Include="frmAnnotationsCleanup.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmAnnotationsCleanup.Designer.cs">
<DependentUpon>frmAnnotationsCleanup.cs</DependentUpon>
</Compile>
<Compile Include="frmBatchRefresh.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmBatchRefresh.designer.cs">
<DependentUpon>frmBatchRefresh.cs</DependentUpon>
</Compile>
<Compile Include="frmBatchRefreshCheckedOut.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmBatchRefreshCheckedOut.designer.cs">
<DependentUpon>frmBatchRefreshCheckedOut.cs</DependentUpon>
</Compile>
<Compile Include="frmManageUser.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmManageUser.designer.cs">
<DependentUpon>frmManageUser.cs</DependentUpon>
</Compile>
<Compile Include="frmPDFStatusForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmPDFStatusForm.designer.cs">
<DependentUpon>frmPDFStatusForm.cs</DependentUpon>
</Compile>
<Compile Include="frmPSI.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmPSI.Designer.cs">
<DependentUpon>frmPSI.cs</DependentUpon>
</Compile>
<Compile Include="frmRODbProperties.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmRODbProperties.Designer.cs">
<DependentUpon>frmRODbProperties.cs</DependentUpon>
</Compile>
<Compile Include="frmSI.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmSI.Designer.cs">
<DependentUpon>frmSI.cs</DependentUpon>
</Compile>
<Compile Include="frmVEPROMS.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmVEPROMS.Designer.cs">
<DependentUpon>frmVEPROMS.cs</DependentUpon>
</Compile>
<Compile Include="frmFolderProperties.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmFolderProperties.Designer.cs">
<DependentUpon>frmFolderProperties.cs</DependentUpon>
</Compile>
<Compile Include="frmProcedureProperties.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmProcedureProperties.Designer.cs">
<DependentUpon>frmProcedureProperties.cs</DependentUpon>
</Compile>
<Compile Include="frmPropGrid.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmPropGrid.Designer.cs">
<DependentUpon>frmPropGrid.cs</DependentUpon>
</Compile>
<Compile Include="frmSectionProperties.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmSectionProperties.Designer.cs">
<DependentUpon>frmSectionProperties.cs</DependentUpon>
</Compile>
<Compile Include="frmSysOptions.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmSysOptions.Designer.cs">
<DependentUpon>frmSysOptions.cs</DependentUpon>
</Compile>
<Compile Include="frmVersionsProperties.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmVersionsProperties.Designer.cs">
<DependentUpon>frmVersionsProperties.cs</DependentUpon>
</Compile>
<Compile Include="Program.cs" />
<EmbeddedResource Include="AboutVEPROMS.resx">
<SubType>Designer</SubType>
<DependentUpon>AboutVEPROMS.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="dlgAnnotationsSelect.resx">
<DependentUpon>dlgAnnotationsSelect.cs</DependentUpon>
<Generator>ResXFileCodeGenerator</Generator>
</EmbeddedResource>
<EmbeddedResource Include="dlgMSWordMessage.resx">
<DependentUpon>dlgMSWordMessage.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="dlgCheckOpenTabs.resx">
<DependentUpon>dlgCheckOpenTabs.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DlgCloseTabsOrExit.resx">
<DependentUpon>DlgCloseTabsOrExit.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="dlgImpHowToHandleROs.resx">
<DependentUpon>dlgImpHowToHandleROs.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DlgPrintProcedure.resx">
<DependentUpon>DlgPrintProcedure.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="dlgSetChangeBarStartDate.resx">
<DependentUpon>dlgSetChangeBarStartDate.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="dlgUCFDetail.resx">
<DependentUpon>dlgUCFDetail.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmAnnotationsCleanup.resx">
<DependentUpon>frmAnnotationsCleanup.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmPDFStatusForm.resx">
<DependentUpon>frmPDFStatusForm.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="frmPSI.resx">
<SubType>Designer</SubType>
<DependentUpon>frmPSI.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmRODbProperties.resx">
<SubType>Designer</SubType>
<DependentUpon>frmRODbProperties.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmSI.resx">
<DependentUpon>frmSI.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmVEPROMS.resx">
<SubType>Designer</SubType>
<DependentUpon>frmVEPROMS.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmFolderProperties.resx">
<DependentUpon>frmFolderProperties.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="frmProcedureProperties.resx">
<DependentUpon>frmProcedureProperties.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="frmPropGrid.resx">
<SubType>Designer</SubType>
<DependentUpon>frmPropGrid.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmSectionProperties.resx">
<DependentUpon>frmSectionProperties.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="frmSysOptions.resx">
<SubType>Designer</SubType>
<DependentUpon>frmSysOptions.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmVersionsProperties.resx">
<DependentUpon>frmVersionsProperties.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<SubType>Designer</SubType>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="ShortcutLists.resx">
<DependentUpon>ShortcutLists.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="VlnWeb.resx">
<DependentUpon>VlnWeb.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<None Include="App.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<SubType>Designer</SubType>
</None>
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<Compile Include="Settings.cs" />
<Compile Include="ShortcutLists.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="ShortcutLists.designer.cs">
<DependentUpon>ShortcutLists.cs</DependentUpon>
</Compile>
<Compile Include="VlnWeb.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="VlnWeb.Designer.cs">
<DependentUpon>VlnWeb.cs</DependentUpon>
</Compile>
<EmbeddedResource Include="VEPROMS.gclicx" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\Separator.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\ProtectFormHS.png" />
</ItemGroup>
<ItemGroup>
<None Include="FixRev.Bat" />
<None Include="MSWordVBA\vlnNextROForm.frm" />
<None Include="MSWordVBA\vlnNextROForm.frx" />
<None Include="MSWordVBA\vlnWestROConvert.frm" />
<None Include="MSWordVBA\vlnWestROConvert.frx" />
<None Include="Properties\DataSources\System.Drawing.Imaging.ImageCodecInfo.datasource" />
<None Include="Properties\DataSources\VEPROMS.CSLA.Library.DocVersionConfig.datasource" />
<None Include="Properties\DataSources\VEPROMS.CSLA.Library.FormatInfoList.datasource" />
<None Include="Properties\DataSources\VEPROMS.CSLA.Library.ItemAnnotations.datasource" />
<None Include="Properties\DataSources\VEPROMS.CSLA.Library.RODbInfoList.datasource" />
<None Include="Properties\DataSources\VEPROMS.CSLA.Library.SectionConfig.datasource" />
<None Include="Resources\UnProtectFormHS.png" />
<None Include="veproms.dct">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<Content Include="BarakahEULA.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="PROMSFixes.Sql">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="PROMSRollback %28v2.0%29.Sql">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="ROBuild.Sql">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="ROFixes.Sql">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="SORTCUTS_INSERT.RTF">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="SORTCUTS_MISC.rtf">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="SORTCUTS_NAVIGATION.rtf">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="SORTCUTS_RIBBON.rtf">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="SORTCUTS_TXTMODS.rtf">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<Content Include="DBConnection_Sample.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="DemoEULA.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="EULA.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="MSWordVBA\VlnWROMacros.bas" />
<Content Include="Resources\Admin.png" />
<EmbeddedResource Include="dlgApproveProcedure.resx">
<DependentUpon>dlgApproveProcedure.cs</DependentUpon>
<SubType>Designer</SubType>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="dlgCheckedOutProcedure.resx">
<DependentUpon>dlgCheckedOutProcedure.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="dlgExportImport.resx">
<DependentUpon>dlgExportImport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="dlgManageSecurity.resx">
<DependentUpon>dlgManageSecurity.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="dlgPhoneList.resx">
<SubType>Designer</SubType>
<DependentUpon>dlgPhoneList.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="dlgPickROFolder.resx">
<DependentUpon>dlgPickROFolder.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="dlgTransitionReport.resx">
<DependentUpon>dlgTransitionReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="frmBatchRefresh.resx">
<DependentUpon>frmBatchRefresh.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="frmBatchRefreshCheckedOut.resx">
<DependentUpon>frmBatchRefreshCheckedOut.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="frmManageUser.resx">
<DependentUpon>frmManageUser.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Resources\ATOM.BMP">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="Resources\CPLLOGO.BMP">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="Resources\DOMLOGO.BMP">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="Resources\GPCLOGO.BMP">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</EmbeddedResource>
<Content Include="Resources\Save.png" />
<Content Include="Resources\SaveAllHS.png" />
<Content Include="Resources\SaveAs.png" />
<Content Include="VEicon.ico" />
<Content Include="veproms.ico" />
<Content Include="Vicon.ico" />
<Content Include="WestinghouseEULA.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<COMReference Include="stdole">
<Guid>{00020430-0000-0000-C000-000000000046}</Guid>
<VersionMajor>2</VersionMajor>
<VersionMinor>0</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>primary</WrapperTool>
<Isolated>False</Isolated>
</COMReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\FlexableMessageBox\FlexableMessageBox.csproj">
<Project>{b22ce5ad-288c-44cd-8a22-b3bcf77b7161}</Project>
<Name>FlexableMessageBox</Name>
</ProjectReference>
<ProjectReference Include="..\LBWordLibrary\LBWordLibrary.csproj">
<Project>{70F23722-19A3-4AC1-A900-55831C945786}</Project>
<Name>LBWordLibrary</Name>
</ProjectReference>
<ProjectReference Include="..\Volian.Base.Library\Volian.Base.Library.csproj">
<Project>{AEEE9FD1-6892-45E2-A67E-418C06D46FF9}</Project>
<Name>Volian.Base.Library</Name>
</ProjectReference>
<ProjectReference Include="..\Volian.Controls.Library\Volian.Controls.Library.csproj">
<Project>{8556527C-6615-487F-8AF7-22EBC3EF0268}</Project>
<Name>Volian.Controls.Library</Name>
</ProjectReference>
<ProjectReference Include="..\Volian.Print.Library\Volian.Print.Library.csproj">
<Project>{94830C07-6A3A-450E-9674-C9B4293A7726}</Project>
<Name>Volian.Print.Library</Name>
</ProjectReference>
<ProjectReference Include="..\Volian.Utils.Library\Volian.Utils.Library.csproj">
<Project>{62314B9C-DA84-4037-8B68-AA18C1F641F5}</Project>
<Name>Volian.Utils.Library</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
<Install>false</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>cmd /c "$(ProjectDir)FixRev.bat"</PreBuildEvent>
</PropertyGroup>
</Project>
PROMS/VEPROMS User Interface/dlgApproveProcedure.cs
+1 -1
View File
@@ -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, selectedSlave); // "true tell export to convert ROs and Transitions to text dlgExportImport dlg = new dlgExportImport("Export", pi, MyFrmVEPROMS, (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");
PROMS/VEPROMS User Interface/dlgExportImport.cs
+113 -133
View File
@@ -75,9 +75,8 @@ namespace VEPROMS
xa.InnerText = value; xa.InnerText = value;
return xa; return xa;
} }
public dlgExportImport(string mode, FolderInfo folderInfo, frmVEPROMS myFrmVEPROMS, E_UCFImportOptions frset, int unitIndex = 0) public dlgExportImport(string mode, FolderInfo folderInfo, frmVEPROMS myFrmVEPROMS, int unitIndex = 0)
{ {
UCFImportDefaultFromSettings = frset;
MyFrmVEPROMS = myFrmVEPROMS;// Save frmVEPROMS for Import to shutoff SessionPing MyFrmVEPROMS = myFrmVEPROMS;// Save frmVEPROMS for Import to shutoff SessionPing
_MyMode = mode; _MyMode = mode;
MyFolder = folderInfo; MyFolder = folderInfo;
@@ -97,9 +96,8 @@ namespace VEPROMS
FormClosed += RemoveUnit_OnClose; FormClosed += RemoveUnit_OnClose;
} }
} }
public dlgExportImport(string mode, DocVersionInfo docVersionInfo, frmVEPROMS myFrmVEPROMS, E_UCFImportOptions frset, int unitIndex = 0) public dlgExportImport(string mode, DocVersionInfo docVersionInfo, frmVEPROMS myFrmVEPROMS, int unitIndex = 0)
{ {
UCFImportDefaultFromSettings = frset;
MyFrmVEPROMS = myFrmVEPROMS;// Save frmVEPROMS for Import to shutoff SessionPing MyFrmVEPROMS = myFrmVEPROMS;// Save frmVEPROMS for Import to shutoff SessionPing
_MyMode = mode; _MyMode = mode;
MyDocVersion = docVersionInfo; MyDocVersion = docVersionInfo;
@@ -120,9 +118,8 @@ namespace VEPROMS
FormClosed += RemoveUnit_OnClose; FormClosed += RemoveUnit_OnClose;
} }
} }
public dlgExportImport(string mode, ProcedureInfo procedureInfo, frmVEPROMS myFrmVEPROMS, E_UCFImportOptions frset, int unitIndex = 0) public dlgExportImport(string mode, ProcedureInfo procedureInfo, frmVEPROMS myFrmVEPROMS, int unitIndex = 0)
{ {
UCFImportDefaultFromSettings = frset;
MyFrmVEPROMS = myFrmVEPROMS;// Save frmVEPROMS for Import to shutoff SessionPing MyFrmVEPROMS = myFrmVEPROMS;// Save frmVEPROMS for Import to shutoff SessionPing
_MyMode = mode; _MyMode = mode;
MyProcedure = procedureInfo; MyProcedure = procedureInfo;
@@ -724,28 +721,28 @@ namespace VEPROMS
ImportProcedureNew(xd); ImportProcedureNew(xd);
isImported = true; isImported = true;
} }
mschill marked this conversation as resolved Outdated
mschill commented 2025-09-03 10:02:06 -04:00
Outdated
Review
Copy Link
Copy Source

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
mschill commented 2025-09-03 12:42:06 -04:00
Outdated
Review
Copy Link
Copy Source

still valid

still valid
if (isImported && UCFImportCase == E_UCFImportOptions.LoadForSetOnly) UpdateFormatForUCFInSet(); //if (isImported && UCFImportCase == E_UCFImportOptions.LoadForSetOnly) UpdateFormatForUCFInSet();
return true;// Import Suceeded return true;// Import Suceeded
} }
mschill marked this conversation as resolved Outdated
mschill commented 2025-09-03 10:02:13 -04:00
Outdated
Review
Copy Link
Copy Source

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
private void UpdateFormatForUCFInSet() //private void UpdateFormatForUCFInSet()
{ //{
// this gets called if the UCFImportCase == LoadForSetOnly, i.e. only items in this PROCEDURE Set whose formats point to a // // this gets called if the UCFImportCase == LoadForSetOnly, i.e. only items in this PROCEDURE Set whose formats point to a
// UCF format should point to the updated (copied) UCF format. // // UCF format should point to the updated (copied) UCF format.
if (renamedUCFFormatId == null) return; // if (renamedUCFFormatId == null) return;
foreach (int key in renamedUCFFormatId.Keys) // foreach (int key in renamedUCFFormatId.Keys)
{ // {
using (ContentInfoList cil = ContentInfoList.FixFormatIDAfterImport(MyDocVersion.VersionID.ToString(), renamedUCFFormatId[key], key)) // using (ContentInfoList cil = ContentInfoList.FixFormatIDAfterImport(MyDocVersion.VersionID.ToString(), renamedUCFFormatId[key], key))
{ // {
foreach (ContentInfo ci in cil) // foreach (ContentInfo ci in cil)
{ // {
using (Content c = ci.Get()) // using (Content c = ci.Get())
{ // {
ContentInfo.Refresh(c); // ContentInfo.Refresh(c);
} // }
} // }
} // }
} // }
} //}
// Added Error Handling to assure that Change Manager is turned-on regardless of success or failure of the import // Added Error Handling to assure that Change Manager is turned-on regardless of success or failure of the import
// B2019-046: improved error handling (added return value & error message) // B2019-046: improved error handling (added return value & error message)
private bool TryToLoadImportDataDocument() private bool TryToLoadImportDataDocument()
@@ -1014,8 +1011,8 @@ namespace VEPROMS
c.Save(); c.Save();
} }
} }
private E_UCFImportOptions UCFImportDefaultFromSettings; //private E_UCFImportOptions UCFImportDefaultFromSettings;
private E_UCFImportOptions UCFImportCase = E_UCFImportOptions.LoadOnlyImported; //private E_UCFImportOptions UCFImportCase = E_UCFImportOptions.LoadOnlyImported;
Dictionary<string, string> existingCopyFCName = new Dictionary<string, string>(); Dictionary<string, string> existingCopyFCName = new Dictionary<string, string>();
// note that this is used when importing a folder or a procedure (procedure was added for UCF changes) // note that this is used when importing a folder or a procedure (procedure was added for UCF changes)
private bool LoadFormats(XmlDocument xd, string xmlpath) private bool LoadFormats(XmlDocument xd, string xmlpath)
1
 @@ -1057,7 +1054,6 @@ namespace VEPROMS
{ {
existingFC.Add(exFI.Config); existingFC.Add(exFI.Config);
importedFC.Add(config); importedFC.Add(config);
conflictingUCFdata = true;
fname.Add(name); fname.Add(name);
} }
else else
@@ -1066,22 +1062,6 @@ namespace VEPROMS
} }
} }
// there is a difference in UCF data, see if user wants sections to use the existing or new ucf data:
if (conflictingUCFdata)
{
// Bring up dialog to allow user to choose how the UCF data is handled:
// Importing of a procedure(s) (names of UCF exist in current DB and in exported DB)
//Case 0 - ignore (don't bring in new UCF)
//Case 1 - bringing in new UCF and not using it
//Case 2 - bringing in new UCF and only using it for imported data
//Case 3 - bringing in new UCF and using it across the board
//Case 4 - bringing in new UCF and using it for the current procedure set (not applicable for procedure sets)
UCFImportCase = UCFImportDefaultFromSettings; // from the options/settings
dlgUCFImportOptions ucfoptDlg = new dlgUCFImportOptions(fname, existingFC, importedFC, UCFImportCase, xmlpath);
DialogResult dr = ucfoptDlg.ShowDialog();
if (dr != DialogResult.OK) return false;
UCFImportCase = ucfoptDlg.UCFImportOptionsCase; // may be reset from dialog.
}
// first see if any of the imported formats have different data. If so, // first see if any of the imported formats have different data. If so,
foreach (XmlNode nd in nl) foreach (XmlNode nd in nl)
{ {
@@ -1133,102 +1113,102 @@ namespace VEPROMS
// various cases listed above: // various cases listed above:
if (existingFormat.ContainsKey(name)) if (existingFormat.ContainsKey(name))
{ {
// if case 0 and this ucf already exists, ignore it: //// if case 0 and this ucf already exists, ignore it:
if (UCFImportCase == E_UCFImportOptions.Ignore) continue; //if (UCFImportCase == E_UCFImportOptions.Ignore) continue;
// if case 1, 2, 4 and the name exists, make a 'copy' of the newly imported format: //// if case 1, 2, 4 and the name exists, make a 'copy' of the newly imported format:
// need to add this format - name must be unique so add 'COPY(x) of 'original name'' where x is unique number: //// need to add this format - name must be unique so add 'COPY(x) of 'original name'' where x is unique number:
if (UCFImportCase == E_UCFImportOptions.LoadNotUsed || UCFImportCase == E_UCFImportOptions.LoadOnlyImported || UCFImportCase == E_UCFImportOptions.LoadForSetOnly) //if (UCFImportCase == E_UCFImportOptions.LoadNotUsed || UCFImportCase == E_UCFImportOptions.LoadOnlyImported || UCFImportCase == E_UCFImportOptions.LoadForSetOnly)
{ //{
int count = (fil.Where(fi => fi.Name.EndsWith(name))).Count(); // int count = (fil.Where(fi => fi.Name.EndsWith(name))).Count();
if (count > 0) // if (count > 0)
mschill commented 2025-09-03 10:03:18 -04:00
Outdated
Review
Copy Link
Copy Source

Is there any code that is executed inside this if statement?

If no, should if statement be removed?

Is there any code that is executed inside this if statement? If no, should if statement be removed?
mschill commented 2025-09-03 12:44:38 -04:00
Outdated
Review
Copy Link
Copy Source

still valid

still valid
mschill commented 2025-09-04 06:56:19 -04:00
Outdated
Review
Copy Link
Copy Source

Will address in later changes

Will address in later changes
{ // {
string origname = name; // string origname = name;
mschill marked this conversation as resolved Outdated
mschill commented 2025-09-03 10:02:37 -04:00
Outdated
Review
Copy Link
Copy Source

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
name = string.Format("Copy {0} of {1}", count.ToString(), name); // name = string.Format("Copy {0} of {1}", count.ToString(), name);
if (UCFImportCase == E_UCFImportOptions.LoadOnlyImported || UCFImportCase == E_UCFImportOptions.LoadForSetOnly) // if (UCFImportCase == E_UCFImportOptions.LoadOnlyImported || UCFImportCase == E_UCFImportOptions.LoadForSetOnly)
{ // {
if (renamedUCFFormatName == null) renamedUCFFormatName = new Dictionary<string, string>(); // if (renamedUCFFormatName == null) renamedUCFFormatName = new Dictionary<string, string>();
renamedUCFFormatName.Add(origname, name); // renamedUCFFormatName.Add(origname, name);
} // }
} // }
} //}
// if case 3, take the existing config data and create in a record whose name is Old(x) of 'original name' (the record // if case 3, take the existing config data and create in a record whose name is Old(x) of 'original name' (the record
// creation gets done below). Then modify the existing record to have the config data. The result is that any // creation gets done below). Then modify the existing record to have the config data. The result is that any
// sections that used this UCF throughout the database will have the new config data. // sections that used this UCF throughout the database will have the new config data.
if (UCFImportCase == E_UCFImportOptions.LoadUseAll) //if (UCFImportCase == E_UCFImportOptions.LoadUseAll)
{ //{
string savname = name; // string savname = name;
int count = (fil.Where(fi => fi.Name.EndsWith(name))).Count(); // int count = (fil.Where(fi => fi.Name.EndsWith(name))).Count();
if (count > 0) // if (count > 0)
{ // {
name = string.Format("Old {0} of {1}", count.ToString(), name); // name = string.Format("Old {0} of {1}", count.ToString(), name);
} // }
// update the 'old' record by getting the original config data. // // update the 'old' record by getting the original config data.
string savdesc = null; // string savdesc = null;
DateTime savdts = DateTime.Now; // DateTime savdts = DateTime.Now;
string savuid = null; // string savuid = null;
int savpar = 0; // int savpar = 0;
string savconfig = null; // string savconfig = null;
using (Format origRecord = Format.Get(existingFormat[savname])) // using (Format origRecord = Format.Get(existingFormat[savname]))
{ // {
savdesc = origRecord.Description; // savdesc = origRecord.Description;
savdts = origRecord.DTS; // savdts = origRecord.DTS;
savuid = origRecord.UserID; // savuid = origRecord.UserID;
savpar = origRecord.ParentID; // savpar = origRecord.ParentID;
savconfig = origRecord.Config; // savconfig = origRecord.Config;
origRecord.Name = savname; // origRecord.Name = savname;
origRecord.Description = description; // origRecord.Description = description;
origRecord.DTS = dts; // origRecord.DTS = dts;
origRecord.UserID = userid; // origRecord.UserID = userid;
origRecord.MyParent = pformat; // origRecord.MyParent = pformat;
origRecord.Config = config; // origRecord.Config = config;
origRecord.Save(); // origRecord.Save();
description = savdesc; // description = savdesc;
dts = savdts; // dts = savdts;
userid = savuid; // userid = savuid;
pformat = Format.Get(savpar); // pformat = Format.Get(savpar);
config = savconfig; // config = savconfig;
// }
//}
} }
} //if (UCFImportCase == 0) // ignore it
//{
}
if (UCFImportCase == 0) // ignore it
{
importedFormat.Add(formatid, name); importedFormat.Add(formatid, name);
} //}
else //else
{ //{
Format rec = Format.MakeFormat(pformat, name, description, null, null, dts, userid); // Format rec = Format.MakeFormat(pformat, name, description, null, null, dts, userid);
rec.Config = config; // rec.Config = config;
rec.Save(); // rec.Save();
if (UCFImportCase == E_UCFImportOptions.LoadNotUsed || UCFImportCase == E_UCFImportOptions.LoadUseAll) // don't reset format id (case 1 don't use it, case 3 copies new data into original record // if (UCFImportCase == E_UCFImportOptions.LoadNotUsed || UCFImportCase == E_UCFImportOptions.LoadUseAll) // don't reset format id (case 1 don't use it, case 3 copies new data into original record
importedFormat.Add(formatid, name); // importedFormat.Add(formatid, name);
mschill marked this conversation as resolved Outdated
mschill commented 2025-09-03 10:03:38 -04:00
Outdated
Review
Copy Link
Copy Source

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
else if (UCFImportCase == E_UCFImportOptions.LoadOnlyImported || UCFImportCase == E_UCFImportOptions.LoadForSetOnly) // case 2 uses it for any items imported, case 4 uses it for any sections within current set // else if (UCFImportCase == E_UCFImportOptions.LoadOnlyImported || UCFImportCase == E_UCFImportOptions.LoadForSetOnly) // case 2 uses it for any items imported, case 4 uses it for any sections within current set
{ // {
existingFormat.Add(name, rec.FormatID); // change to original name? // existingFormat.Add(name, rec.FormatID); // change to original name?
mschill marked this conversation as resolved Outdated
mschill commented 2025-09-03 10:03:45 -04:00
Outdated
Review
Copy Link
Copy Source

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
importedFormat.Add(rec.FormatID, name); // importedFormat.Add(rec.FormatID, name);
// get format id for the original named format // // get format id for the original named format
if (UCFImportCase == E_UCFImportOptions.LoadForSetOnly && renamedUCFFormatName != null) // if (UCFImportCase == E_UCFImportOptions.LoadForSetOnly && renamedUCFFormatName != null)
{ // {
int origformatid = -1; // int origformatid = -1;
foreach (var kvp in renamedUCFFormatName) // foreach (var kvp in renamedUCFFormatName)
{ // {
if (kvp.Value == name) // if (kvp.Value == name)
{ // {
origformatid = existingFormat[kvp.Key]; // origformatid = existingFormat[kvp.Key];
break; // break;
} // }
} // }
if (origformatid != -1) // if (origformatid != -1)
{ // {
if (renamedUCFFormatId == null) renamedUCFFormatId = new Dictionary<int, int>(); // if (renamedUCFFormatId == null) renamedUCFFormatId = new Dictionary<int, int>();
renamedUCFFormatId.Add(rec.FormatID, origformatid); // renamedUCFFormatId.Add(rec.FormatID, origformatid);
} // }
} // }
} // }
} //}
} }
FormatInfoList.Reset(); FormatInfoList.Reset();
return true; return true;
PROMS/VEPROMS User Interface/dlgExportImportEP.cs
+3 -3
View File
@@ -21,7 +21,7 @@ namespace VEPROMS
private static Regex _ROAccPageTokenPattern = new Regex("[<][^<>-]+-[^<>]+[>]"); private static Regex _ROAccPageTokenPattern = new Regex("[<][^<>-]+-[^<>]+[>]");
public dlgExportImportEP(string mode, FolderInfo folderInfo, frmVEPROMS myFrmVEPROMS, int annotationTypeId, int unitIndex = 0) : base(mode, folderInfo, myFrmVEPROMS, (E_UCFImportOptions)0, unitIndex) public dlgExportImportEP(string mode, FolderInfo folderInfo, frmVEPROMS myFrmVEPROMS, int annotationTypeId, int unitIndex = 0) : base(mode, folderInfo, myFrmVEPROMS, ( unitIndex))
{ {
_AnnotationType = AnnotationTypeInfo.Get(annotationTypeId); _AnnotationType = AnnotationTypeInfo.Get(annotationTypeId);
_ExportBothConvertedandNot = true; _ExportBothConvertedandNot = true;
@@ -29,7 +29,7 @@ namespace VEPROMS
FormClosed += OnClose; FormClosed += OnClose;
Text = $"{mode} Electronic Procedure ({_AnnotationType.Name}) Dialog for {folderInfo.Name}"; Text = $"{mode} Electronic Procedure ({_AnnotationType.Name}) Dialog for {folderInfo.Name}";
} }
public dlgExportImportEP(string mode, DocVersionInfo docVersionInfo, frmVEPROMS myFrmVEPROMS, int annotationTypeId, int unitIndex = 0) : base(mode, docVersionInfo, myFrmVEPROMS, (E_UCFImportOptions)0, unitIndex) public dlgExportImportEP(string mode, DocVersionInfo docVersionInfo, frmVEPROMS myFrmVEPROMS, int annotationTypeId, int unitIndex = 0) : base(mode, docVersionInfo, myFrmVEPROMS, (unitIndex))
{ {
_AnnotationType = AnnotationTypeInfo.Get(annotationTypeId); _AnnotationType = AnnotationTypeInfo.Get(annotationTypeId);
_ExportBothConvertedandNot = true; _ExportBothConvertedandNot = true;
@@ -37,7 +37,7 @@ namespace VEPROMS
FormClosed += OnClose; FormClosed += OnClose;
Text = $"{mode} Electronic Procedure ({_AnnotationType.Name}) Dialog for {docVersionInfo.Name} of {docVersionInfo.MyFolder.Name}"; Text = $"{mode} Electronic Procedure ({_AnnotationType.Name}) Dialog for {docVersionInfo.Name} of {docVersionInfo.MyFolder.Name}";
} }
public dlgExportImportEP(string mode, ProcedureInfo procedureInfo, frmVEPROMS myFrmVEPROMS, int annotationTypeId, int unitIndex = 0) : base(mode, procedureInfo, myFrmVEPROMS, (E_UCFImportOptions)0, unitIndex) public dlgExportImportEP(string mode, ProcedureInfo procedureInfo, frmVEPROMS myFrmVEPROMS, int annotationTypeId, int unitIndex = 0) : base(mode, procedureInfo, myFrmVEPROMS, (unitIndex))
{ {
_AnnotationType = AnnotationTypeInfo.Get(annotationTypeId); _AnnotationType = AnnotationTypeInfo.Get(annotationTypeId);
_ExportBothConvertedandNot = true; _ExportBothConvertedandNot = true;
PROMS/VEPROMS User Interface/dlgUCFDetail.Designer.cs
Generated
-61
View File
@@ -1,61 +0,0 @@
namespace VEPROMS
{
partial class dlgUCFDetail
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.wbBrDet = new System.Windows.Forms.WebBrowser();
this.SuspendLayout();
//
// wbBrDet
//
this.wbBrDet.Dock = System.Windows.Forms.DockStyle.Fill;
this.wbBrDet.Location = new System.Drawing.Point(0, 0);
this.wbBrDet.MinimumSize = new System.Drawing.Size(20, 20);
this.wbBrDet.Name = "wbBrDet";
this.wbBrDet.Size = new System.Drawing.Size(897, 445);
this.wbBrDet.TabIndex = 0;
//
// dlgUCFDetail
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(897, 445);
this.Controls.Add(this.wbBrDet);
this.Name = "dlgUCFDetail";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "User Control of Format Details";
this.Load += new System.EventHandler(this.dlgUCFDetail_Load);
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.WebBrowser wbBrDet;
}
}
PROMS/VEPROMS User Interface/dlgUCFDetail.cs
-77
View File
@@ -1,77 +0,0 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Windows.Forms;
using System.Xml;
using System.IO;
using System.Xml.Xsl;
namespace VEPROMS
{
public partial class dlgUCFDetail : Form
{
private string MyFormatConfig;
private string UCFName;
private string Description;
// This brings up the dialog for displaying the details of what is contained in this User Control of Format
// as defined by the formatConfig. It uses XSL to display the xml. The XSL can be found in UCFDetails.xsl.
// The result is displayed in a web browser control on the dialog.
public dlgUCFDetail(string formatConfig, string name, string desc)
{
MyFormatConfig = formatConfig;
UCFName = name;
Description = desc;
InitializeComponent();
}
private void AddAttribute(XmlNode xn, string name, object value)
{
XmlAttribute xa = xn.OwnerDocument.CreateAttribute(name);
xa.Value = value.ToString();
xn.Attributes.Append(xa);
}
private void dlgUCFDetail_Load(object sender, EventArgs e)
{
try
{
//need to add the UCF name & description to this:
XmlDocument xd = new XmlDocument();
xd.LoadXml(MyFormatConfig);
XmlNodeList xnl = xd.GetElementsByTagName("FormatConfig");
if (xnl != null && xnl.Count > 0)
{
AddAttribute(xnl[0], "Name", UCFName);
AddAttribute(xnl[0], "Description", Description);
}
string sXSLSummary = System.IO.File.ReadAllText(Application.StartupPath + "\\" + "UCFDetails.xsl");
StringWriter sw = new StringWriter();
StringWriter xsw = new StringWriter();
using (XmlReader xrt = XmlReader.Create(new StringReader(sXSLSummary)))
{
XmlTextWriter tx = new XmlTextWriter(xsw);
xd.WriteTo(tx);
string tmp = sw.ToString();
tmp = xd.InnerXml;
using (XmlReader xri = XmlReader.Create(new StringReader(tmp)))
{
using (XmlWriter xwo = XmlWriter.Create(sw))
{
XslCompiledTransform xsl = new XslCompiledTransform();
xsl.Load(xrt);
xsl.Transform(xri, xwo); // Perform Transform
}
this.wbBrDet.DocumentText = sw.ToString();
}
}
}
catch (Exception ex)
{
MessageBox.Show("Problem occurred displaying the details.", "UCF Warning", MessageBoxButtons.OK);
}
}
}
}
PROMS/VEPROMS User Interface/dlgUCFDetail.resx
-120
View File
@@ -1,120 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
PROMS/VEPROMS User Interface/frmFolderProperties.cs
+17 -17
View File
@@ -338,23 +338,23 @@ namespace VEPROMS
//if (btnAnnoTypeSave.Enabled) return; //if (btnAnnoTypeSave.Enabled) return;
folderConfigBindingSource.EndEdit(); folderConfigBindingSource.EndEdit();
// if there is a change to the format, clean up any overridden formats that point to the selected item before saving the format change: // if there is a change to the format, clean up any overridden formats that point to the selected item before saving the format change:
if (_FolderConfig.MyFolder.FormatID != _cmbxformatOriginal) //if (_FolderConfig.MyFolder.FormatID != _cmbxformatOriginal)
mschill marked this conversation as resolved Outdated
mschill commented 2025-09-03 10:04:34 -04:00
Outdated
Review
Copy Link
Copy Source

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
{ //{
// clean up & then refresh the configs // // clean up & then refresh the configs
using (ContentInfoList cil = ContentInfoList.ClearOverrideFormatsByFolder(_FolderConfig.MyFolder.FolderID, _cmbxformatOriginal, _FolderConfig.MyFolder.FormatID)) // using (ContentInfoList cil = ContentInfoList.ClearOverrideFormatsByFolder(_FolderConfig.MyFolder.FolderID, _cmbxformatOriginal, _FolderConfig.MyFolder.FormatID))
{ // {
foreach (ContentInfo ci in cil) // foreach (ContentInfo ci in cil)
{ // {
using (Content c = ci.Get()) // using (Content c = ci.Get())
{ // {
// first refresh configs because the ContentInfo.Refresh causes events to occur that refresh screen // // first refresh configs because the ContentInfo.Refresh causes events to occur that refresh screen
// and if configs aren't done first, the screen refresh, if based on config data, will not be correct. // // and if configs aren't done first, the screen refresh, if based on config data, will not be correct.
foreach (ItemInfo ii in ci.ContentItems) ii.RefreshConfig(); // foreach (ItemInfo ii in ci.ContentItems) ii.RefreshConfig();
ContentInfo.Refresh(c); // ContentInfo.Refresh(c);
} // }
} // }
} // }
} //}
// Save Default settings for User // Save Default settings for User
// //
// Save whether we should display the default values on this property page // Save whether we should display the default values on this property page
PROMS/VEPROMS User Interface/frmSectionProperties.cs
+2 -2
View File
@@ -120,7 +120,7 @@ namespace VEPROMS
PlantFormat pf = _SectionConfig.MyFormat != null ? _SectionConfig.MyFormat.PlantFormat : _SectionConfig.MyDefaultFormat.PlantFormat; PlantFormat pf = _SectionConfig.MyFormat != null ? _SectionConfig.MyFormat.PlantFormat : _SectionConfig.MyDefaultFormat.PlantFormat;
CheckOffList chkoffList = pf.FormatData.ProcData.CheckOffData.CheckOffList; CheckOffList chkoffList = pf.FormatData.ProcData.CheckOffData.CheckOffList;
CheckOffHeaderList chkoffHeaderList = pf.FormatData.ProcData.CheckOffData.CheckOffHeaderList; CheckOffHeaderList chkoffHeaderList = pf.FormatData.ProcData.CheckOffData.CheckOffHeaderList;
int maxindx = pf.FormatData.ProcData.CheckOffUCF ? pf.FormatData.ProcData.CheckOffData.CheckOffList.MaxIndex : pf.FormatData.ProcData.CheckOffData.CheckOffList.MaxIndexNoInherit; int maxindx = pf.FormatData.ProcData.CheckOffData.CheckOffList.MaxIndexNoInherit;
// C2020-003 use the _CheckOffIndex dictionary to get and save the index of the selected checkoff from the sorted checkoff list // C2020-003 use the _CheckOffIndex dictionary to get and save the index of the selected checkoff from the sorted checkoff list
// B2020-039: Added the check for a valid selected index so that crash doesn't occur // B2020-039: Added the check for a valid selected index so that crash doesn't occur
if (ppGpbxSignoffCheckoff.Enabled && (chkoffList != null && maxindx > 1) if (ppGpbxSignoffCheckoff.Enabled && (chkoffList != null && maxindx > 1)
@@ -796,7 +796,7 @@ namespace VEPROMS
CheckOffList chkoffList = pf.FormatData.ProcData.CheckOffData.CheckOffList; CheckOffList chkoffList = pf.FormatData.ProcData.CheckOffData.CheckOffList;
if (chkoffList != null) chkoffList.Sort(CompareCheckoffUsingOrderBy); // C2020-003 sort the checkoff list via the Index and/or OrderBy elements if (chkoffList != null) chkoffList.Sort(CompareCheckoffUsingOrderBy); // C2020-003 sort the checkoff list via the Index and/or OrderBy elements
CheckOffHeaderList chkoffHeaderList = pf.FormatData.ProcData.CheckOffData.CheckOffHeaderList; CheckOffHeaderList chkoffHeaderList = pf.FormatData.ProcData.CheckOffData.CheckOffHeaderList;
int maxindx = pf.FormatData.ProcData.CheckOffUCF ? pf.FormatData.ProcData.CheckOffData.CheckOffList.MaxIndex : pf.FormatData.ProcData.CheckOffData.CheckOffList.MaxIndexNoInherit; int maxindx = pf.FormatData.ProcData.CheckOffData.CheckOffList.MaxIndexNoInherit;
// B2019-013: was crashing on indexer of checkofflist. If there were UCF checkoffs but none in original format, the indexer // B2019-013: was crashing on indexer of checkofflist. If there were UCF checkoffs but none in original format, the indexer
// was failing for index of 0 (indexer code went through index attribute of xml and was returning null even though there // was failing for index of 0 (indexer code went through index attribute of xml and was returning null even though there
// were items in list). // were items in list).
PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs
Generated
+5 -5
View File
@@ -1211,7 +1211,7 @@ namespace VEPROMS
this.cbUCFLForSetOnly.Size = new System.Drawing.Size(105, 19); this.cbUCFLForSetOnly.Size = new System.Drawing.Size(105, 19);
this.cbUCFLForSetOnly.TabIndex = 5; this.cbUCFLForSetOnly.TabIndex = 5;
this.cbUCFLForSetOnly.Text = "Load For Set Only"; this.cbUCFLForSetOnly.Text = "Load For Set Only";
this.cbUCFLForSetOnly.CheckedChanged += new System.EventHandler(this.cbUCFLForSetOnly_CheckedChanged); //this.cbUCFLForSetOnly.CheckedChanged += new System.EventHandler(this.cbUCFLForSetOnly_CheckedChanged);
mschill marked this conversation as resolved Outdated
mschill commented 2025-09-03 10:05:06 -04:00
Outdated
Review
Copy Link
Copy Source

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
// //
// cbUCFLUseAll // cbUCFLUseAll
// //
@@ -1227,7 +1227,7 @@ namespace VEPROMS
this.cbUCFLUseAll.Size = new System.Drawing.Size(105, 19); this.cbUCFLUseAll.Size = new System.Drawing.Size(105, 19);
this.cbUCFLUseAll.TabIndex = 4; this.cbUCFLUseAll.TabIndex = 4;
this.cbUCFLUseAll.Text = "Load Use All"; this.cbUCFLUseAll.Text = "Load Use All";
this.cbUCFLUseAll.CheckedChanged += new System.EventHandler(this.cbUCFLUseAll_CheckedChanged); //this.cbUCFLUseAll.CheckedChanged += new System.EventHandler(this.cbUCFLUseAll_CheckedChanged);
mschill marked this conversation as resolved Outdated
mschill commented 2025-09-03 10:05:13 -04:00
Outdated
Review
Copy Link
Copy Source

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
// //
// cbUCFLOnlyImport // cbUCFLOnlyImport
// //
@@ -1243,7 +1243,7 @@ namespace VEPROMS
this.cbUCFLOnlyImport.Size = new System.Drawing.Size(105, 19); this.cbUCFLOnlyImport.Size = new System.Drawing.Size(105, 19);
this.cbUCFLOnlyImport.TabIndex = 3; this.cbUCFLOnlyImport.TabIndex = 3;
this.cbUCFLOnlyImport.Text = "Load Only Imported"; this.cbUCFLOnlyImport.Text = "Load Only Imported";
this.cbUCFLOnlyImport.CheckedChanged += new System.EventHandler(this.cbUCFLOnlyImport_CheckedChanged); //this.cbUCFLOnlyImport.CheckedChanged += new System.EventHandler(this.cbUCFLOnlyImport_CheckedChanged);
mschill marked this conversation as resolved Outdated
mschill commented 2025-09-03 10:05:21 -04:00
Outdated
Review
Copy Link
Copy Source

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
// //
// cbUCFLNotUsed // cbUCFLNotUsed
// //
@@ -1259,7 +1259,7 @@ namespace VEPROMS
this.cbUCFLNotUsed.Size = new System.Drawing.Size(88, 19); this.cbUCFLNotUsed.Size = new System.Drawing.Size(88, 19);
this.cbUCFLNotUsed.TabIndex = 2; this.cbUCFLNotUsed.TabIndex = 2;
this.cbUCFLNotUsed.Text = "Load Not Used"; this.cbUCFLNotUsed.Text = "Load Not Used";
this.cbUCFLNotUsed.CheckedChanged += new System.EventHandler(this.cbUCFLNotUsed_CheckedChanged); //this.cbUCFLNotUsed.CheckedChanged += new System.EventHandler(this.cbUCFLNotUsed_CheckedChanged);
mschill marked this conversation as resolved Outdated
mschill commented 2025-09-03 10:05:28 -04:00
Outdated
Review
Copy Link
Copy Source

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
// //
// cbUCFIgnore // cbUCFIgnore
// //
@@ -1275,7 +1275,7 @@ namespace VEPROMS
this.cbUCFIgnore.Size = new System.Drawing.Size(67, 19); this.cbUCFIgnore.Size = new System.Drawing.Size(67, 19);
this.cbUCFIgnore.TabIndex = 1; this.cbUCFIgnore.TabIndex = 1;
this.cbUCFIgnore.Text = "Ignore"; this.cbUCFIgnore.Text = "Ignore";
this.cbUCFIgnore.CheckedChanged += new System.EventHandler(this.cbUCFIgnore_CheckedChanged); //this.cbUCFIgnore.CheckedChanged += new System.EventHandler(this.cbUCFIgnore_CheckedChanged);
mschill marked this conversation as resolved Outdated
mschill commented 2025-09-03 10:05:34 -04:00
Outdated
Review
Copy Link
Copy Source

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
// //
// btnReset // btnReset
// //
PROMS/VEPROMS User Interface/frmSysOptions.cs
+56 -56
View File
@@ -75,24 +75,24 @@ namespace VEPROMS
cbEnhancedDocumentSync.Checked = Settings.Default.SyncEnhancedDocuments; cbEnhancedDocumentSync.Checked = Settings.Default.SyncEnhancedDocuments;
cbSeparateWindows.Checked = Settings.Default.SeparateWindows; cbSeparateWindows.Checked = Settings.Default.SeparateWindows;
txbxVisioPath.Text = Settings.Default.VisioPath; txbxVisioPath.Text = Settings.Default.VisioPath;
switch (Settings.Default.UCFImportOpt) // see dlgExportImport for descripton of these options. //switch (Settings.Default.UCFImportOpt) // see dlgExportImport for descripton of these options.
mschill marked this conversation as resolved Outdated
mschill commented 2025-09-03 10:05:51 -04:00
Outdated
Review
Copy Link
Copy Source

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
{ //{
case 0: // case 0:
cbUCFIgnore.Checked = true; // cbUCFIgnore.Checked = true;
break; // break;
case 1: // case 1:
cbUCFLNotUsed.Checked = true; // cbUCFLNotUsed.Checked = true;
break; // break;
case 2: // case 2:
cbUCFLOnlyImport.Checked = true; // cbUCFLOnlyImport.Checked = true;
break; // break;
case 3: // case 3:
cbUCFLUseAll.Checked = true; // cbUCFLUseAll.Checked = true;
break; // break;
case 4: // case 4:
cbUCFLForSetOnly.Checked = true; // cbUCFLForSetOnly.Checked = true;
break; // break;
} //}
//CSM - C2024-031 - Getting User Settings //CSM - C2024-031 - Getting User Settings
//and set checkboxes based on what they are set to //and set checkboxes based on what they are set to
@@ -193,7 +193,7 @@ namespace VEPROMS
private bool ss_SyncEnhancedDocuments; private bool ss_SyncEnhancedDocuments;
private bool ss_SeparateWindows; private bool ss_SeparateWindows;
private string ss_VisioPath; private string ss_VisioPath;
private int ss_UCFImportOpt; //private int ss_UCFImportOpt;
mschill marked this conversation as resolved Outdated
mschill commented 2025-09-03 10:06:03 -04:00
Outdated
Review
Copy Link
Copy Source

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
private void SaveStartingSettings() private void SaveStartingSettings()
{ {
@@ -210,7 +210,7 @@ namespace VEPROMS
ss_SyncEnhancedDocuments = Settings.Default.SyncEnhancedDocuments; ss_SyncEnhancedDocuments = Settings.Default.SyncEnhancedDocuments;
ss_SeparateWindows = Settings.Default.SeparateWindows; ss_SeparateWindows = Settings.Default.SeparateWindows;
ss_VisioPath = Settings.Default.VisioPath; ss_VisioPath = Settings.Default.VisioPath;
ss_UCFImportOpt = Settings.Default.UCFImportOpt; //ss_UCFImportOpt = Settings.Default.UCFImportOpt;
mschill marked this conversation as resolved Outdated
mschill commented 2025-09-03 10:06:09 -04:00
Outdated
Review
Copy Link
Copy Source

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
} }
private void RestoreStartingSettings() // used with the cancel button private void RestoreStartingSettings() // used with the cancel button
@@ -227,7 +227,7 @@ namespace VEPROMS
Settings.Default.SyncEnhancedDocuments = ss_SyncEnhancedDocuments; Settings.Default.SyncEnhancedDocuments = ss_SyncEnhancedDocuments;
Settings.Default.SeparateWindows = ss_SeparateWindows; Settings.Default.SeparateWindows = ss_SeparateWindows;
Settings.Default.VisioPath = ss_VisioPath; Settings.Default.VisioPath = ss_VisioPath;
Settings.Default.UCFImportOpt = ss_UCFImportOpt; //Settings.Default.UCFImportOpt = ss_UCFImportOpt;
mschill marked this conversation as resolved Outdated
mschill commented 2025-09-03 10:06:17 -04:00
Outdated
Review
Copy Link
Copy Source

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
} }
@@ -315,45 +315,45 @@ namespace VEPROMS
Settings.Default.VisioPath = txbxVisioPath.Text; Settings.Default.VisioPath = txbxVisioPath.Text;
} }
private void cbUCFIgnore_CheckedChanged(object sender, EventArgs e) //private void cbUCFIgnore_CheckedChanged(object sender, EventArgs e)
mschill marked this conversation as resolved Outdated
mschill commented 2025-09-03 10:06:23 -04:00
Outdated
Review
Copy Link
Copy Source

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
{ //{
if (!_initializing) // if (!_initializing)
{ // {
Settings.Default.UCFImportOpt = 0; // Settings.Default.UCFImportOpt = 0;
} // }
} //}
private void cbUCFLNotUsed_CheckedChanged(object sender, EventArgs e) //private void cbUCFLNotUsed_CheckedChanged(object sender, EventArgs e)
{ //{
if (!_initializing) // if (!_initializing)
{ // {
Settings.Default.UCFImportOpt = 1; // Settings.Default.UCFImportOpt = 1;
} // }
} //}
private void cbUCFLOnlyImport_CheckedChanged(object sender, EventArgs e) //private void cbUCFLOnlyImport_CheckedChanged(object sender, EventArgs e)
{ //{
if (!_initializing) // if (!_initializing)
{ // {
Settings.Default.UCFImportOpt = 2; // Settings.Default.UCFImportOpt = 2;
} // }
} //}
private void cbUCFLUseAll_CheckedChanged(object sender, EventArgs e) //private void cbUCFLUseAll_CheckedChanged(object sender, EventArgs e)
{ //{
if (!_initializing) // if (!_initializing)
{ // {
Settings.Default.UCFImportOpt = 3; // Settings.Default.UCFImportOpt = 3;
} // }
} //}
private void cbUCFLForSetOnly_CheckedChanged(object sender, EventArgs e) //private void cbUCFLForSetOnly_CheckedChanged(object sender, EventArgs e)
{ //{
if (!_initializing) // if (!_initializing)
{ // {
Settings.Default.UCFImportOpt = 4; // Settings.Default.UCFImportOpt = 4;
} // }
} //}
private void cbOTRemember_CheckedChanged(object sender, EventArgs e) private void cbOTRemember_CheckedChanged(object sender, EventArgs e)
{ {
cbOTAutoOpen.Enabled = cbOTAutoOpen.Visible = cbShwRplWrdsColor.Checked; cbOTAutoOpen.Enabled = cbOTAutoOpen.Visible = cbShwRplWrdsColor.Checked;
PROMS/VEPROMS User Interface/frmVEPROMS.cs
+3 -4
View File
@@ -724,7 +724,7 @@ namespace VEPROMS
} }
else else
{ {
dlgExportImport dlg = new dlgExportImport(args.Index == 0 ? "Export" : "Import", fi, this, (E_UCFImportOptions)Properties.Settings.Default.UCFImportOpt);//Added frmVEPROMS Parameter dlgExportImport dlg = new dlgExportImport(args.Index == 0 ? "Export" : "Import", fi, this);//Added frmVEPROMS Parameter
dlg.ShowDialog(this); dlg.ShowDialog(this);
MySessionInfo.CheckInItem(ownerid); MySessionInfo.CheckInItem(ownerid);
@@ -778,7 +778,7 @@ namespace VEPROMS
else else
{ {
dlgExportImport dlg = new dlgExportImport("Import", dvi, this, (E_UCFImportOptions)Properties.Settings.Default.UCFImportOpt);//Added frmVEPROMS Parameter dlgExportImport dlg = new dlgExportImport("Import", dvi, this);//Added frmVEPROMS Parameter
dlg.MyNewProcedure = null; dlg.MyNewProcedure = null;
dlg.ExternalTransitionItem = null; dlg.ExternalTransitionItem = null;
dlg.ShowDialog(this); dlg.ShowDialog(this);
@@ -820,7 +820,7 @@ namespace VEPROMS
else else
{ {
dlgExportImport dlg = new dlgExportImport("Export", pi, this, (E_UCFImportOptions)0);//Added frmVEPROMS Parameter dlgExportImport dlg = new dlgExportImport("Export", pi, this);//Added frmVEPROMS Parameter
dlg.ShowDialog(this); dlg.ShowDialog(this);
MySessionInfo.CheckInItem(ownerid); MySessionInfo.CheckInItem(ownerid);
@@ -2220,7 +2220,6 @@ namespace VEPROMS
// C2025-031 added tool tip messages // C2025-031 added tool tip messages
this.superTooltip1.SetSuperTooltip(btnManageSecurity, new SuperTooltipInfo("Manage Security", "", "Add, Modify, and Delete PROMS User Access", null, null, eTooltipColor.Gray)); this.superTooltip1.SetSuperTooltip(btnManageSecurity, new SuperTooltipInfo("Manage Security", "", "Add, Modify, and Delete PROMS User Access", null, null, eTooltipColor.Gray));
// remove commented out line below when User Control of Formats code is deleted
this.superTooltip1.SetSuperTooltip(btnResetSecurity, new SuperTooltipInfo("Reset Security", "", "WARNING this will \nREMOVE ALL PROMS USERS and Reset to the\nOriginal Volian Defaults", null, null, eTooltipColor.Gray)); this.superTooltip1.SetSuperTooltip(btnResetSecurity, new SuperTooltipInfo("Reset Security", "", "WARNING this will \nREMOVE ALL PROMS USERS and Reset to the\nOriginal Volian Defaults", null, null, eTooltipColor.Gray));
this.superTooltip1.SetSuperTooltip(btnAdministrativeTools, new SuperTooltipInfo("Administrative Tools", "", "Open the PROMS Adminstration Tools Window", null, null, eTooltipColor.Gray)); this.superTooltip1.SetSuperTooltip(btnAdministrativeTools, new SuperTooltipInfo("Administrative Tools", "", "Open the PROMS Adminstration Tools Window", null, null, eTooltipColor.Gray));
this.superTooltip1.SetSuperTooltip(btnUpdateFormats, new SuperTooltipInfo("Update Formats", "", "Install New Formats \n or Re-Install Formats", null, null, eTooltipColor.Gray)); this.superTooltip1.SetSuperTooltip(btnUpdateFormats, new SuperTooltipInfo("Update Formats", "", "Install New Formats \n or Re-Install Formats", null, null, eTooltipColor.Gray));
PROMS/VEPROMS.CSLA.Library/Config/FormatConfig.cs
+42 -41
View File
@@ -213,14 +213,14 @@ namespace VEPROMS.CSLA.Library
[TypeConverter(typeof(ExpandableObjectConverter))] [TypeConverter(typeof(ExpandableObjectConverter))]
public class Flags public class Flags
{ {
private bool? _CheckOffUCF; //private bool? _CheckOffUCF;
mschill marked this conversation as resolved Outdated
mschill commented 2025-09-03 10:08:01 -04:00
Outdated
Review
Copy Link
Copy Source

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
mschill commented 2025-09-03 12:49:26 -04:00
Outdated
Review
Copy Link
Copy Source

still valid

still valid
[DisplayName("UCF CheckOffs")] //[DisplayName("UCF CheckOffs")]
[Description("Additional UCF Check Offs and Sign Offs")] //[Description("Additional UCF Check Offs and Sign Offs")]
public bool? CheckOffUCF //public bool? CheckOffUCF
{ //{
get { return _CheckOffUCF; } // get { return _CheckOffUCF; }
set { _CheckOffUCF = value; } // set { _CheckOffUCF = value; }
} //}
private bool? _PartialStepCompression; private bool? _PartialStepCompression;
[DisplayName("Partial Step Compression")] [DisplayName("Partial Step Compression")]
[Description("Automatically compress last sub-steps to fit on page")] [Description("Automatically compress last sub-steps to fit on page")]
@@ -272,41 +272,42 @@ namespace VEPROMS.CSLA.Library
} }
#endregion ReplaceStrData #endregion ReplaceStrData
#region ReplaceStr #region ReplaceStr
[Flags] //[Flags]
mschill marked this conversation as resolved Outdated
mschill commented 2025-09-03 10:08:09 -04:00
Outdated
Review
Copy Link
Copy Source

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
public enum E_ReplaceFlagsUCF : uint //public enum
{ //: uint
High = 0x0001, // Do ReplaceWords in HIGH LEVEL STEPS //{
RNO = 0x0002, // Do ReplaceWords in RNOS // High = 0x0001, // Do ReplaceWords in HIGH LEVEL STEPS
Caution = 0x0004, // Do ReplaceWords in CAUTIONS // RNO = 0x0002, // Do ReplaceWords in RNOS
Note = 0x0008, // Do ReplaceWords in NOTES // Caution = 0x0004, // Do ReplaceWords in CAUTIONS
Table = 0x0010, // Do ReplaceWords in TABLES // Note = 0x0008, // Do ReplaceWords in NOTES
Substep = 0x0020, // Do ReplaceWords in SUBSTEPS // Table = 0x0010, // Do ReplaceWords in TABLES
Attach = 0x0040, // Do ReplaceWords in ATTACHMENTS // Substep = 0x0020, // Do ReplaceWords in SUBSTEPS
Bkgd = 0x0080, // Do ReplaceWords in BACKGROUNDS // Attach = 0x0040, // Do ReplaceWords in ATTACHMENTS
DiffUnit = 0x0100, // Do ReplaceWords ONLY for different UNIT # // Bkgd = 0x0080, // Do ReplaceWords in BACKGROUNDS
TOC = 0x0200, // Do in auto table-of-contents // DiffUnit = 0x0100, // Do ReplaceWords ONLY for different UNIT #
StatTree = 0x0400, // TOC = 0x0200, // Do in auto table-of-contents
HLSSetpnt = 0x0800, // Do ReplaceWords in HighLevelStep SETPoiNTs // StatTree = 0x0400,
mschill marked this conversation as resolved Outdated
mschill commented 2025-09-03 12:51:51 -04:00
Outdated
Review
Copy Link
Copy Source

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
mschill commented 2025-09-03 12:56:07 -04:00
Outdated
Review
Copy Link
Copy Source

still valid

still valid
Trans = 0x1000, // Do ReplaceWords in TRANSITIONS // HLSSetpnt = 0x0800, // Do ReplaceWords in HighLevelStep SETPoiNTs
Setpoint = 0x2000, // Do ReplaceWords in SETPOINTS // Trans = 0x1000, // Do ReplaceWords in TRANSITIONS
// Setpoint = 0x2000, // Do ReplaceWords in SETPOINTS
// Case Sensitivity Flags - default is off (Case Sensitive Replace) // // Case Sensitivity Flags - default is off (Case Sensitive Replace)
CaseInsens = 0x0000C000, // Do ReplaceWords for all words thatmatch, regardless of case, // CaseInsens = 0x0000C000, // Do ReplaceWords for all words thatmatch, regardless of case,
// and replace with the ReplaceWith string as is // // and replace with the ReplaceWith string as is
// B2019-022: do not support CaseInsensFirst & CaseInsensAll - there is no supporting replace word code: // // B2019-022: do not support CaseInsensFirst & CaseInsensAll - there is no supporting replace word code:
//CaseInsensFirst = 0x4000, // Do ReplaceWords for all words thatexactly match the ReplaceWord, // //CaseInsensFirst = 0x4000, // Do ReplaceWords for all words thatexactly match the ReplaceWord,
// except the case of the first character may be different // // except the case of the first character may be different
//CaseInsensAll = 0x8000, // Do ReplaceWords for all words that match the ReplaceWord, regardless of case // //CaseInsensAll = 0x8000, // Do ReplaceWords for all words that match the ReplaceWord, regardless of case
Partials = 0x10000, // Do replace even on partial matches // Partials = 0x10000, // Do replace even on partial matches
Plackeep = 0x20000, // Do replace in PlaceKeepers // Plackeep = 0x20000, // Do replace in PlaceKeepers
InSecTitle = 0x40000, // InSecTitle = 0x40000,
BeforeTrans = 0x80000, // Only do replace if the string occurs immediately before a transition. // BeforeTrans = 0x80000, // Only do replace if the string occurs immediately before a transition.
BeforeList = 0x100000, // C2021-045 Only if the text ends with a colon ":" // BeforeList = 0x100000, // C2021-045 Only if the text ends with a colon ":"
PageList = 0x200000, // F2021-053 Do replace words for PageList items that are ROs // PageList = 0x200000, // F2021-053 Do replace words for PageList items that are ROs
FirstWord = 0x400000, // C2021-056 Do only if is the first word in the text // FirstWord = 0x400000, // C2021-056 Do only if is the first word in the text
NotInRO = 0x800000 // B2022-015 BNPPalr: Determine whether RO text should have Replace Words applied // NotInRO = 0x800000 // B2022-015 BNPPalr: Determine whether RO text should have Replace Words applied
} //}
[Serializable] [Serializable]
[TypeConverter(typeof(ExpandableObjectConverter))] [TypeConverter(typeof(ExpandableObjectConverter))]
public class ReplaceStr public class ReplaceStr
3
PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs
+79 -157
View File
@@ -1755,165 +1755,88 @@ namespace VEPROMS.CSLA.Library
#endregion #endregion
#region UCF Fix FormatId After Import
private class FixFormatIDAfterImportCriteria
{
private string _DocVersionList;
public string DocVersionList
{
get { return _DocVersionList; }
set { _DocVersionList = value; }
}
private int _OldFormatID;
public int OldFormatID
{
get { return _OldFormatID; }
set { _OldFormatID = value; }
}
private int _NewFormatID;
public int NewFormatID
{
get { return _NewFormatID; }
set { _NewFormatID = value; }
}
public FixFormatIDAfterImportCriteria(string dvlst, int oldfid, int newfid)
{
_DocVersionList = dvlst;
_OldFormatID = oldfid;
_NewFormatID = newfid;
}
}
private void DataPortal_Fetch(FixFormatIDAfterImportCriteria criteria) //#region UCF Clear Overwridden Formats
{ //private class ClearOverrideFormatsByFolderCriteria
try //{
{ // public ClearOverrideFormatsByFolderCriteria(int folderID, int? formatID, int? newformatID)
using (SqlConnection cn = Database.VEPROMS_SqlConnection) // {
{ // _FormatID = formatID;
using (SqlCommand cm = cn.CreateCommand()) // _FolderID = folderID;
{ // _NewFormatID = newformatID;
cm.CommandType = CommandType.StoredProcedure; // }
cm.CommandText = "vesp_UpdateVersionFormatForUCF"; // private int? _FormatID;
cm.Parameters.AddWithValue("@VersionList", criteria.DocVersionList); // public int? FormatID
cm.Parameters.AddWithValue("@OldFormatID", criteria.OldFormatID); // {
cm.Parameters.AddWithValue("@NewFormatID", criteria.NewFormatID); // get { return _FormatID; }
cm.CommandTimeout = Database.DefaultTimeout; // set { _FormatID = value; }
using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader())) // }
{ // private int? _NewFormatID;
IsReadOnly = false; // public int? NewFormatID
while (dr.Read()) // {
{ // get { return _NewFormatID; }
ContentInfo contentInfo = new ContentInfo(dr); // set { _NewFormatID = value; }
this.Add(contentInfo); // }
} // private int _FolderID;
IsReadOnly = true; // public int FolderID
} // {
} // get { return _FolderID; }
} // set { _FolderID = value; }
} // }
catch (Exception ex) //}
{
Database.LogException("FixFormatIDAfterImport.DataPortal_Fetch", ex);
throw new DbCslaException("FixFormatIDAfterImport.DataPortal_Fetch", ex);
}
}
public static ContentInfoList FixFormatIDAfterImport(string dvlst, int oldfid, int newfid) //private void DataPortal_Fetch(ClearOverrideFormatsByFolderCriteria criteria)
{ //{
try // try
{ // {
ContentInfoList tmp = DataPortal.Fetch<ContentInfoList>(new FixFormatIDAfterImportCriteria(dvlst, oldfid, newfid)); // using (SqlConnection cn = Database.VEPROMS_SqlConnection)
return tmp; // {
} // using (SqlCommand cm = cn.CreateCommand())
catch (Exception ex) // {
{ // cm.CommandType = CommandType.StoredProcedure;
throw new DbCslaException("Error on ContentInfoList.FixFormatIDAfterImport", ex); // cm.CommandText = "vesp_ClearOverrideFormatsByFolder";
} // cm.Parameters.AddWithValue("@FolderID", criteria.FolderID);
} // if (criteria.FormatID == null)
// cm.Parameters.AddWithValue("@FormatID", DBNull.Value);
// else
// cm.Parameters.AddWithValue("@FormatID", criteria.FormatID);
// if (criteria.NewFormatID == null)
// cm.Parameters.AddWithValue("@NewFormatID", DBNull.Value);
// else
// cm.Parameters.AddWithValue("@NewFormatID", criteria.NewFormatID);
// cm.CommandTimeout = Database.DefaultTimeout;
// using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
// {
// IsReadOnly = false;
// while (dr.Read())
// {
// ContentInfo contentInfo = new ContentInfo(dr);
// this.Add(contentInfo);
// }
// IsReadOnly = true;
// }
// }
// }
// }
// catch (Exception ex)
// {
// Database.LogException("ClearOverrideFormatsByFolderCriteria.DataPortal_Fetch", ex);
// throw new DbCslaException("ClearOverrideFormatsByFolderCriteria.DataPortal_Fetch", ex);
// }
//}
#endregion //public static ContentInfoList ClearOverrideFormatsByFolder(int folderID, int? formatID, int? newformatID)
//{
#region UCF Clear Overwridden Formats // try
private class ClearOverrideFormatsByFolderCriteria // {
{ // ContentInfoList tmp = DataPortal.Fetch<ContentInfoList>(new ClearOverrideFormatsByFolderCriteria(folderID, formatID, newformatID));
public ClearOverrideFormatsByFolderCriteria(int folderID, int? formatID, int? newformatID) // return tmp;
{ // }
_FormatID = formatID; // catch (Exception ex)
_FolderID = folderID; // {
_NewFormatID = newformatID; // throw new DbCslaException("Error on ContentInfoList.ClearOverrideFormatsByFolder", ex);
} // }
private int? _FormatID; //}
public int? FormatID
{
get { return _FormatID; }
set { _FormatID = value; }
}
private int? _NewFormatID;
public int? NewFormatID
{
get { return _NewFormatID; }
set { _NewFormatID = value; }
}
private int _FolderID;
public int FolderID
{
get { return _FolderID; }
set { _FolderID = value; }
}
}
private void DataPortal_Fetch(ClearOverrideFormatsByFolderCriteria criteria)
{
try
{
using (SqlConnection cn = Database.VEPROMS_SqlConnection)
{
using (SqlCommand cm = cn.CreateCommand())
{
cm.CommandType = CommandType.StoredProcedure;
cm.CommandText = "vesp_ClearOverrideFormatsByFolder";
cm.Parameters.AddWithValue("@FolderID", criteria.FolderID);
if (criteria.FormatID == null)
cm.Parameters.AddWithValue("@FormatID", DBNull.Value);
else
cm.Parameters.AddWithValue("@FormatID", criteria.FormatID);
if (criteria.NewFormatID == null)
cm.Parameters.AddWithValue("@NewFormatID", DBNull.Value);
else
cm.Parameters.AddWithValue("@NewFormatID", criteria.NewFormatID);
cm.CommandTimeout = Database.DefaultTimeout;
using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
{
IsReadOnly = false;
while (dr.Read())
{
ContentInfo contentInfo = new ContentInfo(dr);
this.Add(contentInfo);
}
IsReadOnly = true;
}
}
}
}
catch (Exception ex)
{
Database.LogException("ClearOverrideFormatsByFolderCriteria.DataPortal_Fetch", ex);
throw new DbCslaException("ClearOverrideFormatsByFolderCriteria.DataPortal_Fetch", ex);
}
}
public static ContentInfoList ClearOverrideFormatsByFolder(int folderID, int? formatID, int? newformatID)
{
try
{
ContentInfoList tmp = DataPortal.Fetch<ContentInfoList>(new ClearOverrideFormatsByFolderCriteria(folderID, formatID, newformatID));
return tmp;
}
catch (Exception ex)
{
throw new DbCslaException("Error on ContentInfoList.ClearOverrideFormatsByFolder", ex);
}
}
private class ClearOverrideFormatsByDocVersionCriteria private class ClearOverrideFormatsByDocVersionCriteria
{ {
@@ -2077,7 +2000,6 @@ namespace VEPROMS.CSLA.Library
} }
} }
#endregion
#region Enhanced #region Enhanced
PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs
+12 -12
View File
1
 @@ -2195,12 +2195,12 @@ namespace VEPROMS.CSLA.Library
//int profileDepth = ProfileTimer.Push(">>>> DoReplaceWords2.ForLoop"); //int profileDepth = ProfileTimer.Push(">>>> DoReplaceWords2.ForLoop");
foreach (FormatConfig.ReplaceStr rs in rsl) foreach (FormatConfig.ReplaceStr rs in rsl)
{ {
bool dopartial = (E_ReplaceFlags)(rs.Flag & FormatConfig.E_ReplaceFlagsUCF.Partials) == E_ReplaceFlags.Partials; bool dopartial = (E_ReplaceFlags)(rs.Flag) == E_ReplaceFlags.Partials;
if (!dopartial) // F2021-093: Partials moved into their own method and done first if (!dopartial) // F2021-093: Partials moved into their own method and done first
mschill marked this conversation as resolved
mschill commented 2025-09-03 10:10:19 -04:00
Review
Copy Link
Copy Source

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
mschill commented 2025-09-03 12:52:46 -04:00
Review
Copy Link
Copy Source

still valid

still valid
{ {
bool onlyDoList = (E_ReplaceFlags)(rs.Flag & FormatConfig.E_ReplaceFlagsUCF.BeforeList) == E_ReplaceFlags.BeforeList; // C2021-045 bool onlyDoList = (E_ReplaceFlags)(rs.Flag) == E_ReplaceFlags.BeforeList; // C2021-045
bool onlyIfFirstWord = (E_ReplaceFlags)(rs.Flag & FormatConfig.E_ReplaceFlagsUCF.FirstWord) == E_ReplaceFlags.FirstWord; // C2021-056 bool onlyIfFirstWord = (E_ReplaceFlags)(rs.Flag) == E_ReplaceFlags.FirstWord; // C2021-056
bool doInPagelist = (E_ReplaceFlags)(rs.Flag & FormatConfig.E_ReplaceFlagsUCF.PageList) == E_ReplaceFlags.PageList; // B2021-132 bool doInPagelist = (E_ReplaceFlags)(rs.Flag) == E_ReplaceFlags.PageList; // B2021-132
//B2021-132 only do replacewords in paglist if the replaceword pagelist flag is set //B2021-132 only do replacewords in paglist if the replaceword pagelist flag is set
if (_DoReplWordInPageList && !doInPagelist) continue; if (_DoReplWordInPageList && !doInPagelist) continue;
@@ -2228,7 +2228,7 @@ namespace VEPROMS.CSLA.Library
{ {
if (!dicReplaceRegex.ContainsKey(rs)) if (!dicReplaceRegex.ContainsKey(rs))
{ {
RegexOptions myOptions = (E_ReplaceFlags)(rs.Flag & FormatConfig.E_ReplaceFlagsUCF.CaseInsens) == E_ReplaceFlags.CaseInsens ? RegexOptions.IgnoreCase : RegexOptions.None; RegexOptions myOptions = (E_ReplaceFlags)(rs.Flag) == E_ReplaceFlags.CaseInsens ? RegexOptions.IgnoreCase : RegexOptions.None;
//int profileDepth3 = ProfileTimer.Push(">>>> DoReplaceWords2.BuildMatch"); //int profileDepth3 = ProfileTimer.Push(">>>> DoReplaceWords2.BuildMatch");
// CASEINSENS: Do ReplaceWords for all words that match, regardless of case, and replace with the ReplaceWith string as is // CASEINSENS: Do ReplaceWords for all words that match, regardless of case, and replace with the ReplaceWith string as is
//RegexOptions myOptions = (rs.Flag & E_ReplaceFlags.CaseInsens) == E_ReplaceFlags.CaseInsens ? RegexOptions.IgnoreCase & RegexOptions.Singleline : RegexOptions.None & RegexOptions.Singleline; //RegexOptions myOptions = (rs.Flag & E_ReplaceFlags.CaseInsens) == E_ReplaceFlags.CaseInsens ? RegexOptions.IgnoreCase & RegexOptions.Singleline : RegexOptions.None & RegexOptions.Singleline;
@@ -2274,12 +2274,12 @@ namespace VEPROMS.CSLA.Library
Dictionary<E_ReplaceFlags?, bool> shouldReplace = new Dictionary<E_ReplaceFlags?, bool>(); Dictionary<E_ReplaceFlags?, bool> shouldReplace = new Dictionary<E_ReplaceFlags?, bool>();
foreach (FormatConfig.ReplaceStr rs in rsl) foreach (FormatConfig.ReplaceStr rs in rsl)
{ {
bool dopartial = (E_ReplaceFlags)(rs.Flag & FormatConfig.E_ReplaceFlagsUCF.Partials) == E_ReplaceFlags.Partials; bool dopartial = (E_ReplaceFlags)(rs.Flag) == E_ReplaceFlags.Partials;
if (dopartial) if (dopartial)
{ {
bool onlyDoList = (E_ReplaceFlags)(rs.Flag & FormatConfig.E_ReplaceFlagsUCF.BeforeList) == E_ReplaceFlags.BeforeList; // C2021-045 bool onlyDoList = (E_ReplaceFlags)(rs.Flag) == E_ReplaceFlags.BeforeList; // C2021-045
bool onlyIfFirstWord = (E_ReplaceFlags)(rs.Flag & FormatConfig.E_ReplaceFlagsUCF.FirstWord) == E_ReplaceFlags.FirstWord; // C2021-056 bool onlyIfFirstWord = (E_ReplaceFlags)(rs.Flag) == E_ReplaceFlags.FirstWord; // C2021-056
bool doInPagelist = (E_ReplaceFlags)(rs.Flag & FormatConfig.E_ReplaceFlagsUCF.PageList) == E_ReplaceFlags.PageList; // B2021-132 bool doInPagelist = (E_ReplaceFlags)(rs.Flag) == E_ReplaceFlags.PageList; // B2021-132
//B2021-132 only do replacewords in paglist if the replaceword pagelist flag is set //B2021-132 only do replacewords in paglist if the replaceword pagelist flag is set
if (_DoReplWordInPageList && !doInPagelist) continue; if (_DoReplWordInPageList && !doInPagelist) continue;
@@ -2304,7 +2304,7 @@ namespace VEPROMS.CSLA.Library
{ {
if (!dicReplaceRegex.ContainsKey(rs)) if (!dicReplaceRegex.ContainsKey(rs))
{ {
RegexOptions myOptions = (E_ReplaceFlags)(rs.Flag & FormatConfig.E_ReplaceFlagsUCF.CaseInsens) == E_ReplaceFlags.CaseInsens ? RegexOptions.IgnoreCase : RegexOptions.None; RegexOptions myOptions = (E_ReplaceFlags)(rs.Flag) == E_ReplaceFlags.CaseInsens ? RegexOptions.IgnoreCase : RegexOptions.None;
dicReplaceRegex.Add(rs, new Regex(rs.ReplaceWord, myOptions)); dicReplaceRegex.Add(rs, new Regex(rs.ReplaceWord, myOptions));
} }
try try
@@ -2563,12 +2563,12 @@ namespace VEPROMS.CSLA.Library
{ {
// B2022-015 BNPPalr: Determine whether RO text should have Replace Words applied. InLinkAndNotInRoFlag checks // B2022-015 BNPPalr: Determine whether RO text should have Replace Words applied. InLinkAndNotInRoFlag checks
// for flag on replace word item & checks that it is within and RO link // for flag on replace word item & checks that it is within and RO link
bool InLinkAndNotInRoFlag = ((foundMatch.MyWord.Flag & FormatConfig.E_ReplaceFlagsUCF.NotInRO) != 0) ? VerifyWithinLink(text, foundMatch, offset) : false; bool InLinkAndNotInRoFlag = ((foundMatch.MyWord.Flag) != 0) ? VerifyWithinLink(text, foundMatch, offset) : false;
if (!InLinkAndNotInRoFlag && VerifyNoHardSpace(text, foundMatch, offset) && VerifyNoLink(text, foundMatch, offset)) if (!InLinkAndNotInRoFlag && VerifyNoHardSpace(text, foundMatch, offset) && VerifyNoLink(text, foundMatch, offset))
{ {
//if(offset != 0 || foundMatch.MyMatch.Index != 0 || !foundMatch.MyWord.ReplaceWith.StartsWith(@"{\par}")) //if(offset != 0 || foundMatch.MyMatch.Index != 0 || !foundMatch.MyWord.ReplaceWith.StartsWith(@"{\par}"))
//{ //{
if (((foundMatch.MyWord.Flag & FormatConfig.E_ReplaceFlagsUCF.DiffUnit) == 0) || DiffUnit(foundMatch.MyWord.ReplaceWord, _MyItemInfo, "UNIT ")) if (((foundMatch.MyWord.Flag) == 0) || DiffUnit(foundMatch.MyWord.ReplaceWord, _MyItemInfo, "UNIT "))
{ {
string with = foundMatch.MyWord.ReplaceWith; string with = foundMatch.MyWord.ReplaceWith;
if (offset == 0 && with.StartsWith(@"{\par}")) if (offset == 0 && with.StartsWith(@"{\par}"))
PROMS/VEPROMS.CSLA.Library/Extension/FormatExt.cs
+62 -62
View File
@@ -596,68 +596,68 @@ public partial class FormatInfo : IFormatOrFormatInfo
} }
// Get format data, but do not resolve the 'Data' and 'Genmac' fields, i.e. keep empty if they are // Get format data, but do not resolve the 'Data' and 'Genmac' fields, i.e. keep empty if they are
// empty. // empty.
public static FormatInfo GetFormatNoUCFByFormatID(int formatID) //public static FormatInfo GetFormatNoUCFByFormatID(int formatID)
{ //{
try // try
{ // {
FormatInfo tmp = DataPortal.Fetch<FormatInfo>(new FormatIDNoUCFCriteria(formatID)); // FormatInfo tmp = DataPortal.Fetch<FormatInfo>(new FormatIDNoUCFCriteria(formatID));
if (tmp.ErrorMessage == "No Record Found") // if (tmp.ErrorMessage == "No Record Found")
{ // {
tmp.Dispose(); // Clean-up FormatInfo // tmp.Dispose(); // Clean-up FormatInfo
tmp = null; // tmp = null;
} // }
return tmp; // return tmp;
} // }
catch (Exception ex) // catch (Exception ex)
{ // {
throw new DbCslaException("Error on FormatInfo.GetFormatNoUCFByFormatID", ex); // throw new DbCslaException("Error on FormatInfo.GetFormatNoUCFByFormatID", ex);
} // }
} //}
protected class FormatIDNoUCFCriteria //protected class FormatIDNoUCFCriteria
{ //{
private int _FormatID; // private int _FormatID;
public int FormatID { get { return _FormatID; } } // public int FormatID { get { return _FormatID; } }
public FormatIDNoUCFCriteria(int formatID) // public FormatIDNoUCFCriteria(int formatID)
{ // {
_FormatID = formatID; // _FormatID = formatID;
} // }
} //}
private void DataPortal_Fetch(FormatIDNoUCFCriteria criteria) //private void DataPortal_Fetch(FormatIDNoUCFCriteria criteria)
{ //{
if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] FormatInfo.DataPortal_Fetch", GetHashCode()); // if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] FormatInfo.DataPortal_Fetch", GetHashCode());
try // try
{ // {
using (SqlConnection cn = Database.VEPROMS_SqlConnection) // using (SqlConnection cn = Database.VEPROMS_SqlConnection)
{ // {
ApplicationContext.LocalContext["cn"] = cn; // ApplicationContext.LocalContext["cn"] = cn;
using (SqlCommand cm = cn.CreateCommand()) // using (SqlCommand cm = cn.CreateCommand())
{ // {
cm.CommandType = CommandType.StoredProcedure; // cm.CommandType = CommandType.StoredProcedure;
cm.CommandText = "getFormatNoUCF"; // cm.CommandText = "getFormatNoUCF";
cm.Parameters.AddWithValue("@FormatID", criteria.FormatID); // cm.Parameters.AddWithValue("@FormatID", criteria.FormatID);
cm.CommandTimeout = Database.DefaultTimeout; // cm.CommandTimeout = Database.DefaultTimeout;
using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader())) // using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
{ // {
if (!dr.Read()) // if (!dr.Read())
{ // {
_ErrorMessage = "No Record Found"; // _ErrorMessage = "No Record Found";
return; // return;
} // }
ReadData(dr); // ReadData(dr);
} // }
} // }
// removing of item only needed for local data portal // // removing of item only needed for local data portal
if (ApplicationContext.ExecutionLocation == ApplicationContext.ExecutionLocations.Client) // if (ApplicationContext.ExecutionLocation == ApplicationContext.ExecutionLocations.Client)
ApplicationContext.LocalContext.Remove("cn"); // ApplicationContext.LocalContext.Remove("cn");
} // }
} // }
catch (Exception ex) // catch (Exception ex)
{ // {
if (_MyLog.IsErrorEnabled) _MyLog.Error("FormatInfo.DataPortal_Fetch", ex); // if (_MyLog.IsErrorEnabled) _MyLog.Error("FormatInfo.DataPortal_Fetch", ex);
_ErrorMessage = ex.Message; // _ErrorMessage = ex.Message;
throw new DbCslaException("FormatInfo.DataPortal_Fetch", ex); // throw new DbCslaException("FormatInfo.DataPortal_Fetch", ex);
} // }
} //}
#region PlantFormat #region PlantFormat
[NonSerialized] [NonSerialized]
private PlantFormat _PlantFormat; private PlantFormat _PlantFormat;
PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
+20 -20
View File
@@ -6067,7 +6067,7 @@ namespace VEPROMS.CSLA.Library
// To determine if the section has a checkoff... // To determine if the section has a checkoff...
// Section won't have checkoffs if there is no checkofflist, or // Section won't have checkoffs if there is no checkofflist, or
ProcData pd = ActiveFormat.PlantFormat.FormatData.ProcData; ProcData pd = ActiveFormat.PlantFormat.FormatData.ProcData;
int maxindx = pd.CheckOffUCF ? pd.CheckOffData.CheckOffList.MaxIndex : pd.CheckOffData.CheckOffList.MaxIndexNoInherit; int maxindx = pd.CheckOffData.CheckOffList.MaxIndexNoInherit;
if (pd.CheckOffData == null || pd.CheckOffData.CheckOffList == null || maxindx <= 0) return false; if (pd.CheckOffData == null || pd.CheckOffData.CheckOffList == null || maxindx <= 0) return false;
if (pd.CheckOffData.CheckOffHeaderList == null || pd.CheckOffData.CheckOffHeaderList.MaxIndex <= 1) return true; if (pd.CheckOffData.CheckOffHeaderList == null || pd.CheckOffData.CheckOffHeaderList.MaxIndex <= 1) return true;
//if (pd.CheckOffData == null || pd.CheckOffData.CheckOffHeaderList == null || pd.CheckOffData.CheckOffHeaderList.Count <= 1) return false; //if (pd.CheckOffData == null || pd.CheckOffData.CheckOffHeaderList == null || pd.CheckOffData.CheckOffHeaderList.Count <= 1) return false;
@@ -6099,7 +6099,7 @@ namespace VEPROMS.CSLA.Library
private int SectionDefaultCheckOffIndex() private int SectionDefaultCheckOffIndex()
{ {
ProcData pd = ActiveFormat.PlantFormat.FormatData.ProcData; ProcData pd = ActiveFormat.PlantFormat.FormatData.ProcData;
int maxindx = pd.CheckOffUCF ? pd.CheckOffData.CheckOffList.MaxIndex : pd.CheckOffData.CheckOffList.MaxIndexNoInherit; int maxindx = pd.CheckOffData.CheckOffList.MaxIndexNoInherit;
if (pd.CheckOffData != null && pd.CheckOffData.CheckOffList != null && maxindx == 2) return 0; // if only two items, first is macro - use it. if (pd.CheckOffData != null && pd.CheckOffData.CheckOffList != null && maxindx == 2) return 0; // if only two items, first is macro - use it.
SectionConfig sc = ActiveSection.MyConfig as SectionConfig; SectionConfig sc = ActiveSection.MyConfig as SectionConfig;
return sc.Section_CheckoffListSelection; return sc.Section_CheckoffListSelection;
@@ -6111,23 +6111,23 @@ namespace VEPROMS.CSLA.Library
if (!SectionHasCheckOffs()) return null; if (!SectionHasCheckOffs()) return null;
int stpCoIndx = CheckOffIndex(); // this step has a checkoff defined int stpCoIndx = CheckOffIndex(); // this step has a checkoff defined
if (stpCoIndx == -1) return null; if (stpCoIndx == -1) return null;
if (stpCoIndx > 1) //if (stpCoIndx > 1)
mschill marked this conversation as resolved Outdated
mschill commented 2025-09-03 10:11:36 -04:00
Outdated
Review
Copy Link
Copy Source

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
{ //{
if (ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffUCF && stpCoIndx >= 100) // if (ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffUCF && stpCoIndx >= 100)
{ // {
// get index, if greater than 100, store that - otherwise store index down list. // // get index, if greater than 100, store that - otherwise store index down list.
// if this format does not have ucf signoffs, indx is just the selected index from the combo box. // // if this format does not have ucf signoffs, indx is just the selected index from the combo box.
foreach (CheckOff co in ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffList) // foreach (CheckOff co in ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffList)
{ // {
if (stpCoIndx == co.Index) // if (stpCoIndx == co.Index)
{ // {
stpCoIndx = (int)co.Index; // stpCoIndx = (int)co.Index;
break; // break;
} // }
} // }
} // }
return ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffList[stpCoIndx]; // DO override of CheckOffList[] to get ucf // return ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffList[stpCoIndx]; // DO override of CheckOffList[] to get ucf
} //}
int sectCoIndx = SectionDefaultCheckOffIndex(); // no checkoff on step, see if there is a section default. int sectCoIndx = SectionDefaultCheckOffIndex(); // no checkoff on step, see if there is a section default.
if (sectCoIndx == -1) return null; if (sectCoIndx == -1) return null;
if ((ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffOnHLSOnly && IsHigh) if ((ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffOnHLSOnly && IsHigh)
@@ -6161,7 +6161,7 @@ namespace VEPROMS.CSLA.Library
get get
{ {
ProcData pd = ActiveFormat.PlantFormat.FormatData.ProcData; ProcData pd = ActiveFormat.PlantFormat.FormatData.ProcData;
int maxindx = pd.CheckOffUCF ? pd.CheckOffData.CheckOffList.MaxIndex : pd.CheckOffData.CheckOffList.MaxIndexNoInherit; int maxindx = pd.CheckOffData.CheckOffList.MaxIndexNoInherit;
if (pd.CheckOffData != null && pd.CheckOffData.CheckOffList != null && maxindx == 2 && pd.CheckOffData.CheckOffList[0].MenuItem == "Enabled") if (pd.CheckOffData != null && pd.CheckOffData.CheckOffList != null && maxindx == 2 && pd.CheckOffData.CheckOffList[0].MenuItem == "Enabled")
return true; // if only two items, first is macro - use it. return true; // if only two items, first is macro - use it.
return false; return false;
PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
+39 -58
View File
@@ -1579,25 +1579,6 @@ namespace VEPROMS.CSLA.Library
return _PSI == null ? _PSI = new PSI(SelectSingleNode("PSI")) : _PSI; return _PSI == null ? _PSI = new PSI(SelectSingleNode("PSI")) : _PSI;
} }
} }
private LazyLoad<bool> _CheckOffUCF;
public bool CheckOffUCF
{
get
{
// The following line is used in UCF (User Control of Format).
// This needs to be able to control a change in setting in UCF versus its use:
// - This is a special case since the original format, using the value in BaseAll, is always 'false'. And the value
// should never be set in original volian plant format files, if the additional UCF checkoffs are to be used, this must
// be set in the UCF user interface.
if (PlantFormat.DoingUCFCheckOffs) return PlantFormat.DoingUCFCheckOffsUse;
if (PlantFormat.IgnoreUCF) return LazyLoad(ref _CheckOffUCF, "@CheckOffUCF");
bool? localvalue = null; // comes to here if in edit or print - use any UCF data before going to original format.
FormatConfig fc = PlantFormat.GetFormatConfig(MyFormat);
if (fc != null) localvalue = fc.PlantFormat.FormatData.Flags.CheckOffUCF;
return localvalue ?? LazyLoad(ref _CheckOffUCF, "@CheckOffUCF");
}
}
// specifies the maxiumn length of the procedure title before PROMS considers to wrap the title // specifies the maxiumn length of the procedure title before PROMS considers to wrap the title
// this is used with the {PROCTITLE} PageStyle toekn // this is used with the {PROCTITLE} PageStyle toekn
@@ -1955,25 +1936,25 @@ namespace VEPROMS.CSLA.Library
// UseCheckOffUCF is false or there is no FormatConfig (UCF) data: // UseCheckOffUCF is false or there is no FormatConfig (UCF) data:
FormatConfig fc = PlantFormat.GetFormatConfig(MyFormat); FormatConfig fc = PlantFormat.GetFormatConfig(MyFormat);
if (!MyFormat.PlantFormat.FormatData.ProcData.CheckOffUCF || fc==null) //if (!MyFormat.PlantFormat.FormatData.ProcData.CheckOffUCF || fc==null)
{ //{
_CheckOffList = new CheckOffList(SelectNodes("CheckOffList/CheckOff"), MyFormat); // _CheckOffList = new CheckOffList(SelectNodes("CheckOffList/CheckOff"), MyFormat);
// B2019-100: If Ignoring the UCF data, just return the entire list. Also, return entire list if there is no UCF data (fc == null) // // B2019-100: If Ignoring the UCF data, just return the entire list. Also, return entire list if there is no UCF data (fc == null)
if (PlantFormat.IgnoreUCF || fc == null) return _CheckOffList; // if (PlantFormat.IgnoreUCF || fc == null) return _CheckOffList;
// If not ignoring UCF settings, only return those that are active // // If not ignoring UCF settings, only return those that are active
foreach (FormatConfig.CheckOff co in fc.PlantFormat.FormatData.CheckOffList) // foreach (FormatConfig.CheckOff co in fc.PlantFormat.FormatData.CheckOffList)
{ // {
foreach (CheckOff coo in _CheckOffList) // foreach (CheckOff coo in _CheckOffList)
{ // {
if ((int)coo.Index == Convert.ToInt32(co.Index) && !(bool)co.Active) // if ((int)coo.Index == Convert.ToInt32(co.Index) && !(bool)co.Active)
{ // {
_CheckOffList.Remove(coo); // _CheckOffList.Remove(coo);
break; // break;
} // }
} // }
} // }
return _CheckOffList; // return _CheckOffList;
} //}
// UseCheckOfffUCF is true: // UseCheckOfffUCF is true:
// merge the checkoff list from the current format and the checkoff list from the base format // merge the checkoff list from the current format and the checkoff list from the base format
_CheckOffList = new CheckOffList(SelectNodes("CheckOffList/CheckOff"), MyFormat); _CheckOffList = new CheckOffList(SelectNodes("CheckOffList/CheckOff"), MyFormat);
@@ -2008,26 +1989,26 @@ namespace VEPROMS.CSLA.Library
{ {
if (_CheckOffHeaderList != null) return _CheckOffHeaderList; if (_CheckOffHeaderList != null) return _CheckOffHeaderList;
FormatConfig fc = PlantFormat.GetFormatConfig(MyFormat); FormatConfig fc = PlantFormat.GetFormatConfig(MyFormat);
if (!MyFormat.PlantFormat.FormatData.ProcData.CheckOffUCF || fc == null) //if (!MyFormat.PlantFormat.FormatData.ProcData.CheckOffUCF || fc == null)
{ //{
_CheckOffHeaderList = new CheckOffHeaderList(SelectNodes("CheckOffHeaderList/CheckOffHeader"), MyFormat); // _CheckOffHeaderList = new CheckOffHeaderList(SelectNodes("CheckOffHeaderList/CheckOffHeader"), MyFormat);
// Depending on the IgnoreUCF flag, either return this list with UCF Inactive flags set or return the // // Depending on the IgnoreUCF flag, either return this list with UCF Inactive flags set or return the
// list as is. // // list as is.
if (PlantFormat.IgnoreUCF || fc == null) return _CheckOffHeaderList; // if (PlantFormat.IgnoreUCF || fc == null) return _CheckOffHeaderList;
// If not ignoring UCF settings, only return those that are active // // If not ignoring UCF settings, only return those that are active
foreach (FormatConfig.CheckOffHeader coh in fc.PlantFormat.FormatData.CheckOffHeaderList) // foreach (FormatConfig.CheckOffHeader coh in fc.PlantFormat.FormatData.CheckOffHeaderList)
{ // {
foreach (CheckOffHeader coo in _CheckOffHeaderList) // foreach (CheckOffHeader coo in _CheckOffHeaderList)
{ // {
if ((int)coo.Index == Convert.ToInt32(coh.Index) && !(bool)coh.Active) // if ((int)coo.Index == Convert.ToInt32(coh.Index) && !(bool)coh.Active)
{ // {
_CheckOffHeaderList.Remove(coo); // _CheckOffHeaderList.Remove(coo);
break; // break;
} // }
} // }
} // }
return _CheckOffHeaderList; // return _CheckOffHeaderList;
} //}
// merge the checkoff header lists from the current format and the list from the base // merge the checkoff header lists from the current format and the list from the base
_CheckOffHeaderList = new CheckOffHeaderList(SelectNodes("CheckOffHeaderList/CheckOffHeader"), MyFormat); _CheckOffHeaderList = new CheckOffHeaderList(SelectNodes("CheckOffHeaderList/CheckOffHeader"), MyFormat);
CheckOffHeaderList retlist2 = new CheckOffHeaderList(SelectNodes("../CheckOffDataUCF/CheckOffHeaderList/CheckOffHeader"), MyFormat); CheckOffHeaderList retlist2 = new CheckOffHeaderList(SelectNodes("../CheckOffDataUCF/CheckOffHeaderList/CheckOffHeader"), MyFormat);
PROMS/Volian.Controls.Library/DisplayTags.cs
+14 -14
View File
@@ -367,7 +367,7 @@ namespace Volian.Controls.Library
if (fmtdata.ProcData.CheckOffData.CheckoffOnSubStepsOnly) if (fmtdata.ProcData.CheckOffData.CheckoffOnSubStepsOnly)
_checkoffsAllowed = cmbCheckoff.Enabled = CurItemInfo.IsType("Substep"); _checkoffsAllowed = cmbCheckoff.Enabled = CurItemInfo.IsType("Substep");
int maxindx = fmtdata.ProcData.CheckOffUCF ? fmtdata.ProcData.CheckOffData.CheckOffList.MaxIndex : fmtdata.ProcData.CheckOffData.CheckOffList.MaxIndexNoInherit; int maxindx = fmtdata.ProcData.CheckOffData.CheckOffList.MaxIndexNoInherit;
if (_checkoffsAllowed && !(fmtdata.ProcData.CheckOffData.CheckOffList == null) && !(maxindx == 0)) if (_checkoffsAllowed && !(fmtdata.ProcData.CheckOffData.CheckOffList == null) && !(maxindx == 0))
{ {
CheckOffList chkoffList = fmtdata.ProcData.CheckOffData.CheckOffList; CheckOffList chkoffList = fmtdata.ProcData.CheckOffData.CheckOffList;
@@ -858,19 +858,19 @@ namespace Volian.Controls.Library
int indx = _CheckOffIndex[cmbCheckoff.SelectedIndex]; // C2020-003 get the non-sorted index from the sorted index int indx = _CheckOffIndex[cmbCheckoff.SelectedIndex]; // C2020-003 get the non-sorted index from the sorted index
// get index, if greater than 100, store that - otherwise store index down list. // get index, if greater than 100, store that - otherwise store index down list.
// if this format does not have ucf signoffs, indx is just the selected index from the combo box. // if this format does not have ucf signoffs, indx is just the selected index from the combo box.
if (CurItemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffUCF) //if (CurItemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffUCF)
{ //{
// get index, if greater than 100, store that - otherwise store index down list. // // get index, if greater than 100, store that - otherwise store index down list.
// if this format does not have ucf signoffs, indx is just the selected index from the combo mobx. // // if this format does not have ucf signoffs, indx is just the selected index from the combo mobx.
foreach (CheckOff co in CurItemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffList) // foreach (CheckOff co in CurItemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffList)
{ // {
if (cmbCheckoff.SelectedItem == co.MenuItem) // if (cmbCheckoff.SelectedItem == co.MenuItem)
{ // {
if ((int)co.Index >= 100) indx = (int)co.Index; // if ((int)co.Index >= 100) indx = (int)co.Index;
break; // break;
} // }
} // }
} //}
StepConfig sc = CurItemInfo.MyConfig as StepConfig; StepConfig sc = CurItemInfo.MyConfig as StepConfig;
sc.Step_CheckOffIndex = indx; sc.Step_CheckOffIndex = indx;
//using (Content cnt = Content.Get(CurItemInfo.MyContent.ContentID)) //using (Content cnt = Content.Get(CurItemInfo.MyContent.ContentID))
PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj
-9
View File
@@ -218,12 +218,6 @@
<Compile Include="dlgEnhMissingItem.Designer.cs"> <Compile Include="dlgEnhMissingItem.Designer.cs">
<DependentUpon>dlgEnhMissingItem.cs</DependentUpon> <DependentUpon>dlgEnhMissingItem.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="dlgUCFImportOptions.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="dlgUCFImportOptions.Designer.cs">
<DependentUpon>dlgUCFImportOptions.cs</DependentUpon>
</Compile>
<Compile Include="EditItem.cs"> <Compile Include="EditItem.cs">
<SubType>UserControl</SubType> <SubType>UserControl</SubType>
</Compile> </Compile>
@@ -479,9 +473,6 @@
<EmbeddedResource Include="dlgEnhMissingItem.resx"> <EmbeddedResource Include="dlgEnhMissingItem.resx">
<DependentUpon>dlgEnhMissingItem.cs</DependentUpon> <DependentUpon>dlgEnhMissingItem.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="dlgUCFImportOptions.resx">
<DependentUpon>dlgUCFImportOptions.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FindReplace.resx"> <EmbeddedResource Include="FindReplace.resx">
<DependentUpon>FindReplace.cs</DependentUpon> <DependentUpon>FindReplace.cs</DependentUpon>
<SubType>Designer</SubType> <SubType>Designer</SubType>
PROMS/Volian.Controls.Library/dlgUCFImportOptions.Designer.cs
Generated
-397
View File
@@ -1,397 +0,0 @@
namespace Volian.Controls.Library
{
partial class dlgUCFImportOptions
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.btnOk = new System.Windows.Forms.Button();
this.btnCancel = new System.Windows.Forms.Button();
this.pnlOptions = new System.Windows.Forms.Panel();
this.pnlChoices = new System.Windows.Forms.Panel();
this.cmbFNames = new DevComponents.DotNetBar.Controls.ComboBoxEx();
this.grPnlLoad = new DevComponents.DotNetBar.Controls.GroupPanel();
this.grPnlUse = new DevComponents.DotNetBar.Controls.GroupPanel();
this.rbOnlyImported = new System.Windows.Forms.RadioButton();
this.rbAll = new System.Windows.Forms.RadioButton();
this.rbSetOnly = new System.Windows.Forms.RadioButton();
this.cbUse = new DevComponents.DotNetBar.Controls.CheckBoxX();
this.lblLoadFormat = new DevComponents.DotNetBar.LabelX();
this.sBtnLoad = new DevComponents.DotNetBar.Controls.SwitchButton();
this.lblFmt = new System.Windows.Forms.Label();
this.pnlXmlDiff = new System.Windows.Forms.Panel();
this.wbBrwsExisting = new System.Windows.Forms.WebBrowser();
this.splitterWebBrowsers = new System.Windows.Forms.Splitter();
this.pnlWbBrwsImp = new System.Windows.Forms.Panel();
this.wbBrwsImporting = new System.Windows.Forms.WebBrowser();
this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip();
this.pnlChoices.SuspendLayout();
this.grPnlLoad.SuspendLayout();
this.grPnlUse.SuspendLayout();
this.pnlXmlDiff.SuspendLayout();
this.pnlWbBrwsImp.SuspendLayout();
this.SuspendLayout();
//
// btnOk
//
this.btnOk.DialogResult = System.Windows.Forms.DialogResult.OK;
this.btnOk.Location = new System.Drawing.Point(31, 356);
this.btnOk.Name = "btnOk";
this.btnOk.Size = new System.Drawing.Size(65, 23);
this.btnOk.TabIndex = 5;
this.btnOk.Text = "OK";
this.btnOk.UseVisualStyleBackColor = true;
this.btnOk.Click += new System.EventHandler(this.btnOk_Click);
//
// btnCancel
//
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.btnCancel.Location = new System.Drawing.Point(121, 356);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(65, 23);
this.btnCancel.TabIndex = 6;
this.btnCancel.Text = "Cancel";
this.btnCancel.UseVisualStyleBackColor = true;
//
// pnlOptions
//
this.pnlOptions.Location = new System.Drawing.Point(0, 0);
this.pnlOptions.Name = "pnlOptions";
this.pnlOptions.Size = new System.Drawing.Size(200, 100);
this.pnlOptions.TabIndex = 0;
//
// pnlChoices
//
this.pnlChoices.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.pnlChoices.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.pnlChoices.Controls.Add(this.cmbFNames);
this.pnlChoices.Controls.Add(this.grPnlLoad);
this.pnlChoices.Controls.Add(this.lblLoadFormat);
this.pnlChoices.Controls.Add(this.sBtnLoad);
this.pnlChoices.Controls.Add(this.lblFmt);
this.pnlChoices.Controls.Add(this.btnCancel);
this.pnlChoices.Controls.Add(this.btnOk);
this.pnlChoices.Location = new System.Drawing.Point(0, 0);
this.pnlChoices.Name = "pnlChoices";
this.pnlChoices.Size = new System.Drawing.Size(250, 606);
this.pnlChoices.TabIndex = 7;
//
// cmbFNames
//
this.cmbFNames.DisplayMember = "Text";
this.cmbFNames.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
this.cmbFNames.FormattingEnabled = true;
this.cmbFNames.ItemHeight = 16;
this.cmbFNames.Location = new System.Drawing.Point(26, 48);
this.cmbFNames.Name = "cmbFNames";
this.cmbFNames.Size = new System.Drawing.Size(191, 22);
this.cmbFNames.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.cmbFNames.TabIndex = 15;
this.cmbFNames.SelectedIndexChanged += new System.EventHandler(this.cmbFNames_SelectedIndexChanged);
//
// grPnlLoad
//
this.grPnlLoad.CanvasColor = System.Drawing.SystemColors.Control;
this.grPnlLoad.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
this.grPnlLoad.Controls.Add(this.grPnlUse);
this.grPnlLoad.Controls.Add(this.cbUse);
this.grPnlLoad.DisabledBackColor = System.Drawing.Color.Empty;
this.grPnlLoad.Location = new System.Drawing.Point(11, 130);
this.grPnlLoad.Name = "grPnlLoad";
this.grPnlLoad.Size = new System.Drawing.Size(224, 184);
//
//
//
this.grPnlLoad.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
this.grPnlLoad.Style.BackColorGradientAngle = 90;
this.grPnlLoad.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
this.grPnlLoad.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.grPnlLoad.Style.BorderBottomWidth = 1;
this.grPnlLoad.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
this.grPnlLoad.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.grPnlLoad.Style.BorderLeftWidth = 1;
this.grPnlLoad.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.grPnlLoad.Style.BorderRightWidth = 1;
this.grPnlLoad.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.grPnlLoad.Style.BorderTopWidth = 1;
this.grPnlLoad.Style.CornerDiameter = 4;
this.grPnlLoad.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
this.grPnlLoad.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
this.grPnlLoad.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
this.grPnlLoad.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
//
//
//
this.grPnlLoad.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
//
//
//
this.grPnlLoad.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.grPnlLoad.TabIndex = 14;
this.grPnlLoad.Text = "Load Options";
//
// grPnlUse
//
this.grPnlUse.BackColor = System.Drawing.Color.Transparent;
this.grPnlUse.CanvasColor = System.Drawing.SystemColors.Control;
this.grPnlUse.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
this.grPnlUse.Controls.Add(this.rbOnlyImported);
this.grPnlUse.Controls.Add(this.rbAll);
this.grPnlUse.Controls.Add(this.rbSetOnly);
this.grPnlUse.DisabledBackColor = System.Drawing.Color.Empty;
this.grPnlUse.Location = new System.Drawing.Point(15, 39);
this.grPnlUse.Name = "grPnlUse";
this.grPnlUse.Size = new System.Drawing.Size(181, 119);
//
//
//
this.grPnlUse.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
this.grPnlUse.Style.BackColorGradientAngle = 90;
this.grPnlUse.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
this.grPnlUse.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.grPnlUse.Style.BorderBottomWidth = 1;
this.grPnlUse.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
this.grPnlUse.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.grPnlUse.Style.BorderLeftWidth = 1;
this.grPnlUse.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.grPnlUse.Style.BorderRightWidth = 1;
this.grPnlUse.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
this.grPnlUse.Style.BorderTopWidth = 1;
this.grPnlUse.Style.CornerDiameter = 4;
this.grPnlUse.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
this.grPnlUse.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
this.grPnlUse.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
this.grPnlUse.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
//
//
//
this.grPnlUse.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
//
//
//
this.grPnlUse.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.grPnlUse.TabIndex = 1;
this.grPnlUse.Text = "In Procedure(s)";
//
// rbOnlyImported
//
this.rbOnlyImported.AutoSize = true;
this.rbOnlyImported.BackColor = System.Drawing.Color.Transparent;
this.rbOnlyImported.Location = new System.Drawing.Point(12, 6);
this.rbOnlyImported.Name = "rbOnlyImported";
this.rbOnlyImported.Size = new System.Drawing.Size(142, 21);
this.superTooltip1.SetSuperTooltip(this.rbOnlyImported, new DevComponents.DotNetBar.SuperTooltipInfo("For Imported Only", "", "The changed UCF will only be used by the procedure(s) that are being imported.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
this.rbOnlyImported.TabIndex = 5;
this.rbOnlyImported.TabStop = true;
this.rbOnlyImported.Text = "For Imported Only";
this.rbOnlyImported.UseVisualStyleBackColor = false;
//
// rbAll
//
this.rbAll.AutoSize = true;
this.rbAll.BackColor = System.Drawing.Color.Transparent;
this.rbAll.Location = new System.Drawing.Point(12, 33);
this.rbAll.Name = "rbAll";
this.rbAll.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.rbAll.Size = new System.Drawing.Size(69, 21);
this.superTooltip1.SetSuperTooltip(this.rbAll, new DevComponents.DotNetBar.SuperTooltipInfo("For All ", "", "The changed UCF will be used in all procedure(s) and section(s) within the databa" +
"se that referenced this UCF. The one that existed in the database will be renam" +
"ed to \'Old N of UCFname\'.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
this.rbAll.TabIndex = 6;
this.rbAll.TabStop = true;
this.rbAll.Text = "For All";
this.rbAll.UseVisualStyleBackColor = false;
//
// rbSetOnly
//
this.rbSetOnly.AutoSize = true;
this.rbSetOnly.BackColor = System.Drawing.Color.Transparent;
this.rbSetOnly.Location = new System.Drawing.Point(12, 60);
this.rbSetOnly.Name = "rbSetOnly";
this.rbSetOnly.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.rbSetOnly.Size = new System.Drawing.Size(108, 21);
this.superTooltip1.SetSuperTooltip(this.rbSetOnly, new DevComponents.DotNetBar.SuperTooltipInfo("For Set Only", "", "The changed UCF will only be used by the procedure(s)/sections(s) within the proc" +
"edure set that this procedure belongs.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
this.rbSetOnly.TabIndex = 7;
this.rbSetOnly.TabStop = true;
this.rbSetOnly.Text = "For Set Only";
this.rbSetOnly.UseVisualStyleBackColor = false;
//
// cbUse
//
this.cbUse.BackColor = System.Drawing.Color.Transparent;
//
//
//
this.cbUse.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.cbUse.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.cbUse.Location = new System.Drawing.Point(17, 5);
this.cbUse.Name = "cbUse";
this.cbUse.Size = new System.Drawing.Size(125, 28);
this.cbUse.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.superTooltip1.SetSuperTooltip(this.cbUse, new DevComponents.DotNetBar.SuperTooltipInfo("Use", "", "If checked, the changes will be used as defined In Procedure(s) below. Otherwise," +
" the format is loaded but not used. ", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
this.cbUse.TabIndex = 0;
this.cbUse.Text = "Use";
this.cbUse.CheckedChanged += new System.EventHandler(this.cbUse_CheckedChanged);
//
// lblLoadFormat
//
//
//
//
this.lblLoadFormat.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.lblLoadFormat.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblLoadFormat.Location = new System.Drawing.Point(124, 89);
this.lblLoadFormat.Name = "lblLoadFormat";
this.lblLoadFormat.Size = new System.Drawing.Size(94, 24);
this.superTooltip1.SetSuperTooltip(this.lblLoadFormat, new DevComponents.DotNetBar.SuperTooltipInfo("Load Format", "", "The User Control of Format changes will be loaded (imported) into the database. O" +
"therwise it will be ignored and the existing User Control of Format will be used" +
".", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
this.lblLoadFormat.TabIndex = 13;
this.lblLoadFormat.Text = "Load Format";
//
// sBtnLoad
//
this.sBtnLoad.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.sBtnLoad.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.sBtnLoad.Location = new System.Drawing.Point(13, 88);
this.sBtnLoad.Name = "sBtnLoad";
this.sBtnLoad.Size = new System.Drawing.Size(102, 26);
this.sBtnLoad.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.sBtnLoad.TabIndex = 12;
this.sBtnLoad.ValueChanged += new System.EventHandler(this.sBtnLoad_ValueChanged);
//
// lblFmt
//
this.lblFmt.AutoSize = true;
this.lblFmt.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblFmt.Location = new System.Drawing.Point(16, 19);
this.lblFmt.Name = "lblFmt";
this.lblFmt.Size = new System.Drawing.Size(140, 18);
this.lblFmt.TabIndex = 8;
this.lblFmt.Text = "Changes to Format:";
//
// pnlXmlDiff
//
this.pnlXmlDiff.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.pnlXmlDiff.Controls.Add(this.wbBrwsExisting);
this.pnlXmlDiff.Controls.Add(this.splitterWebBrowsers);
this.pnlXmlDiff.Controls.Add(this.pnlWbBrwsImp);
this.pnlXmlDiff.Location = new System.Drawing.Point(255, 0);
this.pnlXmlDiff.Name = "pnlXmlDiff";
this.pnlXmlDiff.Size = new System.Drawing.Size(548, 601);
this.pnlXmlDiff.TabIndex = 8;
//
// wbBrwsExisting
//
this.wbBrwsExisting.Dock = System.Windows.Forms.DockStyle.Fill;
this.wbBrwsExisting.Location = new System.Drawing.Point(0, 0);
this.wbBrwsExisting.MinimumSize = new System.Drawing.Size(20, 20);
this.wbBrwsExisting.Name = "wbBrwsExisting";
this.wbBrwsExisting.Size = new System.Drawing.Size(548, 298);
this.wbBrwsExisting.TabIndex = 0;
//
// splitterWebBrowsers
//
this.splitterWebBrowsers.Dock = System.Windows.Forms.DockStyle.Bottom;
this.splitterWebBrowsers.Location = new System.Drawing.Point(0, 298);
this.splitterWebBrowsers.Name = "splitterWebBrowsers";
this.splitterWebBrowsers.Size = new System.Drawing.Size(548, 3);
this.splitterWebBrowsers.TabIndex = 2;
this.splitterWebBrowsers.TabStop = false;
//
// pnlWbBrwsImp
//
this.pnlWbBrwsImp.Controls.Add(this.wbBrwsImporting);
this.pnlWbBrwsImp.Dock = System.Windows.Forms.DockStyle.Bottom;
this.pnlWbBrwsImp.Location = new System.Drawing.Point(0, 301);
this.pnlWbBrwsImp.Name = "panel1";
this.pnlWbBrwsImp.Size = new System.Drawing.Size(548, 300);
this.pnlWbBrwsImp.TabIndex = 3;
//
// wbBrwsImporting
//
this.wbBrwsImporting.Dock = System.Windows.Forms.DockStyle.Fill;
this.wbBrwsImporting.Location = new System.Drawing.Point(0, 0);
this.wbBrwsImporting.MinimumSize = new System.Drawing.Size(20, 20);
this.wbBrwsImporting.Name = "wbBrwsImporting";
this.wbBrwsImporting.Size = new System.Drawing.Size(548, 300);
this.wbBrwsImporting.TabIndex = 0;
//
// superTooltip1
//
this.superTooltip1.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray);
this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
//
// dlgUCFImportOptions
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(803, 606);
this.Controls.Add(this.pnlXmlDiff);
this.Controls.Add(this.pnlChoices);
this.Name = "dlgUCFImportOptions";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "User Control Of Format - Import Options";
this.pnlChoices.ResumeLayout(false);
this.pnlChoices.PerformLayout();
this.grPnlLoad.ResumeLayout(false);
this.grPnlUse.ResumeLayout(false);
this.grPnlUse.PerformLayout();
this.pnlXmlDiff.ResumeLayout(false);
this.pnlWbBrwsImp.ResumeLayout(false);
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.Button btnOk;
private System.Windows.Forms.Button btnCancel;
private System.Windows.Forms.Panel pnlOptions;
private System.Windows.Forms.Panel pnlXmlDiff;
private System.Windows.Forms.WebBrowser wbBrwsExisting;
private System.Windows.Forms.Panel pnlChoices;
private System.Windows.Forms.Label lblFmt;
private DevComponents.DotNetBar.LabelX lblLoadFormat;
private DevComponents.DotNetBar.Controls.SwitchButton sBtnLoad;
private DevComponents.DotNetBar.Controls.GroupPanel grPnlLoad;
private DevComponents.DotNetBar.Controls.GroupPanel grPnlUse;
private DevComponents.DotNetBar.Controls.CheckBoxX cbUse;
private System.Windows.Forms.RadioButton rbOnlyImported;
private System.Windows.Forms.RadioButton rbAll;
private System.Windows.Forms.RadioButton rbSetOnly;
private DevComponents.DotNetBar.SuperTooltip superTooltip1;
private DevComponents.DotNetBar.Controls.ComboBoxEx cmbFNames;
private System.Windows.Forms.Splitter splitterWebBrowsers;
private System.Windows.Forms.Panel pnlWbBrwsImp;
private System.Windows.Forms.WebBrowser wbBrwsImporting;
}
}
PROMS/Volian.Controls.Library/dlgUCFImportOptions.cs
-183
View File
@@ -1,183 +0,0 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Windows.Forms;
using System.Xml;
using System.Xml.Linq;
using System.Xml.Xsl;
using System.IO;
using VEPROMS.CSLA.Library;
namespace Volian.Controls.Library
{
// This dialog is used when the imported UCF is different than one existing in the database. It allows the user to
// select whether to overwrite, copy, etc. See the user interface project/dlgExportImport.cs for the options.
public partial class dlgUCFImportOptions : Form
{
List<string>ExistingFC;
List<string>ImportedFC;
private bool _Initializing = false;
public E_UCFImportOptions UCFImportOptionsCase = E_UCFImportOptions.LoadOnlyImported;
public dlgUCFImportOptions(List<string> name, List<string> existingFC, List<string> importedFC, E_UCFImportOptions defImpOpt, string xmlpath)
{
_Initializing = true;
InitializeComponent();
InitializeFNamesCombo(name);
ExistingFC = existingFC;
ImportedFC = importedFC;
cmbFNames.SelectedIndex = 0; // this displays the web browser differences for first name in the combo box.
// initialize the import of UCF option radio buttons:
UCFImportOptionsCase = defImpOpt;
rbSetOnly.Visible = !xmlpath.ToLower().Contains("folder");
if (defImpOpt == E_UCFImportOptions.Ignore)
{
sBtnLoad.Value = false;
grPnlLoad.Enabled = false;
grPnlUse.Enabled = false;
}
else if (defImpOpt == E_UCFImportOptions.LoadNotUsed)
{
sBtnLoad.Value = true;
grPnlLoad.Enabled = true;
cbUse.Checked = false;
grPnlUse.Enabled = false;
}
else if (defImpOpt == E_UCFImportOptions.LoadOnlyImported)
{
sBtnLoad.Value = true;
grPnlLoad.Enabled = true;
cbUse.Checked = true;
grPnlUse.Enabled = true;
rbOnlyImported.Checked = true;
}
else if (defImpOpt == E_UCFImportOptions.LoadUseAll)
{
sBtnLoad.Value = true;
grPnlLoad.Enabled = true;
cbUse.Checked = true;
grPnlUse.Enabled = true;
rbAll.Checked = true;
}
else if (defImpOpt == E_UCFImportOptions.LoadForSetOnly)
{
sBtnLoad.Value = true;
grPnlLoad.Enabled = true;
cbUse.Checked = true;
grPnlUse.Enabled = true;
rbSetOnly.Checked = true;
}
_Initializing = false;
return;
}
private void InitializeFNamesCombo(List<string> name)
{
foreach (string str in name)
cmbFNames.Items.Add(str);
}
private void DisplayXmlDiff(string existingFC, string importedFC)
{
XmlDocument xd = new XmlDocument();
xd.LoadXml(existingFC);
XmlNodeList xnl = xd.GetElementsByTagName("FormatConfig");
if (xnl != null && xnl.Count > 0) AddAttribute(xnl[0], "Version", "Existing");
string sXSLSummary = System.IO.File.ReadAllText(Application.StartupPath + "\\" + "UCFImpDetails.xsl");
StringWriter sw = new StringWriter();
StringWriter xsw = new StringWriter();
using (XmlReader xrt = XmlReader.Create(new StringReader(sXSLSummary)))
{
XmlTextWriter tx = new XmlTextWriter(xsw);
xd.WriteTo(tx);
string tmp = sw.ToString();
tmp = xd.InnerXml;
using (XmlReader xri = XmlReader.Create(new StringReader(tmp)))
{
using (XmlWriter xwo = XmlWriter.Create(sw))
{
XslCompiledTransform xsl = new XslCompiledTransform();
xsl.Load(xrt);
xsl.Transform(xri, xwo); // Perform Transform
}
wbBrwsExisting.DocumentText = sw.ToString();
}
}
StringWriter sw1 = new StringWriter();
StringWriter xsw1 = new StringWriter();
XmlDocument xd1 = new XmlDocument();
xd1.LoadXml(importedFC);
xnl = xd1.GetElementsByTagName("FormatConfig");
if (xnl != null && xnl.Count > 0) AddAttribute(xnl[0], "Version", "Importing");
using (XmlReader xrt = XmlReader.Create(new StringReader(sXSLSummary)))
{
XmlTextWriter tx = new XmlTextWriter(xsw1);
xd1.WriteTo(tx);
string tmp = xd1.InnerXml;
using (XmlReader xri = XmlReader.Create(new StringReader(tmp)))
{
using (XmlWriter xwo = XmlWriter.Create(sw1))
{
XslCompiledTransform xsl = new XslCompiledTransform();
xsl.Load(xrt);
xsl.Transform(xri, xwo); // Perform Transform
}
wbBrwsImporting.DocumentText = sw1.ToString();
}
}
}
private void AddAttribute(XmlNode xn, string name, string value)
{
XmlAttribute xa = xn.OwnerDocument.CreateAttribute(name);
xa.Value = value.ToString();
xn.Attributes.Append(xa);
}
private void btnOk_Click(object sender, EventArgs e)
{
if (!sBtnLoad.Value) UCFImportOptionsCase = E_UCFImportOptions.Ignore;
else if (!cbUse.Checked) UCFImportOptionsCase = E_UCFImportOptions.LoadNotUsed;
else if (rbOnlyImported.Checked) UCFImportOptionsCase = E_UCFImportOptions.LoadOnlyImported;
else if (rbAll.Checked) UCFImportOptionsCase = E_UCFImportOptions.LoadUseAll;
else if (rbSetOnly.Checked) UCFImportOptionsCase = E_UCFImportOptions.LoadForSetOnly;
this.Close();
}
private void sBtnLoad_ValueChanged(object sender, EventArgs e) // Import options for UCF Change: Load switch button
{
if (_Initializing) return;
if (sBtnLoad.Value)
{
grPnlLoad.Enabled = true; // Import the ucf change. let user select whether to use it.
grPnlUse.Enabled = false;
cbUse.Checked = false;
}
else
{
grPnlLoad.Enabled = false; // Don't import the ucf change.
grPnlUse.Enabled = false;
}
}
private void cbUse_CheckedChanged(object sender, EventArgs e) // Import options for UCF Change: use checkbox
{
if (_Initializing) return;
if (cbUse.Checked)
grPnlUse.Enabled = true; // Use the change. enable the load group & select for imported only
else
grPnlUse.Enabled = false; // Don't use the change.
}
private void cmbFNames_SelectedIndexChanged(object sender, EventArgs e)
{
int indx = cmbFNames.SelectedIndex;
string existingFC = ExistingFC[indx];
string importedFC = ImportedFC[indx];
DisplayXmlDiff(existingFC, importedFC);
}
}
}
PROMS/Volian.Controls.Library/dlgUCFImportOptions.resx
-126
View File
@@ -1,126 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="wbBrwsExisting.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root>
PROMS/Volian.Print.Library/vlnParagraph.cs
+1 -1
View File
1
 @@ -5215,7 +5215,7 @@ namespace Volian.Print.Library
// First see if there is any checkoff data in the format file and that there // First see if there is any checkoff data in the format file and that there
// is a pagelist item for the checkoff header. // is a pagelist item for the checkoff header.
int maxindx = itemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffUCF ? itemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffList.MaxIndex : itemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffList.MaxIndexNoInherit; int maxindx = itemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffList.MaxIndexNoInherit;
if (maxindx <= 0) return; if (maxindx <= 0) return;
if (MyPageHelper.PageListCheckOffHeader == null) return; if (MyPageHelper.PageListCheckOffHeader == null) return;