Skip to content

upstream sgn 377.1 #135

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
Open
nickpalladino wants to merge 79 commits into
base: develop
Choose a base branch
from
Open

upstream sgn 377.1 #135

nickpalladino wants to merge 79 commits into from

Conversation

@nickpalladino
Copy link
Member

@nickpalladino nickpalladino commented Dec 21, 2023 •
edited
Loading

Changes from upstream.

  • changed branch name so github actions would run on branch

Pulling from upstream documentation.

dwaring87 and others added 30 commits October 30, 2023 16:30
@dwaring87
Label Designer: Move sorting options to main page
c3e5083
@dwaring87
Label Designer: Add UI for trial layout sorting
9a92230
@dwaring87
Field Map: update UI for plot order download
405bd8e
@dwaring87
[WIP] Trial: backend function for ordering plots
5d8fba8
@dwaring87
Plot Ordering: add additional fields
b2a5038 
order index
accession name, seedlot name, location name
@dwaring87
Plot Sorting: move function to CXGN::Trial class
2cd1db0
@dwaring87
Trial Layout: download plot order using new backend function
0d10b5a
@dwaring87
Plot Sorting: add support for including border plots
a0ec81e
@dwaring87
Plot Sorting: add option to include gaps / missing plots
1ccdecc
@dwaring87
Trial Layout: only display plot order download section for trials wit…
236864e 
…h defined layouts
@dwaring87
Label Designer: Sort labels by plot layout order
da366f7
@MFlores2021
add ajax get_new_vector_uniquename
99fa123
@dwaring87
Trial Layout: display error messages from layout download
3eb7f5c
@MFlores2021
add autogenerated vector names
2f9b706
@MFlores2021
add check to autogenerate uniquename
dfd6285
@dwaring87
Field Map Plot Order Download: Add HarvestMaster format
820b7c8
@lukasmueller
update empty fixture to something that is more up to date.
58ab530
@dwaring87
Seedlot Upload: check if name already exists as any stock
391cac2
@isaak
update ... _stock_no getters and setters names
1ea700e
@MFlores2021
add upload vectors test
c02473d
@MFlores2021
add upload vectors test files
e546758
@MFlores2021
change stock name by vector name in the results table
45d505b
@lukasmueller
Merge branch 'topic/fix-DiGGer-trial-design' into topic/add_host_to_v…
5f492bf 
…ectors
@dwaring87
Seedlot Upload: Add name check to Seedlot Harvested template
c9a8424
@titima15
fixed seedlot table and added weight
c7a3fce
@lukasmueller
fix test by adding no_plan directive.
f8e423f
@isaak
Merge branch 'topic/fix-DiGGer-trial-design' into topic/fix_prep_desi…
3fd628d 
…gn_test
@isaak
replace hardcoded design key and pass test
63512f2
@MFlores2021
change vector uniquename input as readonly
eb6e2af
@MFlores2021
fix xlsx not readed
5d31f68
titima15 and others added 29 commits December 6, 2023 14:04
@titima15
added tissue_samples list_type
f226550
@titima15
modified test
3005f95
@titima15
Merge branch 'master' into topic/plot_info
35f5c65
@darekbienkowski
Merge pull request solgenomics#4744 from solgenomics/topic/update_emp…
2a1f75e 
…ty_fixture

update empty fixture to something that is more up to date.
@chris263
fixing columns check to upload multi trials
f2f75d4
@chris263
adding column to upload trial
df721ee
@chris263
fixing checks to upload multi trials
43e3ecc
@chris263
fixing variables to upload multi trials
978a39b
@chris263
fixing parsing upload multi trials
ee6cea5
@chris263
fixing parsing name multi trials
2b7f761
@chris263
fixing parsing columns multi trials
63831c0
@chris263
fixing seedlot names in multi trials
6612b3a
@chris263
fixing names in upload plugin
bbd7e1e
@dwaring87
Plot Order Download: simplify download function
c6c3b21
@dwaring87
Plot Order Download: toggle harvestmaster row/range when changed
5eda83c
@darekbienkowski
Merge pull request solgenomics#4754 from solgenomics/topic/label_desi…
655a346 
…gner_sorting

Label Designer Sorting: support Public Lists
@darekbienkowski
Merge pull request solgenomics#4755 from solgenomics/topic/plot_info
b95d1c0 
Improve related stock section on stock details page and add related seedlot info specific to plot and plant details pages ("source of" or "derived from" type)
@darekbienkowski
Merge pull request solgenomics#4756 from solgenomics/topic/fixing_upl…
9ae4885 
…oad_trial_plugin

Topic/fixing upload trial plugin
@dwaring87
Fieldmap: reimplement d3 rebind
2a90e18 
clicking on a plot is not working!
@dwaring87
Legacy v3 of D3
b2390cf 
add v3 of d3 to the d3v3 namespace (since it's now replaced with v4)
replace the usage of d3 in fieldmap.js with d3v3
@lukasmueller
Merge pull request solgenomics#4759 from solgenomics/topic/d3_rebind
5dc670e 
Fieldmap: use legacy v3 of d3
@isaak
remove d3v4
eb84278
@lukasmueller
Merge pull request solgenomics#4762 from solgenomics/topic/fieldmap-d…
161d9e1 
…3V3-fix

remove d3v4 lfrom fieldmap.mas
@darekbienkowski
fix for transplate date and multi trial upload file
ddc0c0a
@darekbienkowski
multi trail test names updated
8bfa6a6
@darekbienkowski
multi trail test fields updated
314441d
@darekbienkowski
Merge pull request solgenomics#4753 from solgenomics/topic/harvest_ma…
b21a5f4 
…ster_download

Field Layout Download: Harvest Master download type
@darekbienkowski
Merge pull request solgenomics#4763 from solgenomics/topic/multitrial…
1de9975 
…_transplate_date_fix

fix for transplate date and multi trial upload file
@mlm483
Merge solgenomics/master into develop
02c663b
@mlm483 mlm483 mentioned this pull request Jan 2, 2024
Closed
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.

10 participants

@nickpalladino @dwaring87 @MFlores2021 @lukasmueller @isaak @titima15 @darekbienkowski @chris263 @mlm483