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

Enable Time-off entry in "Day" view #1662

Merged
merged 1 commit into from
Feb 16, 2024
Merged

Enable Time-off entry in "Day" view #1662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ gem "data_migrate", "~> 8.0.0.rc2"
# pagy for Pagination
gem "pagy", "~> 5.10"

gem "nokogiri", ">= 1.13.10"
gem "nokogiri", ">= 1.16.2"

# Manage application specific business logic. https://github.com/AaronLasseigne/active_interaction
gem "active_interaction"
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,7 @@ DEPENDENCIES
letter_opener_web
money
newrelic_rpm (~> 8.4)
nokogiri (>= 1.13.10)
nokogiri (>= 1.16.2)
omniauth-google-oauth2 (~> 1.0)
omniauth-rails_csrf_protection (~> 1.0)
pagy (~> 5.10)
Expand Down
22 changes: 20 additions & 2 deletions app/javascript/src/components/TimesheetEntries/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,25 @@ const TimesheetEntries = ({ user, isAdminUser }: Iprops) => {
<div className="pb-14">
{!isDesktop && <Header />}
<div className="mt-0 h-full p-4 lg:mt-6 lg:p-0">
<div className="mb-6 flex items-center justify-between md:flex-row-reverse">
<div className="mb-6 flex items-center justify-between">
{isDesktop && (
<nav className="flex">
{["month", "day"].map((item, index) => (
<button
key={index}
className={`mr-10 tracking-widest
${
item === view
? "border-b-2 border-miru-han-purple-1000 font-bold text-miru-han-purple-1000"
: "font-medium text-miru-han-purple-600"
}`}
onClick={() => setView(item)}
>
{item.toUpperCase()}
</button>
))}
</nav>
)}
{isDesktop && isViewTogglerVisible && (
<ViewToggler view={view} setView={setView} />
)}
Expand Down Expand Up @@ -718,7 +736,7 @@ const TimesheetEntries = ({ user, isAdminUser }: Iprops) => {
+ NEW ENTRY
</button>
)}
{view === "month" &&
{view !== "week" &&
!newEntryView &&
!newTimeoffEntryView &&
isDesktop && (
Expand Down
Loading