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

Fixed: Enterprise Organization Report did not show Lync user count

Browse source
This commit is contained in:
robvde 2012-11-12 08:26:26 +04:00
parent ff8bebe9bd
commit 228219f5c3
2 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

25
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/HostedSolution/ReportController.cs
View file

@ -312,6 +312,18 @@ namespace WebsitePanel.EnterpriseServer.Code.HostedSolution
} }
} }
if (report.LyncReport != null)
{
try
{
PopulateLyncReportItems(org, report, topReseller);
}
catch (Exception ex)
{
TaskManager.WriteError(ex);
}
}
if (report.OrganizationReport != null) if (report.OrganizationReport != null)
{ {
try try
@ -324,17 +336,6 @@ namespace WebsitePanel.EnterpriseServer.Code.HostedSolution
} }
} }
if (report.LyncReport != null)
{
try
{
PopulateLyncReportItems(org, report, topReseller);
}
catch (Exception ex)
{
TaskManager.WriteError(ex);
}
}
} }
@ -517,7 +518,7 @@ namespace WebsitePanel.EnterpriseServer.Code.HostedSolution
stats.InstantMessaing = plan.IM; stats.InstantMessaing = plan.IM;
stats.MobileAccess = plan.Mobility; stats.MobileAccess = plan.Mobility;
stats.LyncUserPlan = plan.LyncUserPlanName; stats.LyncUserPlan = plan.LyncUserPlanName;
stats.DisplayName = lyncUser.DisplayName;
} }
catch (Exception ex) catch (Exception ex)
{ {

3
WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/LyncStatisticsReport.cs
View file

@ -52,7 +52,6 @@ namespace WebsitePanel.Providers.HostedSolution
sb.AppendFormat("{0},", ToCsvString(item.OrganizationID)); sb.AppendFormat("{0},", ToCsvString(item.OrganizationID));
sb.AppendFormat("{0},", ToCsvString(item.DisplayName)); sb.AppendFormat("{0},", ToCsvString(item.DisplayName));
sb.AppendFormat("{0},", ToCsvString(item.AccountCreated));
sb.AppendFormat("{0},", ToCsvString(item.SipAddress)); sb.AppendFormat("{0},", ToCsvString(item.SipAddress));
sb.AppendFormat("{0},", ToCsvString(item.PhoneNumber)); sb.AppendFormat("{0},", ToCsvString(item.PhoneNumber));
@ -72,7 +71,7 @@ namespace WebsitePanel.Providers.HostedSolution
private static void AddCSVHeader(StringBuilder sb) private static void AddCSVHeader(StringBuilder sb)
{ {
sb.Append("Top Reseller,Reseller,Customer,Customer Created,Hosting Space,Hosting Space Created,Ogranization Name,Organization Created,Organization ID,Display Name,Account Created,SipAddress,PhoneNumber,Conferencing,EnterpriseVoice,Federation,InstantMessaging,MobileAccess"); sb.Append("Top Reseller,Reseller,Customer,Customer Created,Hosting Space,Hosting Space Created,Ogranization Name,Organization Created,Organization ID,Display Name,SipAddress,PhoneNumber,Conferencing,EnterpriseVoice,Federation,InstantMessaging,MobileAccess");
} }
} }
} }