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

Replace jQueryUI datetimepicker with jQuery Bootstrap datetimepicker #2391

Merged
merged 23 commits into from
Sep 11, 2015
Merged

Replace jQueryUI datetimepicker with jQuery Bootstrap datetimepicker #2391

merged 23 commits into from
Sep 11, 2015

Conversation

dalpo
Copy link
Contributor

@dalpo dalpo commented Aug 26, 2015

@dalpo dalpo force-pushed the feature/bs-datetime-picker branch 2 times, most recently from 33fe95b to 8c593bc Compare August 26, 2015 07:23
@dalpo
Copy link
Contributor Author

dalpo commented Aug 26, 2015

WIP: I'm fixing failing specs

@dalpo dalpo mentioned this pull request Aug 26, 2015
Closed
@dalpo dalpo force-pushed the feature/bs-datetime-picker branch 3 times, most recently from 6fe5b3c to d7b62a8 Compare September 4, 2015 08:45
@dalpo
Copy link
Contributor Author

dalpo commented Sep 4, 2015

The failing specs about mongoid are related to DatabaseCleaner/database_cleaner#385

@dalpo dalpo changed the title Replace old jQuery UI datetime picker with jQuery Bootstrap datetimepicker Replace jQueryUI datetime picker with jQuery Bootstrap datetimepicker Sep 4, 2015
@dalpo dalpo changed the title Replace jQueryUI datetime picker with jQuery Bootstrap datetimepicker Replace jQueryUI datetimepicker with jQuery Bootstrap datetimepicker Sep 4, 2015
mshibuya
mshibuya reviewed Sep 5, 2015
View reviewed changes
config/locales/rails_admin.en.yml
@@ -27,7 +27,6 @@ en:
next: "Next »"
truncate: "…"
misc:
filter_date_format: "mm/dd/yy" # a combination of 'dd', 'mm' and 'yy' with any delimiter. No other interpolation will be done!
Copy link
Member

Choose a reason for hiding this comment

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

This is incompatible change, please state that in changelog.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Changelog updated! 😃

Let me know if you have more feedback.
Thanks!

dalpo added 19 commits September 5, 2015 12:38
@dalpo
Add jquery bootstrap datetimepicker
d0e64fe
@dalpo
Fix: use font awesome icons
6a90c39
@dalpo
Move I18n rails_admin suppurt into a proper directory
d85494c
@dalpo
Change: make accessible current locale to javascript
496388a
@dalpo
Change: initialize new datetimepicker
7cc7c60
@dalpo
Change: move datetime parse logic into a separate file
72c2033
@dalpo
Fix specs
ffb962f
@dalpo
datetime input markup
c3e0851
@dalpo
Fix: allow search date into index action using datepicker
ef2a86a
@dalpo
Drop old jquery ui datepicker assets
af54c8e
@dalpo
Fix mongoid specs
abe3025
@dalpo
Update changelog
63cca16
@dalpo
Change: add #parse_value method into every field class
29e22a5
@dalpo
Refactor date and datetime input fields logic
fe2899f
@dalpo
Move filters render logic into helpers
705fc84
@dalpo
Fix: Mongoid abstract model parsed values
47bf30c
@dalpo
Revert minimum_coverage
b48cd26
@dalpo
Fix: mongoid dependecy load
068b7fd
@dalpo
Fix: new search filters initialization
cd23e23
@dalpo dalpo force-pushed the feature/bs-datetime-picker branch from 06a2ef0 to d2d0ddf Compare September 5, 2015 10:38
@dalpo
Copy link
Contributor Author

dalpo commented Sep 5, 2015

Some screenshots:

screenshot from 2015-09-05 12 23 03

screenshot from 2015-09-05 12 25 01

@dalpo dalpo force-pushed the feature/bs-datetime-picker branch from d2d0ddf to 7d87bfb Compare September 5, 2015 10:56
@dalpo
Copy link
Contributor Author

