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

Development #29

Merged
djankowski merged 9 commits from Development into master 2023-07-19 14:39:24 -04:00
Conversation 0 Commits 9 Files Changed 7 +6 -3
7 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
PROMS/Formats/fmtall/VEGP2all.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/VEGPAlrall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/VEGPAlrall.xml.orig Normal file
View File

Binary file not shown.

3
PROMS/Formats/frmFormatCopy.cs
View File

@ -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)

BIN
PROMS/Formats/genmacall/VEGP2.svg
View File

Binary file not shown.

BIN
PROMS/Formats/genmacall/VEGPAlr.svg
View File

Binary file not shown.

6
PROMS/VEPROMS.CSLA.Library/Extension/DocVersionExt.cs
View File

@ -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);