Skip to content
This repository was archived by the owner on Sep 16, 2024. It is now read-only.

Jdurrell/workshop schedule by room #458

Open
jdurrell wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Jdurrell/workshop schedule by room #458

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98a6d49
Changed schedule view to columns based on room instead of difficulty …
jdurrell Mar 31, 2023
ba7fd73
I'm never going to stop forgetting this, aren't I?
jdurrell Mar 31, 2023
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
83 changes: 35 additions & 48 deletions user-registration-app/src/app/views/live-view/live-view.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,19 +472,14 @@

<div id="workshop-container" class="container-fluid nopadding">
<div class="row no padding">
<div class="col-xl-1"></div>
<!-- <div class="col-xl-1"></div> -->

<!-- <div class="col-md-6 col-lg-6 col-xl-5 nopadding"> -->
<!-- <span class="workshop-track">Beginner</span> -->
<div class="container-fluid">
<div class="col-12">
<div class="col-sm-6 col-md-12 col-lg-4 col-xl-4 nopadding">
<span class="workshop-track">Room 124</span>
<div class="container-fluid py-4">
<div class="col-12 p-md-0 px-4">
<div *ngFor="let workshop of workshops">
<!-- Bodgy hack since person putting in events is inconsistent -->
<div *ngIf="workshop.ws_skill_level == 'Beginner'
|| workshop.ws_skill_levell == 'beginner'
|| workshop.ws_skill_level == ''
|| workshop.ws_skill_level == null"
style="max-width: 800px; margin: auto">
<div *ngIf="workshop.location_name === '124 Business Building'">
<app-live-workshop
[title]="workshop.event_title"
[description]="workshop.event_description"
Expand All @@ -506,26 +501,22 @@
</div>
</div>
</div>
<!-- </div> -->
</div>

<!-- <div class="col-md-6 col-lg-6 col-xl-5 nopadding">
<span class="workshop-track">INTERMEDIATE</span>
<div class="col-sm-6 col-md-12 col-lg-4 col-xl-4 nopadding">
<span class="workshop-track">Room 125</span>
<div class="container-fluid py-4">
<div class="col-12 p-md-0 px-4">
<div *ngFor="let workshop of workshops">
<div *ngIf="workshop.ws_skill_level == 'Intermediate'">
<div *ngIf="workshop.location_name === '125 Business Building'">
<app-live-workshop
[title]="workshop.event_title"
[description]="workshop.event_description"
[date]="workshop.event_start_time"
[endTime]="workshop.event_end_time"
[location]="workshop.location_name"
[skills]="
workshop.ws_relevant_skills ? workshop.ws_relevant_skills.split(',') : []
"
[presenters]="
workshop.ws_presenter_names ? workshop.ws_presenter_names.split(',') : []
"
[skills]="workshop.ws_relevant_skills ? workshop.ws_relevant_skills.split(',') : []"
[presenters]="workshop.ws_presenter_names ? workshop.ws_presenter_names.split(',') : []"
[eventIcon]="workshop.event_icon ? workshop.event_icon.split(',') : []"
[downloads]="workshop.ws_urls"
collapseID="css/html"
Expand All @@ -536,38 +527,34 @@
</div>
</div>
</div>
<div class="col-xl-1"></div> -->
<!-- <div class="col-xl-1"></div> -->

<!-- ADVANCED -->
<!-- <div class="col-md-6 col-lg-4 nopadding">
<span class="workshop-track">ADVANCED</span>
<div class="row">
<div class="container-fluid py-4">
<div class="col-12 p-md-0 px-4">
<div *ngFor="let workshop of workshops">
<div *ngIf="workshop.ws_skill_level == 'Advanced'">
<app-live-workshop
[title]="workshop.event_title"
[description]="workshop.event_description"
[date]="workshop.event_start_time"
[endTime]="workshop.event_end_time"
[location]="workshop.location_name"
[skills]="
workshop.ws_relevant_skills ? workshop.ws_relevant_skills.split(',') : []
"
[presenters]="
workshop.ws_presenter_names ? workshop.ws_presenter_names.split(',') : []
"
[eventIcon]="workshop.event_icon ? workshop.event_icon.split(',') : []"
[downloads]="workshop.ws_urls"
collapseID="css/html"
>
</app-live-workshop>
</div>
<div class="col-sm-6 col-md-12 col-lg-4 col-xl-4 nopadding">
<span class="workshop-track">Room 126</span>
<div class="container-fluid py-4">
<div class="col-12 p-md-0 px-4">
<div *ngFor="let workshop of workshops">
<div *ngIf="workshop.location_name === '126 Business Building'">
<app-live-workshop
[title]="workshop.event_title"
[description]="workshop.event_description"
[date]="workshop.event_start_time"
[endTime]="workshop.event_end_time"
[location]="workshop.location_name"
[skills]="workshop.ws_relevant_skills ? workshop.ws_relevant_skills.split(',') : []"
[presenters]="workshop.ws_presenter_names ? workshop.ws_presenter_names.split(',') : []"
[eventIcon]="workshop.event_icon ? workshop.event_icon.split(',') : []"
[downloads]="workshop.ws_urls"
collapseID="css/html"
>
</app-live-workshop>
</div>
</div>
</div>
</div>
</div> -->
</div>

</div>
</div>
</section>
Expand Down