fix

MyOffice.Data.Models/Accounts/Account.cs

@@ -28,7 +28,7 @@ public class AccountDetailed
 public class AccountSimple
 {
 	public Guid Id { get; set; }
-	public string Name { get; set; }
+	public string Name { get; set; } = null!;
 	public AccountAccessTypeEnum Type { get; set; }
 	public string? CurrencyName { get; set; }
 	public string? CurrencyShortName { get; set; }
@@ -42,7 +42,7 @@ public class AccountSimple
 public class MotionTotalSimple
 {
 	public Guid? Id { get; set; }
-	public string Name { get; set; }
+	public string Name { get; set; } = null!;
 	public string CurrencyId { get; set; } = null!;
 	public string CurrencyName { get; set; } = null!;
 	public decimal CurrencyRate { get; set; }

MyOffice.Data.Models/Accounts/Domain/AccountWithRate.cs

@@ -0,0 +1,10 @@
+namespace MyOffice.Data.Models.Accounts.Domain;
+
+using Currencies;
+
+public class AccountWithRate
+{
+	public Account Account { get; set; } = null!;
+	public Currency? Currency { get; set; }
+	public CurrencyRate? Rate { get; set; }
+}

MyOffice.Data.Repositories/Account/AccountRepository.cs

@@ -3,6 +3,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Models.Accounts;
+using MyOffice.Data.Models.Accounts.Domain;
 using MyOffice.Data.Models.Currencies;
 using MyOffice.Data.Repositories;
 
@@ -117,42 +118,40 @@ public class AccountRepository : AppRepository<Account>, IAccountRepository
 			.ToList();
 	}
 
-	public decimal GetPeriodIncome(Guid userId, DateTime from, DateTime to)
+	public List<AccountWithRate> GetAccountsWithRate(Guid userId, DateTime date)
 	{
-		return _context.Accounts
+		var accounts = _context.Accounts
-			.Where(x => x.AccessRights!.Any(u => u.UserId == userId))
+			.Where(x => x.AccessRights!.Any(a => a.UserId == userId))
-			.Include(x => x.CurrencyGlobal!)
+			.ToList();
-			.ThenInclude(x => x.Currencies!)
-			.ThenInclude(x => x.CurrentRate!)
-			.Select(x => new {
-				Currency = x.CurrencyGlobal!.Currencies!.FirstOrDefault(x => x.UserId == userId),
-				Amount = x.Motions!
-					.Where(x => !x.Item!.Category!.IsInternal)
-					.Where(x => x.DateTime >= from && x.DateTime <= to)
-					.Sum(m => m.AmountPlus)
-			})
-			.ToList()
-			.Select(x => x.Amount * (x.Currency?.CurrentRate?.Rate * x.Currency?.CurrentRate?.Quantity))
-			.Sum() ?? 0;
-	}
 
-	public decimal GetPeriodOutcome(Guid userId, DateTime from, DateTime to)
+		var currencyIds = accounts
+			.Select(x => x.CurrencyGlobalId)
+			.ToList();
+
+		var rates = _context.CurrencyRates
+			.Include(x => x.Currency)
+			.Where(x => x.Currency!.UserId == userId)
+			.Where(x => x.DateTime <= date)
+			.Where(x => currencyIds.Contains(x.Currency!.CurrencyGlobalId))
+			.GroupBy(x => x.Currency!.CurrencyGlobalId)
+			.Select(x => x.OrderByDescending(r => r.DateTime).First())
+			.ToList();
+
+		return accounts
+			.Select(account =>
 			{
-		return _context.Accounts
+				var rate = rates.FirstOrDefault(rate => rate.Currency!.CurrencyGlobalId == account.CurrencyGlobalId);
-			.Where(x => x.AccessRights!.Any(u => u.UserId == userId))
+
-			.Include(x => x.CurrencyGlobal!)
+				var result = new AccountWithRate
-			.ThenInclude(x => x.Currencies!)
+				{
-			.ThenInclude(x => x.CurrentRate!)
+					Account = account,
-			.Select(x => new {
+					Currency = rate?.Currency,
-				Currency = x.CurrencyGlobal!.Currencies!.FirstOrDefault(x => x.UserId == userId),
+					Rate = rate,
-				Amount = x.Motions!
+				};
-					.Where(x => !x.Item!.Category!.IsInternal)
+
-					.Where(x => x.DateTime >= from && x.DateTime <= to)
+				return result;
-					.Sum(m => m.AmountMinus)
 			})
-			.ToList()
+			.ToList(); 
-			.Select(x => x.Amount * (x.Currency?.CurrentRate?.Rate * x.Currency?.CurrentRate?.Quantity))
-			.Sum() ?? 0;
 	}
 
 	public List<AccountSimple> GetRestAtDate(Guid userId, DateTime date)
@@ -198,25 +197,31 @@ public class AccountRepository : AppRepository<Account>, IAccountRepository
 
 	public List<MotionTotalSimple> GetIncomeByCategories(Guid userId, DateTime from, DateTime to)
 	{
+		var accounts = GetAccountsWithRate(userId, to);
+		var accountIds = accounts.Select(x => x.Account.Id);
+
 		return _context.Motions
 			.Where(x => x.DateTime >= from && x.DateTime <= to)
-			.Where(x => x.Item.Category!.UserId == userId)
+			.Where(x => accountIds.Contains(x.AccountId))
 			.Where(x => !x.Item.Category!.IsInternal)
 			.GroupBy(x => new
 			{
 				Id = x.Item.CategoryId,
 				Name = x.Item.Category!.Name,
+				IsUserCategory = x.Item.Category!.UserId == userId,
 				CurrencyId = x.Account.CurrencyGlobalId,
 				CurrencyName = x.Account.CurrencyGlobal!.Name,
 			})
+			.ToList()
 			.Select(x => new MotionTotalSimple
 			{
-				Id = x.Key.Id,
+				Id = x.Key.IsUserCategory ? x.Key.Id : userId,
 				Name = x.Key.Name,
 				CurrencyId = x.Key.CurrencyId,
 				CurrencyName = x.Key.CurrencyName,
 				Amount = x.Sum(a => a.AmountPlus),
-			}).ToList();
+			})
+			.ToList();
 	}
 
 	public List<MotionTotalSimple> GetIncomeByCategory(Guid userId, Guid categoryId, DateTime from, DateTime to)
