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

Move datepicker from gmf to ngeo #1557

Merged
merged 1 commit into from
Jul 13, 2016
Merged

Conversation

jlap
Copy link
Contributor

@jlap jlap commented Jul 11, 2016

This commits moves the datepicker directive from gmf to ngeo.

The wmstime service was splitted in two for this. Now we have the time service in ngeo, and the wmstime service in gmf. The wms time service has the formatting functions, while the time service has simple option setting functions and and utc utility function.

For all of this to work, jquery-ui needs to be a dependency of ngeo instead of gmf, and angular ui-date too. So the third-party folder was moved, and I had to tweak the Makefile a bit for it to work.

Also the ui-date library was included globally in gmf, so that's what I did here too, and that's the bulk of the file changes we see here.

Here the link to the original datepicker example, I kept it since the format is a bit different. It'll visually work exactly as it used to, but the example uses the new ngeo datepicker instead of the gmf one that was deleted:
http://jlap.github.io/ngeo/datepicker/examples/contribs/gmf/datepicker.html

And here's and example right in ngeo:
http://jlap.github.io/ngeo/datepicker/examples/datepicker.html

A nice addition could be to add date formatting functions to the ngeo.time class, but I think that might be out of scope for the ticket.

@jlap jlap force-pushed the datepicker branch 3 times, most recently from 2c40223 to 4d3e1e6 Compare July 12, 2016 04:19
@jlap
Copy link
Contributor Author

jlap commented Jul 12, 2016

Oh forgot to notify you, @fredj this is ready for review !

@sbrunner
Copy link
Member

For me that's looks good but it should be rebased...

@jlap
Copy link
Contributor Author

jlap commented Jul 13, 2016

It's rebased now!

@sbrunner sbrunner merged commit 7749e0f into camptocamp:master Jul 13, 2016
@sbrunner
Copy link
Member

Thanks :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants