update

MyOffice.Data.Models/Items/Item.cs

@@ -13,8 +13,8 @@ public class Item
 	/// UnCategorized category is CategoryId = UserId 
 	/// </summary>
 	public Guid CategoryId { get; set; }
-	public ItemCategory Category { get; set; } = null!;
+	public ItemCategory? Category { get; set; }
 	public Guid ItemGlobalId { get; set; }
 	public ItemGlobal ItemGlobal { get; set; } = null!;
-	public IEnumerable<Motion> Motions { get; set; } = null!;
+	public List<Motion>? Motions { get; set; }
 }

MyOffice.Data.Models/Items/ItemCategory.cs

@@ -8,5 +8,6 @@ public class ItemCategory
 	public Guid UserId { get; set; }
 	public User User { get; set; } = null!;
 	public string Name { get; set; } = null!;
-	public IEnumerable<Item> Items { get; set; } = null!;
+	public List<Item> Items { get; set; } = null!;
+	public bool IsInternal { get; set; }
 }

MyOffice.Data.Repositories/Account/AccountRepository.cs

@@ -90,4 +90,12 @@ public class AccountRepository : AppRepository<Account>, IAccountRepository
 	{
 		return RemoveBase(account) > 0;
 	}
+
+	public List<Account> FindAccounts(Guid userId, string term)
+	{
+		return _context.Accounts
+			.Where(x => x.AccessRights.Any(a => a.UserId == userId))
+			.Where(x => x.Name.Contains(term))
+			.ToList();
+	}
 }

MyOffice.Data.Repositories/Account/IAccountyRepository.cs

@@ -12,4 +12,5 @@ public interface IAccountRepository
 	Account? Get(Guid userId, Guid id);
 	bool Update(Account account);
 	bool Remove(Account account);
+	List<Account> FindAccounts(Guid userId, string term);
 }

MyOffice.Data.Repositories/Item/IItemRepository.cs

@@ -10,4 +10,5 @@ public interface IItemRepository
 	Item? GetByGlobal(Guid userId, Guid globalMotionId);
 	bool Add(Item item);
 	bool Update(Item item);
+	List<Item> Find(Guid userId, string term, int limit);
 }

MyOffice.Data.Repositories/Item/ItemRepository.cs

@@ -31,7 +31,7 @@ public class ItemRepository : AppRepository<Item>, IItemRepository
 			.Include(x => x.Motions)
 			.Include(x => x.Category)
 			.Include(x => x.ItemGlobal)
-			.FirstOrDefault(x => x.Category.UserId == userId && x.ItemGlobalId == globalMotionId);
+			.FirstOrDefault(x => x.Category!.UserId == userId && x.ItemGlobalId == globalMotionId);
 	}
 
 	public bool Update(Item item)
@@ -43,4 +43,15 @@ public class ItemRepository : AppRepository<Item>, IItemRepository
 	{
 		return base.AddBase(item) > 0;
 	}
+
+	public List<Item> Find(Guid userId, string term, int limit)
+	{
+		return _context
+			.Items
+			.Include(x => x.ItemGlobal)
+			.Where(x => x.Category!.UserId == userId && x.ItemGlobal.Name.Contains(term))
+			.OrderByDescending(x => x.Motions.Count())
+			.Take(limit)
+			.ToList();
+	}
 }

MyOffice.Migration.Postgres/Migrations/20230627044606_IsInternal.Designer.cs

