From ef1fa7e8642164c753aa8e87d7bf7d9098a6e683 Mon Sep 17 00:00:00 2001 From: Jonathan McCaffrey Date: Mon, 18 Apr 2022 21:55:14 -0400 Subject: [PATCH] fix(Search) Fixed search auto focus, plus some WIP code --- Components/Form/FormTextComponent.razor | 6 +++ IGP/Dialog/SearchDialogComponent.razor | 34 +++++++++---- .../Parts/OptionsComponent.razor | 49 ++++++++++++++----- Model/BuildOrders/BuildOrderModel.cs | 2 + .../BuildOrders/TrainingCapacityUsedModel.cs | 13 +++++ Services/IServices.cs | 1 + Services/Immortal/BuildOrderService.cs | 46 +++++++++++++++-- 7 files changed, 126 insertions(+), 25 deletions(-) create mode 100644 Model/BuildOrders/TrainingCapacityUsedModel.cs diff --git a/Components/Form/FormTextComponent.razor b/Components/Form/FormTextComponent.razor index 069dfcb..aa43c82 100644 --- a/Components/Form/FormTextComponent.razor +++ b/Components/Form/FormTextComponent.razor @@ -12,6 +12,7 @@ type="text" value="@Value" id="@Id" + @onfocus="OnFocus" @oninput="OnInput" @onchange="OnChange"/> @@ -65,9 +66,13 @@ [Parameter] public EventCallback OnInput { get; set; } + [Parameter] public EventCallback OnChange { get; set; } + + [Parameter] + public EventCallback OnFocus { get; set; } [Parameter] @@ -83,4 +88,5 @@ labelId = Label.ToLower().Replace(" ", "_"); } + } \ No newline at end of file diff --git a/IGP/Dialog/SearchDialogComponent.razor b/IGP/Dialog/SearchDialogComponent.razor index e91b3bc..08c50bb 100644 --- a/IGP/Dialog/SearchDialogComponent.razor +++ b/IGP/Dialog/SearchDialogComponent.razor @@ -1,4 +1,5 @@ -@implements IDisposable; +@using System.Timers +@implements IDisposable; @inject ISearchService searchService @inject IJSRuntime jsRuntime @@ -13,7 +14,7 @@ @onclick:stopPropagation="true"> - +
@@ -120,25 +121,33 @@ protected override void OnInitialized() { searchService.Subscribe(OnSearchChanged); + + timer = new Timer(200); + timer.Elapsed += FocusTimer; + timer.Enabled = false; } - private System.Threading.Timer timer = null!; + + private void FocusTimer(object? sender, ElapsedEventArgs e) + { + jsRuntime.InvokeVoidAsync("SetFocusToElement", "search-input-box"); + StateHasChanged(); + } + + private Timer timer = null!; private void OnSearchChanged() { - if (searchService.IsVisible) + if (timer.Enabled != searchService.IsVisible) { - timer = new System.Threading.Timer(_ => - { - jsRuntime.InvokeVoidAsync("SetFocusToElement", "search-input-box"); - InvokeAsync(StateHasChanged); - }, null, 1, 1); - + timer.Enabled = searchService.IsVisible; } + StateHasChanged(); } public void Dispose() { searchService.Unsubscribe(OnSearchChanged); + timer.Elapsed -= FocusTimer; } @@ -171,4 +180,9 @@ searchService.Hide(); } + private void OnFocus(object obj) + { + timer.Enabled = false; + } + } \ No newline at end of file diff --git a/IGP/Pages/BuildCalculator/Parts/OptionsComponent.razor b/IGP/Pages/BuildCalculator/Parts/OptionsComponent.razor index 4a12249..170a910 100644 --- a/IGP/Pages/BuildCalculator/Parts/OptionsComponent.razor +++ b/IGP/Pages/BuildCalculator/Parts/OptionsComponent.razor @@ -14,21 +14,41 @@ Add a input delay to constructing buildings for simulating worker movement and player micro. - - Wait Time - Not implemented - - - - Add Wait +
+ + + Wait Time + + Add Wait + + + + Wait To + + Add Wait + +
+ + @code { + public int WaitTime { get; set; } = 30; + public int WaitTo { get; set; } = 30; + void OnBuildingInputDelayChanged(ChangeEventArgs changeEventArgs) { buildOrderService.BuildingInputDelay = int.Parse(changeEventArgs.Value!.ToString()!); @@ -46,6 +66,14 @@ economyService.Calculate(buildOrderService, timingService, buildOrderService.GetLastRequestInterval()); } } + + public void OnWaitToClicked() + { + if (buildOrderService.AddWait(WaitTime)) + { + economyService.Calculate(buildOrderService, timingService, buildOrderService.GetLastRequestInterval()); + } + } protected override bool ShouldRender() { @@ -63,6 +91,5 @@ #endif } - public int WaitTime { get; set; } = 30; } \ No newline at end of file diff --git a/Model/BuildOrders/BuildOrderModel.cs b/Model/BuildOrders/BuildOrderModel.cs index 68e43d2..4823102 100644 --- a/Model/BuildOrders/BuildOrderModel.cs +++ b/Model/BuildOrders/BuildOrderModel.cs @@ -29,6 +29,8 @@ public class BuildOrderModel public Dictionary UniqueCompletedCount { get; set; } = new(); public Dictionary SupplyCountTimes { get; set; } = new(); + public List TrainingCapacityModels { get; set; } = new(); + public void Initialize(string faction) { string factionStartingTownHall = faction.Equals(DataType.FACTION_QRath) ? DataType.STARTING_TownHall_QRath : diff --git a/Model/BuildOrders/TrainingCapacityUsedModel.cs b/Model/BuildOrders/TrainingCapacityUsedModel.cs new file mode 100644 index 0000000..44fec99 --- /dev/null +++ b/Model/BuildOrders/TrainingCapacityUsedModel.cs @@ -0,0 +1,13 @@ + + +using Model.Entity.Data; + +namespace Model.BuildOrders; + +public class TrainingCapacityUsedModel +{ + public int TrainingCapacity { get; set; } = 4; + public string UsedBuilding { get; set; } = DataType.BUILDING_LegionHall; + public int StartingUsageTime { get; set; } = 30; + public int StopUsageTime { get; set; } = 60; +} \ No newline at end of file diff --git a/Services/IServices.cs b/Services/IServices.cs index f232cb9..8990e81 100644 --- a/Services/IServices.cs +++ b/Services/IServices.cs @@ -308,6 +308,7 @@ public interface IBuildOrderService public bool Add(EntityModel entity, IEconomyService withEconomy, IToastService toastService); public void Add(EntityModel entity, int atInterval); public bool AddWait(int forInterval); + public bool AddWaitTo(int interval); public void SetName(string name); diff --git a/Services/Immortal/BuildOrderService.cs b/Services/Immortal/BuildOrderService.cs index 5d624de..0801ae5 100644 --- a/Services/Immortal/BuildOrderService.cs +++ b/Services/Immortal/BuildOrderService.cs @@ -101,14 +101,15 @@ public class BuildOrderService : IBuildOrderService if (!buildOrder.CompletedOrders.ContainsKey(lastInterval)) buildOrder.CompletedOrders.Add(lastInterval, new List()); - NotifyDataChanged(); - return true; - } - + public bool AddWaitTo(int interval) + { + throw new NotImplementedException(); + } + public int? WillMeetRequirements(EntityModel entity) { var requirements = entity.Requirements(); @@ -141,7 +142,24 @@ public class BuildOrderService : IBuildOrderService return null; } + + public int? WillMeetTrainingQueue(EntityModel entity) + { + var supply = entity.Supply(); + + if (supply == null || supply.Takes.Equals(0)) return 0; + + // TODO: Finish Training Queue Logic + + foreach (var supplyAtTime in buildOrder.SupplyCountTimes) + if (supply.Takes + buildOrder.CurrentSupplyUsed < supplyAtTime.Key) + return supplyAtTime.Value; + + return null; + } + + public bool Add(EntityModel entity, IEconomyService withEconomy, IToastService withToasts) { @@ -347,6 +365,26 @@ public class BuildOrderService : IBuildOrderService return true; } + private bool HandleTrainingQueue(EntityModel entity, IToastService withToasts, ref int atInterval) + { + var minSupplyInterval = WillMeetSupply(entity); + if (minSupplyInterval == null) + { + withToasts.AddToast(new ToastModel + { + Title = "Supply Cap Reached", Message = "Build more supply!", + SeverityType = SeverityType.Error + }); + + return false; + } + + if (minSupplyInterval > atInterval) atInterval = (int)minSupplyInterval; + + return true; + } + + private bool HandleRequirements(EntityModel entity, IToastService withToasts, ref int atInterval) { var minRequirementInterval = WillMeetRequirements(entity);