diff --git a/Site5/Pages/v5/Init/Default.aspx b/Site5/Pages/v5/Init/Default.aspx index d60bfaa6..6fe62fa5 100644 --- a/Site5/Pages/v5/Init/Default.aspx +++ b/Site5/Pages/v5/Init/Default.aspx @@ -125,9 +125,13 @@ if (isValid) { + + alert('initing progressbar and data init'); + $('#DivProgressDatabase').progressbar({ value: 0, max: 100 }); setTimeout('updateInitProgressBar();', 1000); $('#<%=this.ButtonInitDatabase.ClientID %>').click(); + beginInitDatabase(); } } @@ -162,6 +166,8 @@ function updateInitProgressBar() { + alert('updateInitProgressBar'); + $.ajax({ type: "POST", url: "Default.aspx/GetInitProgress", @@ -180,12 +186,28 @@ } else { // We're not done yet. Keep the progress bar on-screen and keep re-checking every two seconds. + alert('updating progressbar - ' + msg.d); + $('#DivProgressDatabase').progressbar("value", msg.d); setTimeout('updateInitProgressBar();', 2000); } } }); } + + function beginInitDatabase() { + $.ajax({ + type: "POST", + url: "Default.aspx/InitDatabase", + data: "{}", + contentType: "application/json; charset=utf-8", + dataType: "json", + success: function () { + alert('InitDatabase returned'); + } + + }); + } diff --git a/Site5/Pages/v5/Init/Default.aspx.cs b/Site5/Pages/v5/Init/Default.aspx.cs index e8154fea..9c764af5 100644 --- a/Site5/Pages/v5/Init/Default.aspx.cs +++ b/Site5/Pages/v5/Init/Default.aspx.cs @@ -269,12 +269,22 @@ public partial class Pages_v5_Init_Default : System.Web.UI.Page this.TextCredentialsAdminPassword.Text))); } + [WebMethod(true)] + public static void InitDatabase() + { + for (int loop = 0; loop <= 100; loop++) + { + HttpContext.Current.Session["PercentInitComplete"] = loop; + System.Threading.Thread.Sleep(1000); + } + } + [WebMethod(true)] // "true" causes session to be loaded public static int GetInitProgress() { try { - int progress = (int)new Random().Next(100); // (int) HttpContext.Current.Session["PercentInitComplete"]; + int progress = (int) HttpContext.Current.Session["PercentInitComplete"]; return progress; } diff --git a/Site5/Pages/v5/Init/WizardStyle.css b/Site5/Pages/v5/Init/WizardStyle.css index a3162d92..47213123 100644 --- a/Site5/Pages/v5/Init/WizardStyle.css +++ b/Site5/Pages/v5/Init/WizardStyle.css @@ -97,10 +97,11 @@ padding: 0; padding-top:3px; padding-bottom: 3px; - border: 0px solid #E0E0E0; - float: left; - clear:both; + border: 0px solid #E0E0E0; + float: left; + clear: both; } + /* Anchor Element Style */ .swMain ul.anchor li a { display:block;