From 1ea2134084fb7496059f77643ae0f14d7b596af0 Mon Sep 17 00:00:00 2001 From: txsabrina Date: Tue, 13 Aug 2024 00:11:52 -0300 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20condi=C3=A7=C3=B5es=20que=20dis?= =?UTF-8?q?ponilizam=20a=20sala=20de=20eventos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_CallbackSaveFreeTime.cshtml | 60 +++++++------------ .../TimeSelections/_ModalFreeTime.cshtml | 26 ++++---- .../Pages/ScheduleActions/index.cshtml.cs | 4 ++ 3 files changed, 42 insertions(+), 48 deletions(-) diff --git a/src/APP.Platform/Pages/Components/TimeSelections/_CallbackSaveFreeTime.cshtml b/src/APP.Platform/Pages/Components/TimeSelections/_CallbackSaveFreeTime.cshtml index 71551739..d97b6a95 100644 --- a/src/APP.Platform/Pages/Components/TimeSelections/_CallbackSaveFreeTime.cshtml +++ b/src/APP.Platform/Pages/Components/TimeSelections/_CallbackSaveFreeTime.cshtml @@ -177,19 +177,6 @@ style="width: fit-content; font-size: 13px; padding: 5px;" onclick="showInteressados('@Model.TimeSelectionAndJoinTimes.Key.Id')" id="select-interested"> Selecionar Interessados - }else{ - @if(Model.TimeSelectionAndJoinTimes.Value.Count > 0 && Model.TimeSelectionAndJoinTimes.Key?.Status == StatusTimeSelection.Pendente && Model.TimeSelectionAndJoinTimes.Value.Any(joinTime => joinTime.StatusJoinTime == StatusJoinTime.Marcado)) - { -
- - -
- } } } @@ -265,34 +252,31 @@ Cancelar Orientação - - @if(Model.TimeSelectionAndJoinTimes.Key?.Status == StatusTimeSelection.Marcado || Model.TimeSelectionAndJoinTimes.Key?.Status == StatusTimeSelection.ConclusaoPendente) { - if(tempoRestanteEmHoras == 0 - || tempoRestanteEmHoras == 1) + + @if (tempoRestanteEmHoras <= 1) + { + @if (Model.TimeSelectionAndJoinTimes.Key.Ilimitado || Model.TimeSelectionAndJoinTimes.Key?.Status == StatusTimeSelection.Marcado || Model.TimeSelectionAndJoinTimes.Key?.Status == StatusTimeSelection.ConclusaoPendente) { - - } else { - - } - - } else { - + } + + } + else + { + } diff --git a/src/APP.Platform/Pages/Components/TimeSelections/_ModalFreeTime.cshtml b/src/APP.Platform/Pages/Components/TimeSelections/_ModalFreeTime.cshtml index a07d4c7d..1e7f7ad1 100644 --- a/src/APP.Platform/Pages/Components/TimeSelections/_ModalFreeTime.cshtml +++ b/src/APP.Platform/Pages/Components/TimeSelections/_ModalFreeTime.cshtml @@ -188,7 +188,7 @@ ExperienceLevel[] valuesExperience = (ExperienceLevel[])Enum.GetValues(typeof(Ex style="width: fit-content; font-size: 13px; padding: 5px;" onclick="showInteressados('@data.Key.Id')" id="select-interested"> Selecionar Interessados - }else{ + @* }else{ @if(data.Value.Count > 0 && data.Key?.Status == StatusTimeSelection.Pendente && data.Value.Any(joinTime => joinTime.StatusJoinTime == StatusJoinTime.Marcado)) {
@@ -200,7 +200,7 @@ ExperienceLevel[] valuesExperience = (ExperienceLevel[])Enum.GetValues(typeof(Ex Encerrar inscrições e confirmar sala
- } + } *@ } } @@ -272,14 +272,20 @@ ExperienceLevel[] valuesExperience = (ExperienceLevel[])Enum.GetValues(typeof(Ex Cancelar Orientação - - + }else{ + + } @@ -406,7 +412,7 @@ ExperienceLevel[] valuesExperience = (ExperienceLevel[])Enum.GetValues(typeof(Ex } } - @if(data.Value.Count > 0 && data.Key?.Status == StatusTimeSelection.Pendente && data.Value.Any(joinTime => joinTime.StatusJoinTime == StatusJoinTime.Marcado)) + @* @if(data.Value.Count > 0 && data.Key?.Status == StatusTimeSelection.Pendente && data.Value.Any(joinTime => joinTime.StatusJoinTime == StatusJoinTime.Marcado)) {
@@ -417,7 +423,7 @@ ExperienceLevel[] valuesExperience = (ExperienceLevel[])Enum.GetValues(typeof(Ex Encerrar inscrições e confirmar sala
- } + } *@ diff --git a/src/APP.Platform/Pages/ScheduleActions/index.cshtml.cs b/src/APP.Platform/Pages/ScheduleActions/index.cshtml.cs index b3740012..f50e71e1 100644 --- a/src/APP.Platform/Pages/ScheduleActions/index.cshtml.cs +++ b/src/APP.Platform/Pages/ScheduleActions/index.cshtml.cs @@ -348,6 +348,10 @@ public async Task OnGetRenderCalendarAsync() time.Key.MaxParticipants = max; time.Key.Ilimitado = freeTimeBackstage?.Ilimitado ?? false; + if(time.Key.Ilimitado) + { + time.Key.RoomId = CreatePrivateRoom(time.Key, time.Key.PerfilId ?? Guid.Empty); + } } var RhListIds = requestHelpList.Keys.Select(kvp => kvp.Id).ToList(); From 6cdd5e40737db9fa1780796ca75296e0b4ac816c Mon Sep 17 00:00:00 2001 From: txsabrina Date: Tue, 13 Aug 2024 00:17:00 -0300 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20condi=C3=A7=C3=B5es=20que=20dis?= =?UTF-8?q?ponilizam=20a=20sala=20de=20eventos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TimeSelections/_ModalFreeTime.cshtml | 46 ++++++++++--------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/src/APP.Platform/Pages/Components/TimeSelections/_ModalFreeTime.cshtml b/src/APP.Platform/Pages/Components/TimeSelections/_ModalFreeTime.cshtml index 1e7f7ad1..9a8eb077 100644 --- a/src/APP.Platform/Pages/Components/TimeSelections/_ModalFreeTime.cshtml +++ b/src/APP.Platform/Pages/Components/TimeSelections/_ModalFreeTime.cshtml @@ -188,19 +188,6 @@ ExperienceLevel[] valuesExperience = (ExperienceLevel[])Enum.GetValues(typeof(Ex style="width: fit-content; font-size: 13px; padding: 5px;" onclick="showInteressados('@data.Key.Id')" id="select-interested"> Selecionar Interessados - @* }else{ - @if(data.Value.Count > 0 && data.Key?.Status == StatusTimeSelection.Pendente && data.Value.Any(joinTime => joinTime.StatusJoinTime == StatusJoinTime.Marcado)) - { -
- - -
- } *@ } } @@ -272,17 +259,32 @@ ExperienceLevel[] valuesExperience = (ExperienceLevel[])Enum.GetValues(typeof(Ex Cancelar Orientação - - @if(tempoRestanteEmHoras <= 1) + + @if (tempoRestanteEmHoras <= 1) + { + @if (data.Key.Ilimitado || data.Key?.Status == StatusTimeSelection.Marcado || data.Key?.Status == StatusTimeSelection.ConclusaoPendente) + { + + } + else + { + + } + + } + else { - }else{ - }