14 Commits 5dd91625f8 ... 0045b08ac6

Author SHA1 Message Date
  Henry Crosswell 0045b08ac6 merge with master 3 weeks ago
  HenryCrosswell 1914eadcef Merge branch 'km/frontend-tests' of neuroinformatics/oscar-test-data into master 3 weeks ago
  Kimberly Meechan 1a2b747e96 add offspring sex column 3 weeks ago
  Kimberly Meechan c65420a9cf Merge branch 'master' of https://gin.swc.ucl.ac.uk/neuroinformatics/oscar-test-data into km/frontend-tests 3 weeks ago
  K-Meech c87001a707 Merge branch 'hc/specify-offspring-sex-standardisation' of neuroinformatics/oscar-test-data into master 3 weeks ago
  Henry Crosswell e10a327edd conver get to +/- 3 weeks ago
  Henry Crosswell a4dd2e7a0e Merge remote-tracking branch 'origin/master' into hc/specify-offspring-sex-standardisation 3 weeks ago
  Kimberly Meechan f0abadd779 add csv file where all rows are forbidden 3 weeks ago
  Henry Crosswell f76efba72a add back this file, deleted for test 3 weeks ago
  HenryCrosswell 86ada70d77 Merge branch 'hc/correct-nonstandard-genotype' of neuroinformatics/oscar-test-data into master 4 weeks ago
  Henry Crosswell 25410ae99c introduced +/- 4 weeks ago
  Henry Crosswell b3c4ef6c4a introduced +/- 4 weeks ago
  Henry Crosswell b696a66c73 test 4 weeks ago
  Henry Crosswell b29b42322b added +/- resolving to het 4 weeks ago
2 changed files with 11 additions and 1 deletions
  1. 4 0
      pyrat-data-all-forbidden.csv
  2. 7 1
      pyrat-data-forbidden-genotypes.csv

+ 4 - 0
pyrat-data-all-forbidden.csv

@@ -0,0 +1,4 @@
+ID,Offspring sex,Line / Strain (Name),DOB,Father 1,Mother 1,Sacrifice reason,Mutation 1,Grade 1,Mutation 2,Grade 2,Mutation 3,Grade 3,Father 1: Mutation 1,Father 1: Grade 1,Father 1: Mutation 2,Father 1: Grade 2,Father 1: Mutation 3,Father 1: Grade 3,Mother 1: Mutation 1,Mother 1: Grade 1,Mother 1: Mutation 2,Mother 1: Grade 2,Mother 1: Mutation 3,Mother 1: Grade 3
+ID-001,m,Line-AB,02/01/2025,ID-F2,ID-M2,End of experiment,Mut-A,wt,Mut-B,wt,,,Mut-A,hom,Mut-B,het,,,Mut-A,het,Mut-B,hom,,
+ID-002,f,Line-AB,02/01/2025,ID-F2,ID-M2,End of experiment,Mut-A,hom,Mut-B,hom,,,Mut-A,wt,Mut-B,wt,,,Mut-A,wt,Mut-B,wt,,
+ID-003,m,Line-AB,02/01/2025,ID-F2,ID-M2,End of experiment,Mut-A,het,Mut-B,het,,,Mut-A,hom,Mut-B,hom,,,Mut-A,hom,Mut-B,hom,,

+ 7 - 1
pyrat-data-forbidden-genotypes.csv

@@ -5,11 +5,17 @@ ID-003,m,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,Mut-A,Tg,Mut-B,Tg,,,Mu
 ID-004,m,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,Mut-A,+/+,Mut-B,-/-,,,Mut-A,het,Mut-B,het,,,Mut-A,het,Mut-B,het,,
 ID-005,f,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,Mut-A,het,Mut-B,het,,,Mut-A,+/+,Mut-B,+/+,,,Mut-A,-/-,Mut-B,-/-,,
 ID-006,m,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,Mut-A,het,Mut-B,ko/ko,,,Mut-A,ko/ko,Mut-B,het,,,Mut-A,wt,Mut-B,ko/ko,,
+<<<<<<< HEAD
 ID-007,,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,Mut-A,het,Mut-B,ki/ki,,,Mut-A,ki/ki,Mut-B,het,,,Mut-A,wt,Mut-B,ki/ki,,
 ID-008,m,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,Mut-A,het,Mut-B,ko/+,,,Mut-A,ko/-,Mut-B,het,,,Mut-A,-/ko,Mut-B,+/ko,,
 ID-009,,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,Mut-A,het,Mut-B,ki/+,,,Mut-A,ki/-,Mut-B,het,,,Mut-A,-/ki,Mut-B,+/ki,,
+=======
+ID-007,f,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,Mut-A,het,Mut-B,ki/ki,,,Mut-A,ki/ki,Mut-B,het,,,Mut-A,wt,Mut-B,ki/ki,,
+ID-008,m,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,Mut-A,+/-,Mut-B,ko/+,,,Mut-A,ko/-,Mut-B,het,,,Mut-A,-/ko,Mut-B,+/ko,,
+ID-009,m,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,Mut-A,-/+,Mut-B,ki/+,,,Mut-A,ki/-,Mut-B,het,,,Mut-A,-/ki,Mut-B,+/ki,,
+>>>>>>> master
 ID-010,f,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,Mut-A,het,Mut-B,ko/+,,,Mut-A,ko/ko,Mut-B,het,,,Mut-A,wt,Mut-B,+/+,,
-ID-011,m,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,Mut-A,het,Mut-B,,,,Mut-A,het,Mut-B,het,,,Mut-A,het,Mut-B,het,,
+ID-011,m,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,Mut-A,+/-,Mut-B,,,,Mut-A,+/-,Mut-B,het,,,Mut-A,het,Mut-B,het,,
 ID-012,f,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,Mut-A,,Mut-B,,,,Mut-A,hom,Mut-B,het,,,Mut-A,wt,Mut-B,hom,,
 ID-013,m,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,,,,,,,,,,,,,,,,,,
 ID-014,m,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,,,,,,,Mut-A,hom,Mut-B,het,,,Mut-A,wt,Mut-B,hom,,