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

If you try to import a procedure into an empty PROMS folder, the code was deleting the File System Folder including the import file. This happened during D.C. Cook training (12/3/2015).

Browse Source 
B2015-138 When Importing a procedure that has a customer RODB location, and the RODB locations in the Database have been updated to local locations, the user is given the choice of RODBs.  If the user answere OK the RO Database is set for the procedure set (Working Draft).  If the user presses the Cancel button, the import is canceled.
B2015-195 When trying to set an RO Path for a procedure set, the OK button was not being enabled.  This has been fixed.
B2015-196 If you change an RO Path to match an existing path you will be giving a message saying that this cannot be done.
During D.C. Cook training I noticed that there are two items in the tool bar that should only be available in DEBUG mode.  These are LastChange and StepRTF which are used for debugging Multiuser.  They have been changed to not be visible for production mode.
Remove locked or unlocked from toolbar.  It was not connected to anything.
Allow the existing (Customer) FSTs to be used without a local copy of the RO database.
B2015-166 Summary of Changes - Remove duplicate records for new steps.
This commit is contained in:
Rich
2015-12-04 17:14:59 +00:00
parent 7096ff33a2
commit 5ae3a93bea
6 changed files with 88 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,11 +76,11 @@ namespace VEPROMS
Directory.CreateDirectory(PEIPath);
if (_MyMode == "Import")
{
if (MyFolder != null && MyFolder.ChildFolderCount == 0)
{
Directory.Delete(PEIPath, true);
Directory.CreateDirectory(PEIPath);
}
//if (MyFolder != null && MyFolder.ChildFolderCount == 0 )
//{
// Directory.Delete(PEIPath, true);
// Directory.CreateDirectory(PEIPath);
//}
}
pnlExport.Dock = DockStyle.Fill;
pnlImport.Dock = DockStyle.Fill;
@@ -239,8 +239,21 @@ namespace VEPROMS
if ((dlg.SelectedROFolder ?? string.Empty) != string.Empty) // B2015-216 If the return value is null treat it like an empty string
{
MyRODb = RODb.GetByFolderPath(dlg.SelectedROFolder);
RODbInfo myRODBInfo = RODbInfo.Get(MyRODb.RODbID);
oldRODbID = newRODbID = MyRODb.RODbID;
MyDocVersion.RefreshDocVersionAssociations();
ROFstInfo fstInfo = null;
foreach (ROFstInfo tmp in myRODBInfo.RODbROFsts)
if (fstInfo == null || tmp.ROFstID > fstInfo.ROFstID)
fstInfo = tmp;
using(DocVersion dv = MyDocVersion.Get())
{
using (ROFst fst = fstInfo.Get())
{
dv.DocVersionAssociations.Add(fst);
dv.Save();
}
dv.Reset_DocVersionAssociations();
MyDocVersion.RefreshDocVersionAssociations(); }
}
else
{

13
PROMS/VEPROMS User Interface/frmRODbProperties.cs
View File

@@ -203,6 +203,7 @@ namespace VEPROMS
// properties on the top node. And lastly, it is the code default.
ppTxtExt.Text = cfg.GetDefaultGraphicExtension();
ppLblGraphicFileExtLoc.Text = (cfg == null) ? null : cfg.GetDefaultGraphicExtensionLocation();
ppBtnOk.Enabled = false;
if (_roDbInfo == null)
{
string newFolderPath = null;
@@ -212,11 +213,21 @@ namespace VEPROMS
if (dlgROFolder.ShowDialog() == DialogResult.OK)
{
newFolderPath = dlgROFolder.SelectedPath;
RODbInfoList allRODBs = RODbInfoList.Get();
foreach(RODbInfo rodb in allRODBs)
{
if (newFolderPath.ToUpper() == rodb.FolderPath.ToUpper())
{
ppRTxtName.Text = rodb.ROName;
break;
}
}
ppBtnOk.Enabled = true;
}
ppTxtPath.Text = newFolderPath;
}
// Initialize the enabled status for the OK button to false.
ppBtnOk.Enabled = false;
//ppBtnOk.Enabled = false;
ppTxtPath.TextChanged += ppTxtPath_TextChanged;
}
void ppTxtPath_TextChanged(object sender, EventArgs e)