@@ -247,21 +252,26 @@ public class AccountRepository : AppRepository<Account>, IAccountRepository
 
 	public List<MotionTotalSimple> GetOutcomeByCategories(Guid userId, DateTime from, DateTime to)
 	{
+		var accounts = GetAccountsWithRate(userId, to);
+		var accountIds = accounts.Select(x => x.Account.Id);
+
 		return _context.Motions
 			.Where(x => x.DateTime >= from && x.DateTime <= to)
-			.Where(x => x.Item.Category!.UserId == userId)
+			.Where(x => accountIds.Contains(x.AccountId))
 			.Where(x => !x.Item.Category!.IsInternal)
 			.GroupBy(x => new
 			{
 				Id = x.Item.CategoryId,
 				Name = x.Item.Category!.Name,
+				IsUserCategory = x.Item.Category!.UserId == userId,
 				CurrencyId = x.Account.CurrencyGlobalId,
 				CurrencyName = x.Account.CurrencyGlobal!.Name,
 			})
 			.Select(x => new MotionTotalSimple
 			{
-				Id = x.Key.Id,
+				Id = x.Key.IsUserCategory ? x.Key.Id : userId,
-				Name = x.Key.Name,
+				Name = x.Key.IsUserCategory ? x.Key.Name : "UnCategorized",
+				//Name = x.Key.Name,
 				CurrencyId = x.Key.CurrencyId,
 				CurrencyName = x.Key.CurrencyName,
 				Amount = x.Sum(a => a.AmountMinus),
@@ -271,11 +281,14 @@ public class AccountRepository : AppRepository<Account>, IAccountRepository
 
 	public List<MotionTotalSimple> GetOutcomeByCategory(Guid userId, Guid categoryId, DateTime from, DateTime to)
 	{
+		var accounts = GetAccountsWithRate(userId, to);
+		var accountIds = accounts.Select(x => x.Account.Id);
+
 		return _context.Motions
 			.Where(x => x.DateTime >= from && x.DateTime <= to)
-			.Where(x => x.Item.CategoryId == categoryId)
+			.Where(x => accountIds.Contains(x.AccountId))
 			.Where(x => !x.Item.Category!.IsInternal)
-			.Where(x => x.Item.Category!.UserId == userId)
+			.Where(x => x.Item.CategoryId == categoryId)
 			.GroupBy(x => new
 			{
 				Id = x.Item.ItemGlobalId,

MyOffice.Data.Repositories/Account/IAccountyRepository.cs

@@ -15,8 +15,6 @@ public interface IAccountRepository
 	bool Remove(Account account);
 	List<Account> FindAccounts(Guid userId, string term);
 
-	decimal GetPeriodIncome(Guid userId, DateTime from, DateTime to);
-	decimal GetPeriodOutcome(Guid userId, DateTime from, DateTime to);
 	List<AccountSimple> GetRestAtDate(Guid userId, DateTime date);
 	List<MotionTotalSimple> GetIncomeByCategories(Guid userId, DateTime from, DateTime to);
 	List<MotionTotalSimple> GetIncomeByCategory(Guid userId, Guid categoryId, DateTime from, DateTime to);

MyOffice.Data.Repositories/Item/IItemGlobalRepository.cs

@@ -7,4 +7,5 @@ public interface IItemGlobalRepository
 	ItemGlobal? Get(Guid id);
 	ItemGlobal? GetByName(string name);
 	bool Add(ItemGlobal itemGlobal);
+	List<ItemGlobal> GetAvailableToUser(Guid userId);
 }

MyOffice.Data.Repositories/Item/IItemRepository.cs

@@ -6,8 +6,7 @@ public interface IItemRepository
 {
 	List<Item> GetAll(Guid userId);
 	List<Item> GetByCategory(Guid userId, Guid categoryId);
-
+	Item? GetByGlobal(Guid userId, Guid globalItemId);
-	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/ItemGlobalRepository.cs

@@ -1,5 +1,6 @@
 namespace MyOffice.Data.Repositories.Item;
 
+using Microsoft.EntityFrameworkCore;
 using MyOffice.Data.Models.Items;
 
 public class ItemGlobalRepository : AppRepository<ItemGlobal>, IItemGlobalRepository
@@ -18,4 +19,19 @@ public class ItemGlobalRepository : AppRepository<ItemGlobal>, IItemGlobalReposi
 	{
 		return AddBase(itemGlobal) > 0;
 	}
+
+	public List<ItemGlobal> GetAvailableToUser(Guid userId)
+	{
+		return _context.Motions
+			.Include(x => x.Item)
+			.ThenInclude(x => x.ItemGlobal)
+			.ThenInclude(x => x.Items)
+			.ThenInclude(x => x.Category)
+			.Where(x => x.Account.AccessRights!.Any(a => a.UserId == userId))
+			.Where(x => x.Item.ItemGlobal.Items.All(g => g.Category!.UserId != userId))
+			.Select(x => x.Item.ItemGlobal)
+			.GroupBy(x => x.Id)
+			.Select(x => x.First())
+			.ToList();
+	}
 }

MyOffice.Data.Repositories/Item/ItemRepository.cs

@@ -25,13 +25,13 @@ public class ItemRepository : AppRepository<Item>, IItemRepository
 			.ToList();
 	}
 
-	public Item? GetByGlobal(Guid userId, Guid globalMotionId)
+	public Item? GetByGlobal(Guid userId, Guid globalItemId)
 	{
 		return _context.Items
 			.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 == globalItemId);
 	}
 
 	public bool Update(Item item)

MyOffice.SPA/src/app/core/models/selectable.model.spec.ts

@@ -0,0 +1,7 @@
+import { SelectableModel } from './selectable.model';
+
+describe('SelectableModel', () => {
+  it('should create an instance', () => {
+    expect(new SelectableModel()).toBeTruthy();
+  });
+});

MyOffice.SPA/src/app/core/models/selectable.model.ts

@@ -0,0 +1,4 @@
+export interface ISelectableModel<T> {
+	model: T;
+	selected: boolean;
+}

MyOffice.SPA/src/app/pages/accounts/account.component.scss

@@ -1,7 +1,15 @@
-account-motion:nth-child(even) {
+:host-context(body.dark)account-motion:nth-child(even) {
-	filter: brightness(1)
+	filter: brightness(1);
 }
 
-account-motion:nth-child(odd) {
+:host-context(body.dark)account-motion:nth-child(odd) {
-	filter: brightness(1.75)
+	filter: brightness(1.75);
+}
+
+:host-context(body.light)account-motion:nth-child(even) {
+	filter: brightness(0.75);
+}
+
+:host-context(body.light)account-motion:nth-child(odd) {
+	filter: brightness(1);
 }

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

@@ -129,6 +129,7 @@ export class MotionComponent {
 		this.setInProgress();
 
 		var data: MotionModel = {
+			date: this.form.value.date,
 			description: this.form.value.description,
 			plus: this.form.value.plus || 0,
 			minus: this.form.value.minus || 0,

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

@@ -10,6 +10,16 @@
 				<div class="card">
 					<div class="body">
 						<div id="mail-nav">
+							<ul>
+								<mat-form-field class="example-full-width right-content" *ngIf="selectedCount > 0">
+									<mat-label>Move to category</mat-label>
+									<mat-select [(ngModel)]="category"  (selectionChange)="onCategoryChange($event)">
+										<mat-option *ngFor="let category of categories" [value]="category.id">
+											{{category.name}}
+										</mat-option>
+									</mat-select>
+								</mat-form-field>
+							</ul>
 							<ul class="" id="mail-folders">
 								<li *ngFor="let category of categories" [class.active]="selectedCategory && selectedCategory.id == category.id">
 									<a href="javascript:;" (click)="selectCategory(category)" title="{{category.name}}">{{category.name}}</a>
@@ -36,9 +46,13 @@
 							<table class="table">
 								<tbody>
 									<tr *ngFor="let item of items">
-										<td>{{item.name}}</td>
 										<td>
-											<button class="btn-space" (click)="edit(item)" mat-raised-button color="primary">
+											<mat-checkbox [(ngModel)]="item.selected" (change)="onCheckboxChange(item)">
+												{{item.model.name}}
+											</mat-checkbox>
+										</td>
+										<td>
+											<button class="btn-space" (click)="edit(item.model)" mat-raised-button color="primary">
 												Edit
 											</button>
 										</td>

MyOffice.SPA/src/app/pages/settings/item/item.component.scss

@@ -0,0 +1,11 @@
+.card-title {
+	display: flex;
+}
+
+.left-content {
+	flex: 1;
+}
+
+.right-content {
+	margin-left: auto;
+}

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

@@ -10,6 +10,7 @@ import { MatDialog } from '@angular/material/dialog';
 import { ApiRoutes } from '../../../api-routes';
 import { SettingsItemEditComponent } from './edit.item.component';
 import { ItemService } from '../../../services/item.service';
+import { ISelectableModel } from '../../../core/models/selectable.model';
 import { ItemModel } from '../../../model/item.model';
 import { ItemCategoryModel } from '../../../model/item.category.model';
 
@@ -18,9 +19,11 @@ import { ItemCategoryModel } from '../../../model/item.category.model';
 	styleUrls: ['./item.component.scss'],
 })
 export class SettingsItemComponent {
-	public items?: ItemModel[];
+	public items?: ISelectableModel<ItemModel>[];
 	public categories?: ItemCategoryModel[];
 	public selectedCategory?: ItemCategoryModel;
+	public selectedCount: number = 0;
+	public category?: ItemCategoryModel;
 
 	constructor(
 		private dialogModel: MatDialog,
@@ -53,7 +56,7 @@ export class SettingsItemComponent {
 		this.selectedCategory = category;
 		this.itemService.getItems(category.id)
 			.subscribe(data => {
-				this.items = data;
+				this.items = data.map<ISelectableModel<ItemModel>>(x => { return { model: x, selected: false } });
 			});
 	}
 
@@ -95,4 +98,22 @@ export class SettingsItemComponent {
 			this.load();
 		});
 	}
+
+	onCheckboxChange(item: ISelectableModel<ItemModel>) {
+		this.selectedCount += item.selected ? 1 : -1;
+	}
+
+	onCategoryChange(item: any) {
+		var data = {
+			category: item.value,
+			items: this.items!.filter(x => x.selected).map(x => x.model.id)
+		}
+		this.httpClient.post(ApiRoutes.SettingsItems, data)
+			.subscribe(data => {
+				this.category = undefined;
+				this.selectedCount = 0;
+				this.load();
+			}, error => {
+			});
+	}
 }

MyOffice.Services/Item/ItemService.cs

@@ -130,6 +130,17 @@ public class ItemService
 		return _mapper.Map<List<ItemDto>>(_itemRepository.GetByCategory(userId, categoryId));
 	}
 
+	public List<ItemDto> GetByUncategorized(Guid userId)
+	{
+		var itemGlobals = _itemGlobalRepository.GetAvailableToUser(userId);
+		foreach (var itemGlobal in itemGlobals)
+		{
+			GetOrCreate(userId, itemGlobal);
+		}
+
+		return GetByCategory(userId, userId);
+	}
+
 	public Exec<ItemDto, GeneralExecStatus> Update(Guid userId, Guid motionId, Guid categoryId)
 	{
 		var result = new Exec<ItemDto, GeneralExecStatus>(GeneralExecStatus.success);
@@ -204,4 +215,25 @@ public class ItemService
 
 		return _mapper.Map<List<ItemDto>>(_itemRepository.Find(userId, term, limit));
 	}
+
+	public GeneralExecStatus UpdateItemsCategory(Guid userId, Guid categoryId, List<Guid> items)
+	{
+		var category = _itemCategoryRepository.Get(userId, categoryId);
+		if (category == null)
+		{
+			return GeneralExecStatus.not_found;
+		}
+
+		foreach (var item in items)
+		{
+			var dbItem = _itemRepository.GetByGlobal(userId, item);
+			if (dbItem != null)
+			{
+				dbItem.CategoryId = category.Id;
+				_itemRepository.Update(dbItem);
+			}
+		}
+
+		return GeneralExecStatus.success;
+	}
 }

MyOffice.Web/Controllers/SettingsItemController.cs

@@ -101,11 +101,13 @@ public class SettingsItemController : BaseApiController
 	}
 
 	[HttpGet("~/api/settings/items")]
-	public ObjectResult Items([AsGuid] string? category)
+	public ObjectResult Items([AsGuid] string category)
 	{
-		var list = category.IsMissing()
+		var categoryId = category.AsGuid();
-			? _itemService.GetAll(UserId)
+
-			: _itemService.GetByCategory(UserId, category!.AsGuid());
+		var list = categoryId != UserId
+				? _itemService.GetByCategory(UserId, categoryId)
+				: _itemService.GetByUncategorized(UserId);
 
 		return Ok(_mapper.Map<List<ItemViewModel>>(list.OrderBy(x => x.Name)));
 	}
@@ -128,4 +130,23 @@ public class SettingsItemController : BaseApiController
 				throw new NotSupportedException(exec.Status.ToString());
 		}
 	}
