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

MMI-244 Fixed cbra report issues #2371

Merged
merged 5 commits into from
Dec 21, 2024
Merged

MMI-244 Fixed cbra report issues #2371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5ff26fd
MMI-244 Fixed cbra report issues
laidaoyu Dec 19, 2024
1278e16
MMI-244 Updated Cbra report functions
laidaoyu Dec 20, 2024
0c8ab07
MMI-244 Renamed Cbra methods
laidaoyu Dec 20, 2024
3540b59
Fix naming conventions
Fosol Dec 20, 2024
9b9be5d
MMI-244 Fixed total running time issues
laidaoyu Dec 21, 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 .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
},
"yaml.schemaStore.enable": false,
"cSpell.words": [
"CBRA",
"CHES",
"formik",
"Idir",
Expand Down
10 changes: 2 additions & 8 deletions api/net/Areas/Reports/Controllers/CBRAController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,17 @@ namespace TNO.API.Areas.Reports.Controllers;
public class CBRAController : ControllerBase
{
#region Variables
private readonly IContentService _contentService;
private readonly ITimeTrackingService _timeTrackingService;
private readonly IActionService _actionService;
#endregion

#region Constructors
/// <summary>
/// Creates a new instance of a CBRAController object, initializes with specified parameters.
/// </summary>
/// <param name="contentService"></param>
/// <param name="timeTrackingService"></param>
/// <param name="actionService"></param>
public CBRAController(IContentService contentService, ITimeTrackingService timeTrackingService, IActionService actionService)
public CBRAController(ITimeTrackingService timeTrackingService)
{
_contentService = contentService;
_timeTrackingService = timeTrackingService;
_actionService = actionService;
}
#endregion

Expand All @@ -55,7 +49,7 @@ public CBRAController(IContentService contentService, ITimeTrackingService timeT
[SwaggerOperation(Tags = new[] { "CBRA" })]
public FileResult Generate([FromQuery] DateTime from, [FromQuery] DateTime? to)
{
var helper = new CBRAReport(_contentService, _timeTrackingService, _actionService);
var helper = new CBRAReport(_timeTrackingService);

var report = helper.GenerateReport(from, to);

Expand Down
Loading
Loading