From f272310c6793391a7a48323ac0829de681cf6486 Mon Sep 17 00:00:00 2001
From: tpook92 <torsten.pook@uni-goettingen.de>
Date: Thu, 26 Sep 2019 17:22:07 +0200
Subject: [PATCH] add parentmean / grandparent mean to selection techs

selection techs - still needs crosscheck
---
 mobps.html                   | 12 ++++++++++++
 public/javascript/network.js |  3 ++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/mobps.html b/mobps.html
index 56087b0..a786150 100644
--- a/mobps.html
+++ b/mobps.html
@@ -1317,6 +1317,18 @@ <h4>Edge {{ active_edge.id }}</h4>
 							</select>
 						</td>
 					</tr>
+					<tr v-show="['Selection', 'Split', 'Aging'].indexOf(active_edge['Breeding Type']) >= 0 && (active_edge['Selection Type']== 'Parent_Mean' || active_edge['Selection Type']== 'Grandparent_Mean')">
+						<td> Mean between
+							<span class="tooltip">&#9432 <span class="tooltiptext">Select the mean between that parent values is used for the breeding value estimation</span></span>
+						</td>
+						<td>
+							<select v-model="active_edge['Selection Type Mean']">
+								<option v-for="option in selectionType_options2" v-bind:value="option">
+								{{ option }}
+								</option>
+							</select>
+						</td>
+					</tr>
 					<tr v-show="['Selection', 'Split', 'Aging'].indexOf(active_edge['Breeding Type']) >= 0 && active_edge['Selection Type']=='BVE' & geninfo['advanced'] && geninfo['advanced_advanced']">
 						<td>Calculate reliability
 							<span class="tooltip">&#9432 <span class="tooltiptext">Calculate reliability of BVE according to vanRaden 2008</span></span>
diff --git a/public/javascript/network.js b/public/javascript/network.js
index f610c18..bdcf677 100644
--- a/public/javascript/network.js
+++ b/public/javascript/network.js
@@ -253,7 +253,8 @@ var data_Vue = new Vue({
 		plottingType: ["By Repeats", "By Cohorts", "By Time"],
 		Genotype_generation_options: ["Upload Genotypes", "Random-sampling", "Fully-homozygous", "Fully-heterozygous", "All-B-Allele", "All-A-Allele"],
 		Breedingtype_options: ['Selection', 'Reproduction', 'Aging', 'Combine', 'Repeat', 'Split', 'Cloning', 'Selfing', 'DH-Production'],
-		selectionType_options: ['Phenotypic', 'Random', 'BVE' ],
+		selectionType_options: ['Phenotypic', 'Random', 'BVE', 'Parent_Mean', 'Grandparent_Mean'],
+		selectionType_options2: ['BVE', 'Phenotype', 'BV', 'BVE(+ Phenotype if BVE is not available)'],
 		RelationshipMatrix_options: ['VanRaden', 'Pedigree', 'Single Step'],
 		BVEMethod_options: ['Direct Mixed-Model', 'REML-GBLUP (EMMREML)', 'REML-GBLUP (rrBLUP)', 'REML-GBLUP (sommer)', 'Multi-trait REML-GBLUP (sommer)', 'BayesA', 'BayesB', 'BayesC', 'RKHS'],
 		Cohorts_options: ['Only this cohort', 'Last Generation', 'Last 2 Generations', 'Last 3 Generations', 'All',  'Manual select'],