admin/ayanova7
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2022-09-23 23:52:18 +00:00
parent abc6230834
commit 810a7a7c50
5 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AyaNovaSolution.sln
View File

@@ -1147,6 +1147,7 @@ Global
{9C259CE1-D7DC-4249-B1C1-DBB194984EA5}.ReleaseX86AyaNova|x86.ActiveCfg = Debug|Any CPU
{A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|.NET.ActiveCfg = Debug|Any CPU
{A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|WBI.ActiveCfg = Debug|Any CPU

4
Installs/V8Migrate/V8Migrate.iss
View File

@@ -1,10 +1,10 @@
[Setup]
AppName=AyaNova V8 Migrate plugin
AppVerName=AyaNova V8 Migrate plugin 8.0.2
AppVerName=AyaNova V8 Migrate plugin 8.0.3
AppPublisher=Ground Zero Tech-Works Inc.
AppPublisherURL=https://www.ayanova.com/
AppSupportUrl=http://forum.ayanova.com
AppVersion=8.0.2
AppVersion=8.0.3
;App ID is used for updating and patching
;see: http://www.jrsoftware.org/iskb.php?updateinstall
AppId=v8migrate

18
source/Plugins/AyaNova.Plugin.V8/ProgressForm.Designer.cs generated
View File

@@ -34,6 +34,7 @@
this.edCurrent = new System.Windows.Forms.TextBox();
this.edSubOp = new System.Windows.Forms.TextBox();
this.btnCancel = new System.Windows.Forms.Button();
this.btnCopy = new System.Windows.Forms.Button();
this.SuspendLayout();
//
// edOut
@@ -54,7 +55,7 @@
this.btnClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.btnClose.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btnClose.Location = new System.Drawing.Point(777, 603);
this.btnClose.Location = new System.Drawing.Point(737, 588);
this.btnClose.Margin = new System.Windows.Forms.Padding(2);
this.btnClose.Name = "btnClose";
this.btnClose.Size = new System.Drawing.Size(82, 32);
@@ -100,7 +101,7 @@
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.btnCancel.Enabled = false;
this.btnCancel.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btnCancel.Location = new System.Drawing.Point(16, 603);
this.btnCancel.Location = new System.Drawing.Point(27, 588);
this.btnCancel.Margin = new System.Windows.Forms.Padding(2);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(82, 32);
@@ -110,6 +111,17 @@
this.btnCancel.Visible = false;
this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
//
// btnCopy
//
this.btnCopy.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btnCopy.Location = new System.Drawing.Point(314, 588);
this.btnCopy.Name = "btnCopy";
this.btnCopy.Size = new System.Drawing.Size(207, 36);
this.btnCopy.TabIndex = 6;
this.btnCopy.Text = "Copy log to clipboard";
this.btnCopy.UseVisualStyleBackColor = true;
this.btnCopy.Click += new System.EventHandler(this.btnCopy_Click);
//
// ProgressForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -117,6 +129,7 @@
this.CancelButton = this.btnClose;
this.ClientSize = new System.Drawing.Size(870, 646);
this.ControlBox = false;
this.Controls.Add(this.btnCopy);
this.Controls.Add(this.btnCancel);
this.Controls.Add(this.edSubOp);
this.Controls.Add(this.edCurrent);
@@ -142,5 +155,6 @@
private System.Windows.Forms.TextBox edCurrent;
private System.Windows.Forms.TextBox edSubOp;
private System.Windows.Forms.Button btnCancel;
private System.Windows.Forms.Button btnCopy;
}
}

6
source/Plugins/AyaNova.Plugin.V8/ProgressForm.cs
View File

@@ -34,6 +34,7 @@ namespace AyaNova.PlugIn.V8
btnClose.Enabled = true;
btnCancel.Enabled = false;
btnCancel.Visible = false;
}
public void Append(string txt)
@@ -82,6 +83,11 @@ namespace AyaNova.PlugIn.V8
}
private void btnCopy_Click(object sender, EventArgs e)
{
System.Windows.Forms.Clipboard.SetText(AllText);
}
//eoc
}
}

13
source/Plugins/AyaNova.Plugin.V8/V8.cs
View File

@@ -35,7 +35,7 @@ namespace AyaNova.PlugIn.V8
public string PluginVersion
{
get { return "8.0.2"; }
get { return "8.0.3"; }
}
public string About
@@ -162,11 +162,12 @@ namespace AyaNova.PlugIn.V8
ImportTag = util.NormalizeTag(dOpt.Tags);
util.HTTPCLIENT_TIMEOUT_SECONDS = dOpt.HTTPTimeOut;
util.InitClient();
MessageBox.Show("Migration will stop and fail immediately if you login to the AyaNova 8 server before migration has completed.", "Beware");
//here because we logged in fine and can proceed
if (MessageBox.Show("Warning: if you continue the AyaNova 8 destination server's database will be erased.\r\nAre you sure you want to continue?", "Erase data warning", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) return;
if (MessageBox.Show("Last chance: the next step will start migration and the AyaNova 8 target server's data will be erased.\r\nAre you sure you want to proceed?", "Continue migration", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) return;
//Only one command
DoExport();
}
@@ -431,7 +432,7 @@ namespace AyaNova.PlugIn.V8
progress.Show();
progress.StartedImport();
progress.Append("Exporting data to AyaNova server @ " + util.ApiBaseUrl);
progress.Append(util.RELEASE_VERSION_STRING);
progress.Append("V8-Migrate plugin version: " + util.RELEASE_VERSION_STRING);
progress.Append("Option HTTP Timeout: " + util.HTTPCLIENT_TIMEOUT_SECONDS);
progress.Append("Option Migrate assigned docs: " + ExportAssignedDocs.ToString() + "");
progress.Append("Option Migrate tag: \"" + ImportTag + "\"");
@@ -639,7 +640,7 @@ namespace AyaNova.PlugIn.V8
progress.Append("###################################");
progress.Append("###################################");
if (ExceptionDuringMigrate != null)
if (ExceptionDuringMigrate == null)
progress.Append("Export completed");
else
progress.Append("Export ** FAILED **");
@@ -1904,6 +1905,7 @@ namespace AyaNova.PlugIn.V8
dynamic d = new JObject();
if (IsDuplicatev7v8IdMapItem(c.ID, c.PartNumber, progress)) continue;
//string MigrateToPartName = string.Empty;
if (PartNumberNameCombined)
{
string newName = string.Empty;
@@ -1924,6 +1926,9 @@ namespace AyaNova.PlugIn.V8
}
//string sTemp = d.name;
if (string.IsNullOrWhiteSpace(d.name.ToString()))
d.name = GetUniqueName("No name Part");
progress.SubOp("");
progress.Op(ObjectTypeName + " " + d.partNumber + " " + d.name);
d.manufacturerId = await Getv7v8IdMapNullOk(c.ManufacturerID, RootObjectTypes.Vendor);