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

C2025-024 #590

Merged
jjenko merged 18 commits from C2025-024 into Development 2025-08-08 10:19:00 -04:00
Conversation 2 Commits 18 Files Changed 12 +2226 -4210
52 changed files with 2226 additions and 4210 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d7f83fa4d4 - Show all commits

35
PROMS/VEPROMS User Interface/dlgExportImport.cs
View File

@@ -155,9 +155,7 @@ namespace VEPROMS
if (MyFolder != null)
{
sfd.FileName = string.Format("{0}-{1}.expx", Database.ActiveDatabase, MyFolder.Name);
if (sfd.ShowDialog(this) == DialogResult.OK)
{
if (sfd.FileName != string.Empty)
if (sfd.ShowDialog(this) == DialogResult.OK && sfd.FileName != string.Empty)
{
txtExport.Text = sfd.FileName;
if (File.Exists(txtExport.Text))
@@ -166,7 +164,6 @@ namespace VEPROMS
MyExpxZipFile.Save();
}
}
}
else if (MyProcedure != null)
{
txtExport.Enabled = true;
@@ -1330,11 +1327,7 @@ namespace VEPROMS
txtImport.Text = ofd.FileName;
return;
}
if (MyFolder != null)
{
if (ofd.ShowDialog(this) == DialogResult.OK)
{
if (ofd.FileName != string.Empty)
if (MyFolder != null && ofd.ShowDialog(this) == DialogResult.OK && ofd.FileName != string.Empty)
{
Old2NewItem = new Dictionary<int, int>();
Old2NewContent = new Dictionary<int, int>();
@@ -1397,8 +1390,6 @@ namespace VEPROMS
File.Delete(fn);
}
}
}
}
if (MyDocVersion != null)
{
ofd.Filter = "PROMS Procedure Export Files|*.pxml";
@@ -2223,16 +2214,9 @@ namespace VEPROMS
xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "rodbid", ri.RODbID.ToString()));
if (_ExportBothConvertedandNot) SetROLocation(ref xe, ri.ROID, ri.RODbID);
//rousage audits
ExportROUsageAudits(xe, ri);
xn.AppendChild(xe);
}
private void ExportROUsageAudits(XmlElement xe, RoUsageInfo ri)
{
if (cbxExportAudits.Checked) { };
}
private void ExportPart(XmlElement xn, PartInfo pi, string nodename)
{
/*
@@ -2309,16 +2293,9 @@ namespace VEPROMS
xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "dts", ti.DTS.ToString("MM/dd/yyyy HH:mm:ss.fff")));
xe.Attributes.SetNamedItem(AddAttribute(xe.OwnerDocument, "userid", ti.UserID.ToString()));
//transition audits
ExportTransitionAudits(xe, ti);
xn.AppendChild(xe);
}
private void ExportTransitionAudits(XmlElement xe, TransitionInfo ti)
{
if (cbxExportAudits.Checked) { };
}
private void ExportAnnotation(XmlElement xn, AnnotationInfo ai, string nodename)
{
/*
@@ -2813,15 +2790,11 @@ namespace VEPROMS
{
// create a list of the RO databases currently in the database
List<string> roDbNameList = new List<string>();
RODbInfoList rolist = RODbInfoList.Get();
foreach (RODbInfo rodbinfo in rolist)
using (RODbInfoList rolist = RODbInfoList.Get())
{
if (!roDbNameList.Contains(rodbinfo.ROName))
roDbNameList.Add(rodbinfo.ROName);
roDbNameList.AddRange(rolist.Where(rodbinfo => !roDbNameList.Contains(rodbinfo.ROName)).Select(rodbinfo => rodbinfo.ROName));
}
rolist.Dispose();
int cnt = 0;
string roNameNew = roname;