diff --git a/Sevomin.Models/Helpers/SevominUserValidator.cs b/Sevomin.Models/Helpers/SevominUserValidator.cs index 5db8b1b..5c4ac69 100644 --- a/Sevomin.Models/Helpers/SevominUserValidator.cs +++ b/Sevomin.Models/Helpers/SevominUserValidator.cs @@ -14,7 +14,7 @@ namespace Sevomin.Models.Helpers public SevominUserValidator() { - manager = new UserManager(new UserStore(new UsersDbContext())); + manager = new UserManager(new UserStore(SevominDbContext.Current)); } public async Task ValidateAsync(User item) diff --git a/Sevomin.Models/Migrations/201403280733264_Param values.Designer.cs b/Sevomin.Models/Migrations/201403280733264_Param values.Designer.cs new file mode 100644 index 0000000..2cbee85 --- /dev/null +++ b/Sevomin.Models/Migrations/201403280733264_Param values.Designer.cs @@ -0,0 +1,29 @@ +// +namespace Sevomin.Models.Migrations +{ + using System.CodeDom.Compiler; + using System.Data.Entity.Migrations; + using System.Data.Entity.Migrations.Infrastructure; + using System.Resources; + + [GeneratedCode("EntityFramework.Migrations", "6.1.0-30225")] + public sealed partial class Paramvalues : IMigrationMetadata + { + private readonly ResourceManager Resources = new ResourceManager(typeof(Paramvalues)); + + string IMigrationMetadata.Id + { + get { return "201403280733264_Param values"; } + } + + string IMigrationMetadata.Source + { + get { return null; } + } + + string IMigrationMetadata.Target + { + get { return Resources.GetString("Target"); } + } + } +} diff --git a/Sevomin.Models/Migrations/201403280733264_Param values.cs b/Sevomin.Models/Migrations/201403280733264_Param values.cs new file mode 100644 index 0000000..5d47ca1 --- /dev/null +++ b/Sevomin.Models/Migrations/201403280733264_Param values.cs @@ -0,0 +1,47 @@ +namespace Sevomin.Models.Migrations +{ + using System; + using System.Data.Entity.Migrations; + + public partial class Paramvalues : DbMigration + { + public override void Up() + { + CreateTable( + "dbo.Parameters", + c => new + { + Id = c.Int(nullable: false, identity: true), + Name = c.String(nullable: false), + Moscow = c.Boolean(nullable: false), + DisplayMethod = c.Byte(nullable: false), + GroupName = c.String(nullable: false), + CommentAvalin = c.String(maxLength: 140), + CommentDovomin = c.String(maxLength: 140), + ParameterValueId = c.String(maxLength: 50), + }) + .PrimaryKey(t => t.Id) + .Index(t=>t.ParameterValueId); + + CreateTable( + "dbo.ParameterValues", + c => new + { + GroupKey = c.String(nullable: false, maxLength: 50), + Value = c.String(nullable: false, maxLength: 50), + }) + .PrimaryKey(t => new { t.GroupKey, t.Value }) + .Index(t => t.GroupKey); + + } + + public override void Down() + { + DropForeignKey("dbo.ParameterValues", "Parameter_Id", "dbo.Parameters"); + DropIndex("dbo.ParameterValues", new[] { "Parameter_Id" }); + DropIndex("dbo.ParameterValues", new[] { "GroupKey" }); + DropTable("dbo.ParameterValues"); + DropTable("dbo.Parameters"); + } + } +} diff --git a/Sevomin.Models/Migrations/201403280733264_Param values.resx b/Sevomin.Models/Migrations/201403280733264_Param values.resx new file mode 100644 index 0000000..ea148e9 --- /dev/null +++ b/Sevomin.Models/Migrations/201403280733264_Param values.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 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 + + + dbo + + \ No newline at end of file diff --git a/Sevomin.Models/Migrations/Configuration.cs b/Sevomin.Models/Migrations/Configuration.cs index 86324d0..ac2734d 100644 --- a/Sevomin.Models/Migrations/Configuration.cs +++ b/Sevomin.Models/Migrations/Configuration.cs @@ -5,7 +5,7 @@ namespace Sevomin.Models.Migrations using System.Data.Entity.Migrations; using System.Linq; - internal sealed class Configuration : DbMigrationsConfiguration + internal sealed class Configuration : DbMigrationsConfiguration { public Configuration() { @@ -13,7 +13,7 @@ namespace Sevomin.Models.Migrations ContextKey = "Sevomin.Models.UsersDbContext"; } - protected override void Seed(Sevomin.Models.UsersDbContext context) + protected override void Seed(Sevomin.Models.SevominDbContext context) { // This method will be called after migrating to the latest version. diff --git a/Sevomin.Models/Parameter.cs b/Sevomin.Models/Parameter.cs index 91ba817..7797e24 100644 --- a/Sevomin.Models/Parameter.cs +++ b/Sevomin.Models/Parameter.cs @@ -33,6 +33,16 @@ namespace Sevomin.Models [StringLength(140)] public string CommentDovomin { get; set; } - + [StringLength(50)] + public string ParameterValueId { get; set; } + + [NotMapped] + public ICollection ParameterValues + { + get + { + return SevominDbContext.Current.ParameterValues.Where(x => x.GroupKey == ParameterValueId).ToList(); + } + } } } diff --git a/Sevomin.Models/ParameterValue.cs b/Sevomin.Models/ParameterValue.cs index 283185d..1bcc267 100644 --- a/Sevomin.Models/ParameterValue.cs +++ b/Sevomin.Models/ParameterValue.cs @@ -10,16 +10,17 @@ namespace Sevomin.Models { public class ParameterValue { - [Key] - public int Id { get; set; } - [Required] [Index] - [Index("IX_UniqueKey", 1, IsUnique=true)] - public int GroupKey { get; set; } + [Key] + [Column(Order=1)] + [StringLength(50)] + public string GroupKey { get; set; } [Required] - [Index("IX_UniqueKey", 2, IsUnique = true)] + [Key] + [Column(Order = 2)] + [StringLength(50)] public string Value { get; set; } } } diff --git a/Sevomin.Models/Sevomin.Models.csproj b/Sevomin.Models/Sevomin.Models.csproj index a76c72c..8694038 100644 --- a/Sevomin.Models/Sevomin.Models.csproj +++ b/Sevomin.Models/Sevomin.Models.csproj @@ -49,6 +49,7 @@ + False ..\packages\Microsoft.AspNet.Mvc.5.0.0\lib\net45\System.Web.Mvc.dll @@ -81,6 +82,10 @@ 201403270733330_Avvalin-update.cs + + + 201403280733264_Param values.cs + @@ -107,6 +112,9 @@ 201403270733330_Avvalin-update.cs + + 201403280733264_Param values.cs +