Skip to content

refactor: condições que disponilizam a sala de eventos #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
txsabrina wants to merge 3 commits into
base: main
Choose a base branch
from
Open

refactor: condições que disponilizam a sala de eventos #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ea2134
refactor: condições que disponilizam a sala de eventos
txsabrina Aug 13, 2024
6cdd5e4
refactor: condições que disponilizam a sala de eventos
txsabrina Aug 13, 2024
d086723
Merge remote-tracking branch 'origin' into ST-feature-finaliza-evento…
txsabrina Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 22 additions & 38 deletions src/APP.Platform/Pages/Components/TimeSelections/_CallbackSaveFreeTime.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,19 +177,6 @@
style="width: fit-content; font-size: 13px; padding: 5px;" onclick="showInteressados('@Model.TimeSelectionAndJoinTimes.Key.Id')"
id="select-interested"> Selecionar Interessados
</button>
}else{
@if(Model.TimeSelectionAndJoinTimes.Value.Count > 0 && Model.TimeSelectionAndJoinTimes.Key?.Status == StatusTimeSelection.Pendente && Model.TimeSelectionAndJoinTimes.Value.Any(joinTime => joinTime.StatusJoinTime == StatusJoinTime.Marcado))
{
<form asp-page-handler="TimeSelectionStatusMarcado" style="margin-left: auto;justify-content: end;display: flex;" >
<input type="hidden" name="id" value="@Model.TimeSelectionAndJoinTimes.Key?.Id">
<button
type="submit"
class="button-capacitacao"
style="width: fit-content;margin: 20px;">
Encerrar inscrições e confirmar sala
</button>
</form>
}
}
</nav>
}
Expand Down Expand Up @@ -265,34 +252,31 @@
Cancelar Orientação
</div>
</form>
@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)
{
<button
id="entrar-sala"
class="button botao-entrar-active button-right"
onclick="window.open('@Model.TimeSelectionAndJoinTimes.Key?.LinkSala', '_blank');"
>
<button id="entrar-sala"
class="button botao-entrar-active button-right"
onclick="window.open('@Model.TimeSelectionAndJoinTimes.Key?.LinkSala', '_blank');">
Entrar na Sala
</button>
} else {
<button
id="entrar-sala"
class="button botao-entrar button-right"
desabled
>
Entrar na Sala
</button>
}

} else {
<button
id="entrar-sala"
class="button botao-entrar button-right"
desabled
>
}else
{
<button id="entrar-sala"
class="button botao-entrar button-right"
desabled>
Entrar na Sala
</button>
}

}
else
{
<button id="entrar-sala"
class="button botao-entrar button-right"
desabled>
Entrar na Sala
</button>
}
Expand Down
50 changes: 29 additions & 21 deletions src/APP.Platform/Pages/Components/TimeSelections/_ModalFreeTime.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
</button>
}else{
@if(data.Value.Count > 0 && data.Key?.Status == StatusTimeSelection.Pendente && data.Value.Any(joinTime => joinTime.StatusJoinTime == StatusJoinTime.Marcado))
{
<form asp-page-handler="TimeSelectionStatusMarcado" style="margin-left: auto;justify-content: end;display: flex;" >
<input type="hidden" name="id" value="@data.Key?.Id">
<button
type="submit"
class="button-capacitacao"
style="width: fit-content;margin: 20px;">
Encerrar inscrições e confirmar sala
</button>
</form>
}
}
</nav>
}
Expand Down Expand Up @@ -272,14 +259,35 @@ ExperienceLevel[] valuesExperience = (ExperienceLevel[])Enum.GetValues(typeof(Ex
Cancelar Orientação
</div>
</form>

<button
id="entrar-sala"
class="button botao-entrar-active button-right"
onclick="window.open('@data.Key.LinkSala', '_blank');"
>

@if (tempoRestanteEmHoras <= 1)
{
@if (data.Key.Ilimitado || data.Key?.Status == StatusTimeSelection.Marcado || data.Key?.Status == StatusTimeSelection.ConclusaoPendente)
{
<button id="entrar-sala"
class="button botao-entrar-active button-right"
onclick="window.open('@data.Key?.LinkSala', '_blank');">
Entrar na Sala
</button>
}
else
{
<button id="entrar-sala"
class="button botao-entrar button-right"
desabled>
Entrar na Sala
</button>
}

}
else
{
<button id="entrar-sala"
class="button botao-entrar button-right"
desabled>
Entrar na Sala
</button>
}
</div>
</div>
</div>
Expand Down Expand Up @@ -406,7 +414,7 @@ ExperienceLevel[] valuesExperience = (ExperienceLevel[])Enum.GetValues(typeof(Ex
}
}
</div>
@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))
{
<form asp-page-handler="TimeSelectionStatusMarcado" style="margin-left: auto;justify-content: end;display: flex;" >
<input type="hidden" name="id" value="@data.Key?.Id">
Expand All @@ -417,7 +425,7 @@ ExperienceLevel[] valuesExperience = (ExperienceLevel[])Enum.GetValues(typeof(Ex
Encerrar inscrições e confirmar sala
</button>
</form>
}
} *@
</div>
</div>
</div>
Expand Down
4 changes: 4 additions & 0 deletions src/APP.Platform/Pages/ScheduleActions/index.cshtml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,10 @@ public async Task<IActionResult> 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();
Expand Down