From 357797df6bf136351818b1d205b9fbcce06188a8 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <jonny.wong.16@gmail.com>
Date: Mon, 17 Aug 2015 16:23:45 -0700
Subject: [PATCH 1/3] Use cookies to save graph state.

The selected graph state is remembered on refreshing the graph page.
---
 data/interfaces/default/graphs.html | 32 ++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/data/interfaces/default/graphs.html b/data/interfaces/default/graphs.html
index 9aef481d..e3fa13a4 100644
--- a/data/interfaces/default/graphs.html
+++ b/data/interfaces/default/graphs.html
@@ -263,9 +263,35 @@
 <script>
     $(document).ready(function () {
 
-        var current_range = 30;
-        var yaxis = 'plays';
-        var current_tab = '#tabs-1';
+		// Save graph state to cookies
+		$('input[name=yaxis-options]').change(function() {
+			setCookie('graphType', $(this).val(), 365, '/');
+		});
+		$('input[name=date-options]').change(function() {
+			setCookie('graphDate', $(this).val(), 365, '/');
+		});
+		$('a[data-toggle=tab]').click(function() {
+			setCookie('graphTab', $(this).attr('href'), 365, '/');
+		});
+		
+		// Initial values for graph if no saved state
+		var yaxis = 'plays';
+		var current_range = 30;
+		var current_tab = '#tabs-1';
+			
+		// Read saved graph state from cookies and set initial values
+		if(getCookie('graphType')) {
+			var yaxis = getCookie('graphType');
+			$('input[name=yaxis-options][value=' + yaxis + ']').prop('checked', true).trigger('click');
+		}
+		if(getCookie('graphDate')) {
+			var current_range = getCookie('graphDate');
+			$('input[name=date-options][value=' + current_range + ']').prop('checked', true).trigger('click');
+		}
+		if(getCookie('graphTab')) {
+			var current_tab = getCookie('graphTab');
+			$('a[data-toggle=tab][href=' + current_tab + ']').trigger('click');
+		}
 
         function loadGraphsTab1(time_range, yaxis) {
             setGraphFormat(yaxis);

From 22cc06dec3f207d890db37adab35645dd78fe193 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <jonny.wong.16@gmail.com>
Date: Mon, 17 Aug 2015 16:25:27 -0700
Subject: [PATCH 2/3] Fixed tab spacing

---
 data/interfaces/default/graphs.html | 58 ++++++++++++++---------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/data/interfaces/default/graphs.html b/data/interfaces/default/graphs.html
index e3fa13a4..ade1e6ac 100644
--- a/data/interfaces/default/graphs.html
+++ b/data/interfaces/default/graphs.html
@@ -263,35 +263,35 @@
 <script>
     $(document).ready(function () {
 
-		// Save graph state to cookies
-		$('input[name=yaxis-options]').change(function() {
-			setCookie('graphType', $(this).val(), 365, '/');
-		});
-		$('input[name=date-options]').change(function() {
-			setCookie('graphDate', $(this).val(), 365, '/');
-		});
-		$('a[data-toggle=tab]').click(function() {
-			setCookie('graphTab', $(this).attr('href'), 365, '/');
-		});
-		
-		// Initial values for graph if no saved state
-		var yaxis = 'plays';
-		var current_range = 30;
-		var current_tab = '#tabs-1';
-			
-		// Read saved graph state from cookies and set initial values
-		if(getCookie('graphType')) {
-			var yaxis = getCookie('graphType');
-			$('input[name=yaxis-options][value=' + yaxis + ']').prop('checked', true).trigger('click');
-		}
-		if(getCookie('graphDate')) {
-			var current_range = getCookie('graphDate');
-			$('input[name=date-options][value=' + current_range + ']').prop('checked', true).trigger('click');
-		}
-		if(getCookie('graphTab')) {
-			var current_tab = getCookie('graphTab');
-			$('a[data-toggle=tab][href=' + current_tab + ']').trigger('click');
-		}
+        // Save graph state to cookies
+        $('input[name=yaxis-options]').change(function() {
+            setCookie('graphType', $(this).val(), 365, '/');
+        });
+        $('input[name=date-options]').change(function() {
+            setCookie('graphDate', $(this).val(), 365, '/');
+        });
+        $('a[data-toggle=tab]').click(function() {
+            setCookie('graphTab', $(this).attr('href'), 365, '/');
+        });
+        
+        // Initial values for graph if no saved state
+        var yaxis = 'plays';
+        var current_range = 30;
+        var current_tab = '#tabs-1';
+            
+        // Read saved graph state from cookies and set initial values
+        if(getCookie('graphType')) {
+            var yaxis = getCookie('graphType');
+            $('input[name=yaxis-options][value=' + yaxis + ']').prop('checked', true).trigger('click');
+        }
+        if(getCookie('graphDate')) {
+            var current_range = getCookie('graphDate');
+            $('input[name=date-options][value=' + current_range + ']').prop('checked', true).trigger('click');
+        }
+        if(getCookie('graphTab')) {
+            var current_tab = getCookie('graphTab');
+            $('a[data-toggle=tab][href=' + current_tab + ']').trigger('click');
+        }
 
         function loadGraphsTab1(time_range, yaxis) {
             setGraphFormat(yaxis);

From 6cb1c057cfce1d75a47ea307476ba38efd3f1c13 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <jonny.wong.16@gmail.com>
Date: Tue, 18 Aug 2015 02:26:52 -0700
Subject: [PATCH 3/3] Another update to recently added and recently watched.

Recently added albums now include artist name.
Recently watched episodes now include show name.
---
 data/interfaces/default/css/plexpy.css        | 10 ++++++---
 data/interfaces/default/recently_added.html   |  1 +
 .../default/user_recently_watched.html        |  4 +++-
 plexpy/datafactory.py                         | 21 ++++++++++---------
 4 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/data/interfaces/default/css/plexpy.css b/data/interfaces/default/css/plexpy.css
index 9a75b2e0..4d9bef17 100644
--- a/data/interfaces/default/css/plexpy.css
+++ b/data/interfaces/default/css/plexpy.css
@@ -264,6 +264,9 @@ fieldset[disabled] .btn-bright.active {
 .modal-body i {
 	color: #F9AA03;
 }
+.modal-body i.fa {
+	color: #fff;
+}
 .modal-body strong {
 	color: #F9AA03;
 }
@@ -641,13 +644,14 @@ input[type="color"],
 	font-size: 13px;
 	margin: 0;
 	line-height: 15px;
-	font-weight: bold;
+	font-weight: normal;
 	width: 153px;
 	white-space: nowrap;
 	text-align: center;
 	clear: both;
 }
-.dashboard-recent-media-metacontainer text-muted {
+.dashboard-recent-media-metacontainer .text-muted {
+	padding-top: 5px;
 	text-overflow: ellipsis;
 	overflow: hidden;
 	position: relative;
@@ -1151,7 +1155,7 @@ input[type="color"],
 	position: relative;
 	font-size: 13px;
 	line-height: 15px;
-	font-weight: bold;
+	font-weight: normal;
 	width: 140px;
 	margin-left: 10px;
 }
diff --git a/data/interfaces/default/recently_added.html b/data/interfaces/default/recently_added.html
index 3037d4f8..75482622 100644
--- a/data/interfaces/default/recently_added.html
+++ b/data/interfaces/default/recently_added.html
@@ -50,6 +50,7 @@ DOCUMENTATION :: END
 					<div class="cover-face" style="background-image: url(pms_image_proxy?img=${item['thumb']}&width=300&height=300&fallback=cover);"></div>					
 				</div>
 				<div class="dashboard-recent-media-metacontainer">
+                    <h3>${item['parent_title']}</h3>
 					<h3>${item['title']}</h3>
 					<div class="text-muted" id="added_at-${item['rating_key']}">${item['added_at']}</div>
 				</div>
diff --git a/data/interfaces/default/user_recently_watched.html b/data/interfaces/default/user_recently_watched.html
index 1b413439..2cf7b57c 100644
--- a/data/interfaces/default/user_recently_watched.html
+++ b/data/interfaces/default/user_recently_watched.html
@@ -18,6 +18,7 @@ time                    Returns the last watched time of the media.
 title                   Returns the name of the movie or episode.
 
 == Only if 'type' is 'episode ==
+parent_title            Returns the name of the TV Show a season belongs too.
 parent_index            Returns the season number.
 index                   Returns the episode number.
 
@@ -39,8 +40,9 @@ DOCUMENTATION :: END
                     </div>
 					<div class="dashboard-recent-media-metacontainer">
 						% if item['type'] == 'episode':
+						<h3>${item['parent_title']}</h3>
 						<h3>${item['title']}</h3>
-						<h3>(Season ${item['parentIndex']}, Episode ${item['index']})</h3>
+						<h3>(Season ${item['parent_index']}, Episode ${item['index']})</h3>
 						% elif item['type'] == 'movie':
 						<h3>${item['title']}</h3>
 						<h3>(${item['year']})</h3>
diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py
index 97a58c24..3f8e89ef 100644
--- a/plexpy/datafactory.py
+++ b/plexpy/datafactory.py
@@ -381,21 +381,21 @@ class DataFactory(object):
         try:
             if user_id:
                 query = 'SELECT session_history.id, session_history.media_type, session_history.rating_key, title, ' \
-                        'thumb, parent_thumb, media_index, parent_media_index, year, started, user ' \
+                        'grandparent_title, thumb, parent_thumb, media_index, parent_media_index, year, started, user ' \
                         'FROM session_history_metadata ' \
                         'JOIN session_history ON session_history_metadata.id = session_history.id ' \
                         'WHERE user_id = ? AND session_history.media_type != "track" ORDER BY started DESC LIMIT ?'
                 result = monitor_db.select(query, args=[user_id, limit])
             elif user:
                 query = 'SELECT session_history.id, session_history.media_type, session_history.rating_key, title, ' \
-                        'thumb, parent_thumb, media_index, parent_media_index, year, started, user ' \
+                        'grandparent_title, thumb, parent_thumb, media_index, parent_media_index, year, started, user ' \
                         'FROM session_history_metadata ' \
                         'JOIN session_history ON session_history_metadata.id = session_history.id ' \
                         'WHERE user = ? AND session_history.media_type != "track" ORDER BY started DESC LIMIT ?'
                 result = monitor_db.select(query, args=[user, limit])
             else:
                 query = 'SELECT session_history.id, session_history.media_type, session_history.rating_key, title, ' \
-                        'thumb, parent_thumb, media_index, parent_media_index, year, started, user ' \
+                        'grandparent_title, thumb, parent_thumb, media_index, parent_media_index, year, started, user ' \
                         'FROM session_history_metadata WHERE session_history.media_type != "track"' \
                         'JOIN session_history ON session_history_metadata.id = session_history.id ' \
                         'ORDER BY started DESC LIMIT ?'
@@ -406,20 +406,21 @@ class DataFactory(object):
 
         for row in result:
                 if row[1] == 'episode':
-                    thumb = row[5]
+                    thumb = row[6]
                 else:
-                    thumb = row[4]
+                    thumb = row[5]
 
                 recent_output = {'row_id': row[0],
                                  'type': row[1],
                                  'rating_key': row[2],
                                  'title': row[3],
+                                 'parent_title': row[4],
                                  'thumb': thumb,
-                                 'index': row[6],
-                                 'parentIndex': row[7],
-                                 'year': row[8],
-                                 'time': row[9],
-                                 'user': row[10]
+                                 'index': row[7],
+                                 'parent_index': row[8],
+                                 'year': row[9],
+                                 'time': row[10],
+                                 'user': row[11]
                                  }
                 recently_watched.append(recent_output)