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

Out of office #4521

Merged
merged 23 commits into from
Dec 20, 2024
Merged

Out of office #4521

merged 23 commits into from
Dec 20, 2024

Conversation

sowjanyakch
Copy link
Contributor

@sowjanyakch sowjanyakch commented Dec 5, 2024 •
edited
Loading

Resolve #4477

out_of_office_view

  1. Scroll through the office view to find the absence message if the user has set a long absence message.
  2. Show the vacation replacement only if the user has set one otherwise hide the view.
  3. Clicking on the vacation replacement user’s avatar/ name will allow you to join one-on-one conversation with the designated vacation replacement.
  4. Add start and end dates of vacation.
  5. If the user is out of office for only one day, display the message “User is out of office today” without showing the start and end dates of the vacation.

🚧 TODO

  • ...

🏁 Checklist

  • ⛑️ Tests (unit and/or integration) are included or not needed
  • 🔖 Capability is checked or not needed
  • 🔙 Backport requests are created or not needed: /backport to stable-xx.x
  • 📅 Milestone is set
  • 🌸 PR title is meaningful (if it should be in the changelog: is it meaningful to users?)

@sowjanyakch sowjanyakch force-pushed the out_of_office branch 4 times, most recently from ca9225d to a537694 Compare December 10, 2024 12:01
@sowjanyakch sowjanyakch marked this pull request as ready for review December 10, 2024 12:56
@sowjanyakch sowjanyakch self-assigned this Dec 10, 2024
@sowjanyakch sowjanyakch added the 3. to review Waiting for reviews label Dec 10, 2024
@sowjanyakch sowjanyakch force-pushed the out_of_office branch 2 times, most recently from 81c190c to 5290ab1 Compare December 13, 2024 13:01
rapterjet2004
rapterjet2004 requested changes Dec 13, 2024
View reviewed changes
Copy link
Contributor

@rapterjet2004 rapterjet2004 left a comment

Choose a reason for hiding this comment

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

Looks good!

  1. Is that the replacement views are still there even if I didn't set a replacement. This makes it seem like it's still loading even when they're not
    Screenshot 2024-12-13 at 7 46 17 AM

@sowjanyakch sowjanyakch disabled auto-merge December 13, 2024 15:18
@sowjanyakch sowjanyakch force-pushed the out_of_office branch 2 times, most recently from b129260 to 583e0eb Compare December 13, 2024 15:53
@sowjanyakch sowjanyakch force-pushed the out_of_office branch 2 times, most recently from 209439d to 1d4bf20 Compare December 19, 2024 08:58
@sowjanyakch
modify data class UserAbsenceData
f7f7313 
Signed-off-by: sowjanyakch <[email protected]>
@sowjanyakch
use proper naming
083f0de 
Signed-off-by: sowjanyakch <[email protected]>
@sowjanyakch
show replacement only if the user set a replacement
c9d5bc6 
Signed-off-by: sowjanyakch <[email protected]>
@sowjanyakch
apply styling
ecd5bfd 
Signed-off-by: sowjanyakch <[email protected]>
@sowjanyakch
show userAbsence period
4bdedfb 
Signed-off-by: sowjanyakch <[email protected]>
@sowjanyakch
ui changes to out_of_office_view
e7c5408 
Signed-off-by: sowjanyakch <[email protected]>
@sowjanyakch
remove unused namespace declaration
27538a7 
Signed-off-by: sowjanyakch <[email protected]>
@sowjanyakch
format code
a9168b3 
Signed-off-by: sowjanyakch <[email protected]>
@sowjanyakch
use proper color for out of office view
ca4ace6 
Signed-off-by: sowjanyakch <[email protected]>
@sowjanyakch
create chip for avatar icon and name
9a481ae 
Signed-off-by: sowjanyakch <[email protected]>
@sowjanyakch
join 1:1 conversation with replacement user
cadb12c 
Signed-off-by: sowjanyakch <[email protected]>
@sowjanyakch
format code and remove unused colors
3eab184 
Signed-off-by: sowjanyakch <[email protected]>
@sowjanyakch
use theming from server
8ca7698 
Signed-off-by: sowjanyakch <[email protected]>
@sowjanyakch
ktlintFormat
65cb31b 
Signed-off-by: sowjanyakch <[email protected]>
@sowjanyakch
use constants
f707899 
Signed-off-by: sowjanyakch <[email protected]>
@sowjanyakch
hide replacement view when there is no replacement set
74bf9f2 
Signed-off-by: sowjanyakch <[email protected]>
@mahibi
fix detekt warnings
cd50115 
Signed-off-by: Marcel Hibbe <[email protected]>
@github-actions GitHub Actions
Copy link
Contributor

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/4521-talk.apk

qrcode

To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud Talk app.

@github-actions GitHub Actions
Copy link
Contributor

Codacy

Lint

TypemasterPR
Warnings158158
Errors7171

SpotBugs

CategoryBaseNew
Bad practice66
Correctness1616
Dodgy code7171
Internationalization33
Malicious code vulnerability33
Performance44
Security11
Total104104

@sowjanyakch sowjanyakch merged commit 5a7c45e into master Dec 20, 2024
17 checks passed
@sowjanyakch sowjanyakch deleted the out_of_office branch December 20, 2024 14:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rapterjet2004 rapterjet2004 rapterjet2004 approved these changes

@mahibi mahibi mahibi approved these changes

Assignees

@sowjanyakch sowjanyakch

Labels
3. to review Waiting for reviews
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Show "Out of office" message in 1-1 conversations
3 participants
@sowjanyakch @mahibi @rapterjet2004