Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5085 commits
Select commit Hold shift + click to select a range
16867b9
planting date for label designer
titima15 Mar 17, 2026
43b9db0
DB Patch: Update traits view for multiple ontologies
dwaring87 Mar 17, 2026
96361e6
modify date format
titima15 Mar 18, 2026
73c24a9
Use and instead of or to match all image search fields
bm743 Mar 18, 2026
b2c0dd0
Merge pull request #5961 from solgenomics/topic/fix_image_search
lukasmueller Mar 19, 2026
67dda40
Add synonym to trait search, and add field for searching by accession…
bm743 Mar 19, 2026
d532c8f
remove arbitrary trial description length limit of 250 and set to unl…
lukasmueller Mar 20, 2026
1dc317d
remove description length limit
lukasmueller Mar 20, 2026
e64aa6f
remove whitespace differently.
lukasmueller Mar 20, 2026
22ab7ab
Merge pull request #5974 from solgenomics/topic/label_designer
lukasmueller Mar 20, 2026
712ecdb
fix download of phenotype data when using dataset
ClayBirkett Mar 20, 2026
d252a77
code cleanup
ClayBirkett Mar 23, 2026
7b47748
Fix query for matching synonyms
bm743 Mar 23, 2026
f56a907
Merge pull request #5973 from solgenomics/topic/accession_download
lukasmueller Mar 23, 2026
3829eeb
remove size limitations for diverse types of trial descriptions.
lukasmueller Mar 23, 2026
c45c42c
Rewrite parser and make rep numbers change upon accession swap
ryan-preble Mar 23, 2026
0216b8c
Fix non trait ontologies showing up in trait search
ryan-preble Mar 24, 2026
5d9aaf6
Speed up accession swapping and add file format mason template
ryan-preble Mar 24, 2026
8b62474
Make multi trait service response compatible with image analysis
bm743 Mar 26, 2026
8e91226
Handle displaying and saving multi trait observations
bm743 Mar 26, 2026
b96c19f
Add id and synonym to treatment search
bm743 Mar 26, 2026
92493f0
Merge pull request #5984 from solgenomics/fix-dataset-download
lukasmueller Mar 27, 2026
74657c3
Merge pull request #5982 from solgenomics/topic/fix_trial_description…
lukasmueller Mar 27, 2026
522ed54
Remove .csv from upload label
ryan-preble Mar 30, 2026
a1a4b45
Display analyzed imgae overlay with results
bm743 Mar 30, 2026
c1b466a
check all plots in same trial and check obsoleted stocks
ryan-preble Mar 30, 2026
175ebc6
Merge remote-tracking branch 'sgn/master' into topic/intercropping_mu…
dwaring87 Mar 30, 2026
446c8e2
Merge pull request #5988 from solgenomics/topic/suppress_treatments_o…
lukasmueller Mar 30, 2026
67397b6
Merge pull request #5977 from solgenomics/topic/improve_trait_search
lukasmueller Mar 30, 2026
386676a
Merge branch 'topic/intercropping_multiple_accessions_per_plot' into …
dwaring87 Mar 30, 2026
e51d2d7
Add new plugin type
ryan-preble Mar 30, 2026
bf7d3d1
Remove requirement for finish logfile when retrieving existing job
ryan-preble Mar 30, 2026
8371b79
Fix missing plot list display and finish new plugin
ryan-preble Mar 30, 2026
48179d8
Use parsed_values instead of looping through data again
ryan-preble Mar 30, 2026
44acf07
Fix error when no new plot names
ryan-preble Mar 30, 2026
a360139
support also multiple measurements on the same line (separated by
lukasmueller Mar 31, 2026
3894e3e
Fix incorrect hash key in change plot name
ryan-preble Mar 31, 2026
9903dc1
Trial Layout Design: add intercrop accessions
dwaring87 Mar 31, 2026
3ca65ec
Trial Layout Design: add intercrop accessions
dwaring87 Mar 31, 2026
885ae36
Merge branch 'topic/intercropping_multiple_trait_ontologies' of githu…
dwaring87 Mar 31, 2026
fc365db
Intercropping: Add tests
dwaring87 Mar 31, 2026
e57646d
update heatmap plot arguments
isaak Apr 1, 2026
37a377c
clean up
isaak Apr 1, 2026
1b977ac
change an entry in this file to test multi value format parsing.
lukasmueller Apr 1, 2026
9977e1d
add some space between legend and data for cvterm details.
lukasmueller Apr 1, 2026
b70340b
Merge pull request #5949 from solgenomics/topic/intercropping_multipl…
lukasmueller Apr 1, 2026
cfbb6b5
make heatmap arg names and var easier to understand
isaak Apr 1, 2026
1e2318a
fix merge conflict
titima15 Apr 1, 2026
d919277
move dbpatch
titima15 Apr 1, 2026
792f842
validate accessions_and_obsoleted_accessions list type
titima15 Apr 1, 2026
03cb9b2
change file name
titima15 Apr 1, 2026
6384519
Remove trait id when creating samples from multi-trait, fix getting t…
bm743 Apr 1, 2026
49b2d83
set conf key for allowing obsoleted accessions in new trials
titima15 Apr 1, 2026
0abd435
CXGN::Project - get correct project type
dwaring87 Apr 1, 2026
c97564c
Merge branch 'topic/fix_cxgn_project_type' into topic/intercropping_m…
dwaring87 Apr 1, 2026
324eb4c
Intercropping Test: use correct keys when looping through design
dwaring87 Apr 1, 2026
c86ce43
ignore obselete accessions
ClayBirkett Apr 2, 2026
61f6420
Docs: add intercropping section to managing field trials chapter
dwaring87 Apr 2, 2026
4e87832
remove unused key
titima15 Apr 2, 2026
dc417bb
Add test input data
bm743 Apr 2, 2026
9c391e1
Fix trial title to top of page
bm743 Apr 2, 2026
0df97e0
merge to master, resolve conflicts
ryan-preble Apr 2, 2026
e95c551
Bump DB Patch number
dwaring87 Apr 2, 2026
7e7430f
update bookdown docs
invalid-email-address Apr 2, 2026
673cd12
Fix perl linting error
dwaring87 Apr 2, 2026
a0616d8
update bookdown docs
invalid-email-address Apr 2, 2026
28f7058
include is_obsolete during build
titima15 Apr 2, 2026
1ade121
explicitly define is_obsolete value
titima15 Apr 3, 2026
1a3715c
fix test
titima15 Apr 3, 2026
4263ba3
Add back Data::Dumper for use in debugging, when needed
ClayBirkett Apr 6, 2026
186177e
fix merge conflict
isaak Apr 7, 2026
075a209
re-initialize @line correctly every time a new measurement row is cre…
lukasmueller Apr 7, 2026
8b16f52
Merge pull request #5985 from solgenomics/topic/speed_up_accession_ex…
titima15 Apr 7, 2026
503f703
modified labels based on trial stock type
titima15 Apr 7, 2026
8a586f6
check related seedlots
titima15 Apr 7, 2026
a7c2120
declare line and initialize for non repetitive case.
lukasmueller Apr 8, 2026
a494722
remove debugging messages.
lukasmueller Apr 8, 2026
4d246fa
pass correlation selenium test
isaak Apr 8, 2026
93973ef
rename args for clarity
isaak Apr 8, 2026
0c40917
use begin and end meta characters in actual search query.
lukasmueller Apr 8, 2026
12caa18
Marker Metadata: add options to remove individual loci or all loci fr…
dwaring87 Apr 8, 2026
6414e6f
validate seedlot family_name compatibility
titima15 Apr 8, 2026
9688866
Marker Metadata: upload file can update existing marker metadata
dwaring87 Apr 8, 2026
35193a8
Decrease resulting image size, use trait_id if existing in the servic…
bm743 Apr 8, 2026
f8c89bd
fix wizard stuck updating
ClayBirkett Apr 9, 2026
efb5b92
fix linter issue
isaak Apr 9, 2026
2fc812e
add code to check if refresh already running
ClayBirkett Apr 9, 2026
2c7d2cd
code cleanup
ClayBirkett Apr 9, 2026
20f6c4c
Make floating trial header bar look nicer, make it only appear when s…
bm743 Apr 9, 2026
233e50b
Fix css linting error
bm743 Apr 9, 2026
4bfd869
fix typo
isaak Apr 9, 2026
570b366
Merge pull request #6008 from solgenomics/list-accession-validata
lukasmueller Apr 9, 2026
4641e3d
Merge pull request #6007 from solgenomics/topic/accessions_and_obsole…
lukasmueller Apr 9, 2026
9515697
Merge pull request #6006 from solgenomics/topic/fix_cxgn_project_type
lukasmueller Apr 9, 2026
8e65d7b
Merge pull request #6003 from solgenomics/topic/tweak_cvterm_detail_page
lukasmueller Apr 9, 2026
427b596
Fixing more css linting errors
bm743 Apr 9, 2026
b91c587
Marker Metadata: add edit dialog to marker metadata table
dwaring87 Apr 9, 2026
bd8214c
Marker Metadata: link to cvterms and display cvterm name in reference…
dwaring87 Apr 9, 2026
48587ba
Check if do_fuzzy_search parameter is the string 'true' instead of a …
bm743 Apr 9, 2026
61981da
Remove test print statements
bm743 Apr 9, 2026
1334e0c
Re add debug print statement for exact search
bm743 Apr 9, 2026
e519538
Marker Metadata: fix changed reference delimiter
dwaring87 Apr 9, 2026
eee4b9c
fix the test mode
ClayBirkett Apr 9, 2026
d72a8fe
generic plugin
titima15 Apr 9, 2026
0408b62
Merge pull request #6013 from solgenomics/topic/fixed_trial_title
lukasmueller Apr 10, 2026
7761e72
Merge pull request #5999 from solgenomics/topic/fix_job_dismissal_bug
lukasmueller Apr 10, 2026
d767f88
add option to add markers to genotype protocol using VCF upload
ClayBirkett Apr 10, 2026
2d2b740
add markers to existing genotype protocol
ClayBirkett Apr 10, 2026
ee078d4
Fix sample numbering
bm743 Apr 10, 2026
b25b2a5
Add modal for plant creation warning
bm743 Apr 10, 2026
4f2955b
validate amount and weight input type and plots in trial
titima15 Apr 10, 2026
03a5862
Marker Metadata: Add mech tests
dwaring87 Apr 10, 2026
4a94875
set allow_trait_edits to 1 in sgn.conf because that is the historical…
lukasmueller Apr 13, 2026
5b1967a
add error checking
ClayBirkett Apr 13, 2026
38e140e
Merge branch 'master' into topic/cross_and_family_in_trials
titima15 Apr 13, 2026
4701f53
file type info
titima15 Apr 13, 2026
05f42a1
Merge pull request #6026 from solgenomics/refresh-matview
lukasmueller Apr 13, 2026
1af9051
Merge pull request #6023 from solgenomics/topic/fix_stock_attributes_…
lukasmueller Apr 13, 2026
65b84e2
Merge pull request #6016 from solgenomics/topic/obsoleted_accession_s…
lukasmueller Apr 13, 2026
17c57cd
Merge pull request #5993 from solgenomics/topic/multi_trait_image_ana…
lukasmueller Apr 13, 2026
3bf98c1
debug
titima15 Apr 13, 2026
a85e548
Add interface to change individual phenotypes
ryan-preble Apr 13, 2026
311030b
saved message dialog
titima15 Apr 13, 2026
e9caf57
Add correct timezone sigil
ryan-preble Apr 13, 2026
6be7e82
clean up
titima15 Apr 13, 2026
cf0c608
fix logic for non VCF upload
ClayBirkett Apr 13, 2026
5f9b614
Merge pull request #6001 from solgenomics/topic/fix_multiple_upload
isaak Apr 14, 2026
4e11e5d
fix spacing between edit and delete buttons.
lukasmueller Apr 13, 2026
0ea3596
make the cvtermprop dialog a bootstrap dialog; add some predefined va…
lukasmueller Apr 13, 2026
2fd061f
align select with actual values understood by fieldbook (translated b…
lukasmueller Apr 14, 2026
88eb373
adjusting some of the conversions.
lukasmueller Apr 14, 2026
083d5a6
change vocab to how fieldbook uses it.
lukasmueller Apr 14, 2026
750f93b
Trial Layout: add support for custom plot order
dwaring87 Apr 14, 2026
416cb07
Trial Layout Download: improve display
dwaring87 Apr 14, 2026
7288321
Trial Layout Download: add support for custom plot order to Plant, Su…
dwaring87 Apr 14, 2026
21ef1c1
Conf: move marker metadata ontology setting to test config
dwaring87 Apr 14, 2026
a3d1ce0
Add test
ryan-preble Apr 14, 2026
9bc490d
Edit comments
ryan-preble Apr 14, 2026
37aa7e3
varify seedlot origin
titima15 Apr 14, 2026
79a5bc7
valify seedlot in multitrial plugin
titima15 Apr 14, 2026
2bb0fa1
changes to pass fixture test
ClayBirkett Apr 14, 2026
e980a7d
code cleanup and error log cleanup
ClayBirkett Apr 15, 2026
5411823
check seedlot pairs only if all related stocks are in the database
titima15 Apr 15, 2026
95c6e4d
debug
titima15 Apr 15, 2026
9fde2e2
validate seedlot in multi trial upload
titima15 Apr 16, 2026
8670a90
clean up
titima15 Apr 16, 2026
f9b7c6f
Merge pull request #6035 from solgenomics/topic/fix_trait_editing_per…
lukasmueller Apr 16, 2026
4f08fcb
Merge pull request #6030 from solgenomics/topic/fix_adding_accessions
lukasmueller Apr 16, 2026
9bc5824
Merge pull request #6018 from solgenomics/topic/fix_repetitive_measur…
lukasmueller Apr 16, 2026
87ae34b
Add refresh phenoview button and make edits curator-only
ryan-preble Apr 16, 2026
ae2640b
Fix typo in lib/CXGN/BrAPI/v2/Scales.pm
ryan-preble Apr 16, 2026
c01c18d
Make add cvtermprop dialog look cleaner
ryan-preble Apr 16, 2026
374c6fd
make types case insensitive as we changed the case on the user interf…
lukasmueller Apr 16, 2026
ab7e006
make trait type matching case insensitive.
lukasmueller Apr 16, 2026
32038d5
change test due to different login requirement
ryan-preble Apr 16, 2026
465b5ec
test
titima15 Apr 16, 2026
b924c6c
fix bug
titima15 Apr 17, 2026
6b6b688
PhenotypeMatrix: add option to include trait synonym in Native and Ma…
dwaring87 Apr 17, 2026
6ce190f
used seedlot info for family name
titima15 Apr 17, 2026
e4605d8
debug
titima15 Apr 17, 2026
6200acf
limit adding new markers to protocol to 10% of total markers
ClayBirkett Apr 17, 2026
048ccbf
Trial Download: add trait_synonyms option to phenotype downloads
dwaring87 Apr 17, 2026
f1ca643
Phenotype Downloads: add trait synonyms option and site-configurable …
dwaring87 Apr 17, 2026
2e6e944
Merge remote-tracking branch 'sgn/master' into topic/pheno_download_t…
dwaring87 Apr 17, 2026
0a7dcbb
Native Pheno Search: fix results ordering by phenotype value
dwaring87 Apr 20, 2026
2e8294c
Handle case of empty timestamps and operators
ryan-preble Apr 20, 2026
a94bf75
Merge pull request #6045 from solgenomics/topic/trial_layout_plot_order
bm743 Apr 20, 2026
7cce65d
MarkerMetadata: fix for files with no alias column
dwaring87 Apr 20, 2026
08d1a8b
add check for new marker to KASP and Intertek
ClayBirkett Apr 20, 2026
e64d886
correct test results for incorrect markers
ClayBirkett Apr 21, 2026
877d179
output a pedigree that only has a female parent.
lukasmueller Apr 21, 2026
cfc4ac8
fix trial detail page d3 plots disappearance
isaak Apr 21, 2026
2b9d05e
fix KASP and Intertek format to allow new markers
ClayBirkett Apr 21, 2026
39a17dd
correct test results for incorrect markers
ClayBirkett Apr 21, 2026
a71b5a4
correct test results for incorrect markers
ClayBirkett Apr 21, 2026
b2c1aeb
correct test results for incorrect markers
ClayBirkett Apr 22, 2026
38aed25
improve error checking
ClayBirkett Apr 22, 2026
b1b2982
add error checks
ClayBirkett Apr 23, 2026
f684cde
Create remove fillers function and button/confirmation modal
bm743 Apr 23, 2026
96d6a0c
Change delete filler modal element id names
bm743 Apr 23, 2026
bdb3667
Merge pull request #6046 from solgenomics/topic/phenotype_ui_edits
lukasmueller Apr 23, 2026
a7fe376
Merge pull request #6044 from solgenomics/topic/improve_trait_attribu…
lukasmueller Apr 23, 2026
67aa24a
Merge pull request #6038 from solgenomics/topic/major_loci
lukasmueller Apr 23, 2026
823875d
Merge pull request #6015 from solgenomics/topic/intercropping_multipl…
lukasmueller Apr 23, 2026
29a9e3e
fixes downloading traits with date format YYYY-MM-DD
chris263 Apr 23, 2026
daf7f4f
fixing files for repetitive measurements with trait format date
chris263 Apr 23, 2026
dc6af22
enforce not to mix cross and family name stock type in the same trial
titima15 Apr 24, 2026
fba0251
additional info for multi-trial upload with family name stock type
titima15 Apr 24, 2026
5a16db6
validate allowed stock types for munti-trial upload
titima15 Apr 24, 2026
88cda23
exclude also cross and family_name from phenotype assignments.
lukasmueller Apr 24, 2026
ff50a83
fix typo
titima15 Apr 24, 2026
bd0504d
remove transferring seeds ot plot option from manage seedlots page
titima15 Apr 24, 2026
943ef1e
add back test for the simple generic spreadsheet without timestamps.
lukasmueller Apr 25, 2026
1204054
Merge branch 'master' into topic/cross_and_family_in_trials
titima15 Apr 26, 2026
807219d
fix bugs
titima15 Apr 26, 2026
d39f65f
Merge branch 'topic/fix_uploading_issue' into topic/cross_and_family_…
titima15 Apr 26, 2026
7320e87
Merge pull request #6068 from solgenomics/topic/fix_uploading_issue
lukasmueller Apr 27, 2026
1eb7dd6
Merge pull request #6022 from solgenomics/topic/fix-heatmap-selection…
lukasmueller Apr 27, 2026
72a7a45
code clean up
ClayBirkett Apr 27, 2026
e162fe9
Merge branch 'master' into topic/fix_treatment_conversion_for_cross
lukasmueller Apr 27, 2026
189b2ea
fix package name
lukasmueller Apr 27, 2026
6c7176b
Merge pull request #6054 from solgenomics/topic/fix_open_pedigree_in_…
lukasmueller Apr 27, 2026
b85fb93
Merge pull request #6051 from solgenomics/topic/cross_and_family_in_t…
lukasmueller Apr 27, 2026
d7bfca3
Add filler plot stockprop dbpatch
bm743 Apr 27, 2026
afa90cb
Bring brapi modules up to new treatment system, fix boxplotter. Fix p…
ryan-preble Apr 28, 2026
3f9f5f9
Add treatment value to brapi return to force separation of treatment …
ryan-preble Apr 28, 2026
05073cf
Better formatting
ryan-preble Apr 28, 2026
4a93ce0
Appeasing the linter
ryan-preble Apr 28, 2026
1c6da59
Better formatting
ryan-preble Apr 28, 2026
209dfe4
Merge pull request #6067 from solgenomics/topic/fix_treatment_convers…
lukasmueller Apr 28, 2026
9ed9ae4
Fix BrAPI phenotyping test
ryan-preble Apr 29, 2026
2033210
Add check for plot name appearing more than once
ryan-preble Apr 29, 2026
4da286d
Use more conventional logical or operator
ryan-preble Apr 29, 2026
ee0df60
code cleanup
ClayBirkett Apr 30, 2026
cc755e6
Change remove fillers function to remove plots with filler_plot stock…
bm743 Apr 30, 2026
4cde360
Merge pull request #6070 from solgenomics/topic/fix_multiple_ontology…
lukasmueller Apr 30, 2026
5d13f42
Move duplicate entry check to generic file parser
ryan-preble Apr 30, 2026
0b6d042
Make sure empty cells don't get counted as duplicates
ryan-preble Apr 30, 2026
e89966a
Remove treatment projects and integrate new treatments into fieldbook…
ryan-preble May 1, 2026
f1ad236
Fix fieldbook file test
ryan-preble May 1, 2026
b1bde06
js: fix server errors when clicking next step in upload genotyping di…
grapereader May 1, 2026
c90dc38
clean up warning about new markers
ClayBirkett May 4, 2026
bc717a0
clean up warning about new markers
ClayBirkett May 4, 2026
ff55c08
Merge branch 'master' into topic/download_upload_phenotype
lukasmueller May 4, 2026
177d7a2
add configuration variable to show QuickSearch
ClayBirkett May 4, 2026
98b8d1f
Add treatments back to label designer
ryan-preble May 4, 2026
a6bb13b
Add trait IDs to layout selection in label designer
ryan-preble May 4, 2026
2c97597
Merge pull request #6072 from solgenomics/topic/fix_treatments_in_box…
lukasmueller May 4, 2026
cae255d
Merge pull request #6055 from solgenomics/topic/fix-d3-fieldlayout-plots
lukasmueller May 4, 2026
c4484a3
add configuration variable to show QuickSearch
ClayBirkett May 4, 2026
102250e
Change download UI and backend to do all/nothing for treatments on do…
ryan-preble May 4, 2026
288ca48
Fix trial download test
ryan-preble May 4, 2026
16d0e29
fix unit mech test
ClayBirkett May 4, 2026
c1016b1
Fix phenotype parser to keep empty trait values
chris263 May 5, 2026
c11e7a0
fixing conflicts
chris263 May 5, 2026
ef17d55
Working on trait select bugs
ryan-preble May 5, 2026
0eb6550
Remove excessive STDERR and fix empty traits in fieldbook file download
ryan-preble May 5, 2026
aee9e41
Get data type in upload genotyping protocol click handler
grapereader May 5, 2026
66eaab3
Add hyperlinks to images and stocks on field trial detail popup
ryan-preble May 6, 2026
37451d3
Merge pull request #6086 from BFF-AFIRMS/setraver/upstream/fix-upload…
lukasmueller May 7, 2026
02d1b8e
Merge pull request #6076 from solgenomics/topic/fix_accession_swap_du…
lukasmueller May 7, 2026
53deae6
Merge pull request #6064 from solgenomics/topic/download_upload_pheno…
lukasmueller May 7, 2026
a5e3080
Merge pull request #6059 from solgenomics/quicksearch
lukasmueller May 7, 2026
6104c67
Restrict remove fillers function to curators
bm743 May 7, 2026
4710b90
Add hrefs to primary and intercropped accessions
ryan-preble May 11, 2026
78d7ee9
Merge pull request #6094 from solgenomics/topic/add_links_to_plot_det…
titima15 May 11, 2026
ec97bfe
Merge pull request #6061 from solgenomics/topic/remove_field_fillers
lukasmueller May 12, 2026
73f3424
Merge pull request #6053 from solgenomics/topic/pheno_download_trait_…
lukasmueller May 12, 2026
8d09838
Merge pull request #6034 from solgenomics/add-markers-prot
lukasmueller May 12, 2026
7e47f27
Merge pull request #6081 from solgenomics/topic/remove_treatment_proj…
lukasmueller May 12, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/docs/*
5 changes: 5 additions & 0 deletions .github/linters/.htmlhintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"head-script-disabled": false,
"alt-require": false,
"id-class-value": false
}
3 changes: 3 additions & 0 deletions .github/workflows/.htmlhintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"head-script-disabled": false
}
53 changes: 53 additions & 0 deletions .github/workflows/linter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
---
name: Lint

on: # yamllint disable-line rule:truthy
push:
branches:
- 'master'
pull_request:
branches:
- 'master'

permissions: {}

env:
FILTER_REGEX_EXCLUDE: "docs/.*|t/unit_mech/AJAX/_BrAPIv2_germplasm.t"

jobs:
build:
name: Lint
runs-on: ubuntu-latest

permissions:
contents: read
packages: read
# To report GitHub Actions status checks
statuses: write

steps:
- name: Checkout code
uses: actions/checkout@v4
with:
# super-linter needs the full git history to get the
# list of files that changed across commits
fetch-depth: 0

- name: Super-linter
uses: super-linter/super-linter@v8.3.1 # x-release-please-version
env:
# To report GitHub Actions status checks
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
HTMLHINT_CONFIG_FILE: .github/linters/.htmlhintrc
VALIDATE_ALL_CODEBASE: false
VALIDATE_ANSIBLE: false
VALIDATE_CHECKOV: false
VALIDATE_JSCPD: false
VALIDATE_LATEX: false
VALIDATE_CSS: false
FIX_YAML_PRETTIER: true
VALIDATE_JAVASCRIPT_PRETTIER: false
VALIDATE_JAVASCRIPT_ES: false
VALIDATE_SQLFLUFF: false
VALIDATE_BIOME_FORMAT: false
VALIDATE_GITHUB_ACTIONS_ZIZMOR: false
47 changes: 47 additions & 0 deletions .github/workflows/static.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# Simple workflow for deploying static content to GitHub Pages
name: Deploy static content to Pages

on:
# Runs on pushes/marge targeting the default branch
push:
branches: ["master"]
paths:
- 'docs/**'

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
contents: read
pages: write
id-token: write

# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
concurrency:
group: "pages"
cancel-in-progress: false

jobs:
# Single deploy job since we're just deploying
deploy_static_pages:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Pages
uses: actions/configure-pages@v4
- name: Upload artifact
uses: actions/upload-pages-artifact@v3
with:
# Upload docs only
path: './docs'
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4


25 changes: 23 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,27 @@ jobs:
- ${{ github.workspace }}:/home/vagrant/cxgn/sgn
options: --health-cmd="curl --silent --head http://localhost:4444 || exit 1"

keycloak_db:
image: postgres:13.0
env:
POSTGRES_DB: keycloak
POSTGRES_PASSWORD: postgres
options: >-
--health-cmd pg_isready
--health-interval 10s
--health-timeout 5s
--health-retries 5

keycloak:
image: bffafirms/keycloak:26.5.1-0-breedbase-testing
env:
KC_DB_USERNAME: postgres
KC_DB_PASSWORD: postgres
KC_BOOTSTRAP_ADMIN_PASSWORD: password

steps:
- name: Checkout sgn
uses: actions/checkout@v2
uses: actions/checkout@v5

- name: Run unit tests
run: prove --recurse t/unit 2>/dev/null
Expand Down Expand Up @@ -75,6 +93,9 @@ jobs:
- name: Run selenium tests dataset
run: /entrypoint.sh --nopatch t/selenium2/03_dataset 2>/dev/null

- name: Run selenium tests authenticate
run: /entrypoint.sh --nopatch t/selenium2/authenticate 2>/dev/null

- name: Run selenium tests breeders
run: /entrypoint.sh --nopatch t/selenium2/breeders 2>/dev/null

Expand All @@ -88,4 +109,4 @@ jobs:
run: /entrypoint.sh --nopatch t/selenium2/stock 2>/dev/null

- name: Run selenium tests tools
run: /entrypoint.sh --nopatch t/selenium2/tools 2>/dev/null
run: /entrypoint.sh --nopatch t/selenium2/tools 2>/dev/null
45 changes: 45 additions & 0 deletions .github/workflows/test_static.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# Simple workflow for deploying static content to GitHub Pages
name: Build documentation with R bookmark

on:
# Runs on pushes/marge targeting the default branch
pull_request:
paths:
- 'docs/r_markdown_docs/**'

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
contents: write
id-token: write

jobs:
# Single deploy job since we're just deploying
build_and_deploy_static_pages_for_manual:
runs-on: ubuntu-latest
container:
image: bienkowskid/fedora40-r-bookdown
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.ref }}
- name: Save directory for checkout
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
- name: Create gitbook
working-directory: ./docs/r_markdown_docs
run: R -q -e 'bookdown::render_book("index.Rmd", "bookdown::gitbook")'
- name: Create manual pdf
working-directory: ./docs/r_markdown_docs
run: R -q -e 'bookdown::render_book("index.Rmd", "bookdown::pdf_book")'
- name: Commit and push documentation
run: |
date > generated.txt
git config user.name github-actions
git config user.email github-actions@github.com
git add --force --all docs/
git commit -m "update bookdown docs"
git push
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,8 @@ typescript
docs/Gemfile.lock
docs/_site/
.DS_Store
sgn.iml
sgn.iml
docs/*
!docs/r_markdown_docs/
!docs/r_markdown_docs/**
.idea/
116 changes: 116 additions & 0 deletions R/DRRC.r
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@

args=commandArgs(TRUE)

##args is now a list of character vectors
## First check to see if arguments are passed.
## Then cycle through each element of the list and evaluate the expressions.

if(length(args)==0){
print("No arguments supplied.")
##supply default values
paramfile=''
} else {
for(i in 1:length(args)){
print(paste("Processing arg ", args[[i]]));
eval(parse(text=args[[i]]))
}
}

library(reshape2)
library(dplyr)
library(blocksdesign)

source(paramfile)
## 1) Preparing dataframe
all.clones <- treatments
nTrt <- length(all.clones)
nRep <- nRep
nRows <- nRow
nCols <- nCol
# nCols <- nTrt*nRep/nRows
rowsPerBlock <- nTrt/nCols
colsPerBlock <- nTrt/nRows
superCols <- nCols/colsPerBlock
totalPlots <- nTrt*nRep

plot_type <- plot_type
plot_start <- plot_start

blocks = data.frame(block_number = gl(nRep,nTrt),
Cols = gl(superCols,colsPerBlock,totalPlots),
row_number = gl(nRows,nCols,totalPlots),
col_number = gl(nCols,1,totalPlots))

## Setting rep number orthogonal to block number
rep_number = as.numeric(blocks$Cols)


# treatments = data.frame(treatments =gl(nTrt,1,totalPlots))
Z=design(all.clones,blocks, searches = 50, weighting=0.5)
fieldBook <- Z$Design

trialMatrix <- matrix(0,nRows,nCols)

for(i in 1:nrow(fieldBook)){
trialMatrix[fieldBook$subRows[i],fieldBook$subCols[i]]<-fieldBook$treatments[i]
}
trialMatrix

## Adding plot number
colnames(fieldBook)[5] <- "plot_number"

fieldBook$block_number <- as.integer(fieldBook$block_number)
fieldBook$row_number <- as.integer(fieldBook$row_number)
fieldBook$col_number <- as.integer(fieldBook$col_number)

# Load dplyr
library(dplyr)

# Arrange fieldBook by row_number and col_number
fieldBook <- fieldBook %>% arrange(row_number, col_number)
fieldBook$plot_number <- c(1:totalPlots)
fieldBook$plot_id <- c(1:nTrt)



## Number start
## 00101 will be added for NCSU
if(plot_start == "00101"){
fieldBook$plot_number = paste0(formatC(fieldBook$block_number,width=3,flag="0"),
formatC(fieldBook$plot_id,width=2,flag="0"))
}else if (plot_start == 1001){
fieldBook$plot_number <- (1000*fieldBook$block_number)+fieldBook$plot_id
}else if (plot_start == 101) {
fieldBook$plot_number <- (100*fieldBook$block_number)+fieldBook$plot_id
}

cat("plot start is ", plot_start,"\n")
cat("plot type is ", plot_type,"\n")

plot_type = "serpentine"
## Plot number format
if(plot_type == "serpentine"){
for(i in 1:nRows){
if(i%%2==0){
fieldBook[fieldBook$row_number == i, "plot_number"] <- rev(fieldBook[fieldBook$row_number==i,"plot_number"])
}
}
}

fieldBook$rep_number <- rep_number


#### create is_a_control
names(fieldBook)[names(fieldBook) == "treatments"] <- "accession_name"
fieldBook <- transform(fieldBook, is_a_control = ifelse(fieldBook$accession_name %in% controls, 1, 0))

design <- fieldBook %>% dplyr::select(block_number, rep_number, row_number, col_number, plot_number, accession_name, is_a_control)

head(design)

# save result files
basefile <- tools::file_path_sans_ext(paramfile)
outfile = paste(basefile, ".design", sep="");
sink(outfile)
write.table(design, quote=F, sep='\t', row.names=FALSE)
sink();
Loading