kamilniemczycki/toby
1
0
Fork 0
Code Issues Pull Requests 2 Projects Releases Activity

#157 - more interactive calendar #162

Merged
kamilniemczycki merged 20 commits from #157-expansion-calendar into main 2022-06-08 11:02:38 +02:00
Conversation 10 Commits 20 Files Changed 6 +84 -24
kamilniemczycki commented 2022-06-06 11:55:57 +02:00 (Migrated from github.com)
Copy Link

This should close #157

Employee view:

https://user-images.githubusercontent.com/1353655/172138429-9785d7a3-7bc3-4126-81b0-294574928b3d.mp4

https://user-images.githubusercontent.com/1353655/172138505-45c03c33-8268-41cf-839a-60d32e99dcc6.mp4

Administrator view:

https://user-images.githubusercontent.com/1353655/172138643-6efc3dbd-8ddf-4109-ac74-fb2a141f184f.mp4

https://user-images.githubusercontent.com/1353655/172138698-b110859b-9a8c-4a3d-9fda-8abb13924427.mp4

This should close #157 **Employee view:** https://user-images.githubusercontent.com/1353655/172138429-9785d7a3-7bc3-4126-81b0-294574928b3d.mp4 https://user-images.githubusercontent.com/1353655/172138505-45c03c33-8268-41cf-839a-60d32e99dcc6.mp4 **Administrator view:** https://user-images.githubusercontent.com/1353655/172138643-6efc3dbd-8ddf-4109-ac74-fb2a141f184f.mp4 https://user-images.githubusercontent.com/1353655/172138698-b110859b-9a8c-4a3d-9fda-8abb13924427.mp4
krzysztofrewak (Migrated from github.com) requested changes 2022-06-06 12:25:52 +02:00
app/Domain/CalendarGenerator.php
krzysztofrewak (Migrated from github.com) commented 2022-06-06 12:24:03 +02:00
Copy Link
                "isFuture" => $day->isFuture(),

Maybe this would be more readable?

```suggestion "isFuture" => $day->isFuture(), ``` Maybe this would be more readable?
app/Infrastructure/Http/Requests/CreateVacationRequestRequest.php
krzysztofrewak (Migrated from github.com) commented 2022-06-06 12:25:26 +02:00
Copy Link
        return ($this->get("user") === null) ||
            ((int)$this->get("user") === $this->user()->id) ||
            $this->user()->can("createOnBehalfOfEmployee", VacationRequest::class);
```suggestion return ($this->get("user") === null) || ((int)$this->get("user") === $this->user()->id) || $this->user()->can("createOnBehalfOfEmployee", VacationRequest::class); ```
krzysztofrewak (Migrated from github.com) reviewed 2022-06-06 15:16:40 +02:00
krzysztofrewak (Migrated from github.com) left a comment
Copy Link

Looks good for me, but I would like @Baakoma to look at it too.

Looks good for me, but I would like @Baakoma to look at it too.
EwelinaLasowy (Migrated from github.com) requested changes 2022-06-07 08:38:39 +02:00
EwelinaLasowy (Migrated from github.com) left a comment
Copy Link

I can create a vacation request in the past - for couple of reasons. If we want to be consistent, we should allow creating the vacation request in the past also in calendars views.

I can create a vacation request in the past - for couple of reasons. If we want to be consistent, we should allow creating the vacation request in the past also in calendars views.
resources/js/Composables/vacationTypeInfo.js
EwelinaLasowy (Migrated from github.com) commented 2022-06-07 08:31:08 +02:00
Copy Link

PlusIcon will look better.

`PlusIcon` will look better.
resources/js/Pages/AnnualSummary.vue
EwelinaLasowy (Migrated from github.com) commented 2022-06-07 08:30:08 +02:00
Copy Link

I think that we should remove cursor-not-allowed, because it looks bad. Just leave mouse point cursor, but don't highlight this field if user hovers on this. Also please remember, that we using TailwindCSS and it has some classes related to cursors - you don't need to write it in styles, just use as class - link.