@@ -0,0 +1,611 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using MyOffice.DbContext;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace MyOffice.Migrations.Postgres.Migrations
+{
+    [DbContext(typeof(AppDbContext))]
+    [Migration("20230627044606_IsInternal")]
+    partial class IsInternal
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("Npgsql:CollationDefinition:my_ci_collation", "en-u-ks-primary,en-u-ks-primary,icu,False")
+                .HasAnnotation("ProductVersion", "7.0.0")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("MyOffice.Data.Models.Accounts.Account", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CurrencyGlobalId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CurrencyGlobalId");
+
+                    b.ToTable("Accounts");
+                });
+
+            modelBuilder.Entity("MyOffice.Data.Models.Accounts.AccountAccess", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("AccountId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("IsAllowManage")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsAllowRead")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsAllowWrite")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccountId");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AccountAccesses");
+                });
+
+            modelBuilder.Entity("MyOffice.Data.Models.Accounts.AccountAccountCategory", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("AccountId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("CategoryId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccountId");
+
+                    b.HasIndex("CategoryId");
+
+                    b.ToTable("AccountAccountCategories");
+                });
+
+            modelBuilder.Entity("MyOffice.Data.Models.Accounts.AccountCategory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AccountCategories");
+                });
+
+            modelBuilder.Entity("MyOffice.Data.Models.Accounts.Motion", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AccountId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("AmountMinus")
+                        .HasPrecision(18, 6)
+                        .HasColumnType("numeric(18,6)");
+
+                    b.Property<decimal>("AmountPlus")
+                        .HasPrecision(18, 6)
+                        .HasColumnType("numeric(18,6)");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime>("DateTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<int>("ItemId")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccountId");
+
+                    b.HasIndex("ItemId");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("Motions");
+                });
+
+            modelBuilder.Entity("MyOffice.Data.Models.Currencies.Currency", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CurrencyGlobalId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ShortName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CurrencyGlobalId");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("Currencies");
+                });
+
+            modelBuilder.Entity("MyOffice.Data.Models.Currencies.CurrencyGlobal", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<int>("DefaultQuantity")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Symbol")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("CurrencyGlobals");
+                });
+
+            modelBuilder.Entity("MyOffice.Data.Models.Currencies.CurrencyRate", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("CurrencyId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("DateTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<int>("Quantity")
+                        .HasColumnType("integer");
+
+                    b.Property<decimal>("Rate")
+                        .HasColumnType("numeric");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CurrencyId");
+
+                    b.ToTable("CurrencyRates");
+                });
+
+            modelBuilder.Entity("MyOffice.Data.Models.Items.Item", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("CategoryId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ItemGlobalId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CategoryId");
+
+                    b.HasIndex("ItemGlobalId");
+
+                    b.ToTable("Items");
+                });
+
+            modelBuilder.Entity("MyOffice.Data.Models.Items.ItemCategory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("IsInternal")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("ItemCategories");
+                });
+
+            modelBuilder.Entity("MyOffice.Data.Models.Items.ItemGlobal", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ItemGlobals");
+                });
+
+            modelBuilder.Entity("MyOffice.Data.Models.Users.User", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CurrencyId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .UseCollation("my_ci_collation");
+
+                    b.Property<string>("FirstName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FullName")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsEmailConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("LastName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PasswordHash")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .UseCollation("my_ci_collation");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CurrencyId");
+
+                    b.ToTable("Users");
+                });
+
+            modelBuilder.Entity("MyOffice.Data.Models.Users.UserExternal", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .UseCollation("my_ci_collation");
+
+                    b.Property<string>("ExternalId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Provider")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .UseCollation("my_ci_collation");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("UserClaims");
+                });
+
+            modelBuilder.Entity("MyOffice.Data.Models.Accounts.Account", b =>
+                {
+                    b.HasOne("MyOffice.Data.Models.Currencies.CurrencyGlobal", "CurrencyGlobal")
+                        .WithMany("Accounts")
+                        .HasForeignKey("CurrencyGlobalId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("CurrencyGlobal");
+                });
+
+            modelBuilder.Entity("MyOffice.Data.Models.Accounts.AccountAccess", b =>
+                {
+                    b.HasOne("MyOffice.Data.Models.Accounts.Account", "Account")
+                        .WithMany("AccessRights")
+                        .HasForeignKey("AccountId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("MyOffice.Data.Models.Users.User", "User")
+                        .WithMany("AccountAccess")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Account");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("MyOffice.Data.Models.Accounts.AccountAccountCategory", b =>
+                {
+                    b.HasOne("MyOffice.Data.Models.Accounts.Account", "Account")
+                        .WithMany("Categories")
+                        .HasForeignKey("AccountId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("MyOffice.Data.Models.Accounts.AccountCategory", "Category")
+                        .WithMany("Accounts")
+                        .HasForeignKey("CategoryId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Account");
+
+                    b.Navigation("Category");
+                });
+
+            modelBuilder.Entity("MyOffice.Data.Models.Accounts.AccountCategory", b =>
+                {
+                    b.HasOne("MyOffice.Data.Models.Users.User", "User")
+                        .WithMany("AccountCategories")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("MyOffice.Data.Models.Accounts.Motion", b =>
+                {
+                    b.HasOne("MyOffice.Data.Models.Accounts.Account", "Account")
+                        .WithMany("Motions")
+                        .HasForeignKey("AccountId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("MyOffice.Data.Models.Items.Item", "Item")
+                        .WithMany("Motions")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("MyOffice.Data.Models.Users.User", null)
+                        .WithMany("AccountMotions")
+                        .HasForeignKey("UserId");
+
+                    b.Navigation("Account");
+
+                    b.Navigation("Item");
+                });
+
+            modelBuilder.Entity("MyOffice.Data.Models.Currencies.Currency", b =>
+                {
+                    b.HasOne("MyOffice.Data.Models.Currencies.CurrencyGlobal", "CurrencyGlobal")
+                        .WithMany("Currencies")
+                        .HasForeignKey("CurrencyGlobalId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("MyOffice.Data.Models.Users.User", "User")
+                        .WithMany("Currencies")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("CurrencyGlobal");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("MyOffice.Data.Models.Currencies.CurrencyRate", b =>
+                {
+                    b.HasOne("MyOffice.Data.Models.Currencies.Currency", "Currency")
+                        .WithMany("Rates")
+                        .HasForeignKey("CurrencyId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Currency");
+                });
+
+            modelBuilder.Entity("MyOffice.Data.Models.Items.Item", b =>
+                {
+                    b.HasOne("MyOffice.Data.Models.Items.ItemCategory", "Category")
+                        .WithMany("Items")
+                        .HasForeignKey("CategoryId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("MyOffice.Data.Models.Items.ItemGlobal", "ItemGlobal")
+                        .WithMany("Items")
+                        .HasForeignKey("ItemGlobalId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Category");
+
+                    b.Navigation("ItemGlobal");
+                });
+
+            modelBuilder.Entity("MyOffice.Data.Models.Items.ItemCategory", b =>
+                {
+                    b.HasOne("MyOffice.Data.Models.Users.User", "User")
+                        .WithMany("ItemCategories")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("MyOffice.Data.Models.Users.User", b =>
+                {
+                    b.HasOne("MyOffice.Data.Models.Currencies.CurrencyGlobal", "Currency")
+                        .WithMany()
+                        .HasForeignKey("CurrencyId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Currency");
+                });
+
+            modelBuilder.Entity("MyOffice.Data.Models.Users.UserExternal", b =>
+                {
+                    b.HasOne("MyOffice.Data.Models.Users.User", "User")
+                        .WithMany("UserClaims")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("MyOffice.Data.Models.Accounts.Account", b =>
+                {
+                    b.Navigation("AccessRights");
+
+                    b.Navigation("Categories");
+
+                    b.Navigation("Motions");
+                });
+
+            modelBuilder.Entity("MyOffice.Data.Models.Accounts.AccountCategory", b =>
+                {
+                    b.Navigation("Accounts");
+                });
+
+            modelBuilder.Entity("MyOffice.Data.Models.Currencies.Currency", b =>
+                {
+                    b.Navigation("Rates");
+                });
+
+            modelBuilder.Entity("MyOffice.Data.Models.Currencies.CurrencyGlobal", b =>
+                {
+                    b.Navigation("Accounts");
+
+                    b.Navigation("Currencies");
+                });
+
+            modelBuilder.Entity("MyOffice.Data.Models.Items.Item", b =>
+                {
+                    b.Navigation("Motions");
+                });
+
+            modelBuilder.Entity("MyOffice.Data.Models.Items.ItemCategory", b =>
+                {
+                    b.Navigation("Items");
+                });
+
+            modelBuilder.Entity("MyOffice.Data.Models.Items.ItemGlobal", b =>
+                {
+                    b.Navigation("Items");
+                });
+
+            modelBuilder.Entity("MyOffice.Data.Models.Users.User", b =>
+                {
+                    b.Navigation("AccountAccess");
+
+                    b.Navigation("AccountCategories");
+
+                    b.Navigation("AccountMotions");
+
+                    b.Navigation("Currencies");
+
+                    b.Navigation("ItemCategories");
+
+                    b.Navigation("UserClaims");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

MyOffice.Migration.Postgres/Migrations/20230627044606_IsInternal.cs

@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace MyOffice.Migrations.Postgres.Migrations
+{
+    /// <inheritdoc />
+    public partial class IsInternal : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "IsInternal",
+                table: "ItemCategories",
+                type: "boolean",
+                nullable: false,
+                defaultValue: false);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "IsInternal",
+                table: "ItemCategories");
+        }
+    }
+}

MyOffice.Migration.Postgres/Migrations/AppDbContextModelSnapshot.cs

@@ -240,7 +240,7 @@ namespace MyOffice.Migrations.Postgres.Migrations
                     b.ToTable("CurrencyRates");
                 });
 
-            modelBuilder.Entity("MyOffice.Data.Models.Motions.Item", b =>
+            modelBuilder.Entity("MyOffice.Data.Models.Items.Item", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -263,12 +263,15 @@ namespace MyOffice.Migrations.Postgres.Migrations
                     b.ToTable("Items");
                 });
 
-            modelBuilder.Entity("MyOffice.Data.Models.Motions.ItemCategory", b =>
+            modelBuilder.Entity("MyOffice.Data.Models.Items.ItemCategory", b =>
                 {
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid");
 
+                    b.Property<bool>("IsInternal")
+                        .HasColumnType("boolean");
+
                     b.Property<string>("Name")
                         .IsRequired()
                         .HasColumnType("text");
@@ -283,7 +286,7 @@ namespace MyOffice.Migrations.Postgres.Migrations
                     b.ToTable("ItemCategories");
                 });
 
-            modelBuilder.Entity("MyOffice.Data.Models.Motions.ItemGlobal", b =>
+            modelBuilder.Entity("MyOffice.Data.Models.Items.ItemGlobal", b =>
                 {
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
@@ -447,7 +450,7 @@ namespace MyOffice.Migrations.Postgres.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("MyOffice.Data.Models.Motions.Item", "Item")
+                    b.HasOne("MyOffice.Data.Models.Items.Item", "Item")
                         .WithMany("Motions")
                         .HasForeignKey("ItemId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -492,15 +495,15 @@ namespace MyOffice.Migrations.Postgres.Migrations
                     b.Navigation("Currency");
                 });
 
-            modelBuilder.Entity("MyOffice.Data.Models.Motions.Item", b =>
+            modelBuilder.Entity("MyOffice.Data.Models.Items.Item", b =>
                 {
-                    b.HasOne("MyOffice.Data.Models.Motions.ItemCategory", "Category")
+                    b.HasOne("MyOffice.Data.Models.Items.ItemCategory", "Category")
                         .WithMany("Items")
                         .HasForeignKey("CategoryId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("MyOffice.Data.Models.Motions.ItemGlobal", "ItemGlobal")
+                    b.HasOne("MyOffice.Data.Models.Items.ItemGlobal", "ItemGlobal")
                         .WithMany("Items")
                         .HasForeignKey("ItemGlobalId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -511,7 +514,7 @@ namespace MyOffice.Migrations.Postgres.Migrations
                     b.Navigation("ItemGlobal");
                 });
 
-            modelBuilder.Entity("MyOffice.Data.Models.Motions.ItemCategory", b =>
+            modelBuilder.Entity("MyOffice.Data.Models.Items.ItemCategory", b =>
                 {
                     b.HasOne("MyOffice.Data.Models.Users.User", "User")
                         .WithMany("ItemCategories")
@@ -570,17 +573,17 @@ namespace MyOffice.Migrations.Postgres.Migrations
                     b.Navigation("Currencies");
                 });
 
-            modelBuilder.Entity("MyOffice.Data.Models.Motions.Item", b =>
+            modelBuilder.Entity("MyOffice.Data.Models.Items.Item", b =>
                 {
                     b.Navigation("Motions");
                 });
 
-            modelBuilder.Entity("MyOffice.Data.Models.Motions.ItemCategory", b =>
+            modelBuilder.Entity("MyOffice.Data.Models.Items.ItemCategory", b =>
                 {
                     b.Navigation("Items");
                 });
 
-            modelBuilder.Entity("MyOffice.Data.Models.Motions.ItemGlobal", b =>
+            modelBuilder.Entity("MyOffice.Data.Models.Items.ItemGlobal", b =>
                 {
                     b.Navigation("Items");
                 });

MyOffice.SPA/package.json

@@ -44,6 +44,7 @@
 		"@swimlane/ngx-charts": "^20.1.2",
 		"@swimlane/ngx-datatable": "^20.1.0",
 		"@types/d3-shape": "^3.1.1",
+		"angular-animations": "^0.11.0",
 		"angular-auth-oidc-client": "^15.0.3",
 		"angular-feather": "^6.5.0",
 		"angular-gauge": "^4.0.0",

MyOffice.SPA/src/app/api-routes.ts

@@ -28,4 +28,6 @@ export class ApiRoutes {
 
 	static Motions = '/api/accounts/:id/motions';
 	static Motion = '/api/accounts/:id/motions/:motionId';
+
+	static Items = '/api/items';
 }

MyOffice.SPA/src/app/core/validators/atleastonenumber.validator.ts

@@ -5,9 +5,9 @@ import {
 	Validators,
 } from '@angular/forms';
 
-export const atLeastOneNumber = (validator: ValidatorFn, controls: string[] = []) => (
+export const atLeastOneNumber = (validator: ValidatorFn, controls: string[] = []) =>
-	group: FormGroup,
+	(group: FormGroup,): ValidationErrors | null => {
-): ValidationErrors | null => {
+
 		if (!controls) {
 			controls = Object.keys(group.controls);
 		}
@@ -15,10 +15,10 @@ export const atLeastOneNumber = (validator: ValidatorFn, controls: string[] = []
 		const hasAtLeastOne = group && group.controls && controls
 			.some(k => {
 				var v = group.controls[k].value;
-			return v && !isNaN(v) && v !== 0 && !validator(group.controls[k]);
+				return !!(v && !isNaN(v) && parseFloat(v) !== 0 && !validator(group.controls[k]));
 			});
 
 		return hasAtLeastOne ? null : {
 			atLeastOne: true,
 		};
-};
+	};

MyOffice.SPA/src/app/dashboard/dashboard2/dashboard2.component.html

@@ -1,17 +1,19 @@
 <section class="content">
-<div class="content-block">
+	<div class="content-block">
-<div class="block-header">
+		<div class="block-header">
 			<!-- breadcrumb -->
 			<app-breadcrumb [title]="'Dashboad 2'" [items]="['Home']" [active_item]="'Dashboad 2'"></app-breadcrumb>
-</div>
+		</div>
-<div class="row">
+
+	<div class="row">
+
 		<div class="col-12 col-sm-6 col-md-3">
 			<div class="card">
 				<div class="card-body">
 					<div class="d-flex justify-content-between">
 						<div>
-						<h5>Todays Income</h5>
+							<h5>Income</h5>
-						<p class="text-muted">Income For Today</p>
+							<p class="text-muted">Income last 7 days</p>
 						</div>
 						<h3 class="text-info">$170</h3>
 					</div>
@@ -23,19 +25,20 @@
 						</div>
 					</div>
 					<div class="d-flex justify-content-between mt-2">
-					<p class="text-muted mb-0">Change</p>
+						<p class="text-muted mb-0">Change previous 7 days</p>
 						<p class="text-muted mb-0">75%</p>
 					</div>
 				</div>
 			</div>
 		</div>
+
 		<div class="col-12 col-sm-6 col-md-3">
 			<div class="card">
 				<div class="card-body">
 					<div class="d-flex justify-content-between">
 						<div>
-						<h5>Total Revenue</h5>
+							<h5>Outcome</h5>
-						<p class="text-muted">Total Income</p>
+							<p class="text-muted">Outcome last 7 days</p>
 						</div>
 						<h3 class="text-success">$120</h3>
 					</div>
@@ -47,12 +50,13 @@
 						</div>
 					</div>
 					<div class="d-flex justify-content-between mt-2">
-					<p class="text-muted mb-0">Change</p>
+						<p class="text-muted mb-0">Change previous 7 days</p>
 						<p class="text-muted mb-0">25%</p>
 					</div>
 				</div>
 			</div>
 		</div>
+
 		<div class="col-12 col-sm-6 col-md-3">
 			<div class="card">
 				<div class="card-body">
@@ -77,6 +81,7 @@
 				</div>
 			</div>
 		</div>
+
 		<div class="col-12 col-sm-6 col-md-3">
 			<div class="card">
 				<div class="card-body">
@@ -101,39 +106,14 @@
 				</div>
 			</div>
 		</div>
-</div>
+	</div>
-<div class="row clearfix">
+
+		<div class="row clearfix">
 			<!-- Bar chart with line -->
-	<div class="col-xl-8 col-lg-8 col-md-12 col-sm-12">
+			<div class="col-xl-12 col-lg-12 col-md-12 col-sm-12">
 				<div class="card">
 					<div class="header">
-				<h2>Products Performance</h2>
+						<h2>Current rest</h2>
-				<button mat-icon-button [matMenuTriggerFor]="menu" class="header-dropdown">
-					<mat-icon>more_vert</mat-icon>
-				</button>
-				<mat-menu #menu="matMenu">
-					<button mat-menu-item>Action</button>
-					<button mat-menu-item>Another action</button>
-					<button mat-menu-item>Something else here</button>
-				</mat-menu>
-			</div>
-			<div class="body">
-				<div class="recent-report__chart">
-					<apx-chart [series]="lineChartOptions.series!" [chart]="lineChartOptions.chart!"
-					           [xaxis]="lineChartOptions.xaxis!" [stroke]="lineChartOptions.stroke!"
-					           [colors]="lineChartOptions.colors!" [dataLabels]="lineChartOptions.dataLabels!"
-					           [legend]="lineChartOptions.legend!" [tooltip]="lineChartOptions.tooltip!"
-					           [markers]="lineChartOptions.markers!" [grid]="lineChartOptions.grid!" [yaxis]="lineChartOptions.yaxis!"
-					           [title]="lineChartOptions.title!" [fill]="lineChartOptions.fill!">
-					</apx-chart>
-				</div>
-			</div>
-		</div>
-	</div>
-	<div class="col-xl-4 col-lg-4 col-md-12 col-sm-12">
-		<div class="card">
-			<div class="header">
-				<h2>Country Wise Clients</h2>
 						<button mat-icon-button [matMenuTriggerFor]="menu" class="header-dropdown">
 							<mat-icon>more_vert</mat-icon>
 						</button>
@@ -179,9 +159,9 @@
 					</div>
 				</div>
 			</div>
-</div>
+		</div>
-<div class="row clearfix">
+		<div class="row clearfix">
-<div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
+			<div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
 				<div class="card">
 					<div class="header">
 						<h2>Notice Board</h2>
@@ -261,8 +241,8 @@
 						</ng-scrollbar>
 					</div>
 				</div>
-</div>
+			</div>
-<div class="col-xl-4 col-lg-4 col-md-12 col-sm-12">
+			<div class="col-xl-4 col-lg-4 col-md-12 col-sm-12">
 				<div class="card">
 					<div class="header">
 						<h2>Project Status</h2>
@@ -365,8 +345,8 @@
 						</div>
 					</ng-scrollbar>
 				</div>
-</div>
+			</div>
-<div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
+			<div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
 				<div class="card">
 					<div class="header">
 						<h2>Earning Source</h2>
@@ -444,9 +424,9 @@
 						</div>
 					</div>
 				</div>
-</div>
+			</div>
-</div>
+		</div>
-<div class="row clearfix">
+		<div class="row clearfix">
 			<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
 				<div class="card">
 					<div class="header">
@@ -637,6 +617,6 @@
 					</div>
 				</div>
 			</div>
-</div>
+		</div>
-</div>
+	</div>
 </section>

MyOffice.SPA/src/app/model/item.category.model.ts

@@ -2,4 +2,5 @@ export interface ItemCategoryModel {
 	id?: string,
 	name?: string,
 	allowDelete: boolean,
+	isInternal: boolean,
 }

MyOffice.SPA/src/app/model/motion.model.ts

@@ -1,7 +1,7 @@
 export interface MotionModel {
 	id?: string;
 	date?: Date;
-	motion?: string;
+	item?: string;
 	description?: string;
 	plus?: number;
 	minus?: number;

MyOffice.SPA/src/app/pages/accounts/motion.component.html

@@ -1,4 +1,4 @@
-<form [formGroup]="form" novalidate autocomplete="off">
+<form [formGroup]="form" novalidate autocomplete="off" [@pulse]="inProgress">
 	<div class="" style="display: flex;">
 		<div class="" style="width: 310px; min-width: 310px;">
 			<div style="display: flex; align-items: center;">
@@ -7,7 +7,7 @@
 				</a>
 
 				<mat-form-field class="example-full-width" appearance="fill">
-					<input matInput [matDatepicker]="picker3" (focus)="picker3.open()" value={{motion.date}} formControlName="date" required>
+					<input #dateInput matInput [matDatepicker]="picker3" (focus)="picker3.open()" value={{motion.date}} formControlName="date" required>
 					<mat-hint>YYYY/MM/DD</mat-hint>
 					<mat-datepicker-toggle tabindex="-1" matSuffix [for]="picker3"></mat-datepicker-toggle>
 					<mat-datepicker #picker3></mat-datepicker>
@@ -23,11 +23,19 @@
 		</div>
 		<div class="" style="flex-grow: 1;">
 			<mat-form-field class="example-full-width" appearance="fill">
-				<mat-label>Motion</mat-label>
+				<mat-label>
-				<input #motionInput matInput formControlName="motion" required>
+					Motion
-				<mat-error *ngIf="form.controls['motion'].hasError('required')">
+					<span *ngIf="selectedItem">!!</span>
+				</mat-label>
+				<input #motionInput matInput formControlName="item" required [matAutocomplete]="auto">
+				<mat-error *ngIf="form.controls['item'].hasError('required') && !form.pristine">
 					Please enter motion
 				</mat-error>
+				<mat-autocomplete #auto="matAutocomplete" [displayWith]="displayFn" (optionSelected)="selectedFn($event.option.value)">
+					<mat-option *ngFor="let item of filteredItems" [value]="item">
+						{{item.name}}
+					</mat-option>
+				</mat-autocomplete>
 			</mat-form-field>
 			<mat-form-field class="example-full-width" appearance="fill">
 				<input matInput formControlName="description">
@@ -36,17 +44,18 @@
 		<div class="" style="width: 100px; min-width: 100px;">
 			<mat-form-field class="example-full-width" appearance="fill">
 				<input matInput [value]="motion.plus | number:'0.2-2'" formControlName="plus" currencyMask [options]="{ prefix: '', precision: 4, inputMode: 1 }">
+				<mat-error *ngIf="form.hasError('atLeastOne')">
+					Please enter motion
+				</mat-error>
 			</mat-form-field>
 			<mat-form-field class="example-full-width" appearance="fill">
 				<input matInput [value]="motion.minus | number:'0.2-2'" formControlName="minus" currencyMask [options]="{ prefix: '', precision: 4, inputMode: 1 }">
+				<mat-error *ngIf="form.hasError('atLeastOne')">
+					Please enter motion
+				</mat-error>
 			</mat-form-field>
 		</div>
 		<div class="" style="display: inline-block; width: 150px; min-width: 150px;">
-			<!--
-			<button type="button" mat-stroked-button color="primary" *ngIf="!motion.id" (click)="add()">
-				<i class="material-icons font-40">add</i>
-			</button>
-			-->
 			<button type="button" class="m-2" mat-mini-fab color="primary" *ngIf="!motion.id" (click)="add()">
 				<i class="material-icons ">add</i>
 			</button>
@@ -59,6 +68,16 @@
 			<button type="button" class="m-2" mat-mini-fab color="primary" *ngIf="motion.id" (click)="delete()">
 				<i class="material-icons ">delete</i>
 			</button>
+			<div class="preloader m-4" *ngIf="inProgress">
+				<div class="spinner-layer pl-green">
+					<div class="circle-clipper left">
+						<div class="circle"></div>
+					</div>
+					<div class="circle-clipper right">
+						<div class="circle"></div>
+					</div>
+				</div>
+			</div>
 		</div>
 	</div>
 	<hr />

MyOffice.SPA/src/app/pages/accounts/motion.component.ts

@@ -13,21 +13,31 @@ import { ElementRef } from '@angular/core';
 // libs
 import * as moment from 'moment';
 import Swal from 'sweetalert2';
+import { Observable } from 'rxjs';
+import { pulseAnimation } from 'angular-animations';
 
 // app
 import { ApiRoutes } from '../../api-routes';
 import { AccountModel } from '../../model/account.model';
 import { MotionModel } from '../../model/motion.model';
+import { ItemModel } from '../../model/item.model';
 import { atLeastOneNumber } from '../../core/validators/atleastonenumber.validator';
 
 @Component({
 	selector: 'account-motion',
 	templateUrl: './motion.component.html',
 	styleUrls: ['./motion.component.scss'],
+	animations: [
+		pulseAnimation({ direction: '<=>', duration: 200 }),
+	],
 })
 export class MotionComponent {
 	public form!: FormGroup;
 	public errorMessage?: string;
+	public filteredItems: ItemModel[] = [];
+	public option?: string;
+	public selectedItem?: ItemModel;
+	public inProgress: boolean = false;
 
 	@Input('motion') motion!: MotionModel;
 	@Input('account') account!: AccountModel;
@@ -36,6 +46,7 @@ export class MotionComponent {
 	@Output() onDelete: EventEmitter<MotionModel> = new EventEmitter<MotionModel>();
 
 	@ViewChild('motionInput') motionInput?: ElementRef;
+	@ViewChild('dateInput') dateInput?: ElementRef;
 
 	constructor(
 		private fb: FormBuilder,
@@ -52,8 +63,8 @@ export class MotionComponent {
 				this.motion.date,
 				[Validators.required],
 			],
-			motion: [
+			item: [
-				this.motion.motion,
+				this.motion.item,
 				[Validators.required],
 			],
 			description: [
@@ -68,46 +79,112 @@ export class MotionComponent {
 		}, {
 			validator: atLeastOneNumber(Validators.required, ['plus', 'minus'])
 		});
+
+		this.form.controls['item'].valueChanges.subscribe(value => {
+			if (!value) {
+				return;
+			}
+
+			this.selectedItem = undefined;
+
+			this.httpClient
+				.get<ItemModel[]>(ApiRoutes.Items + '?term=' + encodeURIComponent(value))
+				.subscribe(x => {
+					this.filteredItems = x;
+				});
+		});
+	}
+
+	displayFn(item: any): string {
+		var value = item && item.name ? item.name : item;
+		return value;
+	}
+
+	selectedFn(item: ItemModel) {
+		this.selectedItem = item;
 	}
 
 	add() {
 		this.form.markAllAsTouched();
 
+		if (!this.form.valid) {
+			if (this.form.hasError('atLeastOne')) {
+				this.form.get('plus')!.setErrors(this.form.errors);
+				this.form.get('minus')!.setErrors(this.form.errors);
+			}
+			return;
+		}
+
+		this.setInProgress();
+
+		var data = this.form.value;
+		data.motion = data.item.name
+			? data.item.name
+			: data.item;
+		data.itemId = this.selectedItem?.id;
+
 		this.httpClient
-			.post<MotionModel>(ApiRoutes.Motions.replace(':id', this.account.id!), this.form.value)
+			.post<MotionModel>(ApiRoutes.Motions.replace(':id', this.account.id!), data)
 			.subscribe(response => {
 				this.onAdd?.emit(response);
 
 				this.form.patchValue({
-					motion: '',
+					item: '',
 					plus: 0,
 					minus: 0,
 				});
-				this.form.markAsUntouched();
 
+				this.filteredItems = [];
 				this.motionInput?.nativeElement.focus();
+				this.form.markAsUntouched();
+				this.setInProgress(false);
 			}, error => {
 				this.errorMessage = error.detail;
+				this.setInProgress(false);
 			});
 	}
 
+	private setInProgress(inProgress: boolean = true) {
+		this.inProgress = inProgress;
+	}
+
 	update() {
+		this.form.markAllAsTouched();
+
+		if (!this.form.valid) {
+			if (this.form.hasError('atLeastOne')) {
+				this.form.get('plus')!.setErrors(this.form.errors);
+				this.form.get('minus')!.setErrors(this.form.errors);
+			}
+			return;
+		}
+
+		this.setInProgress();
+
 		var url = ApiRoutes.Motion
 			.replace(':id', this.account.id!)
 			.replace(':motionId', this.motion.id!);
 
+		var data = this.form.value;
+		data.motion = data.item.name
+			? data.item.name
+			: data.motion;
+		data.itemId = this.selectedItem?.id;
+
 		this.httpClient
-			.put<MotionModel>(url, this.form.value)
+			.put<MotionModel>(url, data)
 			.subscribe(response => {
 				this.form.markAsUntouched();
+				this.setInProgress(false);
 			}, error => {
 				this.errorMessage = error.detail;
+				this.setInProgress(false);
 			});
 	}
 
 	delete() {
 		Swal.fire({
-			title: 'Delete motion ' + this.motion.motion,
+			title: 'Delete motion ' + this.motion.item,
 			showCancelButton: true,
 			confirmButtonText: 'Delete',
 			showLoaderOnConfirm: true,
@@ -117,12 +194,16 @@ export class MotionComponent {
 						.replace(':id', this.account.id!)
 						.replace(':motionId', this.motion.id!);
 
+					this.setInProgress();
+
 					this.httpClient.delete<MotionModel>(url)
 						.subscribe(data => {
 							resolve(data);
+							this.setInProgress(false);
 						}, error => {
 							Swal.showValidationMessage(error.detail);
 							reject();
+							this.setInProgress(false);
 						});
 
 				}).catch(x => {

MyOffice.SPA/src/app/pages/pages.module.ts

@@ -19,6 +19,8 @@ import { MatCardModule } from '@angular/material/card';
 import { NgxMaskModule } from 'ngx-mask';
 import { NgxCurrencyModule } from "ngx-currency";
 import { MatExpansionModule } from '@angular/material/expansion';
+import { MatAutocompleteModule } from '@angular/material/autocomplete';
+import { MatCheckboxModule } from '@angular/material/checkbox';
 
 // app
 import { PagesRoutingModule } from './pages-routing.module';
@@ -39,6 +41,7 @@ import { SettingsItemEditComponent } from './settings/item/edit.item.component';
 import { AccountListComponent } from './accounts/account.list.component';
 import { AccountComponent } from './accounts/account.component';
 import { MotionComponent } from './accounts/motion.component';
+import { SettingsItemCategoryEditComponent } from './settings/item/edit.item.category.component';
 
 @NgModule({
 	declarations: [
@@ -56,6 +59,7 @@ import { MotionComponent } from './accounts/motion.component';
 		SettingsItemCategoryComponent,
 		SettingsItemComponent,
 		SettingsItemEditComponent,
+		SettingsItemCategoryEditComponent,
 
 		AccountListComponent,
 		AccountComponent,
@@ -78,8 +82,10 @@ import { MotionComponent } from './accounts/motion.component';
 		MatGridListModule,
 		MatCardModule,
 		MatExpansionModule,
+		MatAutocompleteModule,
 		NgxMaskModule,
-		NgxCurrencyModule
+		NgxCurrencyModule,
+		MatCheckboxModule,
 	],
 	providers: [
 		{ provide: MAT_DATE_LOCALE, useValue: 'en-GB' },

MyOffice.SPA/src/app/pages/settings/item/edit.item.category.component.html

@@ -0,0 +1,38 @@
+<div>
+	<h2 mat-dialog-title>
+		Edit item category
+	</h2>
+	<div mat-dialog-content>
+		<form [formGroup]="editForm!" (ngSubmit)="onSubmitClick()">
+			<div class="row">
+				<div class="col-md-6">
+					<div class="text-inside">
+						<mat-form-field class="example-full-width">
+							<mat-label>Name</mat-label>
+							<input matInput value={{category.name}} formControlName="name">
+						</mat-form-field>
+					</div>
+				</div>
+				<div class="col-md-6">
+					<div class="text-inside">
+						<mat-checkbox class="example-margin" formControlName="isInternal">Is internal motion</mat-checkbox>
+					</div>
+				</div>
+			</div>
+			<mat-dialog-actions class="mat-dialog-actions">
+				<div class="mat-dialog-left">
+					<div class="alert alert-danger mat-dialog-error" *ngIf="errorMessage">
+						{{errorMessage}}
+					</div>
+				</div>
+				<div class="mat-dialog-right">
+					<div class="button-bottom">
+						<button type="button" mat-button (click)="closeDialog()">Cancel</button>
+						<button class="btn-space" mat-raised-button color="primary">Save</button>
+					</div>
+				</div>
+			</mat-dialog-actions>
+
+		</form>
+	</div>
+</div>

MyOffice.SPA/src/app/pages/settings/item/edit.item.category.component.ts

@@ -0,0 +1,75 @@
+// angular
+import { Component } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { Inject } from '@angular/core';
+import { UntypedFormBuilder } from '@angular/forms';
+import { UntypedFormGroup } from '@angular/forms';
+import { Validators } from '@angular/forms';
+
+// libs
+import { MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { MatDialogRef } from '@angular/material/dialog';
+
+// app
+import { ApiRoutes } from '../../../api-routes';
+import { ItemCategoryModel } from '../../../model/item.category.model';
+
+@Component({
+	templateUrl: './edit.item.category.component.html',
+	styleUrls: ['./edit.item.category.component.scss'],
+})
+export class SettingsItemCategoryEditComponent {
+	public editForm!: UntypedFormGroup;
+	public errorMessage?: string;
+
+	constructor(
+		private fb: UntypedFormBuilder,
+		private httpClient: HttpClient,
+		private dialogRef: MatDialogRef<SettingsItemCategoryEditComponent>,
+		@Inject(MAT_DIALOG_DATA) public category: ItemCategoryModel
+	) {
+	}
+
+	ngOnInit(): void {
+		this.editForm = this.fb.group({
+			id: [
+				this.category.id,
+			],
+			name: [
+				this.category.name,
+				[Validators.required],
+			],
+			isInternal: [
+				this.category.isInternal,
+			],
+		});
+		console.log(this.editForm.value);
+	}
+
+	closeDialog(): void {
+		this.dialogRef.close();
+	}
+
+	onSubmitClick() {
+		if (this.editForm.valid) {
+			this.errorMessage = undefined;
+			if (!this.category.id) {
+				this.httpClient
+					.post<ItemCategoryModel>(ApiRoutes.SettingsItemCategories, this.editForm.value)
+					.subscribe(response => {
+						this.dialogRef.close({ category: response, refresh: true });
+					}, error => {
+						this.errorMessage = error.detail;
+					});
+			} else {
+				this.httpClient
+					.put<ItemCategoryModel>(ApiRoutes.SettingsItemCategory.replace(':id', this.category.id!), this.editForm.value)
+					.subscribe(response => {
+						this.dialogRef.close({ category: response, refresh: true });
+					}, error => {
+						this.errorMessage = error.detail;
+					});
+			}
+		}
+	}
+}

MyOffice.SPA/src/app/pages/settings/item/edit.item.component.ts

@@ -8,10 +8,10 @@ import { Validators } from '@angular/forms';
 
 // libs
 import { MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { MatDialogRef } from '@angular/material/dialog';
 
 // app
 import { ApiRoutes } from '../../../api-routes';
-import { MatDialogRef } from '@angular/material/dialog';
 import { ItemCategoryModel } from '../../../model/item.category.model';
 import { ItemModel } from '../../../model/item.model';
 import { ItemService } from '../../../services/item.service';

MyOffice.SPA/src/app/pages/settings/item/item.category.component.html

@@ -2,7 +2,7 @@
 	<div class="content-block">
 		<div class="block-header">
 			<!-- breadcrumb -->
-			<app-breadcrumb [title]="'Blank'" [items]="['Home','Settings']" [active_item]="'Motion categories'">
+			<app-breadcrumb [title]="'Item categories'" [items]="['Home','Settings']" [active_item]="'Motion categories'">
 			</app-breadcrumb>
 		</div>
 		<div class="row clearfix">
@@ -11,7 +11,6 @@
 					<mat-card-header>
 						<mat-card-title-group>
 							<mat-card-title>
-								Motion categories
 							</mat-card-title>
 							<mat-card-subtitle>
 							</mat-card-subtitle>
@@ -27,6 +26,9 @@
 								<tbody>
 								<tr *ngFor="let item of categories">
 									<td>{{item.name}}</td>
+									<td>
+										<mat-icon *ngIf="item.isInternal">done</mat-icon>
+									</td>
 									<td>
 										<button class="btn-space" (click)="edit(item)" mat-raised-button color="primary">
 											Edit

MyOffice.SPA/src/app/pages/settings/item/item.category.component.ts

@@ -4,10 +4,12 @@ import { HttpClient } from '@angular/common/http';
 
 // libs
 import Swal from 'sweetalert2';
+import { MatDialog } from '@angular/material/dialog';
 
 // app
 import { ApiRoutes } from '../../../api-routes';
 import { ItemCategoryModel } from '../../../model/item.category.model';
+import { SettingsItemCategoryEditComponent } from './edit.item.category.component';
 
 @Component({
 	templateUrl: './item.category.component.html',
@@ -18,6 +20,7 @@ export class SettingsItemCategoryComponent {
 
 	constructor(
 		private httpClient: HttpClient,
+		private dialogModel: MatDialog,
 	) {
 	}
 
@@ -34,63 +37,26 @@ export class SettingsItemCategoryComponent {
 	}
 
 	public add() {
-		Swal.fire({
+		this.dialogModel.open(SettingsItemCategoryEditComponent, {
-			title: 'Item category name',
+			width: '640px',
-			input: 'text',
+			disableClose: true,
-			inputAttributes: {
+			data: { },
-				autocapitalize: 'off',
+		}).afterClosed().subscribe(x => {
-			},
+			if (x && x.refresh) {
-			showCancelButton: true,
-			confirmButtonText: 'Add',
-			showLoaderOnConfirm: true,
-			preConfirm: (name) => {
-				return new Promise((resolve, reject) => {
-					this.httpClient.post(ApiRoutes.SettingsItemCategories, { name: name })
-						.subscribe(data => {
-							resolve(data);
-						}, error => {
-							Swal.showValidationMessage(error.detail);
-							reject();
-						});
-
-				}).catch(x => {
-					return false;
-				});
-			},
-			allowOutsideClick: () => !Swal.isLoading(),
-		}).then((result) => {
 				this.load();
+			}
 		});
 	}
 
 	public edit(category: ItemCategoryModel) {
-		Swal.fire({
+		this.dialogModel.open(SettingsItemCategoryEditComponent, {
-			title: 'Item category name',
+			width: '640px',
-			input: 'text',
+			disableClose: true,
-			inputValue: category.name,
+			data: category,
-			inputAttributes: {
+		}).afterClosed().subscribe(x => {
-				autocapitalize: 'off',
+			if (x && x.refresh) {
-			},
-			showCancelButton: true,
-			confirmButtonText: 'Update',
-			showLoaderOnConfirm: true,
-			preConfirm: (name) => {
-				return new Promise((resolve, reject) => {
-					this.httpClient.put(ApiRoutes.SettingsItemCategory.replace(':id', category.id!), { name: name })
-						.subscribe(data => {
-							resolve(data);
-						}, error => {
-							Swal.showValidationMessage(error.detail);
-							reject();
-						});
-
-				}).catch(x => {
-					return false;
-				});
-			},
-			allowOutsideClick: () => !Swal.isLoading(),
-		}).then((result) => {
 				this.load();
+			}
 		});
 	}
 

MyOffice.Services/Account/AccountService.cs

@@ -292,8 +292,8 @@
 		{
 			if (motion == null)
 				throw new ArgumentNullException(nameof(motion));
-			if (motion.Motion == null)
+			if (motion.Item == null)
-				throw new ArgumentNullException(nameof(motion.Motion));
+				throw new ArgumentNullException(nameof(motion.Item));
 
 			var result = new Exec<Motion, MotionAddResult>(MotionAddResult.success);
 
@@ -303,7 +303,7 @@
 				return result.Set(MotionAddResult.account_not_found);
 			}
 
-			var itemExec = _itemService.GetOrCreate(userId, motion.Motion);
+			var itemExec = _itemService.GetOrCreate(userId, motion.Item);
 			if (itemExec.Status != ItemGetOrAddResult.success)
 			{
 				return result.Set(MotionAddResult.failure);
@@ -341,8 +341,8 @@
 		{
 			if (motion == null)
 				throw new ArgumentNullException(nameof(motion));
-			if (motion.Motion == null)
+			if (motion.Item == null)
-				throw new ArgumentNullException(nameof(motion.Motion));
+				throw new ArgumentNullException(nameof(motion.Item));
 
 			var result = new Exec<Motion, MotionUpdateResult>(MotionUpdateResult.success);
 
@@ -352,7 +352,7 @@
 				return result.Set(MotionUpdateResult.not_found);
 			}
 
-			var itemExec = _itemService.GetOrCreate(userId, motion.Motion);
+			var itemExec = _itemService.GetOrCreate(userId, motion.Item);
 			if (itemExec.Status != ItemGetOrAddResult.success)
 			{
 				return result.Set(MotionUpdateResult.failure);
@@ -414,5 +414,10 @@
 
 			return result.Set(exists);
 		}
+
+		public List<Account> FindAccounts(Guid userId, string term)
+		{
+			return _accountRepository.FindAccounts(userId, term);
+		}
 	}
 }

MyOffice.Services/Account/Domain/MotionAddUpdate.cs

@@ -3,7 +3,7 @@
 	public class MotionAddUpdate
 	{
 		public DateTime Date { get; set; }
-		public string Motion { get; set; } = null!;
+		public string Item { get; set; } = null!;
 		public string? Description { get; set; }
 		public decimal Plus { get; set; }
 		public decimal Minus { get; set; }

MyOffice.Services/Item/ItemService.cs

@@ -1,18 +1,18 @@
-namespace MyOffice.Services.Item
+namespace MyOffice.Services.Item;
-{
-	using System;
-	using System.Collections.Generic;
-	using System.Linq;
-	using System.Xml.Linq;
-	using Domain;
-	using MyOffice.Core;
-	using MyOffice.Data.Models.Accounts;
-	using MyOffice.Data.Models.Items;
-	using MyOffice.Data.Repositories.Item;
-	using MyOffice.Services.Account.Domain;
 
-	public class ItemService
+using System;
-	{
+using System.Collections.Generic;
+using System.Linq;
+using System.Xml.Linq;
+using Domain;
+using MyOffice.Core;
+using MyOffice.Data.Models.Accounts;
+using MyOffice.Data.Models.Items;
+using MyOffice.Data.Repositories.Item;
+using MyOffice.Services.Account.Domain;
+
+public class ItemService
+{
 	private readonly IItemCategoryRepository _itemCategoryRepository;
 	private readonly IItemRepository _itemRepository;
 	private readonly IItemGlobalRepository _itemGlobalRepository;
@@ -56,6 +56,8 @@
 
 		category.Id = Guid.NewGuid();
 		category.UserId = userId;
+		category.IsInternal = category.IsInternal;
+		category.Items = new List<Item>();
 
 		if (!_itemCategoryRepository.Add(category))
 		{
@@ -79,6 +81,8 @@
 		}
 
 		exists.Name = category.Name;
+		exists.IsInternal = category.IsInternal;
+		exists.Items = new List<Item>();
 
 		if (!_itemCategoryRepository.Update(exists))
 		{
@@ -130,8 +134,7 @@
 			return result.Set(GeneralExecStatus.not_found);
 		}
 
-			motion.Category.Id = categoryId;
+		motion.Category!.Id = categoryId;
-			//motion.CategoryId = categoryId;
 		_itemRepository.Update(motion);
 
 		return result.Set(motion);
@@ -187,5 +190,12 @@
 		item.ItemGlobal = itemGlobal;
 		return result.Set(item);
 	}
+
+	public List<Item> FindItems(Guid userId, string term, int limit = 15)
+	{
+		if (term == null)
+			throw new ArgumentNullException(nameof(term));
+
+		return _itemRepository.Find(userId, term, limit);
 	}
 }

MyOffice.Services/MyOffice.Services.csproj

@@ -11,4 +11,8 @@
     <ProjectReference Include="..\MyOffice.Data.Repositories\MyOffice.Data.Repositories.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Dashboard\" />
+  </ItemGroup>
+
 </Project>

MyOffice.Web/Controllers/AccountController.cs

@@ -6,9 +6,11 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using Models.Account;
+using Models.Item;
 using Models.Motion;
 using Services.Account;
 using Services.Account.Domain;
+using Services.Item;
 
 [Authorize]
 [ApiController]
@@ -17,14 +19,17 @@ public class AccountController : BaseApiController
 {
 	private readonly ILogger<AccountController> _logger;
 	private readonly AccountService _accountService;
+	private readonly ItemService _itemService;
 
 	public AccountController(
 		ILogger<AccountController> logger,
-		AccountService accountService
+		AccountService accountService,
+		ItemService itemService
 	)
 	{
 		_logger = logger;
 		_accountService = accountService;
+		_itemService = itemService;
 	}
 
 	[HttpGet("~/api/accounts")]
@@ -131,4 +136,40 @@ public class AccountController : BaseApiController
 				throw new NotSupportedException(exec.Status.ToString());
 		}
 	}
+
+	[HttpGet("~/api/items")]
+	public object FindItems(string term)
+	{
+		var items = _itemService
+			.FindItems(UserId, term)
+			.Select(x => x.ToModel())
+			.ToList();
+
+		if (term.StartsWith("+") && term.Length > 1)
+		{
+			var accounts = _accountService.FindAccounts(UserId, term.Substring(1));
+			foreach (var account in accounts)
+			{
+				var accountName = $"+{account.Name}";
+				var item = items.FirstOrDefault(x => x.Name == accountName);
+
+				if (item == null)
+				{
+					items.Add(new ItemViewModel
+					{
+						Name = accountName,
+						AccountId = account.Id.ToShort(),
+					});
+				}
+				else
+				{
+					item.AccountId = account.Id.ToShort();
+				}
+			}
+		}
+
+		return items
+			.OrderBy(x => x.AccountId)
+			.ThenBy(x => x.Name);
+	}
 }

MyOffice.Web/Controllers/DashboardController.cs

@@ -0,0 +1,34 @@
+namespace MyOffice.Web.Controllers;
+
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using MyOffice.Services.Account;
+using MyOffice.Services.Item;
+
+[Authorize]
+[ApiController]
+[Route("api/[controller]")]
+public class DashboardController : BaseApiController
+{
+	private readonly ILogger<DashboardController> _logger;
+
+	public DashboardController(
+		ILogger<DashboardController> logger
+	)
+	{
+		_logger = logger;
+	}
+
+
+	[HttpGet("~/api/accounts")]
+	public object Index()
+	{
+		return new
+		{
+			IncomeLastWeek = 100m,
+			IncomePreviousWeek = 100m,
+			OutcomeLastWeek = 100m,
+			OutcomePreviousWeek = 100m,
+		};
+	}
+}

MyOffice.Web/Controllers/SettingsItemController.cs

@@ -17,13 +17,17 @@ using Services.Item.Domain;
 [Route("api/[controller]")]
 public class SettingsItemController : BaseApiController
 {
+	private ILogger<SettingsItemController> _logger;
+
 	private ItemService _itemService;
 
 	public SettingsItemController(
+		ILogger<SettingsItemController> logger,
 		ItemService itemService
 	)
 	{
 		_itemService = itemService;
+		_logger = logger;
 	}
 
 	[HttpGet("~/api/settings/item-categories")]
@@ -40,7 +44,8 @@ public class SettingsItemController : BaseApiController
 	[HttpPost("~/api/settings/item-categories")]
 	public object ItemCategoriesAdd(ItemCategoryViewModel request)
 	{
-		var exec = _itemService.CategoryAdd(UserId, new ItemCategory { Name = request.Name! });
+		var exec = _itemService.CategoryAdd(UserId, request.FromModel());
+
 		switch (exec.Status)
 		{
 			case GeneralExecStatus.success:
@@ -58,7 +63,8 @@ public class SettingsItemController : BaseApiController
 	[HttpPut("~/api/settings/item-categories/{id}")]
 	public object ItemCategoriesEdit(string id, ItemCategoryViewModel request)
 	{
-		var exec = _itemService.CategoryUpdate(UserId, id.AsGuid(), new ItemCategory { Name = request.Name! });
+		var exec = _itemService.CategoryUpdate(UserId, id.AsGuid(), request.FromModel());
+
 		switch (exec.Status)
 		{
 			case GeneralExecStatus.success:

MyOffice.Web/Models/Item/ItemCategoryViewModel.cs

@@ -3,16 +3,18 @@
 	using System.ComponentModel.DataAnnotations;
 	using MyOffice.Core.Extensions;
 	using MyOffice.Data.Models.Items;
+	using MyOffice.Migrations.Postgres.Migrations;
 
 	public class ItemCategoryViewModel
 	{
 		public string? Id { get; set; }
 
 		[Required] 
-		public string? Name { get; set; }
+		public string Name { get; set; } = null!;
 
 		public bool AllowDelete { get; set; }
 		public int SortOrder { get; set; }
+		public bool IsInternal { get; set; }
 	}
 
 	public static class ItemCategoryViewModelExtensions
@@ -24,8 +26,21 @@
 				Id = input.Id.ToShort(),
 				Name = input.Name,
 				AllowDelete = !input.Items.Any() && input.Id != input.UserId,
+				IsInternal = input.IsInternal,
 				SortOrder = input.Id == input.UserId ? 1 : 0
 			};
 		}
+
+		public static ItemCategory FromModel(this ItemCategoryViewModel input)
+		{
+			if (input == null) 
+				throw new ArgumentNullException(nameof(input));
+
+			return new ItemCategory
+			{
+				Name = input.Name,
+				IsInternal = input.IsInternal,
+			};
+		}
 	}
 }

MyOffice.Web/Models/Item/ItemViewModel.cs

@@ -1,6 +1,7 @@
 namespace MyOffice.Web.Models.Item
 {
 	using System.ComponentModel.DataAnnotations;
+	using Data.Models.Accounts;
 	using MyOffice.Core.Extensions;
 	using MyOffice.Data.Models.Items;
 
@@ -9,24 +10,26 @@
 		public string? Id { get; set; }
 
 		public string CategoryId { get; set; } = null!;
-		public string Category { get; set; } = null!;
+		public string? Category { get; set; } = null!;
 		[Required]
 		public string? Name { get; set; }
 
 		public bool AllowDelete { get; set; }
+		public string? AccountId { get; set; }
 	}
 
 	public static class ItemViewModelExtensions
 	{
-		public static ItemViewModel ToModel(this Item input)
+		public static ItemViewModel ToModel(this Item input, Account? account = null)
 		{
 			return new ItemViewModel
 			{
-				Id = input.ItemGlobalId.ToShort(),
+				Id = input.ItemGlobal.Id.ToShort(),
-				CategoryId = input.Category.Id.ToShort(),
+				CategoryId = input.CategoryId.ToShort(),
-				Category = input.Category.Name,
+				Category = input.Category?.Name,
 				Name = input.ItemGlobal.Name,
-				AllowDelete = !input.Motions.Any(),
+				AllowDelete = input.Motions != null && !input.Motions.Any(),
+				AccountId = account?.Id.ToShort(),
 			};
 		}
 	}

MyOffice.Web/Models/Motion/MotionRequest.cs

@@ -5,7 +5,7 @@ using MyOffice.Services.Account.Domain;
 public class MotionRequest
 {
 	public DateTime Date { get; set; }
-	public string Motion { get; set; } = null!;
+	public string Item { get; set; } = null!;
 	public string? Description { get; set; }
 	public decimal? Plus { get; set; }
 	public decimal? Minus { get; set; }
@@ -18,7 +18,7 @@ public static class MotionRequestExtension
 		return new MotionAddUpdate
 		{
 			Date = input.Date,
-			Motion = input.Motion,
+			Item = input.Item,
 			Minus = input.Minus ?? 0,
 			Plus = input.Plus ?? 0,
 			Description = input.Description,

MyOffice.Web/Models/Motion/MotionViewModel.cs

@@ -7,7 +7,7 @@
 	{
 		public string Id { get; set; } = null!;
 		public DateTime Date { get; set; }
-		public string Motion { get; set; } = null!;
+		public string Item { get; set; } = null!;
 		public string? Description { get; set; }
 		public decimal Plus { get; set; }
 		public decimal Minus { get; set; }
@@ -21,7 +21,7 @@
 			{
 				Id = input.Id.ToShort(),
 				Date = input.DateTime,
-				Motion = input.Item.ItemGlobal.Name,
+				Item = input.Item.ItemGlobal.Name,
 				Description = input.Description,
 				Plus = input.AmountPlus,
 				Minus = input.AmountMinus,