Fix machine photo types.

Cicm.Database/Enums.cs

@@ -672,4 +672,11 @@ namespace Cicm.Database
         Auto   = 0,
         Manual = 1
     }
+
+    public enum Sharpness : ushort
+    {
+        Normal = 0,
+        Low    = 1,
+        Hig    = 2
+    }
 }

Cicm.Database/Migrations/20190528222110_MachinePhotoForeignKeys.cs

@@ -0,0 +1,18 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Cicm.Database.Migrations
+{
+    public partial class MachinePhotoForeignKeys : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<int>("MachineId", "MachinePhotos", nullable: false, oldClrType: typeof(int),
+                                              oldNullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<int>("MachineId", "MachinePhotos", nullable: true, oldClrType: typeof(int));
+        }
+    }
+}

Cicm.Database/Migrations/20190528222220_ChangeMachinePhotoSharpnessTypeToExifType.cs

@@ -0,0 +1,19 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Cicm.Database.Migrations
+{
+    public partial class ChangeMachinePhotoSharpnessTypeToExifType : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<ushort>("Sharpness", "MachinePhotos", nullable: true,
+                                                 oldClrType: typeof(string), oldNullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>("Sharpness", "MachinePhotos", nullable: true,
+                                                 oldClrType: typeof(ushort), oldNullable: true);
+        }
+    }
+}

Cicm.Database/Migrations/cicmContextModelSnapshot.cs

@@ -3754,7 +3754,7 @@ namespace Cicm.Database.Migrations
 
                 b.Property<ushort?>("LightSource");
 
-                b.Property<int?>("MachineId");
+                b.Property<int>("MachineId");
 
                 b.Property<ushort?>("MeteringMode");
 
@@ -3768,7 +3768,7 @@ namespace Cicm.Database.Migrations
 
                 b.Property<ushort?>("SensingMethod");
 
-                b.Property<string>("Sharpness");
+                b.Property<ushort?>("Sharpness");
 
                 b.Property<string>("SoftwareUsed");
 

Cicm.Database/Models/MachinePhoto.cs

@@ -52,7 +52,7 @@ namespace Cicm.Database.Models
         public SceneCaptureType? SceneCaptureType { get; set; }
         [DisplayName("Sensing method")]
         public SensingMethod? SensingMethod { get; set; }
-        public string Sharpness { get;             set; }
+        public Sharpness? Sharpness { get;         set; }
         [DisplayName("Software used")]
         public string SoftwareUsed { get; set; }
         [DisplayName("Subject distance range")]
@@ -68,5 +68,8 @@ namespace Cicm.Database.Models
         public virtual Machine         Machine { get; set; }
         [Required]
         public virtual License License { get; set; }
+
+        public int MachineId { get; set; }
+        public int LicenseId { get; set; }
     }
 }

cicm_web/Areas/Admin/Models/MachinePhotoDetailsViewModel.cs

@@ -54,7 +54,7 @@ namespace cicm_web.Areas.Admin.Models
         public SceneCaptureType? SceneCaptureType { get; set; }
         [DisplayName("Sensing method")]
         public SensingMethod? SensingMethod { get; set; }
-        public string Sharpness { get;             set; }
+        public Sharpness? Sharpness { get;         set; }
         [DisplayName("Software used")]
         public string SoftwareUsed { get; set; }
         [DisplayName("Subject distance range")]

cicm_web/cicm_web.csproj

@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
-    <Version>3.0.99.632</Version>
+    <Version>3.0.99.643</Version>
     <Company>Canary Islands Computer Museum</Company>
     <Copyright>Copyright © 2003-2018 Natalia Portillo</Copyright>
     <Product>Canary Islands Computer Museum Website</Product>