Compare commits
26 Commits
8e0b0ce2a7
...
a2aaba7886
Author | SHA1 | Date | |
---|---|---|---|
a2aaba7886 | |||
2c3cf7f163 | |||
afb9e2a162 | |||
9feb073c07 | |||
cb7a549a6f | |||
42483033d5 | |||
a26f9dd89c | |||
01b79bf2a3 | |||
ebc194331f | |||
5f8011d4e0 | |||
5fff20b107 | |||
7535c36cad | |||
74d4c80a4f | |||
6768468a60 | |||
9243b011fd | |||
7f401d74ba | |||
d9092f4f18 | |||
71a4350259 | |||
a7aed0ddf3 | |||
16876375df | |||
deeb7ff3fa | |||
a8d13bb998 | |||
411445901e | |||
ceda31c80e | |||
db7775fbae | |||
9d6df6c80b |
Binary file not shown.
Binary file not shown.
BIN
PROMS/Formats/fmtall/VEGPAlrall.xml.orig
Normal file
BIN
PROMS/Formats/fmtall/VEGPAlrall.xml.orig
Normal file
Binary file not shown.
@ -147,7 +147,8 @@ namespace Formats
|
|||||||
}
|
}
|
||||||
Properties.Settings.Default.FormatPath = txbxPROMSFormatsPath.Text.Substring(0,txbxPROMSFormatsPath.Text.Length-1); // save the copy format path minus the ending backslash
|
Properties.Settings.Default.FormatPath = txbxPROMSFormatsPath.Text.Substring(0,txbxPROMSFormatsPath.Text.Length-1); // save the copy format path minus the ending backslash
|
||||||
Properties.Settings.Default.Save();
|
Properties.Settings.Default.Save();
|
||||||
if(MessageBox.Show("Do you want to end the Format Copier?","Formats Copied.", MessageBoxButtons.YesNo, MessageBoxIcon.Question)== DialogResult.Yes)Application.Exit();
|
//if(MessageBox.Show("Do you want to end the Format Copier?","Formats Copied.", MessageBoxButtons.YesNo, MessageBoxIcon.Question)== DialogResult.Yes)
|
||||||
|
Application.Exit();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void buttonX2_Click(object sender, EventArgs e)
|
private void buttonX2_Click(object sender, EventArgs e)
|
||||||
|
Binary file not shown.
Binary file not shown.
@ -44,8 +44,10 @@ using System.Runtime.InteropServices;
|
|||||||
// Revision DHH (day - no leading zero, two digit hour - military time
|
// Revision DHH (day - no leading zero, two digit hour - military time
|
||||||
//
|
//
|
||||||
// ********* REMEMBER TO CHECK THE AssemblyConfiguration SETTING (ABOVE) ********
|
// ********* REMEMBER TO CHECK THE AssemblyConfiguration SETTING (ABOVE) ********
|
||||||
[assembly: AssemblyVersion("2.1.2306.2214")]
|
[assembly: AssemblyVersion("2.1.2307.2515")]
|
||||||
[assembly: AssemblyFileVersion("2.1.2306.2214")]
|
[assembly: AssemblyFileVersion("2.1.2307.2515")]
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -528,9 +528,11 @@ namespace VEPROMS.CSLA.Library
|
|||||||
string mstr = (MyConfig as DocVersionConfig).Unit_ProcedureNumber;
|
string mstr = (MyConfig as DocVersionConfig).Unit_ProcedureNumber;
|
||||||
string[] units = mstr.Split(",".ToCharArray());
|
string[] units = mstr.Split(",".ToCharArray());
|
||||||
string[] fromdata = fromunitdes.Split(",".ToCharArray());
|
string[] fromdata = fromunitdes.Split(",".ToCharArray());
|
||||||
|
|
||||||
// SelectedSlave is > 0 if a unit has been selected, for example from print or approve. It represents that index into the list of units.
|
// SelectedSlave is > 0 if a unit has been selected, for example from print or approve. It represents that index into the list of units.
|
||||||
if (DocVersionConfig.SelectedSlave > 0)
|
// F2023-098: depending on where this is called from & how data is set, the DocVersionConfig.SelectedSlave may be 0, but the
|
||||||
|
// procInfoSelectedChildToPrint will always have the correct value, i.e. 0 if not printing & the selected slave from the print selection.
|
||||||
|
// Check for procInfoSelectedChildToPrint > 0 also:
|
||||||
|
if (DocVersionConfig.SelectedSlave > 0 || procInfoSelectedChildToPrint > 0)
|
||||||
{
|
{
|
||||||
prefix = units[0].Replace("#", "");
|
prefix = units[0].Replace("#", "");
|
||||||
if (str.ToUpper().IndexOf(@"<U-") > -1) return prefix + Regex.Replace(str, @"\<[uU]-[a-zA-Z]+\>", fromunitdes);
|
if (str.ToUpper().IndexOf(@"<U-") > -1) return prefix + Regex.Replace(str, @"\<[uU]-[a-zA-Z]+\>", fromunitdes);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user