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.

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

Implementing day view in calendar of event screen for both admin and user portal #1447

Merged
merged 14 commits into from
Feb 3, 2024

Conversation

karthxk07
Copy link

@karthxk07 karthxk07 commented Jan 18, 2024

What kind of change does this PR introduce?

Feature , Implements day view in calendar of event screen for both admin and user portal.

Issue Number:

Fixes #1422

Did you add tests for your changes?

No. No new file added, tests already present.

Snapshots/Videos:

Screencast.from.2024-01-18.20-39-24.webm

If relevant, did you update the documentation?

No, no documentation needed.

Summary

To fulfill the need for a multi-calendar view in both the admin and user portals, necessitating a solution to enhance the calendar functionality.
Implemented a day view for the calendar, similar to the layout observed in Google Calendar. This would involve displaying events on a daily basis for improved user experience and functionality.

Does this PR introduce a breaking change?

No, this PR does not introduce breaking changes

Have you read the contributing guide?
Yes

Copy link

Our Pull Request Approval Process

We have these basic policies to make the approval process smoother for our volunteer team.

Testing Your Code

Please make sure your code passes all tests. Our test code coverage system will fail if these conditions occur:

  1. The overall code coverage drops below the target threshold of the repository
  2. Any file in the pull request has code coverage levels below the repository threshold
  3. Merge conflicts

The process helps maintain the overall reliability of the code base and is a prerequisite for getting your PR approved. Assigned reviewers regularly review the PR queue and tend to focus on PRs that are passing.

Reviewers

When your PR has been assigned reviewers contact them to get your code reviewed and approved via:

  1. comments in this PR or
  2. our slack channel

Reviewing Your Code

Your reviewer(s) will have the following roles:

  1. arbitrators of future discussions with other contributors about the validity of your changes
  2. point of contact for evaluating the validity of your work
  3. person who verifies matching issues by others that should be closed.
  4. person who gives general guidance in fixing your tests

CONTRIBUTING.md

Read our CONTRIBUTING.md file. Most importantly:

  1. PRs with issues not assigned to you will be closed by the reviewer
  2. Fix the first comment in the PR so that each issue listed automatically closes

Other

  1. 🎯 Please be considerate of our volunteers' time. Contacting the person who assigned the reviewers is not advised unless they ask for your input. Do not @ the person who did the assignment otherwise.
  2. Read the CONTRIBUTING.md file make

@karthxk07 karthxk07 marked this pull request as ready for review January 18, 2024 16:05
@aashimawadhwa
Copy link
Member

can you change the calendar lines to gray that is used in the code and not black? and how does it looks in the mobile view? @karthxk07

Copy link

codecov bot commented Jan 18, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (c756a73) 96.23% compared to head (b721198) 96.49%.
Report is 7 commits behind head on develop.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #1447      +/-   ##
===========================================
+ Coverage    96.23%   96.49%   +0.25%     
===========================================
  Files          133      134       +1     
  Lines         3404     3511     +107     
  Branches      1031     1090      +59     
===========================================
+ Hits          3276     3388     +112     
+ Misses         123      118       -5     
  Partials         5        5              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@karthxk07
Copy link
Author

@aashimawadhwa I have changed the borders to gray and pushed the commit

Screencast.from.2024-01-19.16-55-02.webm

@aashimawadhwa
Copy link
Member

aashimawadhwa commented Jan 20, 2024

I have few more remarks for the UI changes, if you could implement those too?

  • change the color of the time as well, please understand we have not used black color in admin that much.
  • reduce the spacing between the rows
  • add am and pm instead of using 24 hrs format
  • reduce the size of font used for time
  • show a bar to indicate the current time

Screenshot 2024-01-20 at 6 19 07 PM

Note: please try to replicate design from goggle calendar. we are really working on fine details for UI along with functionalities.
@karthxk07

@karthxk07
Copy link
Author

@aashimawadhwa Ok, I will be working on that

@noman2002
Copy link
Member

@karthxk07 Please write the tests for the lines you have added, its dropping significantly.

@karthxk07
Copy link
Author

@noman2002 ok

Copy link
Member

@noman2002 noman2002 left a comment

Choose a reason for hiding this comment

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

Please write the test for the lines you have added and get the coverage of modified lines to 100%.

@karthxk07
Copy link
Author

@noman2002 i am almost done with the changes , i just need to add all the tests. I will push the commits

@karthxk07
Copy link
Author

karthxk07 commented Jan 28, 2024

@aashimawadhwa I am done adding the requested changes. Does this look fine?

Screencast.from.2024-01-28.12-19-48.webm

@noman2002 I will start working on adding the test for uncovered lines now

@karthxk07
Copy link
Author

@noman2002 I have completed adding the tests too , ☺️ can I get the pull request reviewed please ?

@karthxk07 karthxk07 requested a review from noman2002 January 28, 2024 13:50
@palisadoes
Copy link
Contributor

Please fix the failing tests

  1. Introspection

@karthxk07
Copy link
Author

karthxk07 commented Jan 28, 2024

@palisadoes working on it sir 👍

Please fix the failing tests

  1. Introspection

@palisadoes
Copy link
Contributor

Please fix the failing tests

  • Code coverage is declining. The tests for the files you have submitted are not complete

@karthxk07
Copy link
Author

@palisadoes Sir added tests for uncovered lines

@palisadoes
Copy link
Contributor

Please fix the introspection error. New API code was pushed and Admin needs to be in sync.

@karthxk07
Copy link
Author

@palisadoes Sir , I am not sure why the error is occurring. The new graphql schema does not contain any requirement of UserToReturn type, which is the cause for the error. The new commits to the api repo have fixed this but i am not sure why this error is still occurring. On my local system the files validate properly.

image

image

image

@palisadoes
Copy link
Contributor

Reimport the API data

Copy link
Member

@noman2002 noman2002 left a comment

Choose a reason for hiding this comment

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

Looks fine to me.

@palisadoes palisadoes merged commit 95d4869 into PalisadoesFoundation:develop Feb 3, 2024
9 of 10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants