Skip to content

Implemented Cally to replace JQuery based daterangepicker#4568

Merged
frjo merged 1 commit into
mainfrom
enhancement/datepicker-no-jquery
Jul 12, 2025
Merged

Implemented Cally to replace JQuery based daterangepicker#4568
frjo merged 1 commit into
mainfrom
enhancement/datepicker-no-jquery

Conversation

@wes-otf

@wes-otf wes-otf commented Jun 3, 2025

Copy link
Copy Markdown
Contributor

Fixes #4475. This removes the existing JQuery-based daterangepicker in favor of implementing the DaisyUI supported Cally. This PR builds off of the theme changes of #4543 and requires that to be merged first.

Also added functionality that will ensure the calendars auto-populate ranges if date filters exist (for both submission all AND table_filter_and_search uses)

Test Steps

  • Ensure that the Cally date range picker works as expected in both the submission all view and wherever table_filter_and_search.html is used (like in /projects/reports/)
  • Ensure if dates are being filtered, the calendar indicated that upon opening as ranges are pre-populated

@wes-otf wes-otf added the Type: Enhancement This is an improvement of an existing thing (not a new thing, which would be a feature). label Jun 3, 2025
@wes-otf

wes-otf commented Jun 3, 2025

Copy link
Copy Markdown
Contributor Author

This is awaiting the merge of #4543 - @frjo do we have any need for JQuery after this? Aside from some rewrites of our own code?

@frjo frjo changed the base branch from main to themes June 4, 2025 06:59
@frjo frjo changed the base branch from themes to main June 4, 2025 07:00
@frjo

frjo commented Jun 4, 2025

Copy link
Copy Markdown
Member

@wes-otf I think you are correct. Only five of our own scripts use jQuery and since we removed select2 I believe only the datepicker remain.

@wes-otf

wes-otf commented Jun 4, 2025

Copy link
Copy Markdown
Contributor Author

@frjo I can open a new issue and do those rewrites so we can toss it once and for all if that sounds good?

@frjo

frjo commented Jun 4, 2025

Copy link
Copy Markdown
Member

@wes-otf Sounds good. The themes PR touch most of these javascripts so best to wait until that is merged.

@wes-otf wes-otf changed the base branch from main to themes June 30, 2025 12:35
@theskumar theskumar force-pushed the themes branch 3 times, most recently from 533061f to 350b10f Compare July 8, 2025 05:07
@wes-otf wes-otf force-pushed the enhancement/datepicker-no-jquery branch from 3fb2bb5 to 5e9b942 Compare July 9, 2025 19:45
@wes-otf wes-otf marked this pull request as ready for review July 9, 2025 19:46
@wes-otf wes-otf requested review from frjo, sandeepsajan0 and theskumar and removed request for frjo and theskumar July 9, 2025 19:46
@wes-otf wes-otf changed the base branch from themes to main July 9, 2025 19:48
@wes-otf

wes-otf commented Jul 9, 2025

Copy link
Copy Markdown
Contributor Author

Had a bit of a botched merge but I think this should be ready now - also looks like #4597 got overwritten in some of the rebasing/merging so I added it back here

@wes-otf wes-otf requested a review from theskumar July 9, 2025 20:57
@frjo

frjo commented Jul 10, 2025

Copy link
Copy Markdown
Member

Works well but is the removal of the fixed option, last 7 days etc., intended? Are they not useful as quick options?

date_range_old
date_range_new

@wes-otf

wes-otf commented Jul 10, 2025

Copy link
Copy Markdown
Contributor Author

@frjo this was baked into the previous daterangepicker library - I can write up an issue to potentially customize this a bit but even chatting with some staff they said it isn't a big deal especially when you can manually customize the range in the query/search bar

@theskumar theskumar left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Looks neat! nicely done!

@theskumar

theskumar commented Jul 11, 2025

Copy link
Copy Markdown
Member

Question should we try get that in the form -> date(time) input as well?

EDIT: I think given the browser have native support for datepicker, that might be bit overkill and desired should be considered for future.

@frjo

frjo commented Jul 11, 2025

Copy link
Copy Markdown
Member

I created a separate PR for the async downloads on submission all, #4604.

Can we clean upp the commits in this PR a bit? It has become a bit messy.

I think the actual code is good to go after that.

@frjo frjo added the Type: Patch Mini change, used in release drafter label Jul 11, 2025
@wes-otf wes-otf force-pushed the enhancement/datepicker-no-jquery branch from 11a732f to f52c673 Compare July 11, 2025 14:22
@wes-otf

wes-otf commented Jul 11, 2025

Copy link
Copy Markdown
Contributor Author

Squashed the commits so we should be all good - a bit cleaner now @frjo

@frjo

frjo commented Jul 11, 2025

Copy link
Copy Markdown
Member

@wes-otf Can you take a look at the conflict please. Then we can merge this in.

@wes-otf wes-otf force-pushed the enhancement/datepicker-no-jquery branch from f52c673 to 44e19b8 Compare July 11, 2025 15:22
@wes-otf

wes-otf commented Jul 11, 2025

Copy link
Copy Markdown
Contributor Author

should be good @frjo

@frjo frjo merged commit adea542 into main Jul 12, 2025
7 checks passed
@theskumar theskumar deleted the enhancement/datepicker-no-jquery branch July 20, 2025 09:13
wes-otf added a commit to OpenTechFund/apply-app that referenced this pull request Aug 13, 2025
)

Fixes HyphaApp#4475. 

This removes the existing JQuery-based daterangepicker in
favor of implementing the DaisyUI supported
[Cally](https://wicky.nillia.ms/cally/). This PR builds off of the theme
changes of HyphaApp#4543 and requires that to be merged first.

Also added functionality that will ensure the calendars auto-populate
ranges if date filters exist (for both submission all AND
`table_filter_and_search` uses)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Type: Enhancement This is an improvement of an existing thing (not a new thing, which would be a feature). Type: Patch Mini change, used in release drafter

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Replace daterangepicker with easepick (no-jquery version)

4 participants