28
PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs generated
View File

@@ -63,8 +63,8 @@ namespace VEPROMS
this.cmbFont = new System.Windows.Forms.ComboBox();
this.labelItem10 = new DevComponents.DotNetBar.LabelItem();
this.bottomProgBar = new DevComponents.DotNetBar.ProgressBarItem();
this.labelItem20 = new DevComponents.DotNetBar.LabelItem();
this.lblLocked = new DevComponents.DotNetBar.LabelItem();
//this.labelItem20 = new DevComponents.DotNetBar.LabelItem();
//this.lblLocked = new DevComponents.DotNetBar.LabelItem();
this.labelItem9 = new DevComponents.DotNetBar.LabelItem();
this.lblEditView = new DevComponents.DotNetBar.LabelItem();
this.labelItem11 = new DevComponents.DotNetBar.LabelItem();
@@ -499,8 +499,8 @@ namespace VEPROMS
this.bottomBar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
this.labelItem10,
this.bottomProgBar,
this.labelItem20,
this.lblLocked,
//this.labelItem20,
//this.lblLocked,
this.labelItem9,
this.lblEditView,
this.labelItem11,
@@ -552,17 +552,17 @@ namespace VEPROMS
//
// labelItem20
//
this.labelItem20.BorderSide = DevComponents.DotNetBar.eBorderSide.Left;
this.labelItem20.BorderType = DevComponents.DotNetBar.eBorderType.Bump;
this.labelItem20.Name = "labelItem20";
//this.labelItem20.BorderSide = DevComponents.DotNetBar.eBorderSide.Left;
//this.labelItem20.BorderType = DevComponents.DotNetBar.eBorderType.Bump;
//this.labelItem20.Name = "labelItem20";
//
// lblLocked
//
this.lblLocked.BackColor = System.Drawing.Color.Transparent;
this.lblLocked.ForeColor = System.Drawing.SystemColors.MenuText;
this.lblLocked.Image = global::VEPROMS.Properties.Resources.UnProtectFormHS;
this.lblLocked.Name = "lblLocked";
this.lblLocked.Text = "Unlocked";
//this.lblLocked.BackColor = System.Drawing.Color.Transparent;
//this.lblLocked.ForeColor = System.Drawing.SystemColors.MenuText;
//this.lblLocked.Image = global::VEPROMS.Properties.Resources.UnProtectFormHS;
//this.lblLocked.Name = "lblLocked";
//this.lblLocked.Text = "Unlocked";
//
// labelItem9
//
@@ -1620,7 +1620,7 @@ namespace VEPROMS
//private DevComponents.DotNetBar.Controls.GroupPanel groupPanel1;
//private DevComponents.DotNetBar.Controls.GroupPanel groupPanel3;
private DevComponents.DotNetBar.LabelItem labelItem20;
//private DevComponents.DotNetBar.LabelItem labelItem20;
private DevComponents.DotNetBar.GalleryGroup Common;
private DevComponents.DotNetBar.GalleryGroup Math;
private DevComponents.DotNetBar.GalleryGroup Misc;
@@ -1677,7 +1677,7 @@ namespace VEPROMS
private DevComponents.DotNetBar.ButtonItem btnItemInfo;
private DevComponents.DotNetBar.ButtonItem btnFixMSWord;
private Volian.Controls.Library.DisplayBookMarks displayBookMarks;
private DevComponents.DotNetBar.LabelItem lblLocked;
//private DevComponents.DotNetBar.LabelItem lblLocked;
private DevComponents.DotNetBar.ButtonItem btnShortCuts;
private DevComponents.DotNetBar.LabelItem lblItemID;
private System.Windows.Forms.ComboBox cmbFont;

2
PROMS/VEPROMS User Interface/frmVEPROMS.cs
View File

