zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge commit

Browse source
This commit is contained in:
robvde 2013-06-22 16:27:18 +04:00
commit 03e9c7f3b6
155 changed files with 5554 additions and 3143 deletions
Download patch file Download diff file Expand all files Collapse all files

13
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Schedules.ascx
View file

@ -5,6 +5,8 @@
<%@ Register Src="UserControls/Quota.ascx" TagName="Quota" TagPrefix="uc4" %>
<%@ Import Namespace="WebsitePanel.Portal" %>
<asp:Timer runat="server" Interval="5000" ID="tasksTimer" />
<div class="FormButtonsBar">
<div class="Left">
<asp:Button ID="btnAddItem" runat="server" meta:resourcekey="btnAddItem" Text="Add Scheduled Task" CssClass="Button3" OnClick="btnAddItem_Click" />
@ -15,6 +17,12 @@
<uc1:SearchBox ID="searchBox" runat="server" />
</div>
</div>
<asp:UpdatePanel runat="server" ID="schedulesUpdatePanel" UpdateMode="Conditional">
<Triggers>
<asp:AsyncPostBackTrigger ControlID="tasksTimer" EventName="Tick" />
</Triggers>
<ContentTemplate>
<asp:GridView id="gvSchedules" runat="server" AutoGenerateColumns="False"
DataSourceID="odsSchedules" AllowPaging="True" AllowSorting="True" EmptyDataText="gvSchedules"
OnRowCommand="gvSchedules_RowCommand" CssSelectorClass="NormalGridView"
@ -86,4 +94,7 @@
<asp:ControlParameter ControlID="searchBox" Name="filterColumn" PropertyName="FilterColumn" />
<asp:ControlParameter ControlID="searchBox" Name="filterValue" PropertyName="FilterValue" />
</SelectParameters>
</asp:ObjectDataSource>
</asp:ObjectDataSource>
</ContentTemplate>
</asp:UpdatePanel>

46
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Schedules.ascx.designer.cs generated
View file

