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.LayoutConstants;
import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement;
import eu.etaxonomy.taxeditor.ui.element.TimePeriodElement;
import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.AnnotationSection;
import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
/**
private EntitySelectionElement<AgentBase> selectionAmplificationStaff;
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 TermComboElement<DefinedTerm> comboPurificationMaterialOrMethod;
-
/**
* @param formFactory
textDesignation = formFactory.createTextWithLabelElement(formElement, "Designation", entity.getDescription(), style);
textDesignation.setEnabled(false);
//TODO institution
+// selectionInstitution = formFactory.createSelectionElement(Institution.class, getConversationHolder(), formElement, "Institution", entity.getInstitution(), EntitySelectionElement.ALL, style);
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);
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)
-// numberGelVoltage = formFactory.createNumberTextWithLabelElement(formElement, "Gel Voltage (V)", entity.getElectrophoresisVoltage(), style);
-// 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);
- //TODO notes
+
+ AnnotationSection annotationSection = formFactory.createAnnotationSection(getConversationHolder(), formElement, style);
+ annotationSection.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
+ annotationSection.setEntity(entity);
+
updateDesignationText();
}
updateDesignationText();
}
else if(eventSource==selectionInstitution){
- //TODO implement
+ //TODO institution
+// getEntity().setInstitution(selectionInstitution.getSelection());
updateDesignationText();
}
else if(eventSource==selectionPrimerFW){
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
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.DnaSample;
import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;
import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
*/
public class DnaSampleGeneralDetailElement extends AbstractCdmDetailElement<DnaSample> {
+ private EntitySelectionElement<Institution> selectionInstitution;
+ private EntitySelectionElement<AgentBase> selectionStaff;
private TimePeriodElement datePreservationDate;
- private EntitySelectionElement<AgentBase> selectionPreparedBy;
private NumberWithLabelElement numberPreservationTemperature;
private TermComboElement<DefinedTerm> comboMaterialOrMethods;
private TextWithLabelElement textBarcode;
*/
@Override
protected void createControls(ICdmFormElement formElement, DnaSample entity, int style) {
+ Institution institution = null;
+ AgentBase<?> staff = null;
+ TimePeriod preparationDate = null;
+ if(entity.getDerivedFrom()!=null){
+// institution = entity.getDerivedFrom().getInstitution();
+ staff = entity.getDerivedFrom().getActor();
+ preparationDate = entity.getDerivedFrom().getTimeperiod();
+ }
+
Double temperature = null;
DefinedTerm definedMaterialOrMethod = null;
if(entity.getPreservation()!=null){
temperature = entity.getPreservation().getTemperature();
definedMaterialOrMethod = entity.getPreservation().getDefinedMaterialOrMethod();
}
-// datePreservationDate = formFactory.createTimePeriodElement(formElement, "Preparation date", timePeriod, style);
-// selectionPreparedBy = formFactory.createSelectionElement(AgentBase.class, getConversationHolder(), formElement, "Prepared by", actor, EntitySelectionElement.ALL, style);
+ //TODO institution
+// selectionInstitution = formFactory.createSelectionElement(Institution.class, getConversationHolder(), formElement, "Institution", staff, EntitySelectionElement.ALL, style);
+ selectionStaff = formFactory.createSelectionElement(AgentBase.class, getConversationHolder(), formElement, "Staff", staff, EntitySelectionElement.ALL, style);
+ datePreservationDate = formFactory.createTimePeriodElement(formElement, "Preparation date", preparationDate, style);
numberPreservationTemperature = formFactory.createNumberTextWithLabelElement(formElement, "Preservation Temp. [C°]", temperature, style);
comboMaterialOrMethods = formFactory.createDefinedTermComboElement(TermType.MaterialOrMethod, formElement, "Materials & Methods", definedMaterialOrMethod, style);
- //TODO preparation date
- //TODO sample type
textBarcode = formFactory.createTextWithLabelElement(formElement, "Barcode", entity.getBarcode(), style);
}
if(eventSource==datePreservationDate){
addPreservationMethod().setTimeperiod(datePreservationDate.getTimePeriod());
}
- else if(eventSource==selectionPreparedBy){
- addPreservationMethod().setActor(selectionPreparedBy.getSelection());
+ else if(eventSource==selectionStaff){
+ addPreservationMethod().setActor(selectionStaff.getSelection());
}
else if(eventSource==numberPreservationTemperature){
addPreservationMethod().setTemperature(numberPreservationTemperature.getDouble());
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.LayoutConstants;
import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement;
import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.AnnotationSection;
import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
/**
private TextWithLabelElement textPrimerName;
- //TODO we are using a basic text field which is backed up by a Sequence object modelwise.
+ // we are using a basic text field which is backed up by a Sequence object modelwise.
// 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;
/**
sequenceString = entity.getSequence().getString();
}
textPrimerSequence = formFactory.createTextWithLabelElement(formElement, "Primer seq. 5'->3'", sequenceString, style);
- //TODO: marker
- //TODO: notes
+
+ //TODO dnaMarker
+// comboMarker = formFactory.createDefinedTermComboElement(TermType.DnaMarker, formElement, "DNA Marker", entity.getDnaMarker(), style);
selectionReference = formFactory
.createSelectionElement(Reference.class,
getConversationHolder(), formElement, "Reference",
entity.getPublishedIn(),
EntitySelectionElement.ALL, style);
+
+ AnnotationSection annotationSection = formFactory.createAnnotationSection(getConversationHolder(), formElement, style);
+ annotationSection.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
+ annotationSection.setEntity(entity);
}
/*
if(eventSource==textPrimerName){
getEntity().setLabel(textPrimerName.getText());
}
+ else if(eventSource==comboMarker){
+ //TODO dnaMarker
+// getEntity().setDnaMarker(comboMarker.getSelection());
+ }
else if(eventSource==textPrimerSequence){
SequenceString sequenceString = getEntity().getSequence();
if(sequenceString==null){
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;
+ TimePeriod preparationDate = null;
DefinedTerm preservationMedium = null;
-// TimePeriod preparationDate = null;
+ AgentBase<?> staff = null;
+ if(entity.getDerivedFrom()!=null){
+ staff = entity.getDerivedFrom().getActor();
+ preparationDate = entity.getDerivedFrom().getTimeperiod();
+ }
if(entity.getPreservation()!=null){
- preservationDate = entity.getPreservation().getTimeperiod();
preservationMedium = entity.getPreservation().getMedium();
-
}
- //TODO preparation date
-// datePreparation = formFactory.createTimePeriodElement(formElement, "Preparation date", preparationDate, style);
+ selectionStaff = formFactory.createSelectionElement(AgentBase.class, getConversationHolder(), formElement, "Staff", staff, EntitySelectionElement.ALL,style);
+ datePreparation = formFactory.createTimePeriodElement(formElement, "Preparation date", preparationDate, style);
comboPreservationMedium = formFactory.createDefinedTermComboElement(TermType.MaterialOrMethod, formElement, "Preservation medium", preservationMedium, style);
selectionCollection = formFactory.createSelectionElement(Collection.class, getConversationHolder(), formElement, "Collection", entity.getCollection(), EntitySelectionElement.ALL, style);
textAccessionNumber = formFactory.createTextWithLabelElement(formElement, "Accession Number", entity.getAccessionNumber(), style);
*/
@Override
public void handleEvent(Object eventSource) {
- //TODO: institute, preparation date, prepared by, staff
+ //TODO: institute
if(eventSource==comboKindOfTissue) {
getEntity().setKindOfUnit(comboKindOfTissue.getSelection());
}
else if(eventSource==textBarcode){
getEntity().setBarcode(textBarcode.getText());
}
+ else if(eventSource==datePreparation){
+ if(getEntity().getDerivedFrom()!=null){
+ getEntity().getDerivedFrom().setTimeperiod(datePreparation.getTimePeriod());
+ }
+ }
+ else if(eventSource==selectionStaff){
+ if(getEntity().getDerivedFrom()!=null){
+ getEntity().getDerivedFrom().setActor(selectionStaff.getSelection());
+ }
+ }
}
private PreservationMethod addPreservationMethod(){