From 228219f5c34cba687be441c8ae5ef289628389e3 Mon Sep 17 00:00:00 2001 From: robvde Date: Mon, 12 Nov 2012 08:26:26 +0400 Subject: [PATCH] Fixed: Enterprise Organization Report did not show Lync user count --- .../Code/HostedSolution/ReportController.cs | 27 ++++++++++--------- .../HostedSolution/LyncStatisticsReport.cs | 3 +-- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/HostedSolution/ReportController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/HostedSolution/ReportController.cs index fb322d30..5d9861fb 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/HostedSolution/ReportController.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/HostedSolution/ReportController.cs @@ -310,18 +310,6 @@ namespace WebsitePanel.EnterpriseServer.Code.HostedSolution { TaskManager.WriteError(ex); } - } - - if (report.OrganizationReport != null) - { - try - { - PopulateOrganizationStatisticsReport(org, report, topReseller); - } - catch(Exception ex) - { - TaskManager.WriteError(ex); - } } if (report.LyncReport != null) @@ -335,6 +323,19 @@ namespace WebsitePanel.EnterpriseServer.Code.HostedSolution TaskManager.WriteError(ex); } } + + if (report.OrganizationReport != null) + { + try + { + PopulateOrganizationStatisticsReport(org, report, topReseller); + } + catch(Exception ex) + { + TaskManager.WriteError(ex); + } + } + } @@ -517,7 +518,7 @@ namespace WebsitePanel.EnterpriseServer.Code.HostedSolution stats.InstantMessaing = plan.IM; stats.MobileAccess = plan.Mobility; stats.LyncUserPlan = plan.LyncUserPlanName; - + stats.DisplayName = lyncUser.DisplayName; } catch (Exception ex) { diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/LyncStatisticsReport.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/LyncStatisticsReport.cs index f62e4def..104cb4a5 100644 --- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/LyncStatisticsReport.cs +++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/LyncStatisticsReport.cs @@ -52,7 +52,6 @@ namespace WebsitePanel.Providers.HostedSolution sb.AppendFormat("{0},", ToCsvString(item.OrganizationID)); sb.AppendFormat("{0},", ToCsvString(item.DisplayName)); - sb.AppendFormat("{0},", ToCsvString(item.AccountCreated)); sb.AppendFormat("{0},", ToCsvString(item.SipAddress)); sb.AppendFormat("{0},", ToCsvString(item.PhoneNumber)); @@ -72,7 +71,7 @@ namespace WebsitePanel.Providers.HostedSolution 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"); } } }