troogs/FoodsharingOnboarding
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Database updates

Browse Source
This commit is contained in:
Andre Beging
2022-04-08 16:10:26 +02:00
parent e8f9c4c0f5
commit 7fb5ecf04a
15 changed files with 583 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
FoodsharingSiegen.Server/Data/FsContext.Generated.cs
View File

@@ -2,7 +2,7 @@
// This is auto-generated code.
//------------------------------------------------------------------------------
// This code was generated by Entity Developer tool using EF Core template.
// Code is generated on: 04.04.2022 16:38:40
// Code is generated on: 05.04.2022 16:38:00
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -101,6 +101,7 @@ namespace FoodsharingSiegen.Server.Data
modelBuilder.Entity<User>().Property(x => x.Name).HasColumnName(@"Name").IsRequired().ValueGeneratedNever();
modelBuilder.Entity<User>().Property(x => x.Created).HasColumnName(@"Created").IsRequired().ValueGeneratedNever();
modelBuilder.Entity<User>().Property(x => x.EncryptedPassword).HasColumnName(@"EncryptedPassword").IsRequired().ValueGeneratedNever();
modelBuilder.Entity<User>().Property(x => x.Groups).HasColumnName(@"Groups").IsRequired().ValueGeneratedNever();
modelBuilder.Entity<User>().HasKey(@"Id");
}

1
FoodsharingSiegen.Server/FoodsharingSiegen.Server.csproj
View File

@@ -13,6 +13,7 @@
<ItemGroup>
<PackageReference Include="Blazorise.DataGrid" Version="1.0.2" />
<PackageReference Include="Blazorise.Icons.Material" Version="1.0.2" />
<PackageReference Include="Blazorise.Components" Version="1.0.2" />
<PackageReference Include="Blazorise.Material" Version="1.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.1">

178
FoodsharingSiegen.Server/Migrations/20220405143853_usergroups.Designer.cs generated Normal file
View File

@@ -0,0 +1,178 @@
// <auto-generated />
using System;
using FoodsharingSiegen.Server.Data;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
#nullable disable
namespace FoodsharingSiegen.Server.Migrations
{
[DbContext(typeof(FsContext))]
[Migration("20220405143853_usergroups")]
partial class usergroups
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder.HasAnnotation("ProductVersion", "6.0.1");
modelBuilder.Entity("FoodsharingSiegen.Contracts.Entity.Interaction", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("TEXT")
.HasColumnName("Id");
b.Property<bool>("Alert")
.HasColumnType("INTEGER")
.HasColumnName("Alert");
b.Property<DateTime>("Created")
.HasColumnType("TEXT")
.HasColumnName("Created");
b.Property<DateTime>("Date")
.HasColumnType("TEXT")
.HasColumnName("Date");
b.Property<string>("Info")
.HasColumnType("TEXT")
.HasColumnName("Info");
b.Property<bool>("NotNeeded")
.HasColumnType("INTEGER")
.HasColumnName("NotNeeded");
b.Property<Guid>("ProspectId")
.HasColumnType("TEXT")
.HasColumnName("ProspectId");
b.Property<int>("Type")
.HasColumnType("INTEGER")
.HasColumnName("Type");
b.Property<Guid>("UserId")
.HasColumnType("TEXT")
.HasColumnName("UserId");
b.HasKey("Id");
b.HasIndex("ProspectId");
b.HasIndex("UserId");
b.ToTable("Interactions", (string)null);
});
modelBuilder.Entity("FoodsharingSiegen.Contracts.Entity.Prospect", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("TEXT")
.HasColumnName("Id");
b.Property<DateTime>("Created")
.HasColumnType("TEXT")
.HasColumnName("Created");
b.Property<int>("FsId")
.HasColumnType("INTEGER")
.HasColumnName("FsId");
b.Property<string>("Memo")
.HasColumnType("TEXT")
.HasColumnName("Memo");
b.Property<string>("Name")
.IsRequired()
.HasColumnType("TEXT")
.HasColumnName("Name");
b.Property<Guid>("ProgressId")
.HasColumnType("TEXT")
.HasColumnName("ProgressId");
b.HasKey("Id");
b.ToTable("Prospects", (string)null);
});
modelBuilder.Entity("FoodsharingSiegen.Contracts.Entity.User", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("TEXT")
.HasColumnName("Id");
b.Property<DateTime>("Created")
.HasColumnType("TEXT")
.HasColumnName("Created");
b.Property<string>("EncryptedPassword")
.IsRequired()
.HasColumnType("TEXT")
.HasColumnName("EncryptedPassword");
b.Property<string>("Groups")
.IsRequired()
.HasColumnType("TEXT")
.HasColumnName("Groups");
b.Property<string>("Mail")
.IsRequired()
.HasColumnType("TEXT")
.HasColumnName("Mail");
b.Property<string>("Name")
.IsRequired()
.HasColumnType("TEXT")
.HasColumnName("Name");
b.Property<int>("Type")
.HasColumnType("INTEGER")
.HasColumnName("Type");
b.Property<bool>("Verified")
.HasColumnType("INTEGER")
.HasColumnName("Verified");
b.HasKey("Id");
b.ToTable("Users", (string)null);
});
modelBuilder.Entity("FoodsharingSiegen.Contracts.Entity.Interaction", b =>
{
b.HasOne("FoodsharingSiegen.Contracts.Entity.Prospect", "Prospect")
.WithMany("Interactions")
.HasForeignKey("ProspectId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("FoodsharingSiegen.Contracts.Entity.User", "User")
.WithMany("Interactions")
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("Prospect");
b.Navigation("User");
});
modelBuilder.Entity("FoodsharingSiegen.Contracts.Entity.Prospect", b =>
{
b.Navigation("Interactions");
});
modelBuilder.Entity("FoodsharingSiegen.Contracts.Entity.User", b =>
{
b.Navigation("Interactions");
});
#pragma warning restore 612, 618
}
}
}

