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
2018-08-29 17:40:11 +00:00
parent 9048d6b98e
commit 9e5e12f5be
5 changed files with 55 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AyaNovaSolution.sln
View File

@@ -1110,6 +1110,7 @@ Global
{5407E64B-951B-414D-B532-4AF2EDBDD9FD}.ReleaseX86AyaNova|x86.Build.0 = Release|x86 {5407E64B-951B-414D-B532-4AF2EDBDD9FD}.ReleaseX86AyaNova|x86.Build.0 = Release|x86
{A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|.NET.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.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.ActiveCfg = Debug|Any CPU
{A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|Mixed Platforms.Build.0 = 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 {A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|WBI.ActiveCfg = Debug|Any CPU

56
source/MBI/Properties/PublishProfiles/PublishMBI.pubxml.user
View File

@@ -13,7 +13,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
<publishTime>07/02/2018 11:40:56</publishTime> <publishTime>07/02/2018 11:40:56</publishTime>
</File> </File>
<File Include="bin/App_global.asax.compiled"> <File Include="bin/App_global.asax.compiled">
<publishTime>07/02/2018 13:03:46</publishTime> <publishTime>08/22/2018 16:48:02</publishTime>
</File> </File>
<File Include="bin/App_global.asax.dll"> <File Include="bin/App_global.asax.dll">
<publishTime>06/14/2017 11:29:54</publishTime> <publishTime>06/14/2017 11:29:54</publishTime>
@@ -34,34 +34,34 @@ by editing this MSBuild file. In order to learn more about this please visit htt
<publishTime>07/02/2018 11:40:10</publishTime> <publishTime>07/02/2018 11:40:10</publishTime>
</File> </File>
<File Include="bin/clients.aspx.cdcab7d2.compiled"> <File Include="bin/clients.aspx.cdcab7d2.compiled">
<publishTime>07/02/2018 13:03:46</publishTime> <publishTime>08/22/2018 16:48:02</publishTime>
</File> </File>
<File Include="bin/cmd.aspx.cdcab7d2.compiled"> <File Include="bin/cmd.aspx.cdcab7d2.compiled">
<publishTime>07/02/2018 13:03:46</publishTime> <publishTime>08/22/2018 16:48:02</publishTime>
</File> </File>
<File Include="bin/CSLA.Core.Bindablebase.dll"> <File Include="bin/CSLA.Core.Bindablebase.dll">
<publishTime>07/02/2018 11:48:47</publishTime> <publishTime>07/02/2018 11:48:47</publishTime>
</File> </File>
<File Include="bin/CSLA.dll"> <File Include="bin/CSLA.dll">
<publishTime>07/02/2018 13:02:12</publishTime> <publishTime>08/22/2018 16:46:15</publishTime>
</File> </File>
<File Include="bin/CSLA.Server.DataPortal.dll"> <File Include="bin/CSLA.Server.DataPortal.dll">
<publishTime>07/02/2018 11:48:49</publishTime> <publishTime>07/02/2018 11:48:49</publishTime>
</File> </File>
<File Include="bin/default.aspx.cdcab7d2.compiled"> <File Include="bin/default.aspx.cdcab7d2.compiled">
<publishTime>07/02/2018 13:03:46</publishTime> <publishTime>08/22/2018 16:48:02</publishTime>
</File> </File>
<File Include="bin/FirebirdSql.Data.FirebirdClient.dll"> <File Include="bin/FirebirdSql.Data.FirebirdClient.dll">
<publishTime>07/02/2018 11:40:09</publishTime> <publishTime>07/02/2018 11:40:09</publishTime>
</File> </File>
<File Include="bin/GZTW.AyaNova.BLL.dll"> <File Include="bin/GZTW.AyaNova.BLL.dll">
<publishTime>07/02/2018 13:03:04</publishTime> <publishTime>08/22/2018 16:47:06</publishTime>
</File> </File>
<File Include="bin/GZTW.AyaNovaMBI.dll"> <File Include="bin/GZTW.AyaNovaMBI.dll">
<publishTime>07/02/2018 13:03:32</publishTime> <publishTime>08/22/2018 16:47:48</publishTime>
</File> </File>
<File Include="bin/GZTW.AyaNovaMBI.Pages.dll"> <File Include="bin/GZTW.AyaNovaMBI.Pages.dll">
<publishTime>07/02/2018 13:03:46</publishTime> <publishTime>08/22/2018 16:48:02</publishTime>
</File> </File>
<File Include="bin/GZTW.Data.dll"> <File Include="bin/GZTW.Data.dll">
<publishTime>07/02/2018 11:48:49</publishTime> <publishTime>07/02/2018 11:48:49</publishTime>
@@ -76,55 +76,55 @@ by editing this MSBuild file. In order to learn more about this please visit htt
<publishTime>07/02/2018 11:48:47</publishTime> <publishTime>07/02/2018 11:48:47</publishTime>
</File> </File>
<File Include="bin/labor.aspx.cdcab7d2.compiled"> <File Include="bin/labor.aspx.cdcab7d2.compiled">
<publishTime>07/02/2018 13:03:46</publishTime> <publishTime>08/22/2018 16:48:02</publishTime>
</File> </File>
<File Include="bin/memoedit.aspx.cdcab7d2.compiled"> <File Include="bin/memoedit.aspx.cdcab7d2.compiled">
<publishTime>07/02/2018 13:03:46</publishTime> <publishTime>08/22/2018 16:48:02</publishTime>
</File> </File>
<File Include="bin/memoto.aspx.cdcab7d2.compiled"> <File Include="bin/memoto.aspx.cdcab7d2.compiled">
<publishTime>07/02/2018 13:03:46</publishTime> <publishTime>08/22/2018 16:48:02</publishTime>
</File> </File>
<File Include="bin/Newtonsoft.Json.dll"> <File Include="bin/Newtonsoft.Json.dll">
<publishTime>07/02/2018 12:33:05</publishTime> <publishTime>07/02/2018 12:33:05</publishTime>
</File> </File>
<File Include="bin/ro.aspx.cdcab7d2.compiled"> <File Include="bin/ro.aspx.cdcab7d2.compiled">
<publishTime>07/02/2018 13:03:46</publishTime> <publishTime>08/22/2018 16:48:02</publishTime>
</File> </File>
<File Include="bin/sched2labor.aspx.cdcab7d2.compiled"> <File Include="bin/sched2labor.aspx.cdcab7d2.compiled">
<publishTime>07/02/2018 13:03:46</publishTime> <publishTime>08/22/2018 16:48:02</publishTime>
</File> </File>
<File Include="bin/schedule.aspx.cdcab7d2.compiled"> <File Include="bin/schedule.aspx.cdcab7d2.compiled">
<publishTime>07/02/2018 13:03:46</publishTime> <publishTime>08/22/2018 16:48:02</publishTime>
</File> </File>
<File Include="bin/sign.aspx.cdcab7d2.compiled"> <File Include="bin/sign.aspx.cdcab7d2.compiled">
<publishTime>07/02/2018 13:03:46</publishTime> <publishTime>08/22/2018 16:48:02</publishTime>
</File> </File>
<File Include="bin/status.aspx.cdcab7d2.compiled"> <File Include="bin/status.aspx.cdcab7d2.compiled">
<publishTime>07/02/2018 13:03:46</publishTime> <publishTime>08/22/2018 16:48:02</publishTime>
</File> </File>
<File Include="clients.aspx"> <File Include="clients.aspx">
<publishTime>07/02/2018 13:03:36</publishTime> <publishTime>08/22/2018 16:47:53</publishTime>
</File> </File>
<File Include="cmd.aspx"> <File Include="cmd.aspx">
<publishTime>07/02/2018 13:03:36</publishTime> <publishTime>08/22/2018 16:47:53</publishTime>
</File> </File>
<File Include="default.aspx"> <File Include="default.aspx">
<publishTime>07/02/2018 13:03:36</publishTime> <publishTime>08/22/2018 16:47:53</publishTime>
</File> </File>
<File Include="jquery-1.4.4.min.js"> <File Include="jquery-1.4.4.min.js">
<publishTime>07/02/2018 11:40:56</publishTime> <publishTime>07/02/2018 11:40:56</publishTime>
</File> </File>
<File Include="labor.aspx"> <File Include="labor.aspx">
<publishTime>07/02/2018 13:03:36</publishTime> <publishTime>08/22/2018 16:47:53</publishTime>
</File> </File>
<File Include="mbi.css"> <File Include="mbi.css">
<publishTime>07/02/2018 11:40:55</publishTime> <publishTime>07/02/2018 11:40:55</publishTime>
</File> </File>
<File Include="memoedit.aspx"> <File Include="memoedit.aspx">
<publishTime>07/02/2018 13:03:36</publishTime> <publishTime>08/22/2018 16:47:53</publishTime>
</File> </File>
<File Include="memoto.aspx"> <File Include="memoto.aspx">
<publishTime>07/02/2018 13:03:36</publishTime> <publishTime>08/22/2018 16:47:53</publishTime>
</File> </File>
<File Include="ok.gif"> <File Include="ok.gif">
<publishTime>07/02/2018 11:40:55</publishTime> <publishTime>07/02/2018 11:40:55</publishTime>
@@ -133,25 +133,25 @@ by editing this MSBuild file. In order to learn more about this please visit htt
<publishTime>07/02/2018 11:40:55</publishTime> <publishTime>07/02/2018 11:40:55</publishTime>
</File> </File>
<File Include="PrecompiledApp.config"> <File Include="PrecompiledApp.config">
<publishTime>07/02/2018 13:03:33</publishTime> <publishTime>08/22/2018 16:47:49</publishTime>
</File> </File>
<File Include="ro.aspx"> <File Include="ro.aspx">
<publishTime>07/02/2018 13:03:36</publishTime> <publishTime>08/22/2018 16:47:53</publishTime>
</File> </File>
<File Include="sched2labor.aspx"> <File Include="sched2labor.aspx">
<publishTime>07/02/2018 13:03:36</publishTime> <publishTime>08/22/2018 16:47:53</publishTime>
</File> </File>
<File Include="schedule.aspx"> <File Include="schedule.aspx">
<publishTime>07/02/2018 13:03:36</publishTime> <publishTime>08/22/2018 16:47:53</publishTime>
</File> </File>
<File Include="sig.js"> <File Include="sig.js">
<publishTime>07/02/2018 11:40:56</publishTime> <publishTime>07/02/2018 11:40:56</publishTime>
</File> </File>
<File Include="sign.aspx"> <File Include="sign.aspx">
<publishTime>07/02/2018 13:03:36</publishTime> <publishTime>08/22/2018 16:47:53</publishTime>
</File> </File>
<File Include="status.aspx"> <File Include="status.aspx">
<publishTime>07/02/2018 13:03:36</publishTime> <publishTime>08/22/2018 16:47:53</publishTime>
</File> </File>
<File Include="user.gif"> <File Include="user.gif">
<publishTime>07/02/2018 11:40:56</publishTime> <publishTime>07/02/2018 11:40:56</publishTime>

4
source/Plugins/AyaNova.Plugin.Dump/Dump.cs
View File

@@ -171,8 +171,10 @@ namespace AyaNova.Plugin.Dump
ProgressForm progress = new ProgressForm(); ProgressForm progress = new ProgressForm();
progress.Show(); progress.Show();
progress.StartedImport();
progress.Append("Dumping data to " + tempArchiveFolder); progress.Append("Dumping data to " + tempArchiveFolder);
//DUMP IT! //DUMP IT!
dumpGlobalSettings(tempArchiveFolder, progress); dumpGlobalSettings(tempArchiveFolder, progress);
dumpLocales(tempArchiveFolder, progress); dumpLocales(tempArchiveFolder, progress);
@@ -191,6 +193,8 @@ namespace AyaNova.Plugin.Dump
Directory.Delete(tempArchiveFolder, true); Directory.Delete(tempArchiveFolder, true);
progress.Append("Dump completed"); progress.Append("Dump completed");
progress.FinishedImport();
//----------------------------------- //-----------------------------------
//endof method //endof method
} }

16
source/Plugins/AyaNova.Plugin.Dump/ProgressForm.Designer.cs generated
View File

@@ -34,21 +34,24 @@
// //
// edOut // edOut
// //
this.edOut.Cursor = System.Windows.Forms.Cursors.Default;
this.edOut.Dock = System.Windows.Forms.DockStyle.Top; this.edOut.Dock = System.Windows.Forms.DockStyle.Top;
this.edOut.Location = new System.Drawing.Point(0, 0); this.edOut.Location = new System.Drawing.Point(0, 0);
this.edOut.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.edOut.Margin = new System.Windows.Forms.Padding(2);
this.edOut.Multiline = true; this.edOut.Multiline = true;
this.edOut.Name = "edOut"; this.edOut.Name = "edOut";
this.edOut.ReadOnly = true;
this.edOut.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; this.edOut.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
this.edOut.Size = new System.Drawing.Size(667, 410); this.edOut.Size = new System.Drawing.Size(870, 546);
this.edOut.TabIndex = 0; this.edOut.TabIndex = 0;
// //
// btnClose // btnClose
// //
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.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.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(574, 473); this.btnClose.Location = new System.Drawing.Point(777, 577);
this.btnClose.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.btnClose.Margin = new System.Windows.Forms.Padding(2);
this.btnClose.Name = "btnClose"; this.btnClose.Name = "btnClose";
this.btnClose.Size = new System.Drawing.Size(82, 32); this.btnClose.Size = new System.Drawing.Size(82, 32);
this.btnClose.TabIndex = 1; this.btnClose.TabIndex = 1;
@@ -61,13 +64,12 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.btnClose; this.CancelButton = this.btnClose;
this.ClientSize = new System.Drawing.Size(667, 516); this.ClientSize = new System.Drawing.Size(870, 620);
this.ControlBox = false; this.ControlBox = false;
this.Controls.Add(this.btnClose); this.Controls.Add(this.btnClose);
this.Controls.Add(this.edOut); this.Controls.Add(this.edOut);
this.Cursor = System.Windows.Forms.Cursors.AppStarting;
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.Margin = new System.Windows.Forms.Padding(2);
this.Name = "ProgressForm"; this.Name = "ProgressForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Dumping..."; this.Text = "Dumping...";

13
source/Plugins/AyaNova.Plugin.Dump/ProgressForm.cs
View File

@@ -16,6 +16,19 @@ namespace AyaNova.Plugin.Dump
InitializeComponent(); InitializeComponent();
} }
public void StartedImport()
{
Cursor.Current = Cursors.WaitCursor;
btnClose.Enabled = false;
}
public void FinishedImport()
{
Cursor.Current = Cursors.Default;
btnClose.Enabled = true;
}
public void Append(string txt) public void Append(string txt)
{ {
edOut.AppendText(txt + "\r\n"); edOut.AppendText(txt + "\r\n");