From 1e07dbec63bced51857e67b00941b91ca86a7f77 Mon Sep 17 00:00:00 2001
From: Tavares André
Date: Thu, 11 Jun 2015 20:25:12 +0200
Subject: Reports - Add Users activities
---
.../Localization/Server/server.json | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
(limited to 'MediaBrowser.Server.Implementations')
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index 49a912012..3f28e90ea 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -1448,6 +1448,7 @@
"OptionReportList": "List View",
"OptionReportStatistics": "Statistics",
"OptionReportGrouping": "Grouping",
+ "OptionReportActivities": "Activities Log",
"HeaderExport": "Export",
"HeaderColumns": "Columns",
"ButtonReset": "Reset",
@@ -1455,5 +1456,9 @@
"ButtonUnlockGuide": "Unlock Guide",
"LabelEnableFullScreen": "Enable fullscreen mode",
"LabelEnableChromecastAc3Passthrough": "Enable Chromecast AC3 Passthrough",
- "LabelSyncPath": "Synced content path:"
+ "LabelSyncPath": "Synced content path:",
+ "HeaderOverview": "Overview",
+ "HeaderShortOverview": "Short Overview",
+ "HeaderType": "Type",
+ "HeaderSeverity": "Severity"
}
--
cgit v1.2.3
From 0fa55fd6de42b683bcdcc0c632f4db1436bca36d Mon Sep 17 00:00:00 2001
From: Tavares André
Date: Tue, 30 Jun 2015 20:38:09 +0200
Subject: Reports - icons and people fix
---
.../Reports/Activities/ReportActivitiesBuilder.cs | 12 +-
MediaBrowser.Api/Reports/ReportsService.cs | 2348 ++++++++++----------
MediaBrowser.Api/Reports/Stat/ReportStatBuilder.cs | 464 ++--
.../Localization/Server/server.json | 7 +-
4 files changed, 1493 insertions(+), 1338 deletions(-)
(limited to 'MediaBrowser.Server.Implementations')
diff --git a/MediaBrowser.Api/Reports/Activities/ReportActivitiesBuilder.cs b/MediaBrowser.Api/Reports/Activities/ReportActivitiesBuilder.cs
index 4e2e85846..34115812e 100644
--- a/MediaBrowser.Api/Reports/Activities/ReportActivitiesBuilder.cs
+++ b/MediaBrowser.Api/Reports/Activities/ReportActivitiesBuilder.cs
@@ -159,7 +159,17 @@ namespace MediaBrowser.Api.Reports
break;
case HeaderMetadata.UserPrimaryImageTag:
- option.Column = (i, r) => i.UserPrimaryImageTag;
+ //option.Column = (i, r) => i.UserPrimaryImageTag;
+ option.Column = (i, r) =>
+ {
+ if (!string.IsNullOrEmpty(i.UserId))
+ {
+ MediaBrowser.Controller.Entities.User user = _userManager.GetUserById(i.UserId);
+ if (user != null)
+ return user.PrimaryImagePath;
+ }
+ return string.Empty;
+ };
option.Header.SortField = "";
break;
case HeaderMetadata.Severity:
diff --git a/MediaBrowser.Api/Reports/ReportsService.cs b/MediaBrowser.Api/Reports/ReportsService.cs
index ebf5183c5..2c0728719 100644
--- a/MediaBrowser.Api/Reports/ReportsService.cs
+++ b/MediaBrowser.Api/Reports/ReportsService.cs
@@ -24,1139 +24,1219 @@ using System.Text;
namespace MediaBrowser.Api.Reports
{
- /// The reports service.
- ///
- public class ReportsService : BaseApiService
- {
-
-
- /// Manager for user.
- private readonly IUserManager _userManager;
-
- /// Manager for library.
- private readonly ILibraryManager _libraryManager;
- /// The localization.
- private readonly ILocalizationManager _localization;
-
- ///
- /// Initializes a new instance of the MediaBrowser.Api.Reports.ReportsService class.
- /// Manager for user.
- /// Manager for library.
- /// The localization.
- public ReportsService(IUserManager userManager, ILibraryManager libraryManager, ILocalizationManager localization)
- {
- _userManager = userManager;
- _libraryManager = libraryManager;
- _localization = localization;
- }
-
- /// Gets the given request.
- /// The request.
- /// A Task<object>
- public async Task
", "");
}
var versionString = !string.Equals(mode, "cordova", StringComparison.OrdinalIgnoreCase) ? "?v=" + appVersion : string.Empty;
@@ -316,7 +316,7 @@ namespace MediaBrowser.WebDashboard.Api
html = html.Replace("", "" + GetMetaTags(mode) + GetCommonCss(mode, appVersion));
- html = html.Replace("", GetInitialJavascript(mode, appVersion) + importsHtml + GetCommonJavascript(mode, appVersion)) + "";
+ html = html.Replace("