From 0678908fd9a6ad33896ffe92784f0c2a581c802e Mon Sep 17 00:00:00 2001 From: geogolem Date: Thu, 23 Feb 2017 07:08:30 -0500 Subject: [PATCH] Cleanup min availability (#846) * some minor cleanup + changed filter on wanted/missing * MovieIndex Footer add counts + update legend * minor spelling error + typo --- src/UI/Content/progress-bars.less | 3 + src/UI/Movies/Index/FooterViewTemplate.hbs | 29 ++++----- src/UI/Movies/Index/MoviesIndexLayout.js | 69 ++++++++++++++++------ 3 files changed, 65 insertions(+), 36 deletions(-) diff --git a/src/UI/Content/progress-bars.less b/src/UI/Content/progress-bars.less index 9211b1c87..c08a92d6d 100644 --- a/src/UI/Content/progress-bars.less +++ b/src/UI/Content/progress-bars.less @@ -37,3 +37,6 @@ .progress-bar-purple { #gradient > .vertical(@purple, @nzbdronePurple); } +.progress-bar-gray { + #gradient > .vertical(@gray-light, @gray-light); +} diff --git a/src/UI/Movies/Index/FooterViewTemplate.hbs b/src/UI/Movies/Index/FooterViewTemplate.hbs index ce1e5172f..1f754a672 100644 --- a/src/UI/Movies/Index/FooterViewTemplate.hbs +++ b/src/UI/Movies/Index/FooterViewTemplate.hbs @@ -1,10 +1,11 @@
    -
  • Missing, but not yet considered availabile
  • -
  • Downloaded and imported.
  • -
  • Missing and monitored.
  • -
  • Missing, but not monitored.
  • +
  • Missing, but not yet considered available: {{missingNotAvailable}}
  • +
  • Downloaded and imported: {{downloaded}}
  • +
  • Downloaded, but not monitored: {{downloadedNotMonitored}}
  • +
  • Missing and monitored: {{missingMonitored}}
  • +
  • Missing, but not monitored: {{missingNotMonitored}}
@@ -12,7 +13,7 @@
Movies
-
{{series}}
+
{{movies}}
Released
{{released}}
@@ -27,23 +28,13 @@
-
Monitored
-
{{monitored}}
- -
Unmonitored
-
{{unmonitored}}
+
Available,Monitored&Missing
+
{{missingMonitoredAvailable}}
+
Monitored
+
{{monitored}}
-
-
-
Episodes
-
{{episodes}}
- -
Files
-
{{episodeFiles}}
-
-
diff --git a/src/UI/Movies/Index/MoviesIndexLayout.js b/src/UI/Movies/Index/MoviesIndexLayout.js index 2b4989e11..ffd7cf227 100644 --- a/src/UI/Movies/Index/MoviesIndexLayout.js +++ b/src/UI/Movies/Index/MoviesIndexLayout.js @@ -323,40 +323,75 @@ module.exports = Marionette.Layout.extend({ _showFooter : function() { var footerModel = new FooterModel(); - var series = MoviesCollection.models.length; - var episodes = 0; - var episodeFiles = 0; + var movies = MoviesCollection.models.length; + var announced = 0; - var released = 0; var incinemas = 0; - var monitored = 0; + var released = 0; + + var monitored = 0; + + var downloaded =0; + var missingMonitored=0; + var missingNotMonitored=0; + var missingNotAvailable=0; + var missingMonitoredAvailable=0; + + var downloadedNotMonitored=0; _.each(MoviesCollection.models, function(model) { - episodes += model.get('episodeCount'); - episodeFiles += model.get('episodeFileCount'); if (model.get('status').toLowerCase() === 'released') { released++; - } else if (model.get('status').toLowerCase() === 'incinemas') { + } + else if (model.get('status').toLowerCase() === 'incinemas') { incinemas++; - } else { + } + else if (model.get('status').toLowerCase() === 'announced') { announced++; } if (model.get('monitored')) { monitored++; + } + else { //not monitored + if (model.get('downloaded')) { + downloadedNotMonitored++; + } + else { //missing + missingNotMonitored++; + } + } + + if (model.get('downloaded')) { + downloaded++; + } + else { //missing + if (!model.get('isAvailable')) { + missingNotAvailable++; + } + + if (model.get('monitored')) { + missingMonitored++; + if (model.get('isAvailable')) { + missingMonitoredAvailable++; + } + } } }); footerModel.set({ - series : series, - released : released, - incinemas : incinemas, - announced : announced, - monitored : monitored, - unmonitored : series - monitored, - episodes : episodes, - episodeFiles : episodeFiles + movies : movies, + announced : announced, + incinemas : incinemas, + released : released, + monitored : monitored, + downloaded : downloaded, + downloadedNotMonitored : downloadedNotMonitored, + missingMonitored : missingMonitored, + missingMonitoredAvailable : missingMonitoredAvailable, + missingNotAvailable : missingNotAvailable, + missingNotMonitored : missingNotMonitored }); this.footer.show(new FooterView({ model : footerModel }));