+
+	[HttpPost("~/api/settings/items")]
+	public ObjectResult Items(ItemChangeCategoryModel request)
+	{
+		var exec = _itemService.UpdateItemsCategory(UserId, request.category.AsGuid(), request.Items.Select(x => x.AsGuid()).ToList());
+
+		switch (exec)
+		{
+			case GeneralExecStatus.not_found:
+				return ProblemBadResponse("Category not found.");
+			case GeneralExecStatus.failure:
+				return ProblemBadResponse("Update failed.");
+			case GeneralExecStatus.success:
+				return Ok(new {});
+
+			default:
+				throw new NotSupportedException(exec.ToString());
+		}
+	}
 }

MyOffice.Web/Models/Item/ItemChangeCategoryModel.cs

@@ -0,0 +1,7 @@
+namespace MyOffice.Web.Models.Item;
+
+public class ItemChangeCategoryModel
+{
+	public string category { get; set; } = null!;
+	public List<string> Items { get; set; } = null!;
+}

MyOffice.Web/Models/Item/ItemEditModel.cs

@@ -1,8 +1,7 @@
-namespace MyOffice.Web.Models.Item
+namespace MyOffice.Web.Models.Item;
-{
+
 public class ItemEditModel
 {
 	public string Id { get; set; } = null!;
 	public string Category { get; set; } = null!;
 }
-}