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.

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

Rooms sponsors #66

Merged
merged 4 commits into from
Mar 10, 2024
Merged

Conversation

carlynlee
Copy link
Contributor

@carlynlee carlynlee commented Mar 8, 2024

Fixes: #63

more sponsors stuff

@sarcasticadmin
Copy link
Member

Thanks for raising this PR @carlynlee ! Ill be reviewing it tonight since I havent been able to thoroughly test this yet

Without setting rooms in the case statement (room-105 for example) the following
queries would not show the speaker in the room (intended) but instead show the
entire schedule as if it were the RPi sign clients when room-105 was missing
in the case:

http://localhost/?room=room-105&year=2024&month=3&day=16&hour=11&minute=30
Make sure topic special chars are dealt with the same way in room as they
are in scroll.php
Copy link
Member

@sarcasticadmin sarcasticadmin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@carlynlee Nice work! I think that does it for #63

Ive included a few additional changes (see commentary) but I think this is all good :shipit:

@@ -186,7 +189,7 @@
"netknights",
"perforce",
"redhat",
"site24x7",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for fixing this!

case 'room-101':
case 'room-103':
case 'room-104':
case 'room-105':
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We were missing this in the index.php so when you when to http://localhost/?room=room-105&year=2024&month=3&day=16&hour=11&minute=30 the it would show the rooms signage but instead the default (full schedule) signage.

Setting this here fix it

@@ -383,8 +397,10 @@
$node->{'Time'} = preg_replace('/<[^>]*>/', '', $node->{'Time'});
$node->{'Day'} = preg_replace('/<[^>]*>/', '', $node->{'Day'});

// Remove Spaces so we can use it for a CSS class
// Remove special chars in Topic from XML request so we can use it for a CSS class
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

figured this was best to include here, although I it wasnt clear if we are actually utilizing this like we are in scroll.php

@sarcasticadmin sarcasticadmin merged commit d68087b into socallinuxexpo:master Mar 10, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update Yearly Tasks for Scale 21x
2 participants