Compare commits
183 Commits
414c2239ee
...
B2024-032-
| Author | SHA1 | Date | |
|---|---|---|---|
| df9736f0fd | |||
| b085a727f0 | |||
| e548e1da63 | |||
| c320634d3d | |||
| af889a8818 | |||
| c265975cbe | |||
| a41a398e7e | |||
|
|
5edaf30601 | ||
| df0c5259c0 | |||
| 10c25dbe44 | |||
| 2df37533a8 | |||
| 6392ee3f0f | |||
| 96ddce8b73 | |||
| c88caefe5d | |||
| eb26b7a123 | |||
| c865b67398 | |||
| 89814777b4 | |||
| de7e2d5f2a | |||
| f51866236f | |||
| a9eec83382 | |||
| fd5739bbcd | |||
| 076e0bfe8e | |||
| 07d10c571b | |||
| 20cbff0255 | |||
| b643f7fdf8 | |||
| 0607fcf261 | |||
| 1289e52600 | |||
| fccc47483f | |||
| 5ffd99bd0e | |||
|
|
dffea37fad | ||
| 811076d432 | |||
| 1bdfb7d1e3 | |||
| 4a3ca1c074 | |||
|
|
9d50f55f71 | ||
|
|
b8e8e80acb | ||
|
|
c77320d4e7 | ||
| 59bc3141e8 | |||
| dc73cc3a50 | |||
| 1433f14a0b | |||
| 6e3fc49517 | |||
| d0f7da7ef6 | |||
| b0776fb8b7 | |||
| cae3e2323d | |||
| ce8497e61f | |||
| 72eaac478f | |||
| 776d9891d9 | |||
|
|
6e37911462 | ||
|
|
d2cad3a9f7 | ||
| 3f94097f73 | |||
| e45422755f | |||
| 09b5cb4be4 | |||
| 50f18ff803 | |||
|
|
6c733d54fc | ||
| 64bdb9fb76 | |||
| 389a3013b5 | |||
| 21c2012c15 | |||
| e309c4a814 | |||
| 95a39e5a12 | |||
|
|
2c587dd848 | ||
| 07f67414a9 | |||
| da4cbfd112 | |||
| e392c1fcc7 | |||
| eeacf9b969 | |||
| cf13e2f7d5 | |||
| 5db530f4e8 | |||
| d42e8115ec | |||
| 4f68414a8a | |||
| 9fd9eac16a | |||
| c4e3ba10c6 | |||
| 3c632d4abc | |||
| ccb2bab805 | |||
| a5a0d389e2 | |||
| 97dbfad875 | |||
|
|
51ef1d127d | ||
|
|
31301c4717 | ||
|
|
b01a9edc1e | ||
| ac1041fa10 | |||
| f7a692248e | |||
| 49500f0926 | |||
| 77cf0f09b4 | |||
|
|
4292581840 | ||
| d9018c44e7 | |||
| 490c61c225 | |||
| 021bcb3c65 | |||
| 8e433cc28e | |||
| 33972bed19 | |||
|
|
ed65bded13 | ||
|
|
c5e145e4f6 | ||
| 2c4a8a79ee | |||
| 42180012fe | |||
| 00268c8fac | |||
| eabfcf7b82 | |||
| 264b444464 | |||
|
|
b1efb03958 | ||
| 821ce21e24 | |||
|
|
02b0fa9b6d | ||
|
|
315a897444 | ||
| 820f82e977 | |||
| 126eff7614 | |||
| 82eeaeb351 | |||
| 78f83eb2a5 | |||
|
|
e38a706931 | ||
|
|
8a8507395f | ||
|
|
e0faa6403f | ||
|
|
88391824eb | ||
|
|
b6f1c9cdb5 | ||
|
|
3a44d4cd0e | ||
|
|
e6f9ae3623 | ||
| 8fa08b09fa | |||
| 578b8842f7 | |||
| 1db167e5ca | |||
| 78020ca40a | |||
| fcaa0ce41d | |||
| 6fed25bbfa | |||
| eee137a324 | |||
| 3710e871a9 | |||
|
|
b3c6ce633d | ||
| 15048a317f | |||
|
|
527422876a | ||
|
|
11f307ec0d | ||
|
|
77706f22e4 | ||
| 9e56422df8 | |||
| 092ed83ca4 | |||
| 6078d30a94 | |||
| 9804cf0fce | |||
| faed1cdfd6 | |||
| 7d5997cd43 | |||
| 72457d956e | |||
| d55df8beb0 | |||
|
|
b2d238f8e1 | ||
| 837978da92 | |||
| 2005eab8cb | |||
| f3b5b425c0 | |||
| dcfdf5f852 | |||
| 77d31a4a99 | |||
| b09c6d654c | |||
| 5a1116f359 | |||
| e171aa66fe | |||
|
|
8883ac6358 | ||
|
|
92345f8f91 | ||
|
|
85f683371c | ||
|
|
79f6a0eeb9 | ||
|
|
19aed4e5ac | ||
| 719d2b5d90 | |||
| e83648ec38 | |||
| 03f7847484 | |||
| fd24f57de3 | |||
| dff3f46ad9 | |||
| afad3365bd | |||
| 98d94baa03 | |||
| 67f965d8dd | |||
| 1d0642a05a | |||
| a132d3de22 | |||
| a3c14cb999 | |||
|
|
b94fb7988d | ||
|
|
8903d2a53e | ||
|
|
cec3b70fbf | ||
| fa10fe4190 | |||
| 0a327a3d81 | |||
|
|
41abad1ad9 | ||
| ce68bb9c42 | |||
|
|
1ca341670e | ||
| 7b16478417 | |||
| 06013afc8b | |||
| b0479c6334 | |||
| 5112c7caff | |||
| de8249b584 | |||
| 3116729507 | |||
| dd1a8dea33 | |||
| 54441eee06 | |||
| 8496d70756 | |||
| 9beeee2aac | |||
| 1c6ac4ac6a | |||
| a8a654e168 | |||
| 2439524413 | |||
| 293224275d | |||
|
|
1f125619f3 | ||
| 9a546064cf | |||
| 5be9daa019 | |||
| d6cb841d46 | |||
| 0095b2883b | |||
| 50e0fcb2b4 | |||
| 4a3d32960f |
@@ -27,7 +27,7 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||||
<FileUpgradeFlags>
|
<FileUpgradeFlags>
|
||||||
</FileUpgradeFlags>
|
</FileUpgradeFlags>
|
||||||
<UpgradeBackupLocation>
|
<UpgradeBackupLocation>
|
||||||
|
|||||||
@@ -32,9 +32,9 @@ namespace AdjustBuildRevision
|
|||||||
{
|
{
|
||||||
// Allow for setting build revision on either proms or the roeditor:
|
// Allow for setting build revision on either proms or the roeditor:
|
||||||
if (Directory.GetCurrentDirectory().ToUpper().Contains("REFOBJ"))
|
if (Directory.GetCurrentDirectory().ToUpper().Contains("REFOBJ"))
|
||||||
outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.2.yyMM.dHH") + "\")");
|
outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.3.yyMM.dHH") + "\")");
|
||||||
else
|
else
|
||||||
outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.1.yyMM.dHH") + "\")");
|
outline = Regex.Replace(line, @"([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)""\)", DateTime.Now.ToString("2.2.yyMM.dHH") + "\")");
|
||||||
// if (outline != line)
|
// if (outline != line)
|
||||||
// {
|
// {
|
||||||
// Console.WriteLine("Before: '{0}'", line);
|
// Console.WriteLine("Before: '{0}'", line);
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<configuration>
|
<configuration>
|
||||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
|
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup></configuration>
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
</sectionGroup>
|
</sectionGroup>
|
||||||
</configSections>
|
</configSections>
|
||||||
<startup>
|
<startup>
|
||||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
|
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
|
||||||
</startup>
|
</startup>
|
||||||
<userSettings>
|
<userSettings>
|
||||||
<Baseline.Properties.Settings>
|
<Baseline.Properties.Settings>
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
<RootNamespace>Baseline</RootNamespace>
|
<RootNamespace>Baseline</RootNamespace>
|
||||||
<AssemblyName>Baseline</AssemblyName>
|
<AssemblyName>Baseline</AssemblyName>
|
||||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
<SccProjectName>
|
<SccProjectName>
|
||||||
</SccProjectName>
|
</SccProjectName>
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||||
<FileUpgradeFlags>
|
<FileUpgradeFlags>
|
||||||
</FileUpgradeFlags>
|
</FileUpgradeFlags>
|
||||||
<UpgradeBackupLocation>
|
<UpgradeBackupLocation>
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
<RootNamespace>FlexableMessageBox</RootNamespace>
|
<RootNamespace>FlexableMessageBox</RootNamespace>
|
||||||
<AssemblyName>FlexableMessageBox</AssemblyName>
|
<AssemblyName>FlexableMessageBox</AssemblyName>
|
||||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
<SccProjectName>
|
<SccProjectName>
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||||
<FileUpgradeFlags>
|
<FileUpgradeFlags>
|
||||||
</FileUpgradeFlags>
|
</FileUpgradeFlags>
|
||||||
<UpgradeBackupLocation>
|
<UpgradeBackupLocation>
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<configuration>
|
<configuration>
|
||||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
|
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup></configuration>
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
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>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||||
<FileUpgradeFlags>
|
<FileUpgradeFlags>
|
||||||
</FileUpgradeFlags>
|
</FileUpgradeFlags>
|
||||||
<UpgradeBackupLocation>
|
<UpgradeBackupLocation>
|
||||||
|
|||||||
@@ -33,7 +33,7 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||||
<OldToolsVersion>2.0</OldToolsVersion>
|
<OldToolsVersion>2.0</OldToolsVersion>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<configuration>
|
<configuration>
|
||||||
<startup>
|
<startup>
|
||||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup><runtime>
|
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup><runtime>
|
||||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" appliesTo="v1.0.3705">
|
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" appliesTo="v1.0.3705">
|
||||||
</assemblyBinding></runtime></configuration>
|
</assemblyBinding></runtime></configuration>
|
||||||
|
|||||||
@@ -23,8 +23,8 @@ using System.Runtime.CompilerServices;
|
|||||||
// Build YYMM (two digit year, two digit month)
|
// Build YYMM (two digit year, two digit month)
|
||||||
// Revision DHH (day - no leading zero, two digit hour - military time
|
// Revision DHH (day - no leading zero, two digit hour - military time
|
||||||
//
|
//
|
||||||
[assembly: AssemblyVersion("2.2.2306.2212")]
|
[assembly: AssemblyVersion("2.3.2404.1611")]
|
||||||
[assembly: AssemblyFileVersion("2.2.2306.2212")]
|
[assembly: AssemblyFileVersion("2.3.2404.1611")]
|
||||||
|
|
||||||
//
|
//
|
||||||
// In order to sign your assembly you must specify a key to use. Refer to the
|
// In order to sign your assembly you must specify a key to use. Refer to the
|
||||||
@@ -89,6 +89,8 @@ using System.Runtime.CompilerServices;
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -44,7 +44,7 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||||
<OldToolsVersion>2.0</OldToolsVersion>
|
<OldToolsVersion>2.0</OldToolsVersion>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<configuration>
|
<configuration>
|
||||||
<startup>
|
<startup>
|
||||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup><runtime>
|
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup><runtime>
|
||||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" appliesTo="v1.0.3705">
|
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" appliesTo="v1.0.3705">
|
||||||
</assemblyBinding></runtime>
|
</assemblyBinding></runtime>
|
||||||
<appSettings>
|
<appSettings>
|
||||||
|
|||||||
@@ -35,7 +35,7 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||||
<OldToolsVersion>2.0</OldToolsVersion>
|
<OldToolsVersion>2.0</OldToolsVersion>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||||
<FileUpgradeFlags>
|
<FileUpgradeFlags>
|
||||||
</FileUpgradeFlags>
|
</FileUpgradeFlags>
|
||||||
<UpgradeBackupLocation>
|
<UpgradeBackupLocation>
|
||||||
|
|||||||
@@ -35,7 +35,7 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||||
<OldToolsVersion>2.0</OldToolsVersion>
|
<OldToolsVersion>2.0</OldToolsVersion>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@@ -746,7 +746,7 @@ namespace RODBInterface
|
|||||||
string csufx = string.Format("_PCCHILD{0}", pcChildIdx);
|
string csufx = string.Format("_PCCHILD{0}", pcChildIdx);
|
||||||
//applicValues += ",";
|
//applicValues += ",";
|
||||||
XmlNode cn = elmnode.SelectSingleNode(parentName + csufx);
|
XmlNode cn = elmnode.SelectSingleNode(parentName + csufx);
|
||||||
if (cn == null)
|
if (cn == null || cn.InnerText.Length == 0) // B2024-004 use Parent value if Child text length is zero
|
||||||
applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, parentValue); // use parent value as default
|
applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, parentValue); // use parent value as default
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -35,7 +35,7 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||||
<OldToolsVersion>2.0</OldToolsVersion>
|
<OldToolsVersion>2.0</OldToolsVersion>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@@ -35,7 +35,7 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||||
<OldToolsVersion>2.0</OldToolsVersion>
|
<OldToolsVersion>2.0</OldToolsVersion>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@@ -51,7 +51,7 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||||
|
|||||||
@@ -46,7 +46,7 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||||
<OldToolsVersion>2.0</OldToolsVersion>
|
<OldToolsVersion>2.0</OldToolsVersion>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@@ -35,7 +35,7 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||||
<OldToolsVersion>2.0</OldToolsVersion>
|
<OldToolsVersion>2.0</OldToolsVersion>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@@ -473,7 +473,7 @@ namespace ctlXMLEditLib
|
|||||||
nd = node.SelectSingleNode(str);
|
nd = node.SelectSingleNode(str);
|
||||||
// if not found with just the string, search the tree.
|
// if not found with just the string, search the tree.
|
||||||
if (nd==null)nd = node.SelectSingleNode("*/"+str);
|
if (nd==null)nd = node.SelectSingleNode("*/"+str);
|
||||||
if (nd == null)
|
if (nd == null || nd.InnerText.Length==0) // B2024-004 use Parent value if Child text length is zero
|
||||||
GetDefaultParentValue(hwnd, node, str); // C2021-026 Parent/Child Field has no value so use parent's value
|
GetDefaultParentValue(hwnd, node, str); // C2021-026 Parent/Child Field has no value so use parent's value
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -35,7 +35,7 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||||
<OldToolsVersion>2.0</OldToolsVersion>
|
<OldToolsVersion>2.0</OldToolsVersion>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@@ -60,6 +60,6 @@
|
|||||||
</logger>
|
</logger>
|
||||||
</log4net>
|
</log4net>
|
||||||
<startup>
|
<startup>
|
||||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
|
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
|
||||||
</startup>
|
</startup>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
<RootNamespace>RoAccessToSql</RootNamespace>
|
<RootNamespace>RoAccessToSql</RootNamespace>
|
||||||
<AssemblyName>RoAccessToSql</AssemblyName>
|
<AssemblyName>RoAccessToSql</AssemblyName>
|
||||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
<SccProjectName>
|
<SccProjectName>
|
||||||
|
|||||||
@@ -33,7 +33,7 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||||
<OldToolsVersion>2.0</OldToolsVersion>
|
<OldToolsVersion>2.0</OldToolsVersion>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@@ -1,73 +1,73 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<configuration>
|
<configuration>
|
||||||
<configSections>
|
<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">
|
<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="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="UISampleNetBar1.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
|
||||||
</sectionGroup>
|
</sectionGroup>
|
||||||
</configSections>
|
</configSections>
|
||||||
<log4net>
|
<log4net>
|
||||||
<appender name="LogFileAppender" type="log4net.Appender.FileAppender">
|
<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="${APPDATA}/Volian/Proms2010/ErrorLog.txt" />-->
|
||||||
<!--<param name="File" value="${LOCALAPPDATA}/Temp/VEPROMS/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">
|
<layout type="log4net.Layout.PatternLayout">
|
||||||
<!--<param name="Header" value="[Header]\r\n" />-->
|
<!--<param name="Header" value="[Header]\r\n" />-->
|
||||||
<!--<param name="Footer" value="[Footer]\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>
|
</layout>
|
||||||
</appender>
|
</appender>
|
||||||
<appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
|
<appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
|
||||||
<layout type="log4net.Layout.PatternLayout">
|
<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>
|
</layout>
|
||||||
</appender>
|
</appender>
|
||||||
<appender name="EventLogAppender" type="log4net.Appender.EventLogAppender">
|
<appender name="EventLogAppender" type="log4net.Appender.EventLogAppender">
|
||||||
<threshold value="WARN" />
|
<threshold value="WARN"/>
|
||||||
<mapping>
|
<mapping>
|
||||||
<level value="DEBUG" />
|
<level value="DEBUG"/>
|
||||||
<eventLogEntryType value="Information" />
|
<eventLogEntryType value="Information"/>
|
||||||
</mapping>
|
</mapping>
|
||||||
<mapping>
|
<mapping>
|
||||||
<level value="INFO" />
|
<level value="INFO"/>
|
||||||
<eventLogEntryType value="Information" />
|
<eventLogEntryType value="Information"/>
|
||||||
</mapping>
|
</mapping>
|
||||||
<mapping>
|
<mapping>
|
||||||
<level value="WARN" />
|
<level value="WARN"/>
|
||||||
<eventLogEntryType value="Warning" />
|
<eventLogEntryType value="Warning"/>
|
||||||
</mapping>
|
</mapping>
|
||||||
<mapping>
|
<mapping>
|
||||||
<level value="ERROR" />
|
<level value="ERROR"/>
|
||||||
<eventLogEntryType value="Error" />
|
<eventLogEntryType value="Error"/>
|
||||||
</mapping>
|
</mapping>
|
||||||
<mapping>
|
<mapping>
|
||||||
<level value="FATAL" />
|
<level value="FATAL"/>
|
||||||
<eventLogEntryType value="Error" />
|
<eventLogEntryType value="Error"/>
|
||||||
</mapping>
|
</mapping>
|
||||||
<layout type="log4net.Layout.PatternLayout">
|
<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>
|
</layout>
|
||||||
</appender>
|
</appender>
|
||||||
<root>
|
<root>
|
||||||
<level value="ALL" />
|
<level value="ALL"/>
|
||||||
<appender-ref ref="ConsoleAppender" />
|
<appender-ref ref="ConsoleAppender"/>
|
||||||
<appender-ref ref="LogFileAppender" />
|
<appender-ref ref="LogFileAppender"/>
|
||||||
<appender-ref ref="EventLogAppender" />
|
<appender-ref ref="EventLogAppender"/>
|
||||||
</root>
|
</root>
|
||||||
<logger name="VEPROMS.CSLA.Library">
|
<logger name="VEPROMS.CSLA.Library">
|
||||||
<level value="INFO" />
|
<level value="INFO"/>
|
||||||
</logger>
|
</logger>
|
||||||
<logger name="Volian.Controls.Library">
|
<logger name="Volian.Controls.Library">
|
||||||
<level value="INFO" />
|
<level value="INFO"/>
|
||||||
</logger>
|
</logger>
|
||||||
</log4net>
|
</log4net>
|
||||||
<appSettings>
|
<appSettings>
|
||||||
<add key="OperatingMode" value="Production" />
|
<add key="OperatingMode" value="Production"/>
|
||||||
<!--"Debug" "Production" "Demo"/-->
|
<!--"Debug" "Production" "Demo"/-->
|
||||||
<add key="OriginalPageBreak" value="False" />
|
<add key="OriginalPageBreak" value="False"/>
|
||||||
<add key="CslaAuthentication" value="Windows" />
|
<add key="CslaAuthentication" value="Windows"/>
|
||||||
<!--
|
<!--
|
||||||
<add key="CslaDataPortalProxy"
|
<add key="CslaDataPortalProxy"
|
||||||
value="Csla.DataPortalClient.RemotingProxy, Csla"/>
|
value="Csla.DataPortalClient.RemotingProxy, Csla"/>
|
||||||
@@ -85,17 +85,17 @@
|
|||||||
value="EnterpriseServicesHost.EnterpriseServicesProxy,
|
value="EnterpriseServicesHost.EnterpriseServicesProxy,
|
||||||
EnterpriseServicesHost"/>
|
EnterpriseServicesHost"/>
|
||||||
-->
|
-->
|
||||||
<add key="ClientSettingsProvider.ServiceUri" value="" />
|
<add key="ClientSettingsProvider.ServiceUri" value=""/>
|
||||||
</appSettings>
|
</appSettings>
|
||||||
<connectionStrings>
|
<connectionStrings>
|
||||||
<add name="VEPROMS" connectionString="Data Source=VOLIAN-SERVER;User Id=proms2010;password=proms2010;Initial Catalog=VEPROMS" 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_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_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_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_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_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_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_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_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" />-->
|
<add name="VEPROMS_BODINE_DEMO" connectionString="Data Source=JCB2-HP\VOLIAN12;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />-->
|
||||||
</connectionStrings>
|
</connectionStrings>
|
||||||
@@ -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,10 +150,10 @@
|
|||||||
<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>
|
||||||
@@ -181,18 +181,22 @@
|
|||||||
</UISampleNetBar1.Properties.Settings>
|
</UISampleNetBar1.Properties.Settings>
|
||||||
</userSettings>
|
</userSettings>
|
||||||
<startup>
|
<startup>
|
||||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
|
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
|
||||||
</startup>
|
</startup>
|
||||||
|
<runtime>
|
||||||
|
<AppContextSwitchOverrides
|
||||||
|
value="Switch.System.Windows.Forms.DoNotLoadLatestRichEditControl=true" />
|
||||||
|
</runtime>
|
||||||
<system.web>
|
<system.web>
|
||||||
<membership defaultProvider="ClientAuthenticationMembershipProvider">
|
<membership defaultProvider="ClientAuthenticationMembershipProvider">
|
||||||
<providers>
|
<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>
|
</providers>
|
||||||
</membership>
|
</membership>
|
||||||
<roleManager defaultProvider="ClientRoleProvider" enabled="true">
|
<roleManager defaultProvider="ClientRoleProvider" enabled="true">
|
||||||
<providers>
|
<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>
|
</providers>
|
||||||
</roleManager>
|
</roleManager>
|
||||||
</system.web>
|
</system.web>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|||||||
@@ -59,6 +59,13 @@ namespace VEPROMS
|
|||||||
get { return _Automatic; }
|
get { return _Automatic; }
|
||||||
set { _Automatic = value; }
|
set { _Automatic = value; }
|
||||||
}
|
}
|
||||||
|
private int _prtSectID = -1;
|
||||||
|
public int PrtSectID
|
||||||
|
{
|
||||||
|
get { return _prtSectID; }
|
||||||
|
set { _prtSectID = value; }
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// C2018-033 Used to turn off using the date/time PDF file prefix and suffix when doing batch file autmatic baseline print testing (frmVEPROMS.cs RunAutomatic())
|
// C2018-033 Used to turn off using the date/time PDF file prefix and suffix when doing batch file autmatic baseline print testing (frmVEPROMS.cs RunAutomatic())
|
||||||
// This is needed so the the automatic baselines can compare results from different runs of PROMS
|
// This is needed so the the automatic baselines can compare results from different runs of PROMS
|
||||||
@@ -768,7 +775,7 @@ namespace VEPROMS
|
|||||||
// B2021-102 put in the using for better memory management
|
// B2021-102 put in the using for better memory management
|
||||||
using (frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNumAndDate, waterMarkText, cbxDebug.Checked, cbxOrPgBrk.Checked,
|
using (frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNumAndDate, waterMarkText, cbxDebug.Checked, cbxOrPgBrk.Checked,
|
||||||
cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked, myPDFPath, cbd, txbPDFName.Text, new Point(Left, Bottom - 50),
|
cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked, myPDFPath, cbd, txbPDFName.Text, new Point(Left, Bottom - 50),
|
||||||
swtbtnBlankPgsForDuplex.Value, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, swtbtnPROMSVersion.Value, true, tbBlankPage.Text, _MergedPfd, watermarkColor))//;//C2018-009 print PROMS version
|
swtbtnBlankPgsForDuplex.Value, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, swtbtnPROMSVersion.Value, true, tbBlankPage.Text, _MergedPfd, watermarkColor, PrtSectID))//;//C2018-009 print PROMS version
|
||||||
{
|
{
|
||||||
frmStatus.CloseWhenDone = true;
|
frmStatus.CloseWhenDone = true;
|
||||||
Application.DoEvents();
|
Application.DoEvents();
|
||||||
@@ -849,8 +856,9 @@ namespace VEPROMS
|
|||||||
// B2016-249 Output Procedure to folder associated with Parent Child
|
// B2016-249 Output Procedure to folder associated with Parent Child
|
||||||
using (frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNumAndDate, waterMarkText, cbxDebug.Checked,
|
using (frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNumAndDate, waterMarkText, cbxDebug.Checked,
|
||||||
cbxOrPgBrk.Checked, cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked, GetMultiunitPDFPath(), cbd, txbPDFName.Text,
|
cbxOrPgBrk.Checked, cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked, GetMultiunitPDFPath(), cbd, txbPDFName.Text,
|
||||||
new Point(Left, Bottom - 50), swtbtnBlankPgsForDuplex.Value, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, swtbtnPROMSVersion.Value, true, tbBlankPage.Text, _MergedPfd, watermarkColor)) // ;//C2018-009 print PROMS version
|
new Point(Left, Bottom - 50), swtbtnBlankPgsForDuplex.Value, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, swtbtnPROMSVersion.Value, true, tbBlankPage.Text, _MergedPfd, watermarkColor, PrtSectID)) // ;//C2018-009 print PROMS version
|
||||||
{
|
{
|
||||||
|
frmStatus.PrtSectID = PrtSectID;
|
||||||
frmStatus.CloseWhenDone = true;
|
frmStatus.CloseWhenDone = true;
|
||||||
Application.DoEvents();
|
Application.DoEvents();
|
||||||
frmStatus.CancelStop = true;
|
frmStatus.CancelStop = true;
|
||||||
@@ -1001,7 +1009,7 @@ namespace VEPROMS
|
|||||||
// B2018-124 use text of watermark form drop down list instead of enum value
|
// B2018-124 use text of watermark form drop down list instead of enum value
|
||||||
using (frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNumAndDate, waterMarkText, cbxDebug.Checked, cbxOrPgBrk.Checked,
|
using (frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNumAndDate, waterMarkText, cbxDebug.Checked, cbxOrPgBrk.Checked,
|
||||||
cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked, GetMultiunitPDFPath(), cbd, txbPDFName.Text, new Point(Left, Bottom - 50),
|
cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked, GetMultiunitPDFPath(), cbd, txbPDFName.Text, new Point(Left, Bottom - 50),
|
||||||
swtbtnBlankPgsForDuplex.Value, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, swtbtnPROMSVersion.Value, false, tbBlankPage.Text, _MergedPfd, watermarkColor))//; //C2018-009 print PROMS version
|
swtbtnBlankPgsForDuplex.Value, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, swtbtnPROMSVersion.Value, false, tbBlankPage.Text, _MergedPfd, watermarkColor, PrtSectID))//; //C2018-009 print PROMS version
|
||||||
{
|
{
|
||||||
frmStatus.MakePlaceKeeper = swtbtnGeneratePlacekeeper.Value;
|
frmStatus.MakePlaceKeeper = swtbtnGeneratePlacekeeper.Value;
|
||||||
frmStatus.MakeContinuousActionSummary = cbxGenerateConActSum.Checked;
|
frmStatus.MakeContinuousActionSummary = cbxGenerateConActSum.Checked;
|
||||||
|
|||||||
@@ -22148,8 +22148,84 @@ AS
|
|||||||
[Folders].[FormatID]=@FormatID
|
[Folders].[FormatID]=@FormatID
|
||||||
|
|
||||||
RETURN
|
RETURN
|
||||||
|
GO
|
||||||
|
|
||||||
|
IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vesp_ListUnlinkedItems]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
|
||||||
|
DROP PROCEDURE [vesp_ListUnlinkedItems];
|
||||||
|
GO
|
||||||
|
|
||||||
|
/*****************************************************************************
|
||||||
|
Volian Enterprises - Proprietary Information - DO NOT COPY OR DISTRIBUTE
|
||||||
|
Copyright 2024 - Volian Enterprises, Inc. All rights reserved.
|
||||||
|
*****************************************************************************/
|
||||||
|
/*
|
||||||
|
==========================================================================================================
|
||||||
|
Author: Kathy Ruffing
|
||||||
|
Create Date: 03/27/2024
|
||||||
|
Description: B2024-018: Gets list of procedures/sections/steps for possible enhanced linking
|
||||||
|
==========================================================================================================
|
||||||
|
*/
|
||||||
|
Create Procedure[dbo].[vesp_ListUnlinkedItems]
|
||||||
|
(
|
||||||
|
@ItemID int,
|
||||||
|
@EnhType int
|
||||||
|
)
|
||||||
|
WITH EXECUTE AS OWNER
|
||||||
|
AS
|
||||||
|
BEGIN
|
||||||
|
DECLARE @ParItemID int
|
||||||
|
DECLARE @EItemID int
|
||||||
|
set @EItemID = (select top 1 VIS.EItemID from vefn_AllSiblingItems(@ItemID)--Find All Siblings
|
||||||
|
outer apply vefn_GetNewEnhancedData(ItemID,@EnhType) VIS -- That are Linked
|
||||||
|
where EitemID is not null)
|
||||||
|
|
||||||
|
if @EItemID is null
|
||||||
|
BEGIN
|
||||||
|
select @EItemID = epp.ItemID
|
||||||
|
from (select * from Parts where ItemID in(select itemID from vefn_AllSiblingItems(@ItemID)))SPP -- FindParent
|
||||||
|
JOIN ITEMS SII ON sPP.ContentID = sII.ContentID -- Get Parent Content ID
|
||||||
|
outer apply vefn_GetNewEnhancedData(SII.ItemID,@EnhType) VIS -- Get Enhanced ID for Parent
|
||||||
|
JOIN ITEMS EII ON VIS.EItemID = EII.ItemID -- Get Enhanced Parent Content ID
|
||||||
|
JOIN PARTS EPP ON EPP.ContentID = EII.ContentID and SPP.FromType = epp.FromType -- Get first Child
|
||||||
|
END
|
||||||
|
if @EItemID is null -- B2024-018: If not found at the current level, check at the parent level
|
||||||
|
BEGIN
|
||||||
|
|
||||||
|
select @ParItemID = dbo.ve_getparentitem(@ItemID)
|
||||||
|
select @EItemID = epp.ItemID
|
||||||
|
from (select * from Parts where ItemID in(select itemID from vefn_AllSiblingItems(@ParItemID)))SPP -- FindParent
|
||||||
|
JOIN ITEMS SII ON sPP.ContentID = sII.ContentID -- Get Parent Content ID
|
||||||
|
outer apply vefn_GetNewEnhancedData(SII.ItemID,@EnhType) VIS -- Get Enhanced ID for Parent
|
||||||
|
JOIN ITEMS EII ON VIS.EItemID = EII.ItemID -- Get Enhanced Parent Content ID
|
||||||
|
JOIN PARTS EPP ON EPP.ContentID = EII.ContentID --and SPP.FromType = epp.FromType (had to remove types may be proc/sect)
|
||||||
|
|
||||||
|
END
|
||||||
|
if @EItemID is null
|
||||||
|
BEGIN
|
||||||
|
select @EItemID = DV2.ItemID from (select *,cast(config as xml) xconfig from DocVersions
|
||||||
|
where ItemID in(select itemID from vefn_AllSiblingItems(@ItemID))) SDV -- Source DocVersion
|
||||||
|
cross apply (select * from vefn_GetEnhancedDocVersions(SDV.VersionID) where @EnhType = Type) EDV -- Enhanced DocVersion
|
||||||
|
Join DocVersions DV2 ON DV2.VersionID = EDV.VersionID -- First Procedure
|
||||||
|
END
|
||||||
|
Select ItemID,PreviousID,II.ContentID,II.[DTS],II.[UserID],II.[LastChanged],
|
||||||
|
(SELECT COUNT(*) FROM [Annotations] WHERE [Annotations].[ItemID]=[II].[ItemID]) [AnnotationCount],
|
||||||
|
(SELECT COUNT(*) FROM [DocVersions] WHERE [DocVersions].[ItemID]=[II].[ItemID]) [DocVersionCount],
|
||||||
|
(SELECT COUNT(*) FROM [Items] [Children] WHERE [Children].[PreviousID]=[II].[ItemID]) [NextCount],
|
||||||
|
(SELECT COUNT(*) FROM [Parts] WHERE [Parts].[ItemID]=[II].[ItemID]) [PartCount],
|
||||||
|
(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[RangeID]=[II].[ItemID]) [Transition_RangeIDCount],
|
||||||
|
(SELECT COUNT(*) FROM [Transitions] WHERE [Transitions].[ToID]=[II].[ItemID]) [Transition_ToIDCount]
|
||||||
|
from Items II
|
||||||
|
Left Join Entries EE ON II.ContentID = EE.ContentID
|
||||||
|
where ItemID In (select SIB.ItemID from vefn_AllSiblingItems(@EItemID) SIB
|
||||||
|
outer apply vefn_GetNewEnhancedData(ItemID,0) VIE
|
||||||
|
Where VIE.EItemID is null)
|
||||||
|
and EE.ContentID is null
|
||||||
|
END
|
||||||
|
Go
|
||||||
|
|
||||||
|
IF (@@Error = 0) PRINT 'Procedure Creation: [vesp_ListUnlinkedItems] Succeeded'
|
||||||
|
ELSE PRINT 'Procedure Creation: [vesp_ListUnlinkedItems] Error on Creation'
|
||||||
|
GO
|
||||||
-----------------------------------------------------------------------------
|
-----------------------------------------------------------------------------
|
||||||
/*
|
/*
|
||||||
---------------------------------------------------------------------------
|
---------------------------------------------------------------------------
|
||||||
@@ -22184,8 +22260,8 @@ BEGIN TRY -- Try Block
|
|||||||
DECLARE @RevDate varchar(255)
|
DECLARE @RevDate varchar(255)
|
||||||
DECLARE @RevDescription varchar(255)
|
DECLARE @RevDescription varchar(255)
|
||||||
|
|
||||||
set @RevDate = '10/03/2023 11:00 AM'
|
set @RevDate = '03/27/2024 11:00 AM'
|
||||||
set @RevDescription = 'C2023-017: Added logic to filter the format list when selecting a format to be applied to a section'
|
set @RevDescription = 'B2024-018: Enhanced link issue with sub-sections in source but not in enhanced'
|
||||||
|
|
||||||
Select cast(@RevDate as datetime) RevDate, @RevDescription RevDescription
|
Select cast(@RevDate as datetime) RevDate, @RevDescription RevDescription
|
||||||
PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription
|
PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -1,92 +0,0 @@
|
|||||||
using System.Reflection;
|
|
||||||
using System.Runtime.CompilerServices;
|
|
||||||
using System.Runtime.InteropServices;
|
|
||||||
|
|
||||||
|
|
||||||
// General Information about an assembly is controlled through the following
|
|
||||||
// set of attributes. Change these attribute values to modify the information
|
|
||||||
// associated with an assembly.
|
|
||||||
[assembly: AssemblyTitle("PROMS")]
|
|
||||||
[assembly: AssemblyDescription("Create, Edit, and Maintain Procedures Sets.")]
|
|
||||||
[assembly: AssemblyConfiguration("")]
|
|
||||||
[assembly: AssemblyCompany("Volian Enterprises, Inc.")]
|
|
||||||
[assembly: AssemblyProduct("PROMS")]
|
|
||||||
[assembly: AssemblyCopyright("Copyright © 2012. All Rights Reserved.")]
|
|
||||||
[assembly: AssemblyTrademark("")]
|
|
||||||
[assembly: AssemblyCulture("")]
|
|
||||||
|
|
||||||
// Setting ComVisible to false makes the types in this assembly not visible
|
|
||||||
// to COM components. If you need to access a type in this assembly from
|
|
||||||
// COM, set the ComVisible attribute to true on that type.
|
|
||||||
[assembly: ComVisible(false)]
|
|
||||||
|
|
||||||
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
|
||||||
[assembly: Guid("2ffeb031-bf85-4153-baa2-2d4da2fd5556")]
|
|
||||||
|
|
||||||
// Version information for an assembly consists of the following four values:
|
|
||||||
//
|
|
||||||
// Major Version
|
|
||||||
// Minor Version
|
|
||||||
// Build YYMM (two digit year, two digit month)
|
|
||||||
// Revision DHH (day - no leading zero, two digit hour - military time
|
|
||||||
//
|
|
||||||
[assembly: AssemblyVersion("11.6.1205.316")]
|
|
||||||
[assembly: AssemblyFileVersion("11.6.1205.316")]
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
2
PROMS/VEPROMS User Interface/VEPROMS.gclicx
Normal file
2
PROMS/VEPROMS User Interface/VEPROMS.gclicx
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
da3d5d14-691f-4908-aa3c-fd3239734232;-8584908724854775808;VkVQUk9NUy5leGU=;ZGEzZDVkMTQtNjkxZi00OTA4LWFhM2MtZmQzMjM5NzM0MjMy,MjQyNzYxODZYWFhYWFhYWDAzNg,Sk9ITi1XSU4xMA,RmFsc2U,ODg0Mw,RmFsc2U,MA,MA,djIwMjQuMQ,,;PxeAWRi6mhDqvUMfJhk9Tniu/8ZnOLQv64hLh05xWM+MPyBs3yYfs3vEn5TLW779QNr1k8F6tV3gOAoLG+JSPZoG3NXmdTe6LJya05W+zWyb0H+jj2ReXN2dNR9fbZNDd3ClAeuzNpsM0pw62aYpOe2Tp6fx9gOFx1/0g8g4/8g
|
||||||
|
da3d5d14-691f-4908-aa3c-fd3239734232;-8584865524854775808;VkVQUk9NUy5leGU=;ZGEzZDVkMTQtNjkxZi00OTA4LWFhM2MtZmQzMjM5NzM0MjMy,NjE5MDczODdYWFhYWFhYWDA1Mw,Q0hSSVM,RmFsc2U,ODg5NA,RmFsc2U,MA,MA,djIwMjQuMQ,,;luo/kWHt4XRAYR+3s8m8QoRagBcvXLv0mHvCYU2VCIeACFord4tdtTGmSUvmGhEmUiAd7YvaTlDlFrlni6CWaVlxa1mdbWuWsNVUkRnyJZ8kOAt1A+3SGfHecCsqotTW7apXjwW5qXLZ/fcgutioe7xaXgniFQysshTdUWt26T8
|
||||||
@@ -19,7 +19,7 @@
|
|||||||
</SccAuxPath>
|
</SccAuxPath>
|
||||||
<SccProvider>
|
<SccProvider>
|
||||||
</SccProvider>
|
</SccProvider>
|
||||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||||
<FileUpgradeFlags>
|
<FileUpgradeFlags>
|
||||||
</FileUpgradeFlags>
|
</FileUpgradeFlags>
|
||||||
<UpgradeBackupLocation>
|
<UpgradeBackupLocation>
|
||||||
@@ -99,12 +99,7 @@
|
|||||||
<Prefer32Bit>false</Prefer32Bit>
|
<Prefer32Bit>false</Prefer32Bit>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
|
<Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL" />
|
||||||
<SpecificVersion>False</SpecificVersion>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="C1.Win.C1SpellChecker.2, Version=2.0.20162.188, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL">
|
|
||||||
<SpecificVersion>False</SpecificVersion>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="Csla">
|
<Reference Include="Csla">
|
||||||
<HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
|
<HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
@@ -139,6 +134,7 @@
|
|||||||
<Reference Include="System.Web.Extensions" />
|
<Reference Include="System.Web.Extensions" />
|
||||||
<Reference Include="System.Windows.Forms" />
|
<Reference Include="System.Windows.Forms" />
|
||||||
<Reference Include="System.Xml" />
|
<Reference Include="System.Xml" />
|
||||||
|
<Reference Include="UIAutomationProvider" />
|
||||||
<Reference Include="VEPROMS.CSLA.Library, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="VEPROMS.CSLA.Library, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<SpecificVersion>False</SpecificVersion>
|
<SpecificVersion>False</SpecificVersion>
|
||||||
<HintPath>..\VEPROMS.CSLA.Library\bin\Debug\VEPROMS.CSLA.Library.dll</HintPath>
|
<HintPath>..\VEPROMS.CSLA.Library\bin\Debug\VEPROMS.CSLA.Library.dll</HintPath>
|
||||||
@@ -427,6 +423,7 @@
|
|||||||
<Compile Include="VlnWeb.Designer.cs">
|
<Compile Include="VlnWeb.Designer.cs">
|
||||||
<DependentUpon>VlnWeb.cs</DependentUpon>
|
<DependentUpon>VlnWeb.cs</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
<EmbeddedResource Include="VEPROMS.gclicx" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="Resources\Separator.png" />
|
<None Include="Resources\Separator.png" />
|
||||||
|
|||||||
@@ -4173,7 +4173,19 @@ namespace VEPROMS
|
|||||||
|
|
||||||
if (glookFor != greplaceWith)
|
if (glookFor != greplaceWith)
|
||||||
{
|
{
|
||||||
content.MyGrid.Data = content.MyGrid.Data.Replace(glookFor, greplaceWith);
|
// B2024-011: For unit RO in grid, old grid data had the ROID in the #Link:ReferencedObject ending in '0000'
|
||||||
|
// so when compared with the newer format "0041" it was not found and not replaced with updated rousageid
|
||||||
|
bool hasNewROID = (content.MyGrid.Data.Contains(glookFor));
|
||||||
|
if (hasNewROID)
|
||||||
|
content.MyGrid.Data = content.MyGrid.Data.Replace(glookFor, greplaceWith);
|
||||||
|
else if (!hasNewROID && glookFor.Contains("0041") && glookFor.Contains("FFFF"))
|
||||||
|
{
|
||||||
|
string newGlookFor = glookFor;
|
||||||
|
newGlookFor = newGlookFor.Replace("0041", "0000");
|
||||||
|
if (content.MyGrid.Data.Contains(newGlookFor))
|
||||||
|
content.MyGrid.Data = content.MyGrid.Data.Replace(newGlookFor, greplaceWith);
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -57,7 +57,7 @@
|
|||||||
this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
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.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
|
||||||
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
|
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
|
||||||
this.btnCancel.Location = new System.Drawing.Point(165, 111);
|
this.btnCancel.Location = new System.Drawing.Point(179, 111);
|
||||||
this.btnCancel.Name = "btnCancel";
|
this.btnCancel.Name = "btnCancel";
|
||||||
this.btnCancel.Size = new System.Drawing.Size(64, 23);
|
this.btnCancel.Size = new System.Drawing.Size(64, 23);
|
||||||
this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||||
@@ -88,7 +88,7 @@
|
|||||||
this.dateTimeInput1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
this.dateTimeInput1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||||
this.dateTimeInput1.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown;
|
this.dateTimeInput1.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown;
|
||||||
this.dateTimeInput1.ButtonDropDown.Visible = true;
|
this.dateTimeInput1.ButtonDropDown.Visible = true;
|
||||||
this.dateTimeInput1.CustomFormat = "MM/dd/yyyy";
|
this.dateTimeInput1.CustomFormat = "MM/dd/yyyy HH:mm:ss";
|
||||||
this.dateTimeInput1.DateTimeSelectorVisibility = DevComponents.Editors.DateTimeAdv.eDateTimeSelectorVisibility.DateSelector;
|
this.dateTimeInput1.DateTimeSelectorVisibility = DevComponents.Editors.DateTimeAdv.eDateTimeSelectorVisibility.DateSelector;
|
||||||
this.dateTimeInput1.Format = DevComponents.Editors.eDateTimePickerFormat.Custom;
|
this.dateTimeInput1.Format = DevComponents.Editors.eDateTimePickerFormat.Custom;
|
||||||
this.dateTimeInput1.IsPopupCalendarOpen = false;
|
this.dateTimeInput1.IsPopupCalendarOpen = false;
|
||||||
@@ -122,7 +122,7 @@
|
|||||||
this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
this.dateTimeInput1.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||||
this.dateTimeInput1.MonthCalendar.TodayButtonVisible = true;
|
this.dateTimeInput1.MonthCalendar.TodayButtonVisible = true;
|
||||||
this.dateTimeInput1.Name = "dateTimeInput1";
|
this.dateTimeInput1.Name = "dateTimeInput1";
|
||||||
this.dateTimeInput1.Size = new System.Drawing.Size(113, 20);
|
this.dateTimeInput1.Size = new System.Drawing.Size(146, 20);
|
||||||
this.dateTimeInput1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
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.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;
|
this.dateTimeInput1.TabIndex = 4;
|
||||||
@@ -133,7 +133,7 @@
|
|||||||
//
|
//
|
||||||
this.btnNow.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
|
this.btnNow.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
|
||||||
this.btnNow.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
|
this.btnNow.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
|
||||||
this.btnNow.Location = new System.Drawing.Point(149, 51);
|
this.btnNow.Location = new System.Drawing.Point(182, 51);
|
||||||
this.btnNow.Name = "btnNow";
|
this.btnNow.Name = "btnNow";
|
||||||
this.btnNow.Size = new System.Drawing.Size(49, 23);
|
this.btnNow.Size = new System.Drawing.Size(49, 23);
|
||||||
this.btnNow.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
this.btnNow.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||||
@@ -146,7 +146,7 @@
|
|||||||
//
|
//
|
||||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||||
this.ClientSize = new System.Drawing.Size(241, 144);
|
this.ClientSize = new System.Drawing.Size(268, 144);
|
||||||
this.Controls.Add(this.btnNow);
|
this.Controls.Add(this.btnNow);
|
||||||
this.Controls.Add(this.dateTimeInput1);
|
this.Controls.Add(this.dateTimeInput1);
|
||||||
this.Controls.Add(this.label1);
|
this.Controls.Add(this.label1);
|
||||||
|
|||||||
@@ -32,13 +32,46 @@ namespace VEPROMS
|
|||||||
{
|
{
|
||||||
string cbdt = MyProcConfig.Print_ChangeBarDate;
|
string cbdt = MyProcConfig.Print_ChangeBarDate;
|
||||||
string[] tmp = cbdt.Split(' ');
|
string[] tmp = cbdt.Split(' ');
|
||||||
cbdt = tmp[0] + " 00:00:00";
|
|
||||||
dateTimeInput1.Value = (cbdt == null || cbdt == "") ? DateTime.Now : DateTime.Parse(cbdt);
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void btnOK_Click(object sender, EventArgs e)
|
private void btnOK_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
MyProcConfig.Print_ChangeBarDate = dateTimeInput1.Value.ToString("MM/dd/yyyy 00:00:00");// ("MM/dd/yyyy HH:mm:ss");
|
MyProcConfig.Print_ChangeBarDate = dateTimeInput1.Value.ToString("MM/dd/yyyy HH:mm:ss");// ("MM/dd/yyyy HH:mm:ss");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -112,12 +112,12 @@
|
|||||||
<value>2.0</value>
|
<value>2.0</value>
|
||||||
</resheader>
|
</resheader>
|
||||||
<resheader name="reader">
|
<resheader name="reader">
|
||||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
</resheader>
|
</resheader>
|
||||||
<resheader name="writer">
|
<resheader name="writer">
|
||||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
</resheader>
|
</resheader>
|
||||||
<metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
<metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||||
<value>17, 17</value>
|
<value>17, 17</value>
|
||||||
</metadata>
|
</metadata>
|
||||||
</root>
|
</root>
|
||||||
@@ -91,7 +91,13 @@ namespace VEPROMS
|
|||||||
get { return _DidAll; }
|
get { return _DidAll; }
|
||||||
set { _DidAll = value; }
|
set { _DidAll = value; }
|
||||||
}
|
}
|
||||||
public frmPDFStatusForm(ItemInfo myItem, string rev, string watermark, bool debugOutput, bool origPgBrk, bool openPDF, bool overWrite, string pdfPath, ChangeBarDefinition cbd, string pdfFile, Point newLocation, bool insertBlankPages, bool allOrAuto, string prefix, bool saveLinks, int removeTrailingHardReturnsAndManualPageBreaks, bool showPROMSVer, bool didAll, string blankPageText, MergedPdf mergedPdf, string watermarkColor)
|
private int _prtSectID = -1;
|
||||||
|
public int PrtSectID
|
||||||
|
{
|
||||||
|
get { return _prtSectID; }
|
||||||
|
set { _prtSectID = value; }
|
||||||
|
}
|
||||||
|
public frmPDFStatusForm(ItemInfo myItem, string rev, string watermark, bool debugOutput, bool origPgBrk, bool openPDF, bool overWrite, string pdfPath, ChangeBarDefinition cbd, string pdfFile, Point newLocation, bool insertBlankPages, bool allOrAuto, string prefix, bool saveLinks, int removeTrailingHardReturnsAndManualPageBreaks, bool showPROMSVer, bool didAll, string blankPageText, MergedPdf mergedPdf, string watermarkColor, int PrtSectID = -1)
|
||||||
{
|
{
|
||||||
// B2021-088 moved this if/else from CreatePDF() so that the Approval logic will have access to this logic
|
// B2021-088 moved this if/else from CreatePDF() so that the Approval logic will have access to this logic
|
||||||
ProcedureInfo MyProcedure = myItem as ProcedureInfo;
|
ProcedureInfo MyProcedure = myItem as ProcedureInfo;
|
||||||
@@ -116,6 +122,7 @@ namespace VEPROMS
|
|||||||
Prefix = prefix;
|
Prefix = prefix;
|
||||||
OpenPDF = openPDF;
|
OpenPDF = openPDF;
|
||||||
DidAll = didAll;
|
DidAll = didAll;
|
||||||
|
_prtSectID = PrtSectID;
|
||||||
|
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
|
||||||
@@ -276,7 +283,7 @@ namespace VEPROMS
|
|||||||
cachePartInfo = PartInfo.CacheList;
|
cachePartInfo = PartInfo.CacheList;
|
||||||
}
|
}
|
||||||
|
|
||||||
_PdfFile = MyPromsPrinter.Print(PDFPath, MakePlaceKeeper, MakeContinuousActionSummary, MakeTimeCriticalActionSummary);
|
_PdfFile = MyPromsPrinter.Print(PDFPath, MakePlaceKeeper, MakeContinuousActionSummary, MakeTimeCriticalActionSummary, PrtSectID);
|
||||||
|
|
||||||
ProfileTimer.Pop(profileDepth);
|
ProfileTimer.Pop(profileDepth);
|
||||||
|
|
||||||
|
|||||||
46
PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs
generated
46
PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs
generated
@@ -36,6 +36,8 @@ namespace VEPROMS
|
|||||||
this.btnShortCuts = new DevComponents.DotNetBar.ButtonItem();
|
this.btnShortCuts = new DevComponents.DotNetBar.ButtonItem();
|
||||||
this.btnHelpVWeb = new DevComponents.DotNetBar.ButtonItem();
|
this.btnHelpVWeb = new DevComponents.DotNetBar.ButtonItem();
|
||||||
this.btnSendErrorLog = new DevComponents.DotNetBar.ButtonItem();
|
this.btnSendErrorLog = new DevComponents.DotNetBar.ButtonItem();
|
||||||
|
this.btnShowErrFld = new DevComponents.DotNetBar.ButtonItem();
|
||||||
|
this.btnShowPrtFld = new DevComponents.DotNetBar.ButtonItem();
|
||||||
this.btnHelpAbout = new DevComponents.DotNetBar.ButtonItem();
|
this.btnHelpAbout = new DevComponents.DotNetBar.ButtonItem();
|
||||||
this.office2007StartButton1 = new DevComponents.DotNetBar.Office2007StartButton();
|
this.office2007StartButton1 = new DevComponents.DotNetBar.Office2007StartButton();
|
||||||
this.itemContainer1 = new DevComponents.DotNetBar.ItemContainer();
|
this.itemContainer1 = new DevComponents.DotNetBar.ItemContainer();
|
||||||
@@ -66,6 +68,7 @@ namespace VEPROMS
|
|||||||
this.cbScrunch = new System.Windows.Forms.CheckBox();
|
this.cbScrunch = new System.Windows.Forms.CheckBox();
|
||||||
this.btnNext = new System.Windows.Forms.Button();
|
this.btnNext = new System.Windows.Forms.Button();
|
||||||
this.cmbFont = new System.Windows.Forms.ComboBox();
|
this.cmbFont = new System.Windows.Forms.ComboBox();
|
||||||
|
this.lblDummy = new System.Windows.Forms.Label();
|
||||||
this.labelItem10 = new DevComponents.DotNetBar.LabelItem();
|
this.labelItem10 = new DevComponents.DotNetBar.LabelItem();
|
||||||
this.bottomProgBar = new DevComponents.DotNetBar.ProgressBarItem();
|
this.bottomProgBar = new DevComponents.DotNetBar.ProgressBarItem();
|
||||||
this.labelItem9 = new DevComponents.DotNetBar.LabelItem();
|
this.labelItem9 = new DevComponents.DotNetBar.LabelItem();
|
||||||
@@ -206,11 +209,13 @@ namespace VEPROMS
|
|||||||
this.btnHelp.KeyTips = "?";
|
this.btnHelp.KeyTips = "?";
|
||||||
this.btnHelp.Name = "btnHelp";
|
this.btnHelp.Name = "btnHelp";
|
||||||
this.btnHelp.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
|
this.btnHelp.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
|
||||||
this.btnHelpManual,
|
this.btnHelpManual,
|
||||||
this.btnShortCuts,
|
this.btnShortCuts,
|
||||||
this.btnHelpVWeb,
|
this.btnHelpVWeb,
|
||||||
this.btnSendErrorLog,
|
this.btnSendErrorLog,
|
||||||
this.btnHelpAbout});
|
this.btnShowErrFld,
|
||||||
|
this.btnShowPrtFld,
|
||||||
|
this.btnHelpAbout}); ;
|
||||||
this.btnHelp.Text = "Help";
|
this.btnHelp.Text = "Help";
|
||||||
//
|
//
|
||||||
// btnHelpManual
|
// btnHelpManual
|
||||||
@@ -244,6 +249,24 @@ namespace VEPROMS
|
|||||||
this.btnSendErrorLog.Text = "Send Error Log";
|
this.btnSendErrorLog.Text = "Send Error Log";
|
||||||
this.btnSendErrorLog.Click += new System.EventHandler(this.btnSendErrorLog_Click);
|
this.btnSendErrorLog.Click += new System.EventHandler(this.btnSendErrorLog_Click);
|
||||||
//
|
//
|
||||||
|
// btnShowErrFld
|
||||||
|
//
|
||||||
|
//this.btnShowErrFld.Image = global::VEPROMS.Properties.Resources.GoToParentFolderHS;
|
||||||
|
this.btnShowErrFld.Image = ((System.Drawing.Image)(resources.GetObject("btnShowErrFld.Image")));
|
||||||
|
this.btnShowErrFld.Name = "btnShowErrFld";
|
||||||
|
this.btnShowErrFld.Text = "Open Log Folder";
|
||||||
|
this.btnShowErrFld.Click += new System.EventHandler(this.btnShowErrFld_Click);
|
||||||
|
//
|
||||||
|
// btnShowPrtFld
|
||||||
|
//
|
||||||
|
//this.btnShowPrtFld.Image = global::VEPROMS.Properties.Resources.GoToParentFolderHS;
|
||||||
|
this.btnShowPrtFld.Image = ((System.Drawing.Image)(resources.GetObject("btnShowPrtFld.Image")));
|
||||||
|
this.btnShowPrtFld.Name = "btnShowPrtFld";
|
||||||
|
this.btnShowPrtFld.Text = "Open Default Print Folder";
|
||||||
|
this.btnShowPrtFld.Click += new System.EventHandler(this.btnShowPrtFld_Click);
|
||||||
|
//
|
||||||
|
//
|
||||||
|
//
|
||||||
// btnHelpAbout
|
// btnHelpAbout
|
||||||
//
|
//
|
||||||
this.btnHelpAbout.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
|
this.btnHelpAbout.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
|
||||||
@@ -492,6 +515,7 @@ namespace VEPROMS
|
|||||||
this.bottomBar.Controls.Add(this.cbScrunch);
|
this.bottomBar.Controls.Add(this.cbScrunch);
|
||||||
this.bottomBar.Controls.Add(this.btnNext);
|
this.bottomBar.Controls.Add(this.btnNext);
|
||||||
this.bottomBar.Controls.Add(this.cmbFont);
|
this.bottomBar.Controls.Add(this.cmbFont);
|
||||||
|
this.bottomBar.Controls.Add(this.lblDummy);
|
||||||
this.bottomBar.Dock = System.Windows.Forms.DockStyle.Bottom;
|
this.bottomBar.Dock = System.Windows.Forms.DockStyle.Bottom;
|
||||||
this.bottomBar.Font = new System.Drawing.Font("Segoe UI", 9F);
|
this.bottomBar.Font = new System.Drawing.Font("Segoe UI", 9F);
|
||||||
this.bottomBar.IsMaximized = false;
|
this.bottomBar.IsMaximized = false;
|
||||||
@@ -579,6 +603,15 @@ namespace VEPROMS
|
|||||||
this.cmbFont.TabIndex = 0;
|
this.cmbFont.TabIndex = 0;
|
||||||
this.cmbFont.SelectedIndexChanged += new System.EventHandler(this.cmbFont_SelectedIndexChanged);
|
this.cmbFont.SelectedIndexChanged += new System.EventHandler(this.cmbFont_SelectedIndexChanged);
|
||||||
//
|
//
|
||||||
|
// lblDummy
|
||||||
|
//
|
||||||
|
this.lblDummy.Dock = System.Windows.Forms.DockStyle.Right;
|
||||||
|
this.lblDummy.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
|
||||||
|
this.lblDummy.Location = new System.Drawing.Point(1013, 0);
|
||||||
|
this.lblDummy.Name = "lblDummy";
|
||||||
|
this.lblDummy.Size = new System.Drawing.Size(10, 25);
|
||||||
|
this.lblDummy.Visible = false;
|
||||||
|
//
|
||||||
// labelItem10
|
// labelItem10
|
||||||
//
|
//
|
||||||
this.labelItem10.BorderSide = DevComponents.DotNetBar.eBorderSide.Left;
|
this.labelItem10.BorderSide = DevComponents.DotNetBar.eBorderSide.Left;
|
||||||
@@ -1710,6 +1743,7 @@ namespace VEPROMS
|
|||||||
private DevComponents.DotNetBar.ButtonItem btnShortCuts;
|
private DevComponents.DotNetBar.ButtonItem btnShortCuts;
|
||||||
private DevComponents.DotNetBar.LabelItem lblItemID;
|
private DevComponents.DotNetBar.LabelItem lblItemID;
|
||||||
private System.Windows.Forms.ComboBox cmbFont;
|
private System.Windows.Forms.ComboBox cmbFont;
|
||||||
|
private System.Windows.Forms.Label lblDummy;
|
||||||
private DevComponents.DotNetBar.LabelItem lblResolution;
|
private DevComponents.DotNetBar.LabelItem lblResolution;
|
||||||
private DevComponents.DotNetBar.LabelItem lblUser;
|
private DevComponents.DotNetBar.LabelItem lblUser;
|
||||||
private DevComponents.DotNetBar.LabelItem lblLastChange;
|
private DevComponents.DotNetBar.LabelItem lblLastChange;
|
||||||
@@ -1733,6 +1767,8 @@ namespace VEPROMS
|
|||||||
private DevComponents.DotNetBar.TabItem infotabFoldoutMaint;
|
private DevComponents.DotNetBar.TabItem infotabFoldoutMaint;
|
||||||
private Volian.Controls.Library.DisplayFoldoutMaint displayFoldoutMaint;
|
private Volian.Controls.Library.DisplayFoldoutMaint displayFoldoutMaint;
|
||||||
private DevComponents.DotNetBar.ButtonItem btnSendErrorLog;
|
private DevComponents.DotNetBar.ButtonItem btnSendErrorLog;
|
||||||
|
private DevComponents.DotNetBar.ButtonItem btnShowErrFld;
|
||||||
|
private DevComponents.DotNetBar.ButtonItem btnShowPrtFld;
|
||||||
private DevComponents.DotNetBar.TabControlPanel tabControlPanel3;
|
private DevComponents.DotNetBar.TabControlPanel tabControlPanel3;
|
||||||
private DevComponents.DotNetBar.TabItem toosTabReports;
|
private DevComponents.DotNetBar.TabItem toosTabReports;
|
||||||
private Volian.Controls.Library.DisplayReports displayReports;
|
private Volian.Controls.Library.DisplayReports displayReports;
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user