Skip to content
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

Jump to bottom

VIH-10554 Demo Env #2122

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

VIH-10554 Demo Env #2122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
15311c5
Delete VideoWeb/VideoWeb/ClientApp/src/scripts/pexrtc.js
himesh99 Mar 15, 2024
89b2147
Add files via upload
himesh99 Mar 15, 2024
e32218e
Rename pexrtc.txt to pexrtc.js
himesh99 Mar 15, 2024
3b8ef70
Merge remote-tracking branch 'origin/master' into VIH-10554-Demo-Change
May 16, 2024
6d0164e
triggerbuild
May 16, 2024
70e3588
hack to allow admit/dismiss
May 21, 2024
1fb7046
handle null for pexipApi call object
May 28, 2024
bfb8b99
chore: Refactor hearing-controls-base.component.ts to use arrow funct…
May 28, 2024
6cc9e4a
display username
May 29, 2024
20618ba
Merge remote-tracking branch 'origin/master' into VIH-10554-Demo-Change
May 30, 2024
04c6656
hardcode mute guests to true
Jun 3, 2024
048450f
Merge remote-tracking branch 'origin/master' into VIH-10554-Demo-Change
Jun 3, 2024
26cd893
bugfix: roles not refreshing when user starts with no roles because t…
Jun 5, 2024
90a9a49
bugfix: Update conference reducer to handle room and participant info…
Jun 5, 2024
41e4567
Merge remote-tracking branch 'origin/master' into VIH-10554-Demo-Change
Jun 12, 2024
df2c4ed
Merge remote-tracking branch 'refs/remotes/origin/master' into VIH-10…
will-craig Jun 28, 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
1 change: 1 addition & 0 deletions VideoWeb/VideoWeb/ClientApp/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ testem.log
# System Files
.DS_Store
Thumbs.db
random_trigger
3 changes: 3 additions & 0 deletions VideoWeb/VideoWeb/ClientApp/src/app/shared/header/header.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@
<li *ngIf="loggedIn" class="govuk-header__navigation-item stay-right">
<a id="logout-link" class="govuk-header__link" [routerLink]="logoutRoute">{{ 'header.sign-out' | translate }}</a>
</li>
<li class="govuk-header__navigation-item">
<span>{{ username }}</span>
</li>
</ul>
</nav>
</div>
Expand Down
6 changes: 2 additions & 4 deletions ...oWeb/ClientApp/src/app/waiting-space/judge-context-menu/judge-context-menu.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
</ng-container>

<a
*ngIf="canCallParticipantIntoHearing()"
(keyup.enter)="callParticipantIntoHearing()"
tabindex="0"
(click)="callParticipantIntoHearing()"
Expand All @@ -59,15 +58,14 @@
<ng-container *ngIf="isWitness; then isWitnessCallContent; else isNotWitnessCallContent"> </ng-container>
</a>
<a
*ngIf="canDismissParticipantFromHearing()"
(keyup.enter)="dismissParticipantFromHearing()"
tabindex="0"
(click)="dismissParticipantFromHearing()"
[id]="idPrefix + '-dismiss-' + (1 | random)"
>
{{
'judge-context-menu.dismiss-participant'
| translate : { role: 'hearing-role.' + (participant.hearingRole | hyphenate) | translate | lowercase }
| translate: { role: 'hearing-role.' + (participant.hearingRole | hyphenate) | translate | lowercase }
}}
</a>
<a
Expand All @@ -94,6 +92,6 @@
<ng-template #isNotWitnessCallContent>
{{
'judge-context-menu.admit-participant'
| translate : { role: 'hearing-role.' + (participant.hearingRole | hyphenate) | translate | lowercase }
| translate: { role: 'hearing-role.' + (participant.hearingRole | hyphenate) | translate | lowercase }
}}
</ng-template>
7 changes: 0 additions & 7 deletions ...deoWeb/ClientApp/src/app/waiting-space/participants-panel/participants-panel.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,9 +627,6 @@ export class ParticipantsPanelComponent implements OnInit, OnDestroy {
}

async callParticipantIntoHearing(participant: PanelModel) {
if (!participant.isCallableAndReadyToJoin) {
return;
}
this.logger.debug(`${this.loggerPrefix} Judge is attempting to call participant into hearing`, {
conference: this.conferenceId,
participant: participant.id
Expand Down Expand Up @@ -664,10 +661,6 @@ export class ParticipantsPanelComponent implements OnInit, OnDestroy {
}

async dismissParticipantFromHearing(participant: PanelModel) {
if (!participant.isCallableAndReadyToBeDismissed) {
return;
}

this.logger.debug(`${this.loggerPrefix} Judge is attempting to dismiss participant from hearing`, {
conference: this.conferenceId,
participant: participant.id
Expand Down
Loading
Loading