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

Schedule meta and various fixes #1942

Merged
merged 7 commits into from
Jul 26, 2023

Conversation

PeterMis
Copy link
Member

  • Schedule name : relates to xibosignageltd/xibo-private#333
  • Schedule meta : relates to Schedule: meta data for created/modified on/by xibo#3051
  • Schedule Grid : Fixed Event start/end time representation with user created Dayparts
  • Schedule add/edit forms : Fixed Display/groups grouping for Display select
  • Schedule Grid : vertical aligned all tds to middle
  • Members form (mostly relates to sync group) : Fixed the saving cog icon stuck on save button on error
  • Removed schedule-grid-page.twig as we no longer use that (it's all on schedule-page)

@PeterMis PeterMis requested a review from dasgarner July 25, 2023 15:06
@PeterMis PeterMis self-assigned this Jul 25, 2023
Copy link
Member

@dasgarner dasgarner left a comment

Choose a reason for hiding this comment

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

I think we want modifiedBy to be an ID not a name.

@@ -1696,6 +1697,8 @@ public function edit(Request $request, Response $response, $id)
$schedule->actionTriggerCode = $sanitizedParams->getString('actionTriggerCode');
$schedule->actionLayoutCode = $sanitizedParams->getString('actionLayoutCode');
$schedule->maxPlaysPerHour = $sanitizedParams->getInt('maxPlaysPerHour', ['default' => 0]);
$schedule->name = $sanitizedParams->getString('name');
$schedule->modifiedBy = $this->getUser()->userName;
Copy link
Member

Choose a reason for hiding this comment

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

I think this wants to be userId not userName (which can change)

@@ -304,6 +304,30 @@ class Schedule implements \JsonSerializable
*/
public $syncGroupId;

/**
* @SWG\Property(description="The userName of the user that last modified this Schedule")
Copy link
Member

Choose a reason for hiding this comment

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

userId

public function change(): void
{
$this->table('schedule')
->addColumn('modifiedBy', 'string', ['null' => true, 'default' => null])
Copy link
Member

Choose a reason for hiding this comment

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

integer I think? without a reference to the user table though

lib/Factory/ScheduleFactory.php Show resolved Hide resolved
@PeterMis PeterMis requested a review from dasgarner July 26, 2023 11:53
@PeterMis PeterMis merged commit 9a4f68a into xibosignage:westphal Jul 26, 2023
2 checks passed
@PeterMis PeterMis deleted the fixes/schedule-meta-and-fixes branch July 26, 2023 13:35
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.

2 participants