Eureka downloads

5 files changed, 23 insertions, 3 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..a073bd0f9 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 = $"Eureka 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();
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Images/eureka.png b/Software/Visual_Studio/Web/Tango.MachineService/Images/eureka.png
new file mode 100644
index 000000000..c03daaded
--- /dev/null
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Images/eureka.png
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Models/DownloadModel.cs b/Software/Visual_Studio/Web/Tango.MachineService/Models/DownloadModel.cs
index b13f5c66f..cfd2e02cd 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Models/DownloadModel.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Models/DownloadModel.cs
@@ -19,6 +19,7 @@ namespace Tango.MachineService.Models
         {
             MachineStudio,
             PPC,
+            Eureka
         }
     }
 }
\ No newline at end of file
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj b/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj
index 2e05ad690..451706a19 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj
@@ -343,6 +343,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Views\FSEAccount\ResetPasswordVM.cs" />
     <Compile Include="Views\FSEDownloads\IndexViewModel.cs" />
+    <Content Include="Images\eureka.png" />
     <Content Include="Nswag\DataStoreClient.nswag" />
     <None Include="Security\RefreshTokenEncoder.cs" />
     <None Include="Security\RefreshTokenEntity.cs" />
@@ -505,7 +506,7 @@
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Views/Downloads/Index.cshtml b/Software/Visual_Studio/Web/Tango.MachineService/Views/Downloads/Index.cshtml
index 044daaaa2..3a1b8930b 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Views/Downloads/Index.cshtml
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Views/Downloads/Index.cshtml
@@ -24,10 +24,14 @@
                         {
                             <img src="~/Images/machine-studio.png" width="50" />
                         }
-                        else
+                        else if (item.App == Tango.MachineService.Models.DownloadModel.DownloadApp.PPC)
                         {
                             <img src="~/Images/ppc.png" width="50" />
                         }
+                        else
+                        {
+                            <img src="~/Images/eureka.png.png" width="50" />
+                        }
                     </td>
                     <td>
                         <a style="display:inline" href="/Downloads/Download?blobName=@item.ID&downloadApp=@item.App">@item.Name</a>