Added download filter to calendar

api/functions/homepage-connect-functions.php

@@ -1085,6 +1085,7 @@ function getSonarrCalendar($array, $number)
 			"className" => "bg-calendar calendar-item tvID--" . $episodeID,
 			"imagetype" => "tv " . $downloaded,
 			"imagetypeFilter" => "tv",
+			"downloadFilter" => $downloaded,
 			"details" => $details
 		));
 	}
@@ -1147,6 +1148,7 @@ function getLidarrCalendar($array, $number)
 			"className" => "bg-calendar calendar-item musicID--",
 			"imagetype" => "music " . $downloaded,
 			"imagetypeFilter" => "music",
+			"downloadFilter" => $downloaded,
 			"details" => $details
 		));
 	}
@@ -1237,6 +1239,7 @@ function getRadarrCalendar($array, $number, $url)
 				"className" => "bg-calendar movieID--" . $movieID,
 				"imagetype" => "film " . $downloaded,
 				"imagetypeFilter" => "film",
+				"downloadFilter" => $downloaded,
 				"details" => $details
 			));
 		}
@@ -1318,6 +1321,7 @@ function getCouchCalendar($array, $number)
 				"className" => "bg-calendar calendar-item movieID--" . $movieID,
 				"imagetype" => "film " . $downloaded,
 				"imagetypeFilter" => "film",
+				"downloadFilter" => $downloaded,
 				"details" => $details
 			));
 		}
@@ -1385,6 +1389,7 @@ function getSickrageCalendarWanted($array, $number)
 			"className" => "bg-calendar calendar-item tvID--" . $episodeID,
 			"imagetype" => "tv " . $downloaded,
 			"imagetypeFilter" => "tv",
+			"downloadFilter" => $downloaded,
 			"details" => $details,
 		));
 	}
@@ -1440,6 +1445,7 @@ function getSickrageCalendarWanted($array, $number)
 			"className" => "bg-calendar calendar-item tvID--" . $episodeID,
 			"imagetype" => "tv " . $downloaded,
 			"imagetypeFilter" => "tv",
+			"downloadFilter" => $downloaded,
 			"details" => $details,
 		));
 	}
@@ -1495,6 +1501,7 @@ function getSickrageCalendarWanted($array, $number)
 			"className" => "bg-calendar calendar-item tvID--" . $episodeID,
 			"imagetype" => "tv " . $downloaded,
 			"imagetypeFilter" => "tv",
+			"downloadFilter" => $downloaded,
 			"details" => $details,
 		));
 	}
@@ -1550,6 +1557,7 @@ function getSickrageCalendarWanted($array, $number)
 			"className" => "bg-calendar calendar-item tvID--" . $episodeID,
 			"imagetype" => "tv " . $downloaded,
 			"imagetypeFilter" => "tv",
+			"downloadFilter" => $downloaded,
 			"details" => $details,
 		));
 	}
@@ -1602,6 +1610,7 @@ function getSickrageCalendarHistory($array, $number)
 			"className" => "bg-calendar calendar-item tvID--" . $episodeID,
 			"imagetype" => "tv " . $downloaded,
 			"imagetypeFilter" => "tv",
+			"downloadFilter" => $downloaded,
 			"details" => $details,
 		));
 	}

api/pages/homepage.php

@@ -56,17 +56,18 @@ if (file_exists('config' . DIRECTORY_SEPARATOR . 'config.php')) {
             selectable: false,
             height: "auto",
             eventRender: function eventRender( event, element, view ) {
-                if (typeof filter !== "undefined") {
-                    if(filter === "all"){
-                        return event.imagetypeFilter === event.imagetypeFilter;
-                    }else if(filter !== "all"){
-                        return filter === event.imagetypeFilter;
-                    }
-                    if(filter === null){
-                        return event.imagetypeFilter === event.imagetypeFilter;
+                if (typeof filter !== "undefined" && filterDownload !== "undefined") {
+                    if(filter === "all" && filterDownload === "all"){
+                        return (event.imagetypeFilter === event.imagetypeFilter && event.downloadFilter === event.downloadFilter);
+                    }else if(filter !== "all" && filterDownload !== "all"){
+                        return filter === event.imagetypeFilter && filterDownload === event.downloadFilter;
+                    }else if(filter !== "all" && filterDownload === "all"){
+                        return filter === event.imagetypeFilter && event.downloadFilter === event.downloadFilter;
+                    }else if(filter === "all" && filterDownload !== "all"){
+                        return event.imagetypeFilter === event.imagetypeFilter && filterDownload === event.downloadFilter;
                     }
                 }else {
-                    return event.imagetypeFilter === event.imagetypeFilter;
+                    return event.imagetypeFilter === event.imagetypeFilter && event.downloadFilter === event.downloadFilter;
                 }
             },
         });
@@ -106,6 +107,15 @@ function($) {
                             <option value="music">Music</option>
                         </select>
                     </div>
+                    <div class="col-md-12">
+                        <label class="control-label" lang="en">Choose Media Status</label>
+                        <select class="form-control form-white" data-placeholder="Choose media status" id="choose-calender-filter-status">
+                            <option value="all">All</option>
+                            <option value="text-success">Downloaded</option>
+                            <option value="text-danger">Missing</option>
+                            <option value="text-primary animated flash">Premier</option>
+                        </select>
+                    </div>
                 </div>
 			</div>
         </div>

js/custom.js

@@ -1738,9 +1738,11 @@ $(document).on('change', "#edit-tab-form-chooseIcon", function (e) {
         $('#edit-tab-form-inputImage').val(newIcon);
     }
 });
-$(document).on('change', "#choose-calender-filter", function (e) {
+$(document).on('change', "#choose-calender-filter, #choose-calender-filter-status", function (e) {
     filter = $('#choose-calender-filter').val();
+    filterDownload = $('#choose-calender-filter-status').val();
     $('#calendar-filter-modal').modal('hide');
     console.log("Calendar Filter: "+filter);
+    console.log("Calendar Filter: "+filterDownload);
     $('#calendar').fullCalendar('rerenderEvents');
 });