diff --git a/monorepo.sln b/monorepo.sln index 41932c98..f9280092 100644 --- a/monorepo.sln +++ b/monorepo.sln @@ -94,4 +94,4 @@ Global {CB6E63D0-FE51-401A-94C5-69486252F426} = {B3719C53-CAF3-4DBA-9804-B3669A1AFFFD} {B1D71BD1-52C0-44E0-BC3B-590852021521} = {B3719C53-CAF3-4DBA-9804-B3669A1AFFFD} EndGlobalSection -EndGlobal \ No newline at end of file +EndGlobal diff --git a/src/APP.Platform/LegacyModels/ClassLib.Schedule/Entities/FreeTimeBackstage.cs b/src/APP.Platform/LegacyModels/ClassLib.Schedule/Entities/FreeTimeBackstage.cs index 18d77e09..256d1743 100644 --- a/src/APP.Platform/LegacyModels/ClassLib.Schedule/Entities/FreeTimeBackstage.cs +++ b/src/APP.Platform/LegacyModels/ClassLib.Schedule/Entities/FreeTimeBackstage.cs @@ -5,5 +5,6 @@ public sealed class FreeTimeBackstage : _BaseEntity public Guid TimeSelectionId { get; set; } public int MaxParticipants { get; set; } public bool Ilimitado { get; set; } + public bool AutoAccept { get; set; } } } diff --git a/src/APP.Platform/LegacyModels/ClassLib.Schedule/Entities/TimeSelection.cs b/src/APP.Platform/LegacyModels/ClassLib.Schedule/Entities/TimeSelection.cs index 68c17df0..4ba56ac4 100644 --- a/src/APP.Platform/LegacyModels/ClassLib.Schedule/Entities/TimeSelection.cs +++ b/src/APP.Platform/LegacyModels/ClassLib.Schedule/Entities/TimeSelection.cs @@ -49,5 +49,8 @@ public sealed class TimeSelection : _BaseEntity [NotMapped] public bool Ilimitado { get; set; } + + [NotMapped] + public bool AutoAccept { get; set; } } } diff --git a/src/APP.Platform/LegacyModels/ClassLib.Schedule/Models/RequestModels/ScheduleTimeSelectionRequestModel.cs b/src/APP.Platform/LegacyModels/ClassLib.Schedule/Models/RequestModels/ScheduleTimeSelectionRequestModel.cs index 8d02f87e..06b4d74c 100644 --- a/src/APP.Platform/LegacyModels/ClassLib.Schedule/Models/RequestModels/ScheduleTimeSelectionRequestModel.cs +++ b/src/APP.Platform/LegacyModels/ClassLib.Schedule/Models/RequestModels/ScheduleTimeSelectionRequestModel.cs @@ -14,4 +14,6 @@ public sealed class ScheduleTimeSelectionRequestModel public DateTime StartTime { get; set; } public DateTime EndTime { get; set; } public List TagsSelected { get; set; } = new(); + + public bool AutoAccept { get; set; } } diff --git a/src/APP.Platform/LegacyModels/ClassLib.Schedule/Models/ViewModels/TimeSelectionForRequestedHelpViewModel.cs b/src/APP.Platform/LegacyModels/ClassLib.Schedule/Models/ViewModels/TimeSelectionForRequestedHelpViewModel.cs index ee9a0869..9ac1f2f8 100644 --- a/src/APP.Platform/LegacyModels/ClassLib.Schedule/Models/ViewModels/TimeSelectionForRequestedHelpViewModel.cs +++ b/src/APP.Platform/LegacyModels/ClassLib.Schedule/Models/ViewModels/TimeSelectionForRequestedHelpViewModel.cs @@ -1,5 +1,4 @@ -using Domain.Contracts; -using Domain.Entities; +using Domain.Entities; using Domain.Enums; namespace Domain.Models.ViewModels; @@ -16,5 +15,4 @@ public class TimeSelectionForRequestedHelpViewModel public string? ImagePath { get; set; } public int Variation { get; set; } public EnumTipoTimeSelection Type { get; set; } = EnumTipoTimeSelection.RequestHelp; - public List HelpResponses { get; set; } = []; } diff --git a/src/APP.Platform/Pages/Canal/Index.cshtml.cs b/src/APP.Platform/Pages/Canal/Index.cshtml.cs index 246e7e47..77768604 100644 --- a/src/APP.Platform/Pages/Canal/Index.cshtml.cs +++ b/src/APP.Platform/Pages/Canal/Index.cshtml.cs @@ -475,6 +475,10 @@ public async Task OnPostTrySetMentor() { JoinTime.StatusJoinTime = StatusJoinTime.Marcado; } + else if (freeTimeBackstage?.AutoAccept ?? false) + { + JoinTime.StatusJoinTime = StatusJoinTime.Marcado; + } else { JoinTime.StatusJoinTime = StatusJoinTime.Pendente; diff --git a/src/APP.Platform/Pages/Components/ModalJoinTime/_ModalJoinTimeForRequestHelp.cshtml b/src/APP.Platform/Pages/Components/ModalJoinTime/_ModalJoinTimeForRequestHelp.cshtml index 8b400a1c..7cbcfdb1 100644 --- a/src/APP.Platform/Pages/Components/ModalJoinTime/_ModalJoinTimeForRequestHelp.cshtml +++ b/src/APP.Platform/Pages/Components/ModalJoinTime/_ModalJoinTimeForRequestHelp.cshtml @@ -33,21 +33,6 @@

- - @if (Model.IsLogedUser) - { -
- @* o textarea para incluir comentario de ajuda esta sendo carregado aqui *@ -
- } - -
- -
- -
- @* os comentarios de ajuda estao sendo carregados aqui *@ -
diff --git a/src/APP.Platform/Pages/Components/ScheduleActions/FormsRequestHelp.cs b/src/APP.Platform/Pages/Components/ScheduleActions/FormsRequestHelp.cs index 41bebfe8..50a74e10 100644 --- a/src/APP.Platform/Pages/Components/ScheduleActions/FormsRequestHelp.cs +++ b/src/APP.Platform/Pages/Components/ScheduleActions/FormsRequestHelp.cs @@ -3,5 +3,6 @@ public class FormsRequestHelp { public ScheduleTimeSelectionRequestModel ScheduleTimeSelection { get; set; } = new(); + public ScheduleFreeTimeForTimeSelectionRequestModel? ScheduleFreeTimeForTimeSelection { get; set; } public Dictionary>? RelatioTags { get; set; } } diff --git a/src/APP.Platform/Pages/Components/ScheduleActions/_FormsCursosAndEventos.cshtml b/src/APP.Platform/Pages/Components/ScheduleActions/_FormsCursosAndEventos.cshtml index 4864a99c..a1bd0112 100644 --- a/src/APP.Platform/Pages/Components/ScheduleActions/_FormsCursosAndEventos.cshtml +++ b/src/APP.Platform/Pages/Components/ScheduleActions/_FormsCursosAndEventos.cshtml @@ -3,325 +3,199 @@ @model FormsCursosAndEventos