- updated molecular DetailsViews according to requirements

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationGeneralDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationGeneralDetailElement.java
index 6b335ba22a4ba093f42b6233855a343b0927eed6..1844b0025fa89a8b0a55d6788074123e5edb5d35 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationGeneralDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationGeneralDetailElement.java
@@ -10,15 +10,15 @@
 package eu.etaxonomy.taxeditor.ui.section.occurrence.dna;
 
 import eu.etaxonomy.cdm.model.agent.AgentBase;
+import eu.etaxonomy.cdm.model.agent.Institution;
 import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.TermType;
+import eu.etaxonomy.cdm.model.common.TimePeriod;
 import eu.etaxonomy.cdm.model.molecular.Amplification;
-import eu.etaxonomy.cdm.model.occurrence.MaterialOrMethodEvent;
+import eu.etaxonomy.cdm.model.molecular.Primer;
 import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.element.CheckboxElement;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
-import eu.etaxonomy.taxeditor.ui.element.NumberWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.element.TimePeriodElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
@@ -31,20 +31,24 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
  */
 public class AmplificationGeneralDetailElement extends AbstractCdmDetailElement<Amplification> {
 
-    private TextWithLabelElement textDescription;
+    private TextWithLabelElement textDesignation;
+    private TextWithLabelElement textNotes;
     private TermComboElement<DefinedTerm> comboMarker;
     private TimePeriodElement dateAmplification;
+    private EntitySelectionElement<Institution> selectionInstitution;
     private EntitySelectionElement<AgentBase> selectionAmplificationStaff;
-    private CheckboxElement checkBoxAmplificationSuccess;
-    private TextWithLabelElement textAmplificationSuccessDetails;
-    private TermComboElement<DefinedTerm> comboAmplificationMaterialOrMethod;
+    private EntitySelectionElement<Primer> selectionPrimerFW;
+    private EntitySelectionElement<Primer> selectionPrimerRW;
+//    private CheckboxElement checkBoxAmplificationSuccess;
+//    private TextWithLabelElement textAmplificationSuccessDetails;
+//    private TermComboElement<DefinedTerm> comboAmplificationMaterialOrMethod;
 
-    private NumberWithLabelElement numberGelVoltage;
-    private NumberWithLabelElement numberGelConcentration;
-    private NumberWithLabelElement numberGelRunningTime;
-    private TextWithLabelElement textLadderUsed;
+//    private NumberWithLabelElement numberGelVoltage;
+//    private NumberWithLabelElement numberGelConcentration;
+//    private NumberWithLabelElement numberGelRunningTime;
+//    private TextWithLabelElement textLadderUsed;
 
-    private TermComboElement<DefinedTerm> comboPurificationMaterialOrMethod;
+//    private TermComboElement<DefinedTerm> comboPurificationMaterialOrMethod;
 
 
     /**
@@ -64,10 +68,14 @@ public class AmplificationGeneralDetailElement extends AbstractCdmDetailElement<
      */
     @Override
     protected void createControls(ICdmFormElement formElement, Amplification entity, int style) {
-        textDescription = formFactory.createTextWithLabelElement(formElement, "Description", entity.getDescription(), style);
+        textDesignation = formFactory.createTextWithLabelElement(formElement, "Designation", entity.getDescription(), style);
+        textDesignation.setEnabled(false);
+        //TODO institution
+        selectionAmplificationStaff = formFactory.createSelectionElement(AgentBase.class, getConversationHolder(), formElement, "Amplification staff", entity.getActor(), EntitySelectionElement.ALL, style);
+        dateAmplification = formFactory.createTimePeriodElement(formElement, "Date", entity.getTimeperiod(), style);
         comboMarker = formFactory.createDefinedTermComboElement(TermType.DnaMarker, formElement, "DNA Marker", entity.getDnaMarker(), style);
-//        dateAmplification = formFactory.createTimePeriodElement(formElement, "Amplification Date", entity.getTimeperiod(), style);
-//        selectionAmplificationStaff = formFactory.createSelectionElement(AgentBase.class, getConversationHolder(), formElement, "Amplification staff", entity.getActor(), EntitySelectionElement.ALL, style);
+        selectionPrimerFW = formFactory.createSelectionElement(Primer.class, getConversationHolder(), formElement, "Primer FW", entity.getForwardPrimer(), EntitySelectionElement.ALL, style);
+        selectionPrimerRW = formFactory.createSelectionElement(Primer.class, getConversationHolder(), formElement, "Primer RW", entity.getReversePrimer(), EntitySelectionElement.ALL, style);
 //        checkBoxAmplificationSuccess = formFactory.createCheckbox(formElement, "Amplification Success", entity.getSuccessful(), style);
 //        textAmplificationSuccessDetails = formFactory.createTextWithLabelElement(formElement, "Ampl. Success Details", entity.getSuccessText(), style);
 //        comboAmplificationMaterialOrMethod = formFactory.createTermComboElement(DefinedTerm.class, formElement, "Ampl. Mat. & Meth.", entity.get, style)
@@ -75,8 +83,47 @@ public class AmplificationGeneralDetailElement extends AbstractCdmDetailElement<
 //        numberGelConcentration = formFactory.createNumberTextWithLabelElement(formElement, "Gel Concentration", entity.getGelConcentration(), style);
 //        numberGelRunningTime = formFactory.createNumberTextWithLabelElement(formElement, "Gel Ruinning Time (Min)", entity.getGelRunningTime(), style);
 //        textLadderUsed = formFactory.createTextWithLabelElement(formElement, "Ladder Used", entity.getLadderUsed(), style);
-        comboPurificationMaterialOrMethod = formFactory.createDefinedTermComboElement(TermType.MaterialOrMethod, formElement, "Purification Mat. & Meth.",
-                entity.getPurification()==null?null:entity.getPurification().getDefinedMaterialOrMethod(), style);
+//        comboPurificationMaterialOrMethod = formFactory.createDefinedTermComboElement(TermType.MaterialOrMethod, formElement, "Purification Mat. & Meth.",
+//                entity.getPurification()==null?null:entity.getPurification().getDefinedMaterialOrMethod(), style);
+        //TODO notes
+        updateDesignationText();
+    }
+
+    private void updateDesignationText(){
+        String institutionName = "";
+        String staffName = "";
+        String dateString = "";
+        //TODO institution
+//        Institution selection = selectionInstitution.getSelection();
+//        if(selection!=null){
+//            institutionName = selection.getName();
+//        }
+        AgentBase staff = selectionAmplificationStaff.getSelection();
+        if(staff!=null){
+            staffName = staff.getTitleCache();
+        }
+        TimePeriod timePeriod = dateAmplification.getTimePeriod();
+        if(timePeriod!=null){
+            dateString = timePeriod.toString()!=null?timePeriod.toString():"";
+        }
+        String designation = "";
+        if(!institutionName.equals("")){
+            designation += institutionName;
+        }
+        if(!staffName.equals("")){
+            if(!designation.equals("")){
+                designation += "_";
+            }
+            designation += staffName;
+        }
+        if(!dateString.equals("")){
+            if(!designation.equals("")){
+                designation += "_";
+            }
+            designation += dateString;
+        }
+        textDesignation.setText(designation);
+        getEntity().setDescription(designation);
     }
 
     /*
@@ -88,46 +135,58 @@ public class AmplificationGeneralDetailElement extends AbstractCdmDetailElement<
      */
     @Override
     public void handleEvent(Object eventSource) {
-        if(eventSource==textDescription){
-            getEntity().setDescription(textDescription.getText());
+        if(eventSource==textNotes){
+            getEntity().setDescription(textNotes.getText());
         }
         else if(eventSource==comboMarker){
             getEntity().setDnaMarker(comboMarker.getSelection());
         }
         else if(eventSource==dateAmplification){
             getEntity().setTimeperiod(dateAmplification.getTimePeriod());
+            updateDesignationText();
         }
         else if(eventSource==selectionAmplificationStaff){
             getEntity().setActor(selectionAmplificationStaff.getEntity());
+            updateDesignationText();
         }
-        else if(eventSource==checkBoxAmplificationSuccess){
-            getEntity().setSuccessful(checkBoxAmplificationSuccess.getSelection());
-        }
-        else if(eventSource==textAmplificationSuccessDetails){
-            getEntity().setSuccessText(textAmplificationSuccessDetails.getText());
-        }
-        else if(eventSource==comboAmplificationMaterialOrMethod){
-
-        }
-        else if(eventSource==numberGelVoltage){
-            getEntity().setElectrophoresisVoltage(numberGelVoltage.getDouble());
-        }
-        else if(eventSource==numberGelConcentration){
-            getEntity().setGelConcentration(numberGelConcentration.getDouble());
+        else if(eventSource==selectionInstitution){
+            //TODO implement
+            updateDesignationText();
         }
-        else if(eventSource==numberGelRunningTime){
-            getEntity().setGelRunningTime(numberGelRunningTime.getDouble());
+        else if(eventSource==selectionPrimerFW){
+            getEntity().setForwardPrimer(selectionPrimerFW.getSelection());
         }
-        else if(eventSource==textLadderUsed){
-            getEntity().setLadderUsed(textLadderUsed.getText());
-        }
-        else if(eventSource==comboPurificationMaterialOrMethod){
-            MaterialOrMethodEvent purification = getEntity().getPurification();
-            if(purification==null){
-                purification = MaterialOrMethodEvent.NewInstance();
-                getEntity().setPurification(purification);
-            }
-            purification.setDefinedMaterialOrMethod(comboPurificationMaterialOrMethod.getSelection());
+        else if(eventSource==selectionPrimerRW){
+            getEntity().setReversePrimer(selectionPrimerRW.getSelection());
         }
+//        else if(eventSource==checkBoxAmplificationSuccess){
+//            getEntity().setSuccessful(checkBoxAmplificationSuccess.getSelection());
+//        }
+//        else if(eventSource==textAmplificationSuccessDetails){
+//            getEntity().setSuccessText(textAmplificationSuccessDetails.getText());
+//        }
+//        else if(eventSource==comboAmplificationMaterialOrMethod){
+//
+//        }
+//        else if(eventSource==numberGelVoltage){
+//            getEntity().setElectrophoresisVoltage(numberGelVoltage.getDouble());
+//        }
+//        else if(eventSource==numberGelConcentration){
+//            getEntity().setGelConcentration(numberGelConcentration.getDouble());
+//        }
+//        else if(eventSource==numberGelRunningTime){
+//            getEntity().setGelRunningTime(numberGelRunningTime.getDouble());
+//        }
+//        else if(eventSource==textLadderUsed){
+//            getEntity().setLadderUsed(textLadderUsed.getText());
+//        }
+//        else if(eventSource==comboPurificationMaterialOrMethod){
+//            MaterialOrMethodEvent purification = getEntity().getPurification();
+//            if(purification==null){
+//                purification = MaterialOrMethodEvent.NewInstance();
+//                getEntity().setPurification(purification);
+//            }
+//            purification.setDefinedMaterialOrMethod(comboPurificationMaterialOrMethod.getSelection());
+//        }
     }
 }
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/DnaQualityDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/DnaQualityDetailElement.java
index 039f2f745c00364d16aab23fcaad5a05bf2634a6..3384b2571cc00ef67a3ea55fca4ae88fbe0b5fbe 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/DnaQualityDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/DnaQualityDetailElement.java
@@ -64,9 +64,10 @@ public class DnaQualityDetailElement extends AbstractCdmDetailElement<DnaSample>
         Double ratioOfAbsorbance260_230 = dnaQuality.getRatioOfAbsorbance260_230();
         Double ratioOfAbsorbance260_280 = dnaQuality.getRatioOfAbsorbance260_280();
         Double concentration = dnaQuality.getConcentration();
+        //TODO quality term
         DefinedTerm qualityTerm = dnaQuality.getQualityTerm();
 
-//        textPurificationMethod = formFactory.createTextWithLabelElement(formElement, "Purification Method", dnaQuality.getPurificationMethod(), style);
+        textPurificationMethod = formFactory.createTextWithLabelElement(formElement, "DNA Purification Details", dnaQuality.getPurificationMethod(), style);
         numberRatioOfAbsorbance260_280 = formFactory.createNumberTextWithLabelElement(formElement, "Ratio of absorbance 260-280", ratioOfAbsorbance260_280, style);
         numberRatioOfAbsorbance260_230 = formFactory.createNumberTextWithLabelElement(formElement, "Ratio of absorbance 260-230", ratioOfAbsorbance260_230, style);
         numberConcentration = formFactory.createNumberTextWithLabelElement(formElement, "Concentration", concentration, style);
@@ -85,8 +86,7 @@ public class DnaQualityDetailElement extends AbstractCdmDetailElement<DnaSample>
     public void handleEvent(Object eventSource) {
         DnaQuality dnaQuality = getEntity().getDnaQuality();
         if(eventSource==textPurificationMethod){
-            //TODO
-//            dnaQuality.setPurificationMethod(textPurificationMethod.getText());
+            dnaQuality.setPurificationMethod(textPurificationMethod.getText());
         }
         else if(eventSource==numberRatioOfAbsorbance260_230){
             dnaQuality.setRatioOfAbsorbance260_230(numberRatioOfAbsorbance260_230.getDouble());

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/DnaSampleGeneralDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/DnaSampleGeneralDetailElement.java
index 3b5dc4d88b17fb69ed89ac15cfa7e0f4b5e96eed..4461471b5c0074fec33bd38b66e406a670fbb6a5 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/DnaSampleGeneralDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/DnaSampleGeneralDetailElement.java
@@ -12,7 +12,6 @@ package eu.etaxonomy.taxeditor.ui.section.occurrence.dna;
 import eu.etaxonomy.cdm.model.agent.AgentBase;
 import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TimePeriod;
 import eu.etaxonomy.cdm.model.molecular.DnaSample;
 import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;
 import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
@@ -54,18 +53,14 @@ public class DnaSampleGeneralDetailElement extends AbstractCdmDetailElement<DnaS
      */
     @Override
     protected void createControls(ICdmFormElement formElement, DnaSample entity, int style) {
-        TimePeriod timePeriod = null;
-        AgentBase<?> actor = null;
         Double temperature = null;
         DefinedTerm definedMaterialOrMethod = null;
         if(entity.getPreservation()!=null){
-            timePeriod= entity.getPreservation().getTimeperiod();
-            actor = entity.getPreservation().getActor();
             temperature = entity.getPreservation().getTemperature();
             definedMaterialOrMethod = entity.getPreservation().getDefinedMaterialOrMethod();
         }
-        datePreservationDate = formFactory.createTimePeriodElement(formElement, "Preservation date", timePeriod, style);
-        selectionPreparedBy = formFactory.createSelectionElement(AgentBase.class, getConversationHolder(), formElement, "Prepared by", actor, EntitySelectionElement.ALL, style);
+//        datePreservationDate = formFactory.createTimePeriodElement(formElement, "Preparation date", timePeriod, style);
+//        selectionPreparedBy = formFactory.createSelectionElement(AgentBase.class, getConversationHolder(), formElement, "Prepared by", actor, EntitySelectionElement.ALL, style);
         numberPreservationTemperature = formFactory.createNumberTextWithLabelElement(formElement, "Preservation Temp. [C°]", temperature, style);
         comboMaterialOrMethods = formFactory.createDefinedTermComboElement(TermType.MaterialOrMethod, formElement, "Materials & Methods", definedMaterialOrMethod, style);
         //TODO preparation date

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/PrimerGeneralDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/PrimerGeneralDetailElement.java
index 3ec0627e43e062282c7d4089ee45a31441690c44..b415ef04b0a65718f88ad38e78545eca3dd3c068 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/PrimerGeneralDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/PrimerGeneralDetailElement.java
@@ -9,9 +9,11 @@
  */
 package eu.etaxonomy.taxeditor.ui.section.occurrence.dna;
 
+import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.molecular.Primer;
 import eu.etaxonomy.cdm.model.molecular.SequenceString;
 import eu.etaxonomy.cdm.model.reference.Reference;
+import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement;
@@ -31,6 +33,11 @@ public class PrimerGeneralDetailElement extends AbstractCdmDetailElement<Primer>
     // This is a bit of a overhead as we may just need the sequence string. This may change in future in both directions:
     // either extending this view to support the remaining fields of Sequence or by switching to the more basic SequenceString model element
     private TextWithLabelElement textPrimerSequence;
+    private TermComboElement<DefinedTerm> comboMarker;
+    /**
+     * free text notes field is backed up by an annotation
+     */
+    private TextWithLabelElement textNotes;
     private EntitySelectionElement<Reference> selectionReference;
 
     /**
@@ -56,6 +63,8 @@ public class PrimerGeneralDetailElement extends AbstractCdmDetailElement<Primer>
             sequenceString = entity.getSequence().getString();
         }
         textPrimerSequence = formFactory.createTextWithLabelElement(formElement, "Primer seq. 5'->3'", sequenceString, style);
+        //TODO: marker
+        //TODO: notes
 
         selectionReference = formFactory
                 .createSelectionElement(Reference.class,

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SequenceGeneralDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SequenceGeneralDetailElement.java
index 10fb8e3c5259781dc118b01a65c00ec48964dd17..e4ac9865c715f234b0ac01e570261d92d2d84045 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SequenceGeneralDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SequenceGeneralDetailElement.java
@@ -37,7 +37,6 @@ public class SequenceGeneralDetailElement extends AbstractCdmDetailElement<Seque
     private TermComboElement<DefinedTerm> comboMarker;
     private TextWithLabelElement textConsensusSequence;
     private NumberWithLabelElement textConsensusSequenceLength;
-    private TextWithLabelElement textBarcodeSequence;
     private TextWithLabelElement textGeneticAccessNo;
     private UriWithLabelElement textNCBIUri;
     private UriWithLabelElement textENAUri;
@@ -63,10 +62,7 @@ public class SequenceGeneralDetailElement extends AbstractCdmDetailElement<Seque
     @Override
     protected void createControls(ICdmFormElement formElement, Sequence entity, int style) {
         comboMarker = formFactory.createDefinedTermComboElement(TermType.DnaMarker, formElement, "DNA Marker", entity.getDnaMarker(), style);
-//        textConsensusSequence = formFactory.createTextWithLabelElement(formElement, "Consensus Sequence 5'->3'", entity.getConsensusSequence().getString(), style);
-//        textConsensusSequenceLength = formFactory.createNumberTextWithLabelElement(formElement, "Consensus Seq. Length", entity.getConsensusSequence().getLength(), style);
-//        ((Text) textConsensusSequenceLength.getMainControl()).setEditable(false);
-        textBarcodeSequence = formFactory.createTextWithLabelElement(formElement, "Barcode Sequence 5'->3'", entity.getBarcodeSequencePart()==null?"":entity.getBarcodeSequencePart().getString(), style);
+        textConsensusSequence = formFactory.createTextWithLabelElement(formElement, "Consensus Sequence 5'->3'", entity.getConsensusSequence().getString(), style);
 
         URI genBankUri = null;
         URI emblUri = null;
@@ -115,14 +111,6 @@ public class SequenceGeneralDetailElement extends AbstractCdmDetailElement<Seque
             getEntity().setConsensusSequence(consensusSequence);
             textConsensusSequenceLength.setNumber(consensusSequence.getLength());
         }
-        else if(eventSource==textBarcodeSequence){
-            SequenceString barcodeSequencePart = getEntity().getBarcodeSequencePart();
-            if(barcodeSequencePart==null){
-                barcodeSequencePart = SequenceString.NewInstance();
-            }
-            barcodeSequencePart.setString(textBarcodeSequence.getText());
-            getEntity().setBarcodeSequencePart(barcodeSequencePart);
-        }
         else if(eventSource==textGeneticAccessNo){
             textGeneticAccessNo.setBackground(getPersistentBackground());
             getEntity().setGeneticAccessionNumber(textGeneticAccessNo.getText());

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/TissueSampleGeneralDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/TissueSampleGeneralDetailElement.java
index f3e5de673c20b711b09a0793408e6d67d9c1e876..00ff3de6b4b45b3b30edf53881076dc9e3c80ae4 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/TissueSampleGeneralDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/TissueSampleGeneralDetailElement.java
@@ -36,10 +36,10 @@ public class TissueSampleGeneralDetailElement extends AbstractCdmDetailElement<D
     static private final Logger logger = Logger.getLogger(TissueSampleGeneralDetailElement.class);
 
     private TermComboElement<DefinedTerm> comboKindOfTissue;
+    private EntitySelectionElement<AgentBase> selectionInstitution;
+    private EntitySelectionElement<AgentBase> selectionStaff;
     private TimePeriodElement datePreparation;
-    private EntitySelectionElement<AgentBase> selectionPreparedBy;
     private TermComboElement<DefinedTerm> comboPreservationMedium;
-    private TimePeriodElement datePreservation;
     private EntitySelectionElement<Collection> selectionCollection;
     private TextWithLabelElement textAccessionNumber;
     private TextWithLabelElement textBarcode;
@@ -64,19 +64,20 @@ public class TissueSampleGeneralDetailElement extends AbstractCdmDetailElement<D
     protected void createControls(ICdmFormElement formElement, DnaSample entity, int style) {
         //TODO handle all parameters here and in handleEvent()
         comboKindOfTissue = formFactory.createDefinedTermComboElement(TermType.KindOfUnit, formElement, "Kind Of Tissue", entity.getKindOfUnit(), style);
-
+        //TODO staff
+//        selectionStaff = formFactory.createSelectionElement(AgentBase.class, getConversationHolder(), formElement, "Staff", null, EntitySelectionElement.ALL, style);
+        //TODO: institute
         TimePeriod preservationDate = null;
         DefinedTerm preservationMedium = null;
 //        TimePeriod preparationDate = null;
-//        AgentBase preparedBy = null;
         if(entity.getPreservation()!=null){
             preservationDate = entity.getPreservation().getTimeperiod();
             preservationMedium = entity.getPreservation().getMedium();
+
         }
+        //TODO preparation date
 //        datePreparation = formFactory.createTimePeriodElement(formElement, "Preparation date", preparationDate, style);
-//        selectionPreparedBy = formFactory.createSelectionElement(AgentBase.class, getConversationHolder(), formElement, "Prepared By", preparedBy, EntitySelectionElement.ALL, style);
         comboPreservationMedium = formFactory.createDefinedTermComboElement(TermType.MaterialOrMethod, formElement, "Preservation medium", preservationMedium, style);
-        datePreservation = formFactory.createTimePeriodElement(formElement, "Preservation date", preservationDate, style);
         selectionCollection = formFactory.createSelectionElement(Collection.class, getConversationHolder(), formElement, "Collection", entity.getCollection(), EntitySelectionElement.ALL, style);
         textAccessionNumber = formFactory.createTextWithLabelElement(formElement, "Accession Number", entity.getAccessionNumber(), style);
         textBarcode = formFactory.createTextWithLabelElement(formElement, "Barcode", entity.getBarcode(), style);
@@ -92,18 +93,13 @@ public class TissueSampleGeneralDetailElement extends AbstractCdmDetailElement<D
      */
     @Override
     public void handleEvent(Object eventSource) {
+        //TODO: institute, preparation date, prepared by, staff
         if(eventSource==comboKindOfTissue) {
             getEntity().setKindOfUnit(comboKindOfTissue.getSelection());
         }
-        else if(eventSource==selectionPreparedBy) {
-            addPreservationMethod().setActor(selectionPreparedBy.getSelection());
-        }
         else if(eventSource==comboPreservationMedium) {
             addPreservationMethod().setMedium(comboPreservationMedium.getSelection());
         }
-        else if (eventSource==datePreservation) {
-            addPreservationMethod().setTimeperiod(datePreservation.getTimePeriod());
-        }
         else if(eventSource==selectionCollection){
             getEntity().setCollection(selectionCollection.getSelection());
         }