Compare commits
No commits in common. "eb26b7a12317d7a3adb8a50e0eac8c9aebe75e3f" and "9d50f55f71ffe8e6cfbdf00828ebb24dd1e635ae" have entirely different histories.
eb26b7a123
...
9d50f55f71
@ -27,7 +27,7 @@
|
||||
</SccAuxPath>
|
||||
<SccProvider>
|
||||
</SccProvider>
|
||||
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<FileUpgradeFlags>
|
||||
</FileUpgradeFlags>
|
||||
<UpgradeBackupLocation>
|
||||
|
||||
@ -32,9 +32,9 @@ namespace AdjustBuildRevision
|
||||
{
|
||||
// Allow for setting build revision on either proms or the roeditor:
|
||||
if (Directory.GetCurrentDirectory().ToUpper().Contains("REFOBJ"))
|
||||
outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.3.yyMM.dHH") + "\")");
|
||||
else
|
||||
outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.2.yyMM.dHH") + "\")");
|
||||
else
|
||||
outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.1.yyMM.dHH") + "\")");
|
||||
// if (outline != line)
|
||||
// {
|
||||
// Console.WriteLine("Before: '{0}'", line);
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup></configuration>
|
||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
</sectionGroup>
|
||||
</configSections>
|
||||
<startup>
|
||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
|
||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
|
||||
</startup>
|
||||
<userSettings>
|
||||
<Baseline.Properties.Settings>
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>Baseline</RootNamespace>
|
||||
<AssemblyName>Baseline</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<SccProjectName>
|
||||
</SccProjectName>
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
</SccAuxPath>
|
||||
<SccProvider>
|
||||
</SccProvider>
|
||||
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<FileUpgradeFlags>
|
||||
</FileUpgradeFlags>
|
||||
<UpgradeBackupLocation>
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>FlexableMessageBox</RootNamespace>
|
||||
<AssemblyName>FlexableMessageBox</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<TargetFrameworkProfile />
|
||||
<SccProjectName>
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
</SccAuxPath>
|
||||
<SccProvider>
|
||||
</SccProvider>
|
||||
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<FileUpgradeFlags>
|
||||
</FileUpgradeFlags>
|
||||
<UpgradeBackupLocation>
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup></configuration>
|
||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -18,7 +18,7 @@
|
||||
</SccAuxPath>
|
||||
<SccProvider>
|
||||
</SccProvider>
|
||||
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<FileUpgradeFlags>
|
||||
</FileUpgradeFlags>
|
||||
<UpgradeBackupLocation>
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
</SccAuxPath>
|
||||
<SccProvider>
|
||||
</SccProvider>
|
||||
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<OldToolsVersion>2.0</OldToolsVersion>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<?xml version="1.0"?>
|
||||
<configuration>
|
||||
<startup>
|
||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup><runtime>
|
||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup><runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" appliesTo="v1.0.3705">
|
||||
</assemblyBinding></runtime></configuration>
|
||||
|
||||
@ -23,8 +23,8 @@ using System.Runtime.CompilerServices;
|
||||
// Build YYMM (two digit year, two digit month)
|
||||
// Revision DHH (day - no leading zero, two digit hour - military time
|
||||
//
|
||||
[assembly: AssemblyVersion("2.3.2404.1611")]
|
||||
[assembly: AssemblyFileVersion("2.3.2404.1611")]
|
||||
[assembly: AssemblyVersion("2.2.2306.2212")]
|
||||
[assembly: AssemblyFileVersion("2.2.2306.2212")]
|
||||
|
||||
//
|
||||
// In order to sign your assembly you must specify a key to use. Refer to the
|
||||
@ -89,8 +89,6 @@ using System.Runtime.CompilerServices;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -44,7 +44,7 @@
|
||||
</SccAuxPath>
|
||||
<SccProvider>
|
||||
</SccProvider>
|
||||
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<OldToolsVersion>2.0</OldToolsVersion>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<?xml version="1.0"?>
|
||||
<configuration>
|
||||
<startup>
|
||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup><runtime>
|
||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup><runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" appliesTo="v1.0.3705">
|
||||
</assemblyBinding></runtime>
|
||||
<appSettings>
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
</SccAuxPath>
|
||||
<SccProvider>
|
||||
</SccProvider>
|
||||
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<OldToolsVersion>2.0</OldToolsVersion>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
</SccAuxPath>
|
||||
<SccProvider>
|
||||
</SccProvider>
|
||||
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<FileUpgradeFlags>
|
||||
</FileUpgradeFlags>
|
||||
<UpgradeBackupLocation>
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
</SccAuxPath>
|
||||
<SccProvider>
|
||||
</SccProvider>
|
||||
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<OldToolsVersion>2.0</OldToolsVersion>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
</SccAuxPath>
|
||||
<SccProvider>
|
||||
</SccProvider>
|
||||
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<OldToolsVersion>2.0</OldToolsVersion>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
</SccAuxPath>
|
||||
<SccProvider>
|
||||
</SccProvider>
|
||||
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<OldToolsVersion>2.0</OldToolsVersion>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
|
||||
@ -51,7 +51,7 @@
|
||||
</SccAuxPath>
|
||||
<SccProvider>
|
||||
</SccProvider>
|
||||
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
|
||||
@ -46,7 +46,7 @@
|
||||
</SccAuxPath>
|
||||
<SccProvider>
|
||||
</SccProvider>
|
||||
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<OldToolsVersion>2.0</OldToolsVersion>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
</SccAuxPath>
|
||||
<SccProvider>
|
||||
</SccProvider>
|
||||
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<OldToolsVersion>2.0</OldToolsVersion>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
</SccAuxPath>
|
||||
<SccProvider>
|
||||
</SccProvider>
|
||||
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<OldToolsVersion>2.0</OldToolsVersion>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
|
||||
@ -60,6 +60,6 @@
|
||||
</logger>
|
||||
</log4net>
|
||||
<startup>
|
||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
|
||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
|
||||
</startup>
|
||||
</configuration>
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>RoAccessToSql</RootNamespace>
|
||||
<AssemblyName>RoAccessToSql</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<TargetFrameworkProfile />
|
||||
<SccProjectName>
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
</SccAuxPath>
|
||||
<SccProvider>
|
||||
</SccProvider>
|
||||
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<OldToolsVersion>2.0</OldToolsVersion>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
|
||||
@ -1,73 +1,73 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<configSections>
|
||||
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
|
||||
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
|
||||
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<section name="VEPROMS.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
|
||||
<section name="UISampleNetBar1.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
|
||||
<section name="VEPROMS.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
|
||||
<section name="UISampleNetBar1.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
|
||||
</sectionGroup>
|
||||
</configSections>
|
||||
<log4net>
|
||||
<appender name="LogFileAppender" type="log4net.Appender.FileAppender">
|
||||
<param name="File" value="${USERPROFILE}/My Documents/VEPROMS/ErrorLog.txt"/>
|
||||
<param name="File" value="${USERPROFILE}/My Documents/VEPROMS/ErrorLog.txt" />
|
||||
<!--<param name="File" value="${APPDATA}/Volian/Proms2010/ErrorLog.txt" />-->
|
||||
<!--<param name="File" value="${LOCALAPPDATA}/Temp/VEPROMS/ErrorLog.txt" />-->
|
||||
<param name="AppendToFile" value="true"/>
|
||||
<param name="AppendToFile" value="true" />
|
||||
<layout type="log4net.Layout.PatternLayout">
|
||||
<!--<param name="Header" value="[Header]\r\n" />-->
|
||||
<!--<param name="Footer" value="[Footer]\r\n" />-->
|
||||
<param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n"/>
|
||||
<param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n" />
|
||||
</layout>
|
||||
</appender>
|
||||
<appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
|
||||
<layout type="log4net.Layout.PatternLayout">
|
||||
<conversionPattern value="--> %date [%thread] %-5level %logger (%property{log4net:HostName}) [%ndc] - %message%newline"/>
|
||||
<conversionPattern value="--> %date [%thread] %-5level %logger (%property{log4net:HostName}) [%ndc] - %message%newline" />
|
||||
</layout>
|
||||
</appender>
|
||||
<appender name="EventLogAppender" type="log4net.Appender.EventLogAppender">
|
||||
<threshold value="WARN"/>
|
||||
<threshold value="WARN" />
|
||||
<mapping>
|
||||
<level value="DEBUG"/>
|
||||
<eventLogEntryType value="Information"/>
|
||||
<level value="DEBUG" />
|
||||
<eventLogEntryType value="Information" />
|
||||
</mapping>
|
||||
<mapping>
|
||||
<level value="INFO"/>
|
||||
<eventLogEntryType value="Information"/>
|
||||
<level value="INFO" />
|
||||
<eventLogEntryType value="Information" />
|
||||
</mapping>
|
||||
<mapping>
|
||||
<level value="WARN"/>
|
||||
<eventLogEntryType value="Warning"/>
|
||||
<level value="WARN" />
|
||||
<eventLogEntryType value="Warning" />
|
||||
</mapping>
|
||||
<mapping>
|
||||
<level value="ERROR"/>
|
||||
<eventLogEntryType value="Error"/>
|
||||
<level value="ERROR" />
|
||||
<eventLogEntryType value="Error" />
|
||||
</mapping>
|
||||
<mapping>
|
||||
<level value="FATAL"/>
|
||||
<eventLogEntryType value="Error"/>
|
||||
<level value="FATAL" />
|
||||
<eventLogEntryType value="Error" />
|
||||
</mapping>
|
||||
<layout type="log4net.Layout.PatternLayout">
|
||||
<param name="ConversionPattern" value="---> %d [%t] %-5p %c - %m%n"/>
|
||||
<param name="ConversionPattern" value="---> %d [%t] %-5p %c - %m%n" />
|
||||
</layout>
|
||||
</appender>
|
||||
<root>
|
||||
<level value="ALL"/>
|
||||
<appender-ref ref="ConsoleAppender"/>
|
||||
<appender-ref ref="LogFileAppender"/>
|
||||
<appender-ref ref="EventLogAppender"/>
|
||||
<level value="ALL" />
|
||||
<appender-ref ref="ConsoleAppender" />
|
||||
<appender-ref ref="LogFileAppender" />
|
||||
<appender-ref ref="EventLogAppender" />
|
||||
</root>
|
||||
<logger name="VEPROMS.CSLA.Library">
|
||||
<level value="INFO"/>
|
||||
<level value="INFO" />
|
||||
</logger>
|
||||
<logger name="Volian.Controls.Library">
|
||||
<level value="INFO"/>
|
||||
<level value="INFO" />
|
||||
</logger>
|
||||
</log4net>
|
||||
<appSettings>
|
||||
<add key="OperatingMode" value="Production"/>
|
||||
<add key="OperatingMode" value="Production" />
|
||||
<!--"Debug" "Production" "Demo"/-->
|
||||
<add key="OriginalPageBreak" value="False"/>
|
||||
<add key="CslaAuthentication" value="Windows"/>
|
||||
<add key="OriginalPageBreak" value="False" />
|
||||
<add key="CslaAuthentication" value="Windows" />
|
||||
<!--
|
||||
<add key="CslaDataPortalProxy"
|
||||
value="Csla.DataPortalClient.RemotingProxy, Csla"/>
|
||||
@ -85,17 +85,17 @@
|
||||
value="EnterpriseServicesHost.EnterpriseServicesProxy,
|
||||
EnterpriseServicesHost"/>
|
||||
-->
|
||||
<add key="ClientSettingsProvider.ServiceUri" value=""/>
|
||||
<add key="ClientSettingsProvider.ServiceUri" value="" />
|
||||
</appSettings>
|
||||
<connectionStrings>
|
||||
<add name="VEPROMS" connectionString="Data Source=VOLIAN-SERVER;User Id=proms2010;password=proms2010;Initial Catalog=VEPROMS" providerName="System.Data.SqlClient"/>
|
||||
<add name="VEPROMS_LOCAL" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient"/>
|
||||
<add name="VEPROMS_RMARK_DEBUG" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient"/>
|
||||
<add name="VEPROMS_RMARK_DEMO" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient"/>
|
||||
<add name="VEPROMS" connectionString="Data Source=VOLIAN-SERVER;User Id=proms2010;password=proms2010;Initial Catalog=VEPROMS" providerName="System.Data.SqlClient" />
|
||||
<add name="VEPROMS_LOCAL" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />
|
||||
<add name="VEPROMS_RMARK_DEBUG" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />
|
||||
<add name="VEPROMS_RMARK_DEMO" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />
|
||||
<!--<add name="VEPROMS_BODINE_DEBUG" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />
|
||||
<add name="VEPROMS_BODINE_DEMO" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />-->
|
||||
<add name="VEPROMS_BODINE_DEBUG" connectionString="Data Source=JCB2-HP\VOLIAN08;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient"/>
|
||||
<add name="VEPROMS_BODINE_DEMO" connectionString="Data Source=JCB2-HP\VOLIAN08;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient"/>
|
||||
<add name="VEPROMS_BODINE_DEBUG" connectionString="Data Source=JCB2-HP\VOLIAN08;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />
|
||||
<add name="VEPROMS_BODINE_DEMO" connectionString="Data Source=JCB2-HP\VOLIAN08;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />
|
||||
<!--<add name="VEPROMS_BODINE_DEBUG" connectionString="Data Source=JCB2-HP\VOLIAN12;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />
|
||||
<add name="VEPROMS_BODINE_DEMO" connectionString="Data Source=JCB2-HP\VOLIAN12;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />-->
|
||||
</connectionStrings>
|
||||
@ -135,10 +135,10 @@
|
||||
<value>True</value>
|
||||
</setting>
|
||||
<setting name="QATItems" serializeAs="String">
|
||||
<value/>
|
||||
<value />
|
||||
</setting>
|
||||
<setting name="DefaultDB" serializeAs="String">
|
||||
<value/>
|
||||
<value />
|
||||
</setting>
|
||||
<setting name="LastVersion" serializeAs="String">
|
||||
<value>0.0</value>
|
||||
@ -150,10 +150,10 @@
|
||||
<value>True</value>
|
||||
</setting>
|
||||
<setting name="SMTPServer" serializeAs="String">
|
||||
<value/>
|
||||
<value />
|
||||
</setting>
|
||||
<setting name="SMTPUser" serializeAs="String">
|
||||
<value/>
|
||||
<value />
|
||||
</setting>
|
||||
<setting name="UpdateSettings" serializeAs="String">
|
||||
<value>True</value>
|
||||
@ -181,22 +181,18 @@
|
||||
</UISampleNetBar1.Properties.Settings>
|
||||
</userSettings>
|
||||
<startup>
|
||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
|
||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
|
||||
</startup>
|
||||
<runtime>
|
||||
<AppContextSwitchOverrides
|
||||
value="Switch.System.Windows.Forms.DoNotLoadLatestRichEditControl=true" />
|
||||
</runtime>
|
||||
<system.web>
|
||||
<membership defaultProvider="ClientAuthenticationMembershipProvider">
|
||||
<providers>
|
||||
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri=""/>
|
||||
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
|
||||
</providers>
|
||||
</membership>
|
||||
<roleManager defaultProvider="ClientRoleProvider" enabled="true">
|
||||
<providers>
|
||||
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400"/>
|
||||
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
|
||||
</providers>
|
||||
</roleManager>
|
||||
</system.web>
|
||||
</configuration>
|
||||
</configuration>
|
||||
@ -0,0 +1,2 @@
|
||||
C1.Win.C1FlexGrid.C1FlexGrid, C1.Win.C1FlexGrid.2
|
||||
C1.Win.C1SpellChecker.C1SpellChecker, C1.Win.C1SpellChecker.2
|
||||
@ -19,7 +19,7 @@
|
||||
</SccAuxPath>
|
||||
<SccProvider>
|
||||
</SccProvider>
|
||||
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<FileUpgradeFlags>
|
||||
</FileUpgradeFlags>
|
||||
<UpgradeBackupLocation>
|
||||
@ -99,11 +99,11 @@
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="C1.Win.4.8">
|
||||
<HintPath>..\VEPROMS\packages\C1.Win.8.0.20233.631\lib\net48\C1.Win.4.8.dll</HintPath>
|
||||
<Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
</Reference>
|
||||
<Reference Include="C1.Win.C1FlexGrid.4.8">
|
||||
<HintPath>..\VEPROMS\packages\C1.Win.C1FlexGrid.4.8.20233.631\lib\net48\C1.Win.C1FlexGrid.4.8.dll</HintPath>
|
||||
<Reference Include="C1.Win.C1SpellChecker.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
</Reference>
|
||||
<Reference Include="Csla">
|
||||
<HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
|
||||
|
||||
@ -57,7 +57,7 @@
|
||||
this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
|
||||
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
|
||||
this.btnCancel.Location = new System.Drawing.Point(179, 111);
|
||||
this.btnCancel.Location = new System.Drawing.Point(165, 111);
|
||||
this.btnCancel.Name = "btnCancel";
|
||||
this.btnCancel.Size = new System.Drawing.Size(64, 23);
|
||||
this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
@ -88,7 +88,7 @@
|
||||
this.dateTimeInput1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
this.dateTimeInput1.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown;
|
||||
this.dateTimeInput1.ButtonDropDown.Visible = true;
|
||||
this.dateTimeInput1.CustomFormat = "MM/dd/yyyy HH:mm:ss";
|
||||
this.dateTimeInput1.CustomFormat = "MM/dd/yyyy";
|
||||
this.dateTimeInput1.DateTimeSelectorVisibility = DevComponents.Editors.DateTimeAdv.eDateTimeSelectorVisibility.DateSelector;
|
||||
this.dateTimeInput1.Format = DevComponents.Editors.eDateTimePickerFormat.Custom;
|
||||
this.dateTimeInput1.IsPopupCalendarOpen = false;
|
||||
@ -122,7 +122,7 @@
|
||||
this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
this.dateTimeInput1.MonthCalendar.TodayButtonVisible = true;
|
||||
this.dateTimeInput1.Name = "dateTimeInput1";
|
||||
this.dateTimeInput1.Size = new System.Drawing.Size(146, 20);
|
||||
this.dateTimeInput1.Size = new System.Drawing.Size(113, 20);
|
||||
this.dateTimeInput1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.superTooltip1.SetSuperTooltip(this.dateTimeInput1, new DevComponents.DotNetBar.SuperTooltipInfo("Change Bar Start Date", "", "Only the changes made after this date will have change bars.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(138, 67)));
|
||||
this.dateTimeInput1.TabIndex = 4;
|
||||
@ -133,7 +133,7 @@
|
||||
//
|
||||
this.btnNow.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
|
||||
this.btnNow.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
|
||||
this.btnNow.Location = new System.Drawing.Point(182, 51);
|
||||
this.btnNow.Location = new System.Drawing.Point(149, 51);
|
||||
this.btnNow.Name = "btnNow";
|
||||
this.btnNow.Size = new System.Drawing.Size(49, 23);
|
||||
this.btnNow.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
@ -146,7 +146,7 @@
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.ClientSize = new System.Drawing.Size(268, 144);
|
||||
this.ClientSize = new System.Drawing.Size(241, 144);
|
||||
this.Controls.Add(this.btnNow);
|
||||
this.Controls.Add(this.dateTimeInput1);
|
||||
this.Controls.Add(this.label1);
|
||||
|
||||
@ -32,46 +32,13 @@ namespace VEPROMS
|
||||
{
|
||||
string cbdt = MyProcConfig.Print_ChangeBarDate;
|
||||
string[] tmp = cbdt.Split(' ');
|
||||
|
||||
if (tmp[0] == null || tmp[0] == "") // First time date set.
|
||||
{
|
||||
cbdt = DateTime.Now.ToString("MM/dd/yyyy") + " " + DateTime.Now.ToString("HH:mm:ss");
|
||||
dateTimeInput1.Value = DateTime.Parse(cbdt);
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
DateTime tmpdt = DateTime.Parse(cbdt);
|
||||
if (tmpdt.Date == DateTime.Today) // Date has before been set.
|
||||
{
|
||||
TimeSpan start = TimeSpan.Parse("00:00:00");
|
||||
|
||||
var time = tmpdt.TimeOfDay;
|
||||
if (start < time) // If time is greater than 12:00:00 AM
|
||||
{
|
||||
cbdt = DateTime.Now.ToString("MM/dd/yyyy") + " " + tmpdt.TimeOfDay.ToString();
|
||||
dateTimeInput1.Value = DateTime.Parse(cbdt);
|
||||
return;
|
||||
}
|
||||
else // if time is 12:00:00 AM
|
||||
{
|
||||
cbdt = DateTime.Now.ToString("MM/dd/yyyy") + " " + " 00:00:00";
|
||||
dateTimeInput1.Value = DateTime.Parse(cbdt);
|
||||
return;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
cbdt = tmpdt.ToString();
|
||||
dateTimeInput1.Value = DateTime.Parse(cbdt);
|
||||
return;
|
||||
}
|
||||
}
|
||||
cbdt = tmp[0] + " 00:00:00";
|
||||
dateTimeInput1.Value = (cbdt == null || cbdt == "") ? DateTime.Now : DateTime.Parse(cbdt);
|
||||
}
|
||||
|
||||
private void btnOK_Click(object sender, EventArgs e)
|
||||
{
|
||||
MyProcConfig.Print_ChangeBarDate = dateTimeInput1.Value.ToString("MM/dd/yyyy HH:mm:ss");// ("MM/dd/yyyy HH:mm:ss");
|
||||
MyProcConfig.Print_ChangeBarDate = dateTimeInput1.Value.ToString("MM/dd/yyyy 00:00:00");// ("MM/dd/yyyy HH:mm:ss");
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -112,12 +112,12 @@
|
||||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
<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=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
<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=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
</metadata>
|
||||
</root>
|
||||
@ -468,12 +468,10 @@ namespace VEPROMS.CSLA.Library
|
||||
return text;
|
||||
}
|
||||
// B2022-035: resolve unit specific designators - moved code to here so that other objects can use it
|
||||
// B2024-025 added <ID> to the replace list
|
||||
public static string ResolveUnitSpecific(DocVersionInfo mydocversion, string text)
|
||||
{
|
||||
if (mydocversion == null) return text;
|
||||
text = Regex.Replace(text, @"\<U\>", mydocversion.DocVersionConfig.Unit_Number, RegexOptions.IgnoreCase);
|
||||
text = Regex.Replace(text, @"\<ID\>", mydocversion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase);
|
||||
text = Regex.Replace(text, @"\<(U(-|\\u8209\?)ID)\>", mydocversion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase);
|
||||
text = Regex.Replace(text, @"\<(U(-|\\u8209\?)NAME)\>", mydocversion.DocVersionConfig.Unit_Name, RegexOptions.IgnoreCase);
|
||||
text = Regex.Replace(text, @"\<(U(-|\\u8209\?)TEXT)\>", mydocversion.DocVersionConfig.Unit_Text, RegexOptions.IgnoreCase);
|
||||
|
||||
@ -2934,8 +2934,7 @@ namespace VEPROMS.CSLA.Library
|
||||
{
|
||||
string str = MyContent.Text;
|
||||
// B2022-035: resolve unit specific designators
|
||||
// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
|
||||
str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(this.MyDocVersion, str);
|
||||
if (str.ToUpper().Contains(@"<U")) str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(this.MyDocVersion, str);
|
||||
return ConvertToDisplayText(str, false, " "); // B2024-013 added " " to replace hard returns with a space instead of semi-colon
|
||||
}
|
||||
}
|
||||
@ -2947,8 +2946,7 @@ namespace VEPROMS.CSLA.Library
|
||||
{
|
||||
string str = MyContent.Text;
|
||||
// B2022-035: resolve unit specific designators
|
||||
// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
|
||||
str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(this.MyDocVersion, str);
|
||||
if (str.ToUpper().Contains(@"<U")) str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(this.MyDocVersion, str);
|
||||
return ConvertToDisplayText(str, false, ""); // pass in empty string for hard retun char will keep hard return
|
||||
}
|
||||
}
|
||||
@ -2962,8 +2960,7 @@ namespace VEPROMS.CSLA.Library
|
||||
string str = MyContent.Text;
|
||||
if (MyDocVersion != null)
|
||||
{
|
||||
// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
|
||||
str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(MyDocVersion, str);
|
||||
str = Regex.Replace(str, @"\<[uU]\>", MyDocVersion.DocVersionConfig.Unit_Number);
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -2982,13 +2979,16 @@ namespace VEPROMS.CSLA.Library
|
||||
if (MyDocVersion != null)
|
||||
{
|
||||
// B2022-035: resolve unit specific designators
|
||||
// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
|
||||
str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(MyDocVersion, str);
|
||||
if (str.ToUpper().Contains("<U")) str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(MyDocVersion, str);
|
||||
}
|
||||
else
|
||||
{
|
||||
_MyLog.WarnFormat("Disconnected Data - ItemID = {0}", ItemID);
|
||||
}
|
||||
//if (str.Contains("<u>"))
|
||||
// str = str.Replace("<u>", MyDocVersion.DocVersionConfig.Unit_Number);
|
||||
//if (str.Contains("<U>"))
|
||||
// str = str.Replace("<U>", MyDocVersion.DocVersionConfig.Unit_Number);
|
||||
return ConvertToDisplayText(str);
|
||||
}
|
||||
}
|
||||
@ -3047,8 +3047,7 @@ namespace VEPROMS.CSLA.Library
|
||||
string str = MyContent.Text;
|
||||
if (MyDocVersion != null)
|
||||
{
|
||||
// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
|
||||
str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(MyDocVersion, str);
|
||||
str = Regex.Replace(str, @"\<[uU]\>", MyDocVersion.DocVersionConfig.Unit_Number);
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -3081,8 +3080,8 @@ namespace VEPROMS.CSLA.Library
|
||||
}
|
||||
else
|
||||
str = MyContent.Number;
|
||||
// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
|
||||
str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(MyDocVersion, str);
|
||||
str = Regex.Replace(str, @"\<U-ID\>", MyDocVersion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase);
|
||||
str = Regex.Replace(str, @"\<ID\>", MyDocVersion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase);
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -3095,9 +3094,7 @@ namespace VEPROMS.CSLA.Library
|
||||
// str = str.Replace(@"<S\u8209?ID>", MyDocVersion.DocVersionConfig.Unit_ID);
|
||||
str = ConvertToDisplayText(str);
|
||||
if (MyDocVersion != null) // B2020-086 check for null doc version - happens if item we are trying to open is no longer there (disconnected)
|
||||
// B2017-019 - process "<u>" in section number
|
||||
// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
|
||||
str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(MyDocVersion, str);
|
||||
str = Regex.Replace(str, @"\<[uU]\>", MyDocVersion.DocVersionConfig.Unit_Number); // B2017-019 - process "<u>" in section number
|
||||
return str;
|
||||
}
|
||||
//get { return ConvertToDisplayText(MyContent.Number); }
|
||||
|
||||
@ -1540,8 +1540,8 @@ namespace VEPROMS.CSLA.Library
|
||||
ItemInfo tmpitm = TranGetSectionItem(itminfo);
|
||||
if (!tmpitm.IsSection) return "";
|
||||
string str = tmpitm.MyContent.Number;
|
||||
// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
|
||||
str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(itminfo.MyDocVersion, str);
|
||||
str = Regex.Replace(str, @"\<U\>", itminfo.MyDocVersion.DocVersionConfig.Unit_Number, RegexOptions.IgnoreCase );
|
||||
str = Regex.Replace(str, @"\<ID\>", itminfo.MyDocVersion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase);
|
||||
return (str);
|
||||
}
|
||||
private static string TranGetSectionNumber(TransitionBuilder tb, bool allLevels)
|
||||
@ -1566,8 +1566,8 @@ namespace VEPROMS.CSLA.Library
|
||||
}
|
||||
//string str = tmpitm.MyContent.Number;
|
||||
string str = BuildSectionPath(ToSections);
|
||||
// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
|
||||
str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(tb._ToItem.MyDocVersion, str);
|
||||
str = Regex.Replace(str, @"\<U\>", tb._ToItem.MyDocVersion.DocVersionConfig.Unit_Number, RegexOptions.IgnoreCase);
|
||||
str = Regex.Replace(str, @"\<ID\>", tb._ToItem.MyDocVersion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase);
|
||||
//if (!str.EndsWith(".") && tb._ToItem.ItemID != tb._ToItem.ActiveSection.ItemID)
|
||||
tb.StepPrefix = ".";
|
||||
tb.SectionNumberLength = str.Length;
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
</SccAuxPath>
|
||||
<SccProvider>
|
||||
</SccProvider>
|
||||
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<FileUpgradeFlags>
|
||||
</FileUpgradeFlags>
|
||||
<UpgradeBackupLocation>
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
</FileUpgradeFlags>
|
||||
<UpgradeBackupLocation>
|
||||
</UpgradeBackupLocation>
|
||||
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<OldToolsVersion>2.0</OldToolsVersion>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
</SccAuxPath>
|
||||
<SccProvider>
|
||||
</SccProvider>
|
||||
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<FileUpgradeFlags>
|
||||
</FileUpgradeFlags>
|
||||
<UpgradeBackupLocation>
|
||||
|
||||
@ -2185,9 +2185,6 @@ namespace Volian.Controls.Library
|
||||
// B2017-043 account for Horizontal Scroll
|
||||
int colT = MyStepPanel.DisplayRectangle.X + MyStepPanel.ToDisplay((int)myStepSectionLayoutData.ColT);
|
||||
if (x < colT) x = colT;
|
||||
// B2023-025: if x is <= 0, add 20 to it so that left column of table isn't cut-off. 20 was used because lesser numbers
|
||||
// still cut-off the left column (by trial and error).
|
||||
if (x <= 0) x = 20;
|
||||
int y = FindTop(myParentEditItem.Bottom);
|
||||
return new Point(x, y);
|
||||
}
|
||||
@ -3583,9 +3580,6 @@ namespace Volian.Controls.Library
|
||||
private string ResolveUnitApp(DocVersionInfo dvi, string str)
|
||||
{
|
||||
if (dvi == null) return str;
|
||||
// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
|
||||
str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(dvi, str);
|
||||
// look for un-resolved tokens and replace less/greater than chars with "*?" and "?*" respectively
|
||||
string tmp = str.ToUpper();
|
||||
int sindx = tmp.IndexOf("<U");
|
||||
int eindx = tmp.IndexOf(">", sindx + 1);
|
||||
@ -3594,34 +3588,21 @@ namespace Volian.Controls.Library
|
||||
{
|
||||
reptmp = str.Substring(sindx, eindx - sindx + 1);
|
||||
tmp = reptmp.ToUpper();
|
||||
str = str.Replace(reptmp, tmp.Replace("<", "*?").Replace(">", "?*")); // unresolved token
|
||||
if (tmp == "<U>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Number);
|
||||
else if (tmp == "<U-TEXT>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Text);
|
||||
else if (tmp == "<U-NUMBER>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Number);
|
||||
else if (tmp == "<U-NAME>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Name);
|
||||
else if (tmp == "<U-ID>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_ID);
|
||||
// B2021-145: For applicability, the tree view & pdf file name are not getting resolved when using any of the ‘OTHER’ tokens
|
||||
else if (tmp == "<U-OTHERTEXT>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Text);
|
||||
else if (tmp == "<U-OTHERNUMBER>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Number);
|
||||
else if (tmp == "<U-OTHERNAME>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Name);
|
||||
else if (tmp == "<U-OTHERID>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_ID);
|
||||
else str = str.Replace(reptmp, tmp.Replace("<", "*?").Replace(">", "?*"));
|
||||
tmp = str.ToUpper();
|
||||
sindx = tmp.IndexOf("<U");
|
||||
eindx = tmp.IndexOf(">", sindx + 1);
|
||||
}
|
||||
//string tmp = str.ToUpper();
|
||||
//int sindx = tmp.IndexOf("<U");
|
||||
//int eindx = tmp.IndexOf(">", sindx + 1);
|
||||
//string reptmp;
|
||||
//while (sindx > -1 && eindx > -1) // B2022-007 added while loop to process more than one <U- RO value
|
||||
//{
|
||||
// reptmp = str.Substring(sindx, eindx - sindx + 1);
|
||||
// tmp = reptmp.ToUpper();
|
||||
// if (tmp == "<U>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Number);
|
||||
// else if (tmp == "<U-TEXT>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Text);
|
||||
// else if (tmp == "<U-NUMBER>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Number);
|
||||
// else if (tmp == "<U-NAME>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Name);
|
||||
// else if (tmp == "<U-ID>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_ID);
|
||||
// // B2021-145: For applicability, the tree view & pdf file name are not getting resolved when using any of the ‘OTHER’ tokens
|
||||
// else if (tmp == "<U-OTHERTEXT>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Text);
|
||||
// else if (tmp == "<U-OTHERNUMBER>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Number);
|
||||
// else if (tmp == "<U-OTHERNAME>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Name);
|
||||
// else if (tmp == "<U-OTHERID>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_ID);
|
||||
// else str = str.Replace(reptmp, tmp.Replace("<", "*?").Replace(">", "?*"));
|
||||
// tmp = str.ToUpper();
|
||||
// sindx = tmp.IndexOf("<U");
|
||||
// eindx = tmp.IndexOf(">", sindx + 1);
|
||||
//}
|
||||
return str;
|
||||
}
|
||||
// C2021-018 used to display Alarm Point Table RO values in the editor
|
||||
|
||||
@ -3716,17 +3716,17 @@ namespace Volian.Controls.Library
|
||||
/// Grid will be saved to an Excel file.
|
||||
/// </summary>
|
||||
/// <param name="initDir"></param>
|
||||
//public void ExportToExcel(string initDir)
|
||||
//{
|
||||
// SaveFileDialog sfd = new SaveFileDialog();
|
||||
// sfd.DefaultExt = ".xls";
|
||||
// sfd.Filter = "Excel files (*.xls)|*.xls|All files (*.*)|*.* ";
|
||||
// //sfd.InitialDirectory = @"C:\Development\SampleTableData";
|
||||
// sfd.InitialDirectory = initDir;
|
||||
// sfd.Title = "Save Excel File";
|
||||
// sfd.ShowDialog();
|
||||
// this.SaveExcel(sfd.FileName);
|
||||
//}
|
||||
public void ExportToExcel(string initDir)
|
||||
{
|
||||
SaveFileDialog sfd = new SaveFileDialog();
|
||||
sfd.DefaultExt = ".xls";
|
||||
sfd.Filter = "Excel files (*.xls)|*.xls|All files (*.*)|*.* ";
|
||||
//sfd.InitialDirectory = @"C:\Development\SampleTableData";
|
||||
sfd.InitialDirectory = initDir;
|
||||
sfd.Title = "Save Excel File";
|
||||
sfd.ShowDialog();
|
||||
this.SaveExcel(sfd.FileName);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Prompts user with Open File dialog.
|
||||
@ -3761,25 +3761,25 @@ namespace Volian.Controls.Library
|
||||
/// </summary>
|
||||
/// <param name="initDir"></param>
|
||||
/// <returns></returns>
|
||||
//public string ImportExcel(string initDir)
|
||||
//{
|
||||
// string rtn = "";
|
||||
// //VlnFlexGrid grd = rbtDefaultTable.Checked ? vlnFlexGrid2 : vlnFlexGrid3; //GetActiveGrid();
|
||||
// OpenFileDialog ofd = new OpenFileDialog();
|
||||
// ofd.DefaultExt = ".xls";
|
||||
// ofd.Filter = "Excel files (*.xls)|*.xls|All files (*.*)|*.*";
|
||||
// //ofd.InitialDirectory = @"C:\Development\SampleTableData";
|
||||
// ofd.InitialDirectory = initDir;
|
||||
// ofd.Multiselect = false;
|
||||
// ofd.Title = "Select Excel File";
|
||||
// ofd.ShowDialog();
|
||||
// this.Clear();
|
||||
// this.MergedRanges.Clear();
|
||||
// this.LoadExcel(ofd.FileName);
|
||||
// this.AdjustGridControlSize();
|
||||
// rtn = ofd.SafeFileName;
|
||||
// return rtn;
|
||||
//}
|
||||
public string ImportExcel(string initDir)
|
||||
{
|
||||
string rtn = "";
|
||||
//VlnFlexGrid grd = rbtDefaultTable.Checked ? vlnFlexGrid2 : vlnFlexGrid3; //GetActiveGrid();
|
||||
OpenFileDialog ofd = new OpenFileDialog();
|
||||
ofd.DefaultExt = ".xls";
|
||||
ofd.Filter = "Excel files (*.xls)|*.xls|All files (*.*)|*.*";
|
||||
//ofd.InitialDirectory = @"C:\Development\SampleTableData";
|
||||
ofd.InitialDirectory = initDir;
|
||||
ofd.Multiselect = false;
|
||||
ofd.Title = "Select Excel File";
|
||||
ofd.ShowDialog();
|
||||
this.Clear();
|
||||
this.MergedRanges.Clear();
|
||||
this.LoadExcel(ofd.FileName);
|
||||
this.AdjustGridControlSize();
|
||||
rtn = ofd.SafeFileName;
|
||||
return rtn;
|
||||
}
|
||||
public static List<string> ROTableUpdate(object sender, ROFstInfoROTableUpdateEventArgs args)
|
||||
{
|
||||
string xml = null;
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
</SccAuxPath>
|
||||
<SccProvider>
|
||||
</SccProvider>
|
||||
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<FileUpgradeFlags>
|
||||
</FileUpgradeFlags>
|
||||
<UpgradeBackupLocation>
|
||||
@ -87,14 +87,11 @@
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\..\..\..\3rdPartyLibraries\Edraw\AxInterop.EDWordLib.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="C1.Win.4.8">
|
||||
<HintPath>..\VEPROMS\packages\C1.Win.8.0.20233.631\lib\net48\C1.Win.4.8.dll</HintPath>
|
||||
<Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
</Reference>
|
||||
<Reference Include="C1.Win.C1FlexGrid.4.8, Version=4.8.20233.631, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
|
||||
<HintPath>..\VEPROMS\packages\C1.Win.C1FlexGrid.4.8.20233.631\lib\net48\C1.Win.C1FlexGrid.4.8.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="C1.Win.C1SpellChecker.4.8, Version=4.8.20233.631, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
|
||||
<HintPath>..\VEPROMS\packages\C1.Win.C1SpellChecker.4.8.20233.631\lib\net48\C1.Win.C1SpellChecker.4.8.dll</HintPath>
|
||||
<Reference Include="C1.Win.C1SpellChecker.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
</Reference>
|
||||
<Reference Include="Csla">
|
||||
<HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
|
||||
@ -488,7 +485,6 @@
|
||||
<DependentUpon>PreviewROImage.cs</DependentUpon>
|
||||
<SubType>Designer</SubType>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Properties\licenses.licx" />
|
||||
<EmbeddedResource Include="RTBItem.resx">
|
||||
<DependentUpon>RTBItem.cs</DependentUpon>
|
||||
<SubType>Designer</SubType>
|
||||
@ -586,12 +582,10 @@
|
||||
<ItemGroup>
|
||||
<None Include="app.config" />
|
||||
<None Include="ClassDiagram1.cd" />
|
||||
<None Include="packages.config" />
|
||||
<None Include="Properties\Settings.settings">
|
||||
<Generator>SettingsSingleFileGenerator</Generator>
|
||||
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
|
||||
</None>
|
||||
<EmbeddedResource Include="Volian.Controls.Library.gclicx" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="DisplayApplicability.resx">
|
||||
|
||||
@ -1 +0,0 @@
|
||||
da3d5d14-691f-4908-aa3c-fd3239734232;-8584914772854775808;Vm9saWFuLkNvbnRyb2xzLkxpYnJhcnkuZGxs;ZGEzZDVkMTQtNjkxZi00OTA4LWFhM2MtZmQzMjM5NzM0MjMy,MDEwODE5MjdYWFhYWFhYWDA1Mg,Sk9ITi1XSU4xMA,RmFsc2U,ODQzNA,RmFsc2U,MA,MA,djIwMjIuMw,,;c7VmK7aSALscK1Nd/lI1cS3mms+p4j4Fsa2LgKQ1JmeSkNKq5X8LWx2NLOHITkvv+3IbbTQcVPnGa7hKiEDHlfH3thfwEvtzoqprZSXMOYfNPiXTPIIYPNb6L31Qq7AGiogvw+dMD9o/AiUWt4Q7a5SRmYU+PbrlNAXVISIzndw
|
||||
@ -12,4 +12,4 @@
|
||||
</setting>
|
||||
</Volian.Controls.Library.Properties.Settings>
|
||||
</userSettings>
|
||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup></configuration>
|
||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
|
||||
|
||||
@ -1,6 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="C1.Win" version="8.0.20233.631" targetFramework="net481" />
|
||||
<package id="C1.Win.C1FlexGrid" version="4.8.20233.631" targetFramework="net481" />
|
||||
<package id="C1.Win.C1SpellChecker" version="4.8.20233.631" targetFramework="net481" />
|
||||
</packages>
|
||||
@ -1322,7 +1322,7 @@ namespace Volian.Controls.Library
|
||||
{
|
||||
MenuItem miri = mir.MenuItems.Add("Create Procedure to Import");
|
||||
miri.Tag = ri.RevisionID;
|
||||
miri.Click += new EventHandler(MultiUnitImportProcedure_Click); //B2024-024 Parent Child Create Approved Import file
|
||||
miri.Click += new EventHandler(ImportProcedure_Click);
|
||||
}
|
||||
|
||||
//end added jcb 20111031
|
||||
@ -1420,8 +1420,8 @@ namespace Volian.Controls.Library
|
||||
|
||||
void ImportProcedure_Click(object sender, EventArgs e)
|
||||
{
|
||||
//B2024-024 restored the line below from prior change - didn't work for non parent/childs sets - created a new click event method (below) for parent/child sets.
|
||||
RevisionInfo ri = (sender as MenuItem).Tag as RevisionInfo;
|
||||
//RevisionInfo ri = (sender as MenuItem).Tag as RevisionInfo;
|
||||
RevisionInfo ri = RevisionInfo.Get(int.Parse((sender as MenuItem).Tag.ToString()));
|
||||
RevisionConfig rc = ri.MyConfig as RevisionConfig;
|
||||
// bug fix: B2016-183 - add the child's name (ex Unit 1) to the export file name for Parent/Child procedures.
|
||||
int applIdx = rc.Applicability_Index;
|
||||
@ -1440,30 +1440,6 @@ namespace Volian.Controls.Library
|
||||
FlexibleMessageBox.Show("Approved procedure saved to import file " + fileName, "Creating Export of Approved Procedure", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||
}
|
||||
|
||||
//B2024-024 create import file for parent/child procedure set
|
||||
void MultiUnitImportProcedure_Click(object sender, EventArgs e)
|
||||
{
|
||||
//RevisionInfo ri = (sender as MenuItem).Tag as RevisionInfo;
|
||||
RevisionInfo ri = RevisionInfo.Get(int.Parse((sender as MenuItem).Tag.ToString()));
|
||||
RevisionConfig rc = ri.MyConfig as RevisionConfig;
|
||||
// bug fix: B2016-183 - add the child's name (ex Unit 1) to the export file name for Parent/Child procedures.
|
||||
int applIdx = rc.Applicability_Index;
|
||||
string str = (applIdx > 0) ? _currentPri.MyDocVersion.UnitNames[applIdx - 1] + "_" : ""; // if parent/child get the defined child name to inlcude the export filename
|
||||
System.Xml.XmlDocument xd = new System.Xml.XmlDocument();
|
||||
xd.LoadXml(ri.LatestVersion.ApprovedXML);
|
||||
string PEIPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\VEPROMS\PEI_" + Database.VEPROMS_SqlConnection.Database;
|
||||
DirectoryInfo di = new DirectoryInfo(PEIPath);
|
||||
if (!di.Exists) di.Create();
|
||||
// B2022-048: Crash when creating Procedure to Import from versions. Couldn't handle '/' in proc number.
|
||||
string fNametmp = xd.SelectSingleNode("procedure/content/@number").InnerText.Replace(" ", "_").Replace(@"\u8209?", "-").Replace(@"\u9586?", "_").Replace("/", "-") + ".pxml";
|
||||
// B2022-112: If applicability, need to resolve the '<' and '>' characters. Just use the UnitNames, i.e. str, from above.
|
||||
if (applIdx > 0) fNametmp = Regex.Replace(fNametmp, @"\<U-ID\>", str, RegexOptions.IgnoreCase);
|
||||
string fileName = PEIPath + "\\" + str + "Approved_Rev_" + ri.RevisionNumber.Replace(" ", "_").Replace("\\", "-").Replace("/", "-") + "_" + fNametmp;
|
||||
xd.Save(fileName);
|
||||
FlexibleMessageBox.Show("Approved procedure saved to import file " + fileName, "Creating Export of Approved Procedure", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||
}
|
||||
|
||||
|
||||
void ApprovedRevision_Click(object sender, EventArgs e)
|
||||
{
|
||||
bool superceded = false;
|
||||
@ -3209,7 +3185,7 @@ namespace Volian.Controls.Library
|
||||
{
|
||||
// If parent step is open in editor, use the OnInsertItemInfo to insert step & add RTBItems to step editor panel
|
||||
ItemInfo ii = tn.VEObject as ItemInfo;
|
||||
if (OnInsertItemInfo(this, new vlnTreeItemInfoInsertEventArgs(ii, (newtype == MenuSelections.StepAfter) ? E_InsertType.After : E_InsertType.Before, "")))
|
||||
if (OnInsertItemInfo(this, new vlnTreeItemInfoInsertEventArgs(ii, (newtype == MenuSelections.StepAfter) ? E_InsertType.After : E_InsertType.Before, "New Step")))
|
||||
{
|
||||
tn = (VETreeNode)((newtype == MenuSelections.StepAfter) ? tn.NextNode : tn.PrevNode);
|
||||
}
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>Volian.Pipe.Library</RootNamespace>
|
||||
<AssemblyName>Volian.Pipe.Library</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<TargetFrameworkProfile />
|
||||
<SccProjectName>"%24/PROMS/Volian.Pipe.Library", RQGAAAAA</SccProjectName>
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
using System;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
using C1.Win.C1FlexGrid;
|
||||
|
||||
@ -0,0 +1 @@
|
||||
C1.Win.C1FlexGrid.C1FlexGrid, C1.Win.C1FlexGrid.2
|
||||
@ -1834,8 +1834,7 @@ i = 0;
|
||||
{
|
||||
if (section.ActiveFormat.PlantFormat.FormatData.ProcData.CapitalizeTitle) title = title.ToUpper();
|
||||
// B2022-035: resolve unit specific designators
|
||||
// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
|
||||
title = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(section.MyDocVersion, title);
|
||||
if (title.ToUpper().Contains(@"<U")) title = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(section.MyDocVersion, title);
|
||||
plstr = SplitTitle(svgGroup, pageItem, title, (int)linelen, token, plstr, null); //,rowAdj);
|
||||
}
|
||||
break;
|
||||
@ -1848,8 +1847,7 @@ i = 0;
|
||||
string title1 = section.MyProcedure.MyContent.Text;
|
||||
if (section.ActiveFormat.PlantFormat.FormatData.ProcData.CapitalizeTitle) title1 = title1.ToUpper();
|
||||
// F2024-012 copied this line from above (processing COVERPROCTITLE) to resolve unit designators in the procedure title
|
||||
// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
|
||||
title1 = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(section.MyDocVersion, title1);
|
||||
if (title1.ToUpper().Contains(@"<U")) title1 = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(section.MyDocVersion, title1);
|
||||
plstr = SplitCoverTitle(svgGroup, pageItem, title1, (int)coverlinelen, token, plstr);//, rowAdj);
|
||||
break;
|
||||
case "{TITLE&UNIT}":
|
||||
@ -2473,9 +2471,6 @@ i = 0;
|
||||
private string ResolveUnitApp(DocVersionInfo dvi, string str)
|
||||
{
|
||||
if (dvi == null) return str;
|
||||
// B2024-025 - process all of the applicability token (<U-xxx>, <U>, <ID>)
|
||||
str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(dvi, str);
|
||||
// look for un-resolved tokens and replace less/greater than chars with "*?" and "?*" respectively
|
||||
string tmp = str.ToUpper();
|
||||
int sindx = tmp.IndexOf("<U");
|
||||
int eindx = tmp.IndexOf(">", sindx + 1);
|
||||
@ -2484,34 +2479,21 @@ i = 0;
|
||||
{
|
||||
reptmp = str.Substring(sindx, eindx - sindx + 1);
|
||||
tmp = reptmp.ToUpper();
|
||||
str = str.Replace(reptmp, tmp.Replace("<", "*?").Replace(">", "?*"));
|
||||
if (tmp == "<U>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Number);
|
||||
else if (tmp == "<U-TEXT>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Text);
|
||||
else if (tmp == "<U-NUMBER>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Number);
|
||||
else if (tmp == "<U-NAME>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Name);
|
||||
else if (tmp == "<U-ID>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_ID);
|
||||
// B2021-145: For applicability, the tree view & pdf file name are not getting resolved when using any of the ‘OTHER’ tokens
|
||||
else if (tmp == "<U-OTHERTEXT>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Text);
|
||||
else if (tmp == "<U-OTHERNUMBER>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Number);
|
||||
else if (tmp == "<U-OTHERNAME>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Name);
|
||||
else if (tmp == "<U-OTHERID>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_ID);
|
||||
else str = str.Replace(reptmp, tmp.Replace("<", "*?").Replace(">", "?*"));
|
||||
tmp = str.ToUpper();
|
||||
sindx = tmp.IndexOf("<U");
|
||||
eindx = tmp.IndexOf(">", sindx + 1);
|
||||
}
|
||||
//string tmp = str.ToUpper();
|
||||
//int sindx = tmp.IndexOf("<U");
|
||||
//int eindx = tmp.IndexOf(">", sindx + 1);
|
||||
//string reptmp;
|
||||
//while (sindx > -1 && eindx > -1) // B2022-007 added while loop to process more than one <U- RO value
|
||||
//{
|
||||
// reptmp = str.Substring(sindx, eindx - sindx + 1);
|
||||
// tmp = reptmp.ToUpper();
|
||||
// if (tmp == "<U>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Number);
|
||||
// else if (tmp == "<U-TEXT>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Text);
|
||||
// else if (tmp == "<U-NUMBER>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Number);
|
||||
// else if (tmp == "<U-NAME>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Name);
|
||||
// else if (tmp == "<U-ID>") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_ID);
|
||||
// // B2021-145: For applicability, the tree view & pdf file name are not getting resolved when using any of the ‘OTHER’ tokens
|
||||
// else if (tmp == "<U-OTHERTEXT>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Text);
|
||||
// else if (tmp == "<U-OTHERNUMBER>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Number);
|
||||
// else if (tmp == "<U-OTHERNAME>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Name);
|
||||
// else if (tmp == "<U-OTHERID>") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_ID);
|
||||
// else str = str.Replace(reptmp, tmp.Replace("<", "*?").Replace(">", "?*"));
|
||||
// tmp = str.ToUpper();
|
||||
// sindx = tmp.IndexOf("<U");
|
||||
// eindx = tmp.IndexOf(">", sindx + 1);
|
||||
//}
|
||||
return str;
|
||||
}
|
||||
// B2019-076: moved the following to DocVersionExt.cs to make it available to transitionext.cs code.
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
</SccAuxPath>
|
||||
<SccProvider>
|
||||
</SccProvider>
|
||||
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<FileUpgradeFlags>
|
||||
</FileUpgradeFlags>
|
||||
<UpgradeBackupLocation>
|
||||
@ -65,11 +65,8 @@
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="C1.Win.4.8">
|
||||
<HintPath>..\VEPROMS\packages\C1.Win.8.0.20233.631\lib\net48\C1.Win.4.8.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="C1.Win.C1FlexGrid.4.8">
|
||||
<HintPath>..\VEPROMS\packages\C1.Win.C1FlexGrid.4.8.20233.631\lib\net48\C1.Win.C1FlexGrid.4.8.dll</HintPath>
|
||||
<Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
</Reference>
|
||||
<Reference Include="Csla">
|
||||
<HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
|
||||
@ -156,9 +153,7 @@
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="packages.config" />
|
||||
<EmbeddedResource Include="Properties\licenses.licx" />
|
||||
<EmbeddedResource Include="Volian.Print.Library.gclicx" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
|
||||
@ -1 +0,0 @@
|
||||
da3d5d14-691f-4908-aa3c-fd3239734232;-8584914772854775808;Vm9saWFuLlByaW50LkxpYnJhcnkuZGxs;ZGEzZDVkMTQtNjkxZi00OTA4LWFhM2MtZmQzMjM5NzM0MjMy,MDEwODE5MjdYWFhYWFhYWDA1Mg,Sk9ITi1XSU4xMA,RmFsc2U,ODQzNA,RmFsc2U,MA,MA,djIwMjIuMw,,;c7VmK7aSALscK1Nd/lI1cS3mms+p4j4Fsa2LgKQ1JmeSkNKq5X8LWx2NLOHITkvv+3IbbTQcVPnGa7hKiEDHlfH3thfwEvtzoqprZSXMOYfNPiXTPIIYPNb6L31Qq7AGiogvw+dMD9o/AiUWt4Q7a5SRmYU+PbrlNAXVISIzndw
|
||||
@ -1,5 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="BouncyCastle" version="1.8.9" targetFramework="net481" />
|
||||
<package id="iTextSharp" version="5.5.13.3" targetFramework="net481" />
|
||||
</packages>
|
||||
@ -18,7 +18,7 @@
|
||||
</SccAuxPath>
|
||||
<SccProvider>
|
||||
</SccProvider>
|
||||
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<FileUpgradeFlags>
|
||||
</FileUpgradeFlags>
|
||||
<UpgradeBackupLocation>
|
||||
@ -71,8 +71,7 @@
|
||||
<Reference Include="Itenso.Rtf.Parser">
|
||||
<HintPath>..\..\..\..\3rdPartyLibraries\RtfConverter\bin\Debug\Itenso.Rtf.Parser.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="itextsharp, Version=4.1.2.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<Reference Include="itextsharp">
|
||||
<HintPath>..\..\..\..\3rdPartyLibraries\iTechSharp\itextsharp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="log4net">
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
</SccAuxPath>
|
||||
<SccProvider>
|
||||
</SccProvider>
|
||||
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<FileUpgradeFlags>
|
||||
</FileUpgradeFlags>
|
||||
<UpgradeBackupLocation>
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
</FileUpgradeFlags>
|
||||
<UpgradeBackupLocation>
|
||||
</UpgradeBackupLocation>
|
||||
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<OldToolsVersion>2.0</OldToolsVersion>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user