@@ -1942,6 +1942,8 @@ namespace VEPROMS
btnEditItem.Visible = false;
lblResolution.Visible = false;
txtSearch.Visible = false;
lblLastChange.Visible = false;
btnStepRTF.Visible = false;
}
}
#region MRU

48
PROMS/VEPROMS User Interface/frmVersionsProperties.cs
View File

@@ -199,6 +199,8 @@ namespace VEPROMS
}
// Get the ro path - there is no 'default'
if (_DocVersionConfig.MyDocVersion.DocVersionAssociationCount < 0 && _DocVersionConfig.MyDocVersion.DocVersionAssociations.Count == 0)
;// The line above refreshes the data
if (_DocVersionConfig.MyDocVersion.DocVersionAssociationCount > 0)
{
RODbInfo rdi = RODbInfo.GetJustRODB(SelectedROFst.RODbID);
@@ -986,23 +988,39 @@ namespace VEPROMS
// get the rodb from the selection - and then do an 'update rofst'...
RODbInfoList rdil = RODbInfoList.Get();
RODbInfo rdi = rdil[cmbRoDb.SelectedIndex];
ROFst tmp = ROFstInfo.AddRoFst(rdi, _DocVersionConfig.MyDocVersion, DoProgressBarRefresh); // RHM Needs To Include Delegate
if (tmp == null)
ROFstInfo fst=null;
foreach(ROFstInfo inf in rdi.RODbROFsts)
if(fst == null || inf.ROFstID > fst.ROFstID)
fst = inf;
if (fst != null)
{
MessageBox.Show("Invalid ro fst directory, use the Property dialog to fix directory path to ro.fst.");
frmRODbProperties dlgROProperties = new frmRODbProperties(_DocVersionConfig.MyDocVersion, rdi);
dlgROProperties.ProgressBar = ProgressBar;
if (dlgROProperties.ShowDialog() == DialogResult.OK)
{
tbRoDb.Text = string.Format("{0} ({1})", SelectedROFst.MyRODb.ROName, SelectedROFst.MyRODb.FolderPath);
ppBtnUpRoVals.Enabled = _DocVersionConfig.MyDocVersion.NewerRoFst; // only allow update if association
}
else
return;
using(ROFst fst1 = fst.Get())
_DocVersionConfig.MyDocVersion.DocVersionAssociations.Add(fst1);
cmbRoDb.Visible = ppBtnRoDbBrowse.Visible = false;
tbRoDb.Visible = btnRoDbProperties.Visible = true;
tbRoDb.Text = string.Format("{0} ({1})", fst.MyRODb.ROName, fst.MyRODb.FolderPath);
}
else
{
ROFst tmp = ROFstInfo.AddRoFst(rdi, _DocVersionConfig.MyDocVersion, DoProgressBarRefresh); // RHM Needs To Include Delegate
if (tmp == null)
{
MessageBox.Show("Invalid ro fst directory, use the Property dialog to fix directory path to ro.fst.");
frmRODbProperties dlgROProperties = new frmRODbProperties(_DocVersionConfig.MyDocVersion, rdi);
dlgROProperties.ProgressBar = ProgressBar;
if (dlgROProperties.ShowDialog() == DialogResult.OK)
{
tbRoDb.Text = string.Format("{0} ({1})", SelectedROFst.MyRODb.ROName, SelectedROFst.MyRODb.FolderPath);
ppBtnUpRoVals.Enabled = _DocVersionConfig.MyDocVersion.NewerRoFst; // only allow update if association
}
else
return;
}
cmbRoDb.Visible = ppBtnRoDbBrowse.Visible = false;
tbRoDb.Visible = btnRoDbProperties.Visible = true;
tbRoDb.Text = string.Format("{0} ({1})", tmp.MyRODb.ROName, tmp.MyRODb.FolderPath);
}
cmbRoDb.Visible = ppBtnRoDbBrowse.Visible = false;
tbRoDb.Visible = btnRoDbProperties.Visible = true;
tbRoDb.Text = string.Format("{0} ({1})", tmp.MyRODb.ROName, tmp.MyRODb.FolderPath);
}
private void ppBtnRoDbBrowse_Click(object sender, EventArgs e)