diff --git a/FSSiegen.Diagram1.view b/FSSiegen.Diagram1.view index 4a52f5b..16b9c4d 100644 --- a/FSSiegen.Diagram1.view +++ b/FSSiegen.Diagram1.view @@ -306,6 +306,25 @@ 144 px 18 px + + b9fd95ad-d147-41df-94c7-3eb0c8eadb90 + EntityDeveloper.EnumTypeMember + + + + + 18 + 12 + + + + 0.5 px + 90.5 px + + + 144 px + 18 px + b61df6d8-6f93-4605-bcb8-40e631176cd7 EntityDeveloper.EnumTypeMember @@ -314,11 +333,11 @@ 145 px - 90 px + 108 px 0 px - 91 px + 109 px @@ -328,15 +347,15 @@ 150 px - 139 px + 157 px 100 px - 139 px + 157 px 800 px - 139 px + 157 px @@ -347,25 +366,25 @@ - 18 + 19 0 - 19 - 18 + 20 + 19 - 20 - 19 + 21 + 20 0.5 px - 0.5 px + 0.500000000000028 px 144 px @@ -378,8 +397,8 @@ - 21 - 19 + 22 + 20 @@ -397,8 +416,8 @@ - 22 - 19 + 23 + 20 @@ -416,8 +435,8 @@ - 23 - 19 + 24 + 20 @@ -433,28 +452,74 @@ EntityDeveloper.EntityFrameworkCore.EntityProperty + + + 25 + 20 + + + + 0.5 px + 72.5 px + + + 144 px + 18 px + + + 12d616f2-eee0-4dbc-9a24-fecb7e65e9ba + EntityDeveloper.EntityFrameworkCore.EntityProperty + + + + + 26 + 20 + + + + 0.5 px + 90.5 px + + + 144 px + 18 px + + + e00e58d3-7b35-4f5e-84fe-09d228801093 + EntityDeveloper.EntityFrameworkCore.EntityProperty + + + + 0 px + 2.8421709430404E-14 px + 145 px - 73 px + 109 px 0 px - 73 px + 109 px - 24 - 18 + 27 + 19 - 25 - 24 + 28 + 27 + + 0 px + 2.8421709430404E-14 px + 144 px 18 px @@ -467,7 +532,7 @@ 0 px - 72 px + 108 px 145 px @@ -486,15 +551,15 @@ 150 px - 158 px + 194 px 100 px - 158 px + 194 px 800 px - 158 px + 194 px @@ -505,20 +570,20 @@ - 26 + 29 0 - 27 - 26 + 30 + 29 - 28 - 27 + 31 + 30 @@ -536,8 +601,8 @@ - 29 - 27 + 32 + 30 @@ -555,8 +620,8 @@ - 30 - 27 + 33 + 30 @@ -574,8 +639,8 @@ - 31 - 27 + 34 + 30 @@ -593,8 +658,8 @@ - 32 - 27 + 35 + 30 @@ -612,8 +677,8 @@ - 33 - 27 + 36 + 30 @@ -641,14 +706,14 @@ - 34 - 26 + 37 + 29 - 35 - 34 + 38 + 37 @@ -662,8 +727,8 @@ - 36 - 34 + 39 + 37 @@ -720,11 +785,11 @@ - 37 + 40 1 - 26 - 38 - 39 + 29 + 41 + 42 0 @@ -736,7 +801,7 @@ Left Right Bottom - 38 + 41 FloatAnchor @@ -748,7 +813,7 @@ Left Right Top - 39 + 42 FloatAnchor @@ -761,20 +826,20 @@ - 40 + 43 0 - 41 - 40 + 44 + 43 - 42 - 41 + 45 + 44 @@ -792,8 +857,8 @@ - 43 - 41 + 46 + 44 @@ -811,8 +876,8 @@ - 44 - 41 + 47 + 44 @@ -830,8 +895,8 @@ - 45 - 41 + 48 + 44 @@ -847,14 +912,52 @@ EntityDeveloper.EnumTypeMember + + + 49 + 44 + + + + 0.5 px + 72.5 px + + + 144 px + 18 px + + + 9cc2e8a4-4b74-4aaa-860c-7b7a8b643174 + EntityDeveloper.EnumTypeMember + + + + + 50 + 44 + + + + 0.5 px + 90.5 px + + + 144 px + 18 px + + + 21fa1cd1-2e3c-4a85-bd1b-5780549d0835 + EntityDeveloper.EnumTypeMember + + 145 px - 72 px + 108 px 0 px - 73 px + 109 px @@ -864,15 +967,15 @@ 150 px - 121 px + 157 px 100 px - 121 px + 157 px 800 px - 121 px + 157 px @@ -883,23 +986,23 @@ - 46 - 18 - 26 - 47 - 48 + 51 + 19 + 29 + 52 + 53 0 0 px - 79 px + 97 px Top Bottom Right - 47 + 52 FloatAnchor @@ -911,7 +1014,7 @@ Top Bottom Left - 48 + 53 FloatAnchor @@ -919,7 +1022,7 @@ 34 px - 335 px + 353 px 34 px diff --git a/FSSiegen.efml b/FSSiegen.efml index 9909c12..a8cdae6 100644 --- a/FSSiegen.efml +++ b/FSSiegen.efml @@ -6,13 +6,16 @@ - + + - - + + + + @@ -48,6 +51,12 @@ + + + + + + diff --git a/FoodsharingSiegen.Contracts/Entity/Interaction.Generated.cs b/FoodsharingSiegen.Contracts/Entity/Interaction.Generated.cs index f7011ee..886bc1a 100644 --- a/FoodsharingSiegen.Contracts/Entity/Interaction.Generated.cs +++ b/FoodsharingSiegen.Contracts/Entity/Interaction.Generated.cs @@ -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: 01.04.2022 16:41:05 +// Code is generated on: 02.04.2022 10:49:14 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/FoodsharingSiegen.Contracts/Entity/InteractionType.cs b/FoodsharingSiegen.Contracts/Entity/InteractionType.cs index d65b69c..289597d 100644 --- a/FoodsharingSiegen.Contracts/Entity/InteractionType.cs +++ b/FoodsharingSiegen.Contracts/Entity/InteractionType.cs @@ -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: 01.04.2022 16:41:05 +// Code is generated on: 02.04.2022 10:49:14 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -22,7 +22,10 @@ namespace FoodsharingSiegen.Contracts.Entity { EinAb = 10, Welcome = 20, - Verify = 30, - Pass = 40 + IdCheck = 30, + PrintPass = 40, + PdfPass = 50, + Verify = 60, + Complete = 70 } } diff --git a/FoodsharingSiegen.Contracts/Entity/Prospect.Generated.cs b/FoodsharingSiegen.Contracts/Entity/Prospect.Generated.cs index 1a49083..798c6a7 100644 --- a/FoodsharingSiegen.Contracts/Entity/Prospect.Generated.cs +++ b/FoodsharingSiegen.Contracts/Entity/Prospect.Generated.cs @@ -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: 01.04.2022 16:41:05 +// Code is generated on: 02.04.2022 10:49:14 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -34,6 +34,10 @@ namespace FoodsharingSiegen.Contracts.Entity public virtual Guid ProgressId { get; set; } + public virtual DateTime Created { get; set; } + + public virtual string Memo { get; set; } + public virtual IList Interactions { get; set; } #region Extensibility Method Definitions diff --git a/FoodsharingSiegen.Contracts/Entity/User.Generated.cs b/FoodsharingSiegen.Contracts/Entity/User.Generated.cs index 2549897..1810ddd 100644 --- a/FoodsharingSiegen.Contracts/Entity/User.Generated.cs +++ b/FoodsharingSiegen.Contracts/Entity/User.Generated.cs @@ -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: 01.04.2022 16:41:05 +// Code is generated on: 02.04.2022 10:49:14 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/FoodsharingSiegen.Contracts/Entity/UserType.cs b/FoodsharingSiegen.Contracts/Entity/UserType.cs index 315d119..cb7a5e2 100644 --- a/FoodsharingSiegen.Contracts/Entity/UserType.cs +++ b/FoodsharingSiegen.Contracts/Entity/UserType.cs @@ -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: 01.04.2022 16:41:05 +// Code is generated on: 02.04.2022 10:49:14 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -24,6 +24,7 @@ namespace FoodsharingSiegen.Contracts.Entity ReadOnly = 10, WelcomeTeam = 20, StoreManager = 30, - Admin = 40 + Ambassador = 40, + Admin = 50 } } diff --git a/FoodsharingSiegen.Server/Data/FsContext.Generated.cs b/FoodsharingSiegen.Server/Data/FsContext.Generated.cs index 439dcb1..1bf9874 100644 --- a/FoodsharingSiegen.Server/Data/FsContext.Generated.cs +++ b/FoodsharingSiegen.Server/Data/FsContext.Generated.cs @@ -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: 01.04.2022 16:41:05 +// Code is generated on: 02.04.2022 10:49:14 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -116,6 +116,8 @@ namespace FoodsharingSiegen.Server.Data modelBuilder.Entity().Property(x => x.FsId).HasColumnName(@"FsId").IsRequired().ValueGeneratedNever(); modelBuilder.Entity().Property(x => x.Name).HasColumnName(@"Name").IsRequired().ValueGeneratedNever(); modelBuilder.Entity().Property(x => x.ProgressId).HasColumnName(@"ProgressId").IsRequired().ValueGeneratedNever(); + modelBuilder.Entity().Property(x => x.Created).HasColumnName(@"Created").IsRequired().ValueGeneratedNever(); + modelBuilder.Entity().Property(x => x.Memo).HasColumnName(@"Memo").IsRequired().ValueGeneratedNever(); modelBuilder.Entity().HasKey(@"Id"); } diff --git a/FoodsharingSiegen.Server/Migrations/20220401164353_asd.Designer.cs b/FoodsharingSiegen.Server/Migrations/20220401164353_asd.Designer.cs new file mode 100644 index 0000000..8763d9c --- /dev/null +++ b/FoodsharingSiegen.Server/Migrations/20220401164353_asd.Designer.cs @@ -0,0 +1,152 @@ +// +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("20220401164353_asd")] + partial class asd + { + 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("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("Id"); + + b.Property("Date") + .HasColumnType("TEXT") + .HasColumnName("Date"); + + b.Property("Info") + .HasColumnType("TEXT") + .HasColumnName("Info"); + + b.Property("ProspectId") + .HasColumnType("TEXT") + .HasColumnName("ProspectId"); + + b.Property("Type") + .HasColumnType("INTEGER") + .HasColumnName("Type"); + + b.Property("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("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("Id"); + + b.Property("Created") + .HasColumnType("TEXT") + .HasColumnName("Created"); + + b.Property("FsId") + .HasColumnType("INTEGER") + .HasColumnName("FsId"); + + b.Property("Name") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("Name"); + + b.Property("ProgressId") + .HasColumnType("TEXT") + .HasColumnName("ProgressId"); + + b.HasKey("Id"); + + b.ToTable("Prospects", (string)null); + }); + + modelBuilder.Entity("FoodsharingSiegen.Contracts.Entity.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("Id"); + + b.Property("Created") + .HasColumnType("TEXT") + .HasColumnName("Created"); + + b.Property("Mail") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("Mail"); + + b.Property("Name") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("Name"); + + b.Property("Type") + .HasColumnType("INTEGER") + .HasColumnName("Type"); + + b.Property("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 + } + } +} diff --git a/FoodsharingSiegen.Server/Migrations/20220401164353_asd.cs b/FoodsharingSiegen.Server/Migrations/20220401164353_asd.cs new file mode 100644 index 0000000..2ee6fe8 --- /dev/null +++ b/FoodsharingSiegen.Server/Migrations/20220401164353_asd.cs @@ -0,0 +1,37 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace FoodsharingSiegen.Server.Migrations +{ + public partial class asd : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "Created", + table: "Prospects", + type: "TEXT", + nullable: false, + defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); + + migrationBuilder.AddColumn( + name: "Info", + table: "Interactions", + type: "TEXT", + nullable: true); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "Created", + table: "Prospects"); + + migrationBuilder.DropColumn( + name: "Info", + table: "Interactions"); + } + } +} diff --git a/FoodsharingSiegen.Server/Migrations/20220401171855_asdk.Designer.cs b/FoodsharingSiegen.Server/Migrations/20220401171855_asdk.Designer.cs new file mode 100644 index 0000000..9c251ec --- /dev/null +++ b/FoodsharingSiegen.Server/Migrations/20220401171855_asdk.Designer.cs @@ -0,0 +1,157 @@ +// +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("20220401171855_asdk")] + partial class asdk + { + 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("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("Id"); + + b.Property("Date") + .HasColumnType("TEXT") + .HasColumnName("Date"); + + b.Property("Info") + .HasColumnType("TEXT") + .HasColumnName("Info"); + + b.Property("ProspectId") + .HasColumnType("TEXT") + .HasColumnName("ProspectId"); + + b.Property("Type") + .HasColumnType("INTEGER") + .HasColumnName("Type"); + + b.Property("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("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("Id"); + + b.Property("Created") + .HasColumnType("TEXT") + .HasColumnName("Created"); + + b.Property("FsId") + .HasColumnType("INTEGER") + .HasColumnName("FsId"); + + b.Property("Memo") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("Memo"); + + b.Property("Name") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("Name"); + + b.Property("ProgressId") + .HasColumnType("TEXT") + .HasColumnName("ProgressId"); + + b.HasKey("Id"); + + b.ToTable("Prospects", (string)null); + }); + + modelBuilder.Entity("FoodsharingSiegen.Contracts.Entity.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasColumnName("Id"); + + b.Property("Created") + .HasColumnType("TEXT") + .HasColumnName("Created"); + + b.Property("Mail") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("Mail"); + + b.Property("Name") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("Name"); + + b.Property("Type") + .HasColumnType("INTEGER") + .HasColumnName("Type"); + + b.Property("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 + } + } +} diff --git a/FoodsharingSiegen.Server/Migrations/20220401171855_asdk.cs b/FoodsharingSiegen.Server/Migrations/20220401171855_asdk.cs new file mode 100644 index 0000000..eecd016 --- /dev/null +++ b/FoodsharingSiegen.Server/Migrations/20220401171855_asdk.cs @@ -0,0 +1,26 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace FoodsharingSiegen.Server.Migrations +{ + public partial class asdk : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "Memo", + table: "Prospects", + type: "TEXT", + nullable: false, + defaultValue: ""); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "Memo", + table: "Prospects"); + } + } +} diff --git a/FoodsharingSiegen.Server/Migrations/FsContextModelSnapshot.cs b/FoodsharingSiegen.Server/Migrations/FsContextModelSnapshot.cs index 3ca0c4d..f2af9f2 100644 --- a/FoodsharingSiegen.Server/Migrations/FsContextModelSnapshot.cs +++ b/FoodsharingSiegen.Server/Migrations/FsContextModelSnapshot.cs @@ -28,6 +28,10 @@ namespace FoodsharingSiegen.Server.Migrations .HasColumnType("TEXT") .HasColumnName("Date"); + b.Property("Info") + .HasColumnType("TEXT") + .HasColumnName("Info"); + b.Property("ProspectId") .HasColumnType("TEXT") .HasColumnName("ProspectId"); @@ -56,10 +60,19 @@ namespace FoodsharingSiegen.Server.Migrations .HasColumnType("TEXT") .HasColumnName("Id"); + b.Property("Created") + .HasColumnType("TEXT") + .HasColumnName("Created"); + b.Property("FsId") .HasColumnType("INTEGER") .HasColumnName("FsId"); + b.Property("Memo") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("Memo"); + b.Property("Name") .IsRequired() .HasColumnType("TEXT") diff --git a/FoodsharingSiegen.Server/app.db-shm b/FoodsharingSiegen.Server/app.db-shm index 582145e..f751056 100644 Binary files a/FoodsharingSiegen.Server/app.db-shm and b/FoodsharingSiegen.Server/app.db-shm differ diff --git a/FoodsharingSiegen.Server/app.db-wal b/FoodsharingSiegen.Server/app.db-wal index a07e1f0..77612e4 100644 Binary files a/FoodsharingSiegen.Server/app.db-wal and b/FoodsharingSiegen.Server/app.db-wal differ