26
FoodsharingSiegen.Server/Migrations/20220405143853_usergroups.cs Normal file
View File

@@ -0,0 +1,26 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace FoodsharingSiegen.Server.Migrations
{
public partial class usergroups : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "Groups",
table: "Users",
type: "TEXT",
nullable: false,
defaultValue: "");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "Groups",
table: "Users");
}
}
}

5
FoodsharingSiegen.Server/Migrations/FsContextModelSnapshot.cs
View File

@@ -114,6 +114,11 @@ namespace FoodsharingSiegen.Server.Migrations
.HasColumnType("TEXT")
.HasColumnName("EncryptedPassword");
b.Property<string>("Groups")
.IsRequired()
.HasColumnType("TEXT")
.HasColumnName("Groups");
b.Property<string>("Mail")
.IsRequired()
.HasColumnType("TEXT")

35
FoodsharingSiegen.Server/Pages/Users.razor.cs
View File

@@ -37,6 +37,14 @@ namespace FoodsharingSiegen.Server.Pages
/// </summary>
private List<User>? UserList { get; set; }
public User? SelectedUser { get; set; }
public IEnumerable<UserGroup> UserGroups => Enum.GetValues<UserGroup>();
public List<Company> Companies { get; set; }
public List<UserGroup> SelectedCompanies { get; set; }
public List<string> SelectedCompanyTexts { get; set; } = new();
#endregion
#region Override OnAfterRenderAsync
@@ -55,6 +63,21 @@ namespace FoodsharingSiegen.Server.Pages
#endregion
protected override void OnInitialized()
{
Companies = new List<Company>
{
new Company{Name = "Germany", ISO = "DE"},
new Company{Name = "USA", ISO = "US"},
new Company{Name = "England", ISO = "GB"},
new Company{Name = "Austria", ISO = "AT"}
};
SelectedCompanies = new List<UserGroup> {UserGroups.ElementAt(2)};
base.OnInitialized();
}
#region Private Method Chang
/// <summary>
@@ -119,5 +142,17 @@ namespace FoodsharingSiegen.Server.Pages
}
#endregion
private async Task SelectedChanged(List<UserGroup> arg)
{
}
}
public class Company
{
public string Name { get; set; }
public string ISO { get; set; }
}
}