@ -1,31 +1,3 @@
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,
// are permitted provided that the following conditions are met:
//
// - Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
//
// - Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
//
// - Neither the name of the Outercurve Foundation nor the names of its
// contributors may be used to endorse or promote products derived from this
// software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
@ -40,6 +12,15 @@ namespace WebsitePanel.Portal {
public partial class Schedules {
/// <summary>
/// tasksTimer control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.Timer tasksTimer;
/// <summary>
/// btnAddItem control.
/// </summary>
@ -67,6 +48,15 @@ namespace WebsitePanel.Portal {
/// </remarks>
protected global::WebsitePanel.Portal.SearchBox searchBox;
/// <summary>
/// schedulesUpdatePanel control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.UpdatePanel schedulesUpdatePanel;
/// <summary>
/// gvSchedules control.
/// </summary>

48
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Scripts/AjaxUtils.js
View file

@ -134,45 +134,47 @@ function ReloadProgressImage()
function GetTaskProgress()
{
requestSimpleService = WebsitePanel.Portal.TaskManager.GetTask(
requestSimpleService = WebsitePanel.Portal.TaskManager.GetTaskWithLogRecords(
_taskId, //params
new Date(1, 2, 3, 4),
OnGetTaskProgressComplete, //Complete event
OnGetTaskProgressTimeout //Timeout event
);
}
function OnGetTaskProgressComplete(task)
function OnGetTaskProgressComplete(task)
{
if(task.LastLogRecord != null)
{
$get('objProgressDialogStep').innerHTML = task.LastLogRecord.Text;
}
// set progress indicator
if(task.IndicatorMaximum > 0)
$get("objProgressDialogProgressBar").style.width = task.IndicatorCurrent / task.IndicatorMaximum * 100 + "%";
if(task.Completed)
{
// switch buttons
if (task == null || task.Completed) {
// switch buttons
$get("objProgressDialogCommandButtons").style.display = "none";
$get("objProgressDialogCloseButton").style.display = "block";
// stop timer
StopTimer();
// hide image indicator
$get("imgAjaxIndicator").style.display = "none";
// show success message
$get('objProgressDialogStep').innerHTML = _completeMessage;
}
else
{
$find('ModalPopupProperties')._layout();
//alert(result);
window.setTimeout(GetTaskProgress, 1000);
$get("objProgressDialogProgressBar").style.width = 100 + "%";
return;
}
if (task.Logs != null) {
$get('objProgressDialogStep').innerHTML = task.Logs.length > 0 ? task.Logs[task.Logs.length - 1].Text : "";
}
// set progress indicator
if (task.IndicatorMaximum > 0)
$get("objProgressDialogProgressBar").style.width = task.IndicatorCurrent / task.IndicatorMaximum * 100 + "%";
$find('ModalPopupProperties')._layout();
//alert(result);
window.setTimeout(GetTaskProgress, 1000);
}
function OnGetTaskProgressTimeout(result)

44
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Tasks.ascx.designer.cs generated
View file

@ -1,19 +1,51 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.42
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace WebsitePanel.Portal {
public partial class Tasks {
protected System.Web.UI.Timer tasksTimer;
protected System.Web.UI.UpdatePanel tasksUpdatePanel;
protected System.Web.UI.WebControls.GridView gvTasks;
protected System.Web.UI.WebControls.ObjectDataSource odsTasks;
/// <summary>
/// tasksTimer control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.Timer tasksTimer;
/// <summary>
/// tasksUpdatePanel control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.UpdatePanel tasksUpdatePanel;
/// <summary>
/// gvTasks control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.GridView gvTasks;
/// <summary>
/// odsTasks control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource odsTasks;
}
}

13
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/TasksTaskDetails.ascx.cs
View file

@ -63,7 +63,7 @@ namespace WebsitePanel.Portal
litTitle.Text = String.Format("{0} &quot;{1}&quot;",
GetAuditLogTaskName(task.Source, task.TaskName),
task.ItemName);
litStep.Text = LocalizeActivityText(task.LastLogRecord.Text);
litStep.Text = LocalizeActivityText(task.GetLogs().Count > 0 ? task.GetLogs()[0].Text : String.Empty);
litStartTime.Text = task.StartDate.ToString();
// progress
@ -77,18 +77,19 @@ namespace WebsitePanel.Portal
// execution log
StringBuilder log = new StringBuilder();
task.LastLogRecords.Reverse();
if (task.LastLogRecords.Count > 0)
ViewState["lastLogDate"] = task.LastLogRecords[0].Date.AddTicks(1);
if (task.GetLogs().Count > 0)
ViewState["lastLogDate"] = task.GetLogs()[0].Date.AddTicks(1);
foreach (BackgroundTaskLogRecord logRecord in task.LastLogRecords)
foreach (BackgroundTaskLogRecord logRecord in task.GetLogs())
{
log.Append("[").Append(GetDurationText(task.StartDate, logRecord.Date)).Append("] ");
log.Append(GetLogLineIdent(logRecord.TextIdent));
log.Append(LocalizeActivityText(logRecord.Text));
log.Append("<br>");
}
litLog.Text = log.ToString() + litLog.Text;
litLog.Text = log.ToString();//+ litLog.Text;
if(task.Completed)
btnStop.Visible = false;

4
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/UserControls/ServerTabs.ascx.cs
View file

@ -176,7 +176,7 @@ namespace WebsitePanel.Portal.VPS.UserControls
litElapsed.Text = new TimeSpan(d.Hours, d.Minutes, d.Seconds).ToString();
// bind records
repRecords.DataSource = task.LastLogRecords;
repRecords.DataSource = task.GetLogs();
repRecords.DataBind();
}
@ -213,7 +213,7 @@ namespace WebsitePanel.Portal.VPS.UserControls
// gauge
gauge.Visible = false;
if (e.Item.ItemIndex == task.LastLogRecords.Count - 1)
if (e.Item.ItemIndex == task.GetLogs().Count - 1)
{
gauge.Visible = true;
gauge.Total = task.IndicatorMaximum;

4
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPSForPC/UserControls/ServerTabs.ascx.cs
View file

@ -183,7 +183,7 @@ namespace WebsitePanel.Portal.VPSForPC.UserControls
litElapsed.Text = new TimeSpan(d.Hours, d.Minutes, d.Seconds).ToString();
// bind records
repRecords.DataSource = task.LastLogRecords;
repRecords.DataSource = task.GetLogs();
repRecords.DataBind();
}
@ -228,7 +228,7 @@ namespace WebsitePanel.Portal.VPSForPC.UserControls
// gauge
gauge.Visible = false;
if (e.Item.ItemIndex == task.LastLogRecords.Count - 1)
if (e.Item.ItemIndex == task.GetLogs().Count - 1)
{
gauge.Visible = true;
gauge.Total = task.IndicatorMaximum;