Merged Eureka Branch !!!

1 files changed, 15 insertions, 1 deletions

diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/DownloadsController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/DownloadsController.cs
index 1be5b7bdf..e65a8ebbc 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/DownloadsController.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/DownloadsController.cs
@@ -42,7 +42,7 @@ namespace Tango.MachineService.Controllers
                     downloads.Add(download);
                 }
 
-                foreach (var item in db.TangoVersions.Where(x => x.InstallerBlobName != null).Include(x => x.User).Include(x => x.User.Contact).ToList())
+                foreach (var item in db.TangoVersions.Where(x => x.InstallerBlobName != null).Include(x => x.User).Include(x => x.User.Contact).Include(x => x.MachineVersion).Where(x => x.MachineVersion.Version == 1).ToList())
                 {
                     DownloadModel download = new DownloadModel();
                     download.App = DownloadModel.DownloadApp.PPC;
@@ -55,6 +55,20 @@ namespace Tango.MachineService.Controllers
 
                     downloads.Add(download);
                 }
+
+                foreach (var item in db.TangoVersions.Where(x => x.InstallerBlobName != null).Include(x => x.User).Include(x => x.User.Contact).Include(x => x.MachineVersion).Where(x => x.MachineVersion.Version == 2).ToList())
+                {
+                    DownloadModel download = new DownloadModel();
+                    download.App = DownloadModel.DownloadApp.Eureka;
+                    download.ID = item.InstallerBlobName;
+                    download.Name = $"Twine4X v{item.VersionAndTag}.exe";
+                    download.Version = item.Version;
+                    download.User = item.User.Contact.FullName;
+                    download.Date = item.LastUpdated;
+                    download.Comments = item.Comments;
+
+                    downloads.Add(download);
+                }
             }
 
             downloads = downloads.OrderByDescending(x => x.Date).ToList();