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

#444 - overtime report #449

Merged
merged 15 commits into from
Jul 4, 2024
Merged

#444 - overtime report #449

merged 15 commits into from
Jul 4, 2024

Commits on Jun 6, 2024

  1. #444 - wip: added models and create form for overtime requests

    @kamilpiech97
    kamilpiech97 committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    706389a View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2024

  1. #444 - wip: added full workflow for overtime

    @kamilpiech97
    kamilpiech97 committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    5cd5a1b View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2024

  1. #444 - fixes

    @kamilpiech97
    kamilpiech97 committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    1fb1702 View commit details
    Browse the repository at this point in the history

  2. #444 - added tests

    @kamilpiech97
    kamilpiech97 committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    01d679f View commit details
    Browse the repository at this point in the history

  3. #444 - fix

    @kamilpiech97
    kamilpiech97 committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    d247ce9 View commit details
    Browse the repository at this point in the history

  4. #444 - fixes and added policies

    @kamilpiech97
    kamilpiech97 committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    1976a47 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2024

  1. - fixes

    @kamilpiech97
    kamilpiech97 committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    d7af41f View commit details
    Browse the repository at this point in the history

  2. Update app/Enums/SettlementType.php 

    Co-authored-by: Krzysztof Rewak <krzysztof.rewak@blumilk.pl>
    @kamilpiech97 @krzysztofrewak
    kamilpiech97 and krzysztofrewak authored Jun 11, 2024
    Configuration menu
    Copy the full SHA
    e2d0283 View commit details
    Browse the repository at this point in the history

  3. - cr fixes

    @kamilpiech97
    kamilpiech97 committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    f5c2628 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2024

  1. #444 - added overtime report in Excel file for administrator

    @kamilpiech97
    kamilpiech97 committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    e98b510 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2024

  1. #444 - fixes

    @kamilpiech97
    kamilpiech97 committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    c1fbed5 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2024

  1. Merge branch 'refs/heads/main' into #444-overtime-report 

    # Conflicts:
#	app/Helpers/DateFormats.php
#	app/Http/Controllers/OvertimeRequestController.php
#	app/Http/Controllers/VacationRequestController.php
#	app/Http/Resources/OvertimeRequestResource.php
#	app/Models/OvertimeRequest.php
#	app/Observers/OvertimeRequestObserver.php
#	app/Observers/VacationRequestObserver.php
#	app/Policies/OvertimeRequestPolicy.php
#	app/States/OvertimeRequest/OvertimeRequestState.php
#	app/Validation/Rules/OvertimeRequest/NoPendingOvertimeRequestInRange.php
#	resources/js/Pages/OvertimeRequest/Create.vue
#	resources/js/Pages/OvertimeRequest/Index.vue
#	resources/js/Pages/OvertimeRequest/Show.vue
#	resources/js/Shared/MainMenu.vue
#	routes/web.php
#	tests/Feature/OvertimeRequestTest.php
    @kamilpiech97
    kamilpiech97 committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    3162c6c View commit details
    Browse the repository at this point in the history

  2. #444 - csf

    @kamilpiech97
    kamilpiech97 committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    def12b8 View commit details
    Browse the repository at this point in the history

  3. #444 - fix: fixed button and route for generating overtime reports

    @kamilpiech97
    kamilpiech97 committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    df301a8 View commit details
    Browse the repository at this point in the history

  4. #444 - fix: fixed 'anuluj' button link

    @kamilpiech97
    kamilpiech97 committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    0a033a3 View commit details
    Browse the repository at this point in the history