dalpo commented Sep 5, 2015

Everythink is Green! 🎆

@mshibuya, @sferik (or anyone else) could you review this PR an let me know what do you think about it?

mshibuya
mshibuya reviewed Sep 7, 2015
View reviewed changes
lib/rails_admin/config/fields/types/bson_object_id.rb
require 'mongoid'
rescue LoadError => e
puts "[RailsAdmin] #{e.message}"
end
Copy link
Member

Choose a reason for hiding this comment

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

This message is useless for non-Mongoid users.
Can't we just go without requiring mongoid here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You are right, we can remove it.

mshibuya added a commit that referenced this pull request Sep 11, 2015
@mshibuya
Merge pull request #2391 from dalpo/feature/bs-datetime-picker
50d6e59 
Replace jQueryUI datetimepicker with jQuery Bootstrap datetimepicker
@mshibuya mshibuya merged commit 50d6e59 into railsadminteam:master Sep 11, 2015
@mshibuya
Copy link
Member

Great thanks for your effort! 😃

@fmh
Copy link
Contributor

fmh commented Sep 11, 2015

Good job 👍, but have this error :

No such file to load -- rails_admin/i18n_support

@dalpo
Copy link
Contributor Author

dalpo commented Sep 11, 2015

Thanks guys 😄

@fmh Could you paste the stack trace?

@fmh
Copy link
Contributor

fmh commented Sep 11, 2015

skip it, it's my old application_helper file 😊.

@dalpo
Copy link
Contributor Author

dalpo commented Sep 11, 2015

Don't worry 😉

Let me know if you find some other kind of issue!

@fmh
Copy link
Contributor

fmh commented Sep 12, 2015

@dalpo thx for this feature ,
After some tests, I noticed some visual adjustments to make. look at the screenshots :

  • date widget : very large in filter form
  • time widget : I can not display it in filter form (need to handle time type in filter_box) , very large in all forms
  • time widget : cannot filter with time field.

capture d ecran 2015-09-12 a 12 06 56

capture d ecran 2015-09-12 a 12 34 55

- in modal form : maybe some css settings to correct the display

capture d ecran 2015-09-12 a 12 07 59

I try to send a PR until tomorrow.

Sorry for my English 😊 🇬🇧

@dalpo
Copy link
Contributor Author

dalpo commented Sep 12, 2015

Could you try with a vanilla rails_admin installation, without css customization?

@fmh
Copy link
Contributor

fmh commented Sep 12, 2015

this work fine 😳😳😳, but still can not filter with time field and time widget very large
capture d ecran 2015-09-12 a 19 27 34
it will be better a little small (original bootstrap plugin have this size)

@dalpo
Copy link
Contributor Author

dalpo commented Sep 13, 2015

Thanks @fmh, you are right!

I'm going to check the following issues soon:

  • Better html markup for time input
  • Check time field filters

BTW I have a question...
What kind of database datatype are you using to store HH:mm values?

@fmh
Copy link
Contributor

fmh commented Sep 13, 2015

DataType : Time
Rails Timezone: Bern
DB (mysql) Timezone : default

@mshibuya mshibuya mentioned this pull request Sep 19, 2015
Closed
@dalpo dalpo mentioned this pull request Sep 22, 2015
Closed
@dalpo
Copy link
Contributor Author

dalpo commented Sep 23, 2015

@fmh I opened a new PR #2408

@dalpo dalpo mentioned this pull request Oct 10, 2015
Closed
This was referenced Nov 3, 2015
Closed
Closed
This was referenced Nov 23, 2015
Closed
Merged
@SuperMasterBlasterLaser
Copy link
Contributor

@dalpo Filtering by time only works when language is set to english. When I switched locale to russian, it does not filter by date and between. It just shows all available models in database.

I used Mongoid. Don't know if it is happening on AR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@dalpo @mshibuya @fmh @SuperMasterBlasterLaser