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

Add farmOS-timeline library #862

Merged
merged 18 commits into from
Sep 23, 2024
Merged

Add farmOS-timeline library #862

merged 18 commits into from
Sep 23, 2024

Conversation

mstenta
Copy link
Member

@mstenta mstenta commented Jul 29, 2024

This adds the farmOS-timeline library to farmOS, via a new farm_timeline module with supporting code and render element.

This depends on #850, and therefore includes its commits.

@mstenta mstenta added this to the v3.3.0 milestone Jul 31, 2024
@mstenta mstenta force-pushed the 3.x-timeline branch 2 times, most recently from 84c7f8e to a79c7f7 Compare July 31, 2024 18:35
mstenta added a commit to mstenta/farmOS that referenced this pull request Jul 31, 2024
@mstenta mstenta marked this pull request as ready for review July 31, 2024 18:38
"type": "package",
"package": {
"name": "farmos/farmos-timeline",
"version": "0.0.1",
Copy link
Member

Choose a reason for hiding this comment

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

I'd like to make a new release of the timeline library - we got a new release of the gantt library that should make a few things easier!

Copy link
Member

Choose a reason for hiding this comment

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

paul121 pushed a commit to paul121/farmOS that referenced this pull request Sep 13, 2024
@paul121
Copy link
Member

paul121 commented Sep 13, 2024

Okay this should be ready for review again. I updated farmos-timeline to v0.0.2 and fixed a bug with the parent/child row processing that was implemented in farm_timeline.js. I think this might have been related to what you were seeing @mstenta

I think something got goofed while I was originally working on this and making commits/rebasing.. not entirely sure but I noticed there is still a fixup commit in this PR. So I've squashed that as I originally intended and then added 3 new follow-up commits. Available in this branch: https://github.com/paul121/farmOS/tree/3.x-timeline-fixed

@paul121
Copy link
Member

paul121 commented Sep 13, 2024

@mstenta I should say that I tried testing this with the crop plan and it was working well. The current branch of the grazing plan doesn't seem to work with this timeline branch from farmOS core, it is dependent on some other features maybe? I get an error when trying to install the grazing plan that I'd rather not worry about debugging right now... :-)

@mstenta
Copy link
Member Author

mstenta commented Sep 18, 2024

Rebased onto latest 3.x and merged @paul121's 3.x-timeline-fixed branch.

mstenta and others added 6 commits September 19, 2024 09:53
These are copied directly from the contrib farm_crop_plan module,
originally authored by @paul121.
These are copied directly from the contrib farm_crop_plan module.
Only crop plan specific CSS styles have been removed.
mstenta added a commit to mstenta/farmOS that referenced this pull request Sep 19, 2024
mstenta added a commit to mstenta/farmOS that referenced this pull request Sep 19, 2024
@mstenta mstenta merged commit 7232d5f into farmOS:3.x Sep 23, 2024
1 of 2 checks passed
@mstenta mstenta deleted the 3.x-timeline branch September 23, 2024 18:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

2 participants