I think that we should remove `cursor-not-allowed`, because it looks bad. Just leave mouse point cursor, but don't highlight this field if user hovers on this. Also please remember, that we using TailwindCSS and it has some classes related to cursors - you don't need to write it in styles, just use as class - [link](https://tailwindcss.com/docs/cursor).
EwelinaLasowy (Migrated from github.com) commented 2022-06-07 08:30:32 +02:00
Copy Link

The same as above.

The same as above.
Baakoma (Migrated from github.com) requested changes 2022-06-07 08:46:48 +02:00
app/Infrastructure/Http/Requests/CreateVacationRequestRequest.php
Baakoma (Migrated from github.com) commented 2022-06-07 08:45:48 +02:00
Copy Link

Honestly, I would prefer to not use form request for things like that (optional GET params, authorization, etc), at least not in a project where it is not standard and we did all authorization inside controller methods.

Honestly, I would prefer to not use form request for things like that (optional GET params, authorization, etc), at least not in a project where it is not standard and we did all authorization inside controller methods.
resources/js/Pages/AnnualSummary.vue
Baakoma (Migrated from github.com) commented 2022-06-07 08:29:10 +02:00
Copy Link

Use tailwind classes instead of own css https://tailwindcss.com/docs/cursor#setting-the-cursor-style

Use tailwind classes instead of own css https://tailwindcss.com/docs/cursor#setting-the-cursor-style
kamilniemczycki (Migrated from github.com) reviewed 2022-06-07 10:52:16 +02:00
app/Infrastructure/Http/Requests/CreateVacationRequestRequest.php
kamilniemczycki (Migrated from github.com) commented 2022-06-07 10:52:15 +02:00
Copy Link

Restore this version?

5f02e23f51 (diff-0a0b7b715da129fe7e856b493c478b10a56016e20690ffdc592c20239b4a8e7d)

Restore this version? https://github.com/blumilksoftware/toby/commit/5f02e23f511a4381199f6b9d9e38f6cc4da638c1#diff-0a0b7b715da129fe7e856b493c478b10a56016e20690ffdc592c20239b4a8e7d
Baakoma (Migrated from github.com) reviewed 2022-06-07 10:59:21 +02:00
app/Infrastructure/Http/Requests/CreateVacationRequestRequest.php
Baakoma (Migrated from github.com) commented 2022-06-07 10:59:20 +02:00
Copy Link

Yeah, but I'm not sure if you need to find user by id in this case. Just pass user Id from request to Inertia as you did with start date.

Yeah, but I'm not sure if you need to find user by id in this case. Just pass user Id from request to Inertia as you did with start date.
EwelinaLasowy (Migrated from github.com) requested changes 2022-06-07 14:40:24 +02:00
EwelinaLasowy (Migrated from github.com) left a comment
Copy Link

If I have a day in the calendar ("Podsumowanie roczne"), when I can't create vacation request, for example Saturday, the cursor should not be cursor-pointer but cursor-default.

If I have a day in the calendar ("Podsumowanie roczne"), when I can't create vacation request, for example Saturday, the cursor should not be `cursor-pointer` but `cursor-default`.
resources/js/Composables/vacationTypeInfo.js
EwelinaLasowy (Migrated from github.com) commented 2022-06-07 14:37:23 +02:00
Copy Link
import PlusIcon from 'vue-material-design-icons/Plus.vue'
```suggestion import PlusIcon from 'vue-material-design-icons/Plus.vue' ```
Baakoma (Migrated from github.com) approved these changes 2022-06-08 08:59:19 +02:00
EwelinaLasowy (Migrated from github.com) approved these changes 2022-06-08 08:59:53 +02:00
krzysztofrewak (Migrated from github.com) approved these changes 2022-06-08 10:59:58 +02:00
Sign in to join this conversation.
Reviewers
No Reviewers
Baakoma
EwelinaLasowy
krzysztofrewak
Labels
Clear labels
backend
backend feature
bug
obviously bugged thing - to immediately fix
content
static content update
dependencies
Pull requests that update a dependency file
discussion
ideas to discuss
documentation
improvements or additions to documentation
environment
deployment, testing and other devops stuff
feature
new feature to implement
frontend
frontend feature
investigation
things to research
javascript
Pull requests that update Javascript code
ongoing
ongoing tasks that should never end
php
Pull requests that update Php code
testing
testing stuff
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
kamilniemczycki
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: kamilniemczycki/toby#162
No description provided.
Delete Branch "#157-expansion-calendar"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?