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

Plot Sorting: Label Designer and Field Map #4741

Merged
merged 12 commits into from
Dec 4, 2023

Conversation

dwaring87
Copy link
Member

@dwaring87 dwaring87 commented Nov 27, 2023

Description

This PR makes some changes to plot sorting in the field map and label designer:

  • It creates a new backend function (CXGN::Trial->get_sorted_plots) for sorting plots from one or more Trials using the following parameters:
    • trials = project id(s) of one or more trials to get the plots from
    • order = the order to traverse the plots in (by_col_serpentine, by_col_zigzag, by_row_serpentine, by_row_zigzag)
    • start = the corner of the trial to start in (bottom_left, top_left, top_right, bottom_right)
    • borders = a hash indicating the borders to include (top, right, bottom, left)
    • gaps = whether or not to include missing plots / gaps in the order
  • It adds an AJAX request for getting the sorted plots using the backend function (/ajax/breeders/trial_plot_order)
  • It removes the traverse_map function from fieldmap.js
  • The field map now gets the plot order for the download from the backend function via the new AJAX endpoint
  • In the label designer, it moves the sorting options out of the "Edit Additional Settings" dialog and onto the main page of the last step
  • It adds an option to sort plot-level labels by "Trial Layout: Plot Order" with the option to set all of the plot sorting parameters (Fixes Add planting and harvest order to available LabelDesigner fields  #4683)

Field Map: Download Plot Order

image

Label Designer: Sorting plot-level labels by plot order

image

@dwaring87 dwaring87 changed the title Topic/label designer sorting Plot Sorting: Label Designer and Field Map Nov 27, 2023
Copy link
Contributor

@titima15 titima15 left a comment

Choose a reason for hiding this comment

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

👍

@darekbienkowski darekbienkowski merged commit 9a8f78c into master Dec 4, 2023
1 check passed
@darekbienkowski darekbienkowski deleted the topic/label_designer_sorting branch December 4, 2023 16:06
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.

Add planting and harvest order to available LabelDesigner fields
4 participants