diff --git a/FSSiegen.Diagram1.view b/FSSiegen.Diagram1.view index 569717f..4a52f5b 100644 --- a/FSSiegen.Diagram1.view +++ b/FSSiegen.Diagram1.view @@ -182,8 +182,8 @@ - 152 px - -8 px + 208 px + -56 px 168 px @@ -269,7 +269,7 @@ 18 px - b61df6d8-6f93-4605-bcb8-40e631176cd7 + 5121abf9-8963-4853-92fc-38b4be002089 EntityDeveloper.EnumTypeMember @@ -288,36 +288,55 @@ 18 px - ebd061a6-a896-4a7d-936f-207f87e52535 + 9d01dc6b-a794-47f8-ac79-0ff53861181c + EntityDeveloper.EnumTypeMember + + + + + 17 + 12 + + + + 0.5 px + 72.5 px + + + 144 px + 18 px + + + b61df6d8-6f93-4605-bcb8-40e631176cd7 EntityDeveloper.EnumTypeMember 145 px - 72 px + 90 px 0 px - 73 px + 91 px -296 px - -168 px + -160 px 150 px - 121 px + 139 px 100 px - 121 px + 139 px 800 px - 121 px + 139 px @@ -328,20 +347,20 @@ - 17 + 18 0 - 18 - 17 + 19 + 18 - 19 - 18 + 20 + 19 @@ -359,8 +378,8 @@ - 20 - 18 + 21 + 19 @@ -378,8 +397,8 @@ - 21 - 18 + 22 + 19 @@ -397,8 +416,8 @@ - 22 - 18 + 23 + 19 @@ -426,14 +445,14 @@ - 23 - 17 + 24 + 18 - 24 - 23 + 25 + 24 @@ -462,8 +481,8 @@ - -128 px - 240 px + -136 px + 256 px 150 px @@ -486,20 +505,20 @@ - 25 + 26 0 - 26 - 25 + 27 + 26 - 27 - 26 + 28 + 27 @@ -517,8 +536,8 @@ - 28 - 26 + 29 + 27 @@ -529,25 +548,6 @@ 290 px 18 px - - 6f0890a5-0db1-40e6-931c-92c885506d9b - EntityDeveloper.EntityFrameworkCore.EntityProperty - - - - - 29 - 26 - - - - 0.5 px - 36.5 px - - - 290 px - 18 px - fff013a1-3d14-4f2b-aee3-f5c0e5ad4d8e EntityDeveloper.EntityFrameworkCore.EntityProperty @@ -556,7 +556,26 @@ 30 - 26 + 27 + + + + 0.5 px + 36.5 px + + + 290 px + 18 px + + + 6f0890a5-0db1-40e6-931c-92c885506d9b + EntityDeveloper.EntityFrameworkCore.EntityProperty + + + + + 31 + 27 @@ -567,6 +586,25 @@ 290 px 18 px + + e280a355-8d22-494b-bc72-9f5fb4c85f3a + EntityDeveloper.EntityFrameworkCore.EntityProperty + + + + + 32 + 27 + + + + 0.5 px + 72.5 px + + + 290 px + 18 px + caf3dc53-f6cb-4554-98ac-a700657258e9 EntityDeveloper.EntityFrameworkCore.EntityProperty @@ -574,13 +612,13 @@ - 31 - 26 + 33 + 27 0.5 px - 72.5 px + 90.5 px 290 px @@ -594,23 +632,23 @@ 291 px - 91 px + 109 px 0 px - 91 px + 109 px - 32 - 25 + 34 + 26 - 33 - 32 + 35 + 34 @@ -624,8 +662,8 @@ - 34 - 32 + 36 + 34 @@ -644,7 +682,7 @@ 0 px - 90 px + 108 px 291 px @@ -658,20 +696,20 @@ - 224 px + 160 px 256 px 296 px - 194 px + 212 px 100 px - 194 px + 212 px 800 px - 194 px + 212 px @@ -682,45 +720,39 @@ - 35 + 37 1 - 25 - 36 - 37 + 26 + 38 + 39 0 - 0 px - 97 px + 126 px + 0 px - Top Bottom - Right + Left Right + Bottom - 36 + 38 FloatAnchor - 148 px + 174 px 0 px Left Right Top - 37 + 39 FloatAnchor - - - 372 px - 89 px - - false 865bd42d-b0ba-426f-a351-bcbdd38533f1 @@ -729,20 +761,20 @@ - 38 + 40 0 - 39 - 38 + 41 + 40 - 40 - 39 + 42 + 41 @@ -760,8 +792,8 @@ - 41 - 39 + 43 + 41 @@ -779,8 +811,8 @@ - 42 - 39 + 44 + 41 @@ -798,8 +830,8 @@ - 43 - 39 + 45 + 41 @@ -828,7 +860,7 @@ -128 px - -168 px + -160 px 150 px @@ -851,11 +883,11 @@ - 44 - 17 - 25 - 45 - 46 + 46 + 18 + 26 + 47 + 48 0 @@ -867,31 +899,31 @@ Top Bottom Right - 45 + 47 FloatAnchor 0 px - 79 px + 86.3298969072165 px Top Bottom Left - 46 + 48 FloatAnchor - 42 px - 319 px + 34 px + 335 px - 42 px - 335 px + 34 px + 342.329896907216 px false diff --git a/FSSiegen.edps b/FSSiegen.edps index 2c7a3c5..e984ad0 100644 --- a/FSSiegen.edps +++ b/FSSiegen.edps @@ -8,13 +8,12 @@ - - - - + + + diff --git a/FSSiegen.efml b/FSSiegen.efml index b473f07..9909c12 100644 --- a/FSSiegen.efml +++ b/FSSiegen.efml @@ -3,9 +3,10 @@ - - - + + + + @@ -52,11 +53,14 @@ + + + - - + + diff --git a/FoodsharingSiegen.Contracts/Entity/Interaction.Generated.cs b/FoodsharingSiegen.Contracts/Entity/Interaction.Generated.cs index 6369c47..f7011ee 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:25:00 +// Code is generated on: 01.04.2022 16:41:05 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -27,9 +27,11 @@ namespace FoodsharingSiegen.Contracts.Entity public virtual Guid Id { get; set; } + public virtual Guid UserId { get; set; } + public virtual DateTime Date { get; set; } - public virtual Guid UserId { get; set; } + public virtual string Info { get; set; } public virtual InteractionType Type { get; set; } diff --git a/FoodsharingSiegen.Contracts/Entity/InteractionType.cs b/FoodsharingSiegen.Contracts/Entity/InteractionType.cs index 5c9ff27..d65b69c 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:25:00 +// Code is generated on: 01.04.2022 16:41:05 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/FoodsharingSiegen.Contracts/Entity/Prospect.Generated.cs b/FoodsharingSiegen.Contracts/Entity/Prospect.Generated.cs index e4ab12f..1a49083 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:25:00 +// Code is generated on: 01.04.2022 16:41:05 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/FoodsharingSiegen.Contracts/Entity/User.Generated.cs b/FoodsharingSiegen.Contracts/Entity/User.Generated.cs index 8af9808..2549897 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:25:00 +// Code is generated on: 01.04.2022 16:41:05 // // 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 c382866..315d119 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:25:00 +// Code is generated on: 01.04.2022 16:41:05 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -21,8 +21,9 @@ namespace FoodsharingSiegen.Contracts.Entity public enum UserType : int { Unverified = 0, - User = 1, - Admin = 2, - Superadmin = 3 + ReadOnly = 10, + WelcomeTeam = 20, + StoreManager = 30, + Admin = 40 } } diff --git a/FoodsharingSiegen.Server/Data/FsContext.Generated.cs b/FoodsharingSiegen.Server/Data/FsContext.Generated.cs index 22b96b9..439dcb1 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:25:00 +// Code is generated on: 01.04.2022 16:41:05 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -129,8 +129,9 @@ namespace FoodsharingSiegen.Server.Data { modelBuilder.Entity().ToTable(@"Interactions"); modelBuilder.Entity().Property(x => x.Id).HasColumnName(@"Id").IsRequired().ValueGeneratedOnAdd(); - modelBuilder.Entity().Property(x => x.Date).HasColumnName(@"Date").IsRequired().ValueGeneratedNever(); modelBuilder.Entity().Property(x => x.UserId).HasColumnName(@"UserId").ValueGeneratedNever(); + modelBuilder.Entity().Property(x => x.Date).HasColumnName(@"Date").IsRequired().ValueGeneratedNever(); + modelBuilder.Entity().Property(x => x.Info).HasColumnName(@"Info").ValueGeneratedNever(); modelBuilder.Entity().Property(x => x.Type).HasColumnName(@"Type").IsRequired().ValueGeneratedNever(); modelBuilder.Entity().Property(x => x.ProspectId).HasColumnName(@"ProspectId").ValueGeneratedNever(); modelBuilder.Entity().HasKey(@"Id"); diff --git a/FoodsharingSiegen.Server/Pages/Users.razor b/FoodsharingSiegen.Server/Pages/Users.razor index 0bb7604..de62c9d 100644 --- a/FoodsharingSiegen.Server/Pages/Users.razor +++ b/FoodsharingSiegen.Server/Pages/Users.razor @@ -34,7 +34,7 @@ Editable Responsive> - + - - - + + + + + + - @foreach (var enumValue in Enum.GetValues()) { @enumValue @@ -68,5 +71,8 @@ + + + \ No newline at end of file diff --git a/FoodsharingSiegen.Server/Pages/Users.razor.cs b/FoodsharingSiegen.Server/Pages/Users.razor.cs index 5761ccf..53f27a3 100644 --- a/FoodsharingSiegen.Server/Pages/Users.razor.cs +++ b/FoodsharingSiegen.Server/Pages/Users.razor.cs @@ -1,22 +1,50 @@ -using Blazorise.DataGrid; +using Blazorise.DataGrid; using FoodsharingSiegen.Contracts.Entity; using FoodsharingSiegen.Server.Data.Service; using Microsoft.AspNetCore.Components; namespace FoodsharingSiegen.Server.Pages { + /// + /// The users class (a. beging, 01.04.2022) + /// public partial class Users { + #region Dependencies (Injected) + //////////////////////////////////////////////////////////////////////////////////////////////////// /// Gets or sets the user service. /// /// The user service. //////////////////////////////////////////////////////////////////////////////////////////////////// [Inject] public UserService UserService { get; set; } = null!; - - private List? UserList { get; set; } + + #endregion + + #region Public Properties + + /// + /// Gets or sets the value of the user data grid (ab) + /// public DataGrid UserDataGrid { get; set; } + #endregion + + #region Private Properties + + /// + /// Gets or sets the value of the user list (ab) + /// + private List? UserList { get; set; } + + #endregion + + #region Override OnAfterRenderAsync + + /// + /// Ons the after render using the specified first render (a. beging, 01.04.2022) + /// + /// The first render protected override async Task OnAfterRenderAsync(bool firstRender) { if (firstRender) @@ -24,7 +52,28 @@ namespace FoodsharingSiegen.Server.Pages await base.OnAfterRenderAsync(firstRender); } - + + #endregion + + #region Private Method Chang + + /// + /// Changs the context (a. beging, 01.04.2022) + /// + /// The context + /// The type + private void Chang(CellEditContext context, UserType type) + { + context.Item.Type = type; + } + + #endregion + + #region Private Method LoadUsers + + /// + /// Loads the users (a. beging, 01.04.2022) + /// private async Task LoadUsers() { var usersR = await UserService.GetUsersAsync(); @@ -33,24 +82,42 @@ namespace FoodsharingSiegen.Server.Pages await InvokeAsync(StateHasChanged); } - private async Task RowUpdated(SavedRowItem> arg) - { - if (arg.Item?.Id == null || arg.Item.Id.Equals(Guid.Empty) || arg.Values?.Any() != true) return; + #endregion - await UserService.Update(arg.Item); - } + #region Private Method RowInserted + /// + /// Rows the inserted using the specified arg (a. beging, 01.04.2022) + /// + /// The arg private async Task RowInserted(SavedRowItem> arg) { var addUserR = await UserService.AddUserAsync(arg.Item); if (!addUserR.Success) { - // Error Toast + //Todo Error Toast [01.04.22 - Andre Beging] } else { await LoadUsers(); } } + + #endregion + + #region Private Method RowUpdated + + /// + /// Rows the updated using the specified arg (a. beging, 01.04.2022) + /// + /// The arg + private async Task RowUpdated(SavedRowItem> arg) + { + if (arg.Item?.Id == null || arg.Item.Id.Equals(Guid.Empty) || arg.Values?.Any() != true) return; + + var result = await UserService.Update(arg.Item); + } + + #endregion } } \ No newline at end of file diff --git a/FoodsharingSiegen.Server/Shared/MainLayout.razor b/FoodsharingSiegen.Server/Shared/MainLayout.razor index d796a69..1ff3c89 100644 --- a/FoodsharingSiegen.Server/Shared/MainLayout.razor +++ b/FoodsharingSiegen.Server/Shared/MainLayout.razor @@ -9,7 +9,7 @@
- About +
diff --git a/FoodsharingSiegen.Server/Shared/NavMenu.razor b/FoodsharingSiegen.Server/Shared/NavMenu.razor index bbab352..f60ddee 100644 --- a/FoodsharingSiegen.Server/Shared/NavMenu.razor +++ b/FoodsharingSiegen.Server/Shared/NavMenu.razor @@ -9,16 +9,16 @@
diff --git a/FoodsharingSiegen.Server/app.db-shm b/FoodsharingSiegen.Server/app.db-shm new file mode 100644 index 0000000..582145e Binary files /dev/null and b/FoodsharingSiegen.Server/app.db-shm differ diff --git a/FoodsharingSiegen.Server/app.db-wal b/FoodsharingSiegen.Server/app.db-wal new file mode 100644 index 0000000..a07e1f0 Binary files /dev/null and b/FoodsharingSiegen.Server/app.db-wal differ