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

Fixed issue of Import Procedure has same RO Path but a different ROdbid number

Browse Source 
Fixed issue where the top box of the dialog was not displaying the “&” character used in the RO Path
This commit is contained in:
John Jenko 2016-07-26 15:25:48 +00:00
parent 146e1fb968
commit 254d15948f
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -220,6 +220,15 @@ namespace VEPROMS
MyRODb = RODb.GetJustRoDb(rodbid);
oldRODbID = newRODbID = rodbid;
break;
}
// B2016-175 have the correct (matching) RO Path but the rodbid is different (procedure came from a different SQL database)
// We can use the RO Path but we need to change the rodbid in the RO links of the procedure we are importing
else if (dbi.FolderPath == rofolderpath && dbi.RODbID != rodbid)
{
MyRODb = RODb.GetByFolderPath(rofolderpath);
newRODbID = MyRODb.RODbID;
oldRODbID = rodbid;
break;
}
else
{

20
PROMS/VEPROMS User Interface/dlgPickROFolder.Designer.cs generated
View File

@ -41,9 +41,10 @@ namespace VEPROMS
this.lblImportRO.Location = new System.Drawing.Point(8, 8);
this.lblImportRO.Margin = new System.Windows.Forms.Padding(8);
this.lblImportRO.Name = "lblImportRO";
this.lblImportRO.Size = new System.Drawing.Size(278, 120);
this.lblImportRO.Size = new System.Drawing.Size(520, 120);
this.lblImportRO.TabIndex = 0;
this.lblImportRO.Text = "label1";
this.lblImportRO.UseMnemonic = false;
//
// clbLocalROFolders
//
@ -51,28 +52,30 @@ namespace VEPROMS
this.clbLocalROFolders.FormattingEnabled = true;
this.clbLocalROFolders.Location = new System.Drawing.Point(8, 128);
this.clbLocalROFolders.Name = "clbLocalROFolders";
this.clbLocalROFolders.Size = new System.Drawing.Size(278, 124);
this.clbLocalROFolders.Size = new System.Drawing.Size(520, 124);
this.clbLocalROFolders.TabIndex = 2;
this.clbLocalROFolders.SelectedIndexChanged += new System.EventHandler(this.clbLocalROFolders_SelectedIndexChanged);
//
// btnOkay
//
this.btnOkay.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnOkay.DialogResult = System.Windows.Forms.DialogResult.OK;
this.btnOkay.Enabled = false;
this.btnOkay.Location = new System.Drawing.Point(11, 258);
this.btnOkay.Location = new System.Drawing.Point(372, 260);
this.btnOkay.Name = "btnOkay";
this.btnOkay.Size = new System.Drawing.Size(75, 23);
this.btnOkay.Size = new System.Drawing.Size(75, 32);
this.btnOkay.TabIndex = 3;
this.btnOkay.Text = "OK";//Fixed Code Change Request C2015-056
this.btnOkay.Text = "OK";
this.btnOkay.UseVisualStyleBackColor = true;
this.btnOkay.Click += new System.EventHandler(this.btnOkay_Click);
//
// btnCancel
//
this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.btnCancel.Location = new System.Drawing.Point(208, 258);
this.btnCancel.Location = new System.Drawing.Point(453, 260);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(75, 23);
this.btnCancel.Size = new System.Drawing.Size(75, 32);
this.btnCancel.TabIndex = 4;
this.btnCancel.Text = "Cancel";
this.btnCancel.UseVisualStyleBackColor = true;
@ -81,7 +84,7 @@ namespace VEPROMS
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(294, 292);
this.ClientSize = new System.Drawing.Size(536, 295);
this.Controls.Add(this.btnCancel);
this.Controls.Add(this.btnOkay);
this.Controls.Add(this.clbLocalROFolders);
@ -90,6 +93,7 @@ namespace VEPROMS
this.MinimizeBox = false;
this.Name = "dlgPickROFolder";
this.Padding = new System.Windows.Forms.Padding(8);
this.ShowIcon = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Pick RO Folder";
this.Load += new System.EventHandler(this.dlgPickROFolder_Load);