add missing form child in getFormDefaultData() + sort methods

try to resolve 2 last unit tests errors on ci (no errors in local)
This commit is contained in:
Mathieu Jaumotte 2023-09-29 09:35:52 +02:00
parent eddcfc3921
commit 84ba626fb5
17 changed files with 65 additions and 28 deletions

View File

@ -80,6 +80,7 @@ class ActivityUsersJobAggregator implements AggregatorInterface
]);
}
public function getFormDefaultData(): array
{
return ['job_at' => new RollingDate(RollingDate::T_TODAY)];

View File

@ -79,6 +79,7 @@ class ActivityUsersScopeAggregator implements AggregatorInterface
'required' => true,
]);
}
public function getFormDefaultData(): array
{
return ['scope_at' => new RollingDate(RollingDate::T_TODAY)];

View File

@ -79,6 +79,7 @@ class CreatorScopeAggregator implements AggregatorInterface
'required' => true,
]);
}
public function getFormDefaultData(): array
{
return ['scope_at' => new RollingDate(RollingDate::T_TODAY)];

View File

@ -81,6 +81,7 @@ class ByUserJobAggregator implements AggregatorInterface
'required' => true
]);
}
public function getFormDefaultData(): array
{
return ['job_at' => new RollingDate(RollingDate::T_TODAY)];

View File

@ -79,6 +79,7 @@ class ByUserScopeAggregator implements AggregatorInterface
'required' => true,
]);
}
public function getFormDefaultData(): array
{
return ['scope_at' => new RollingDate(RollingDate::T_TODAY)];

View File

@ -95,7 +95,10 @@ class ByUserJobFilter implements FilterInterface
public function getFormDefaultData(): array
{
return ['job_at' => new RollingDate(RollingDate::T_TODAY)];
return [
'jobs' => [],
'job_at' => new RollingDate(RollingDate::T_TODAY)
];
}
public function getTitle(): string

View File

@ -98,7 +98,10 @@ class ByUserScopeFilter implements FilterInterface
public function getFormDefaultData(): array
{
return ['scope_at' => new RollingDate(RollingDate::T_TODAY)];
return [
'scopes' => [],
'scope_at' => new RollingDate(RollingDate::T_TODAY)
];
}
public function getTitle(): string

View File

@ -88,12 +88,6 @@ class JobFilter implements FilterInterface
'required' => true,
]);
}
public function getFormDefaultData(): array
{
return [
'job_at' => new RollingDate(RollingDate::T_TODAY),
];
}
public function describeAction($data, $format = 'string'): array
{
@ -110,6 +104,14 @@ class JobFilter implements FilterInterface
]];
}
public function getFormDefaultData(): array
{
return [
'job' => [],
'job_at' => new RollingDate(RollingDate::T_TODAY),
];
}
public function getTitle(): string
{
return 'Filter calendars by agent job';

View File

@ -83,10 +83,6 @@ class ScopeFilter implements FilterInterface
'required' => true,
]);
}
public function getFormDefaultData(): array
{
return ['scope_at' => new RollingDate(RollingDate::T_TODAY)];
}
public function describeAction($data, $format = 'string'): array
{
@ -103,6 +99,14 @@ class ScopeFilter implements FilterInterface
]];
}
public function getFormDefaultData(): array
{
return [
'scope' => [],
'scope_at' => new RollingDate(RollingDate::T_TODAY)
];
}
public function getTitle(): string
{
return 'Filter calendars by agent scope';

View File

@ -79,6 +79,7 @@ class CreatorJobAggregator implements AggregatorInterface
'required' => true
]);
}
public function getFormDefaultData(): array
{
return ['job_at' => new RollingDate(RollingDate::T_TODAY)];

View File

@ -80,6 +80,7 @@ final readonly class UserJobAggregator implements AggregatorInterface
'required' => true
]);
}
public function getFormDefaultData(): array
{
return ['job_at' => new RollingDate(RollingDate::T_TODAY)];

View File

@ -80,6 +80,7 @@ final readonly class JobAggregator implements AggregatorInterface
'required' => true
]);
}
public function getFormDefaultData(): array
{
return ['job_at' => new RollingDate(RollingDate::T_TODAY)];

View File

@ -80,6 +80,7 @@ final readonly class ScopeAggregator implements AggregatorInterface
'required' => true,
]);
}
public function getFormDefaultData(): array
{
return ['scope_at' => new RollingDate(RollingDate::T_TODAY)];

View File

@ -102,10 +102,6 @@ class UserJobFilter implements FilterInterface
'required' => true,
]);
}
public function getFormDefaultData(): array
{
return ['date_calc' => new RollingDate(RollingDate::T_TODAY)];
}
public function describeAction($data, $format = 'string')
{
@ -122,6 +118,14 @@ class UserJobFilter implements FilterInterface
];
}
public function getFormDefaultData(): array
{
return [
'jobs' => [],
'date_calc' => new RollingDate(RollingDate::T_TODAY)
];
}
public function getTitle(): string
{
return 'export.filter.course.by_user_job.Filter by user job';

View File

@ -101,10 +101,6 @@ class UserScopeFilter implements FilterInterface
'required' => true,
]);
}
public function getFormDefaultData(): array
{
return ['date_calc' => new RollingDate(RollingDate::T_TODAY)];
}
public function describeAction($data, $format = 'string')
{
@ -121,6 +117,14 @@ class UserScopeFilter implements FilterInterface
];
}
public function getFormDefaultData(): array
{
return [
'scopes' => [],
'date_calc' => new RollingDate(RollingDate::T_TODAY)
];
}
public function getTitle(): string
{
return 'export.filter.course.by_user_scope.Filter by user scope';

View File

@ -94,10 +94,6 @@ class JobFilter implements FilterInterface
])
;
}
public function getFormDefaultData(): array
{
return ['job_at' => new RollingDate(RollingDate::T_TODAY)];
}
public function describeAction($data, $format = 'string')
{
@ -114,6 +110,14 @@ class JobFilter implements FilterInterface
]];
}
public function getFormDefaultData(): array
{
return [
'job' => [],
'job_at' => new RollingDate(RollingDate::T_TODAY)
];
}
public function getTitle(): string
{
return 'export.filter.work.by_user_job.Filter by treating agent job';

View File

@ -92,10 +92,6 @@ class ScopeFilter implements FilterInterface
])
;
}
public function getFormDefaultData(): array
{
return ['scope_at' => new RollingDate(RollingDate::T_TODAY)];
}
public function describeAction($data, $format = 'string'): array
{
@ -112,6 +108,14 @@ class ScopeFilter implements FilterInterface
]];
}
public function getFormDefaultData(): array
{
return [
'scope' => [],
'scope_at' => new RollingDate(RollingDate::T_TODAY)
];
}
public function getTitle(): string
{
return 'export.filter.work.by_user_scope.Filter by treating agent scope';