Revision 1faff10b
Added by Andreas Kohlbecker almost 6 years ago
src/main/java/eu/etaxonomy/cdm/vaadin/view/occurrence/CollectionPopupEditor.java | ||
---|---|---|
15 | 15 |
import com.vaadin.ui.GridLayout; |
16 | 16 |
import com.vaadin.ui.TextField; |
17 | 17 |
|
18 |
import eu.etaxonomy.cdm.model.agent.Institution; |
|
18 | 19 |
import eu.etaxonomy.cdm.model.occurrence.Collection; |
19 | 20 |
import eu.etaxonomy.cdm.vaadin.event.CollectionEditorAction; |
21 |
import eu.etaxonomy.cdm.vaadin.event.InstitutionEditorAction; |
|
20 | 22 |
import eu.etaxonomy.cdm.vaadin.event.ToOneRelatedEntityButtonUpdater; |
21 | 23 |
import eu.etaxonomy.cdm.vaadin.permission.AccessRestrictedView; |
22 | 24 |
import eu.etaxonomy.cdm.vaadin.util.CdmTitleCacheCaptionGenerator; |
... | ... | |
37 | 39 |
|
38 | 40 |
private static final int GRID_COLS = 3; |
39 | 41 |
|
40 |
private static final int GRID_ROWS = 3;
|
|
42 |
private static final int GRID_ROWS = 4;
|
|
41 | 43 |
|
42 | 44 |
TextField codeField; |
43 | 45 |
TextField codeStandardField; |
44 | 46 |
TextField townOrLocationField; |
45 | 47 |
ToOneRelatedEntityCombobox<Collection> superCollectionCombobox; |
48 |
ToOneRelatedEntityCombobox<Institution> institutionCombobox; |
|
46 | 49 |
|
47 | 50 |
|
48 | 51 |
/** |
... | ... | |
135 | 138 |
townOrLocationField.setWidth(100, Unit.PIXELS); |
136 | 139 |
|
137 | 140 |
row++; |
138 |
|
|
139 | 141 |
superCollectionCombobox = new ToOneRelatedEntityCombobox<Collection>("Super-collection", Collection.class); |
140 | 142 |
|
141 | 143 |
|
... | ... | |
171 | 173 |
} |
172 | 174 |
}); |
173 | 175 |
|
176 |
row++; |
|
177 |
institutionCombobox = new ToOneRelatedEntityCombobox<Institution>("Institute", Institution.class); |
|
178 |
addField(institutionCombobox, "institute", 0, row, 1, row); |
|
179 |
|
|
180 |
institutionCombobox.getSelect().setCaptionGenerator( |
|
181 |
new CdmTitleCacheCaptionGenerator<Institution>() |
|
182 |
); |
|
183 |
institutionCombobox.getSelect().addValueChangeListener( |
|
184 |
new ToOneRelatedEntityButtonUpdater<Institution>(institutionCombobox) |
|
185 |
); |
|
186 |
|
|
187 |
|
|
188 |
institutionCombobox.addClickListenerAddEntity( e -> getViewEventBus().publish(this, |
|
189 |
new InstitutionEditorAction( |
|
190 |
EditorActionType.ADD, |
|
191 |
null, |
|
192 |
institutionCombobox, |
|
193 |
this) |
|
194 |
)); |
|
195 |
institutionCombobox.addClickListenerEditEntity(e -> { |
|
196 |
if(institutionCombobox.getValue() != null){ |
|
197 |
getViewEventBus().publish(this, |
|
198 |
new InstitutionEditorAction( |
|
199 |
EditorActionType.EDIT, |
|
200 |
institutionCombobox.getValue().getUuid(), |
|
201 |
e.getButton(), |
|
202 |
institutionCombobox, |
|
203 |
this |
|
204 |
) |
|
205 |
); |
|
206 |
} |
|
207 |
}); |
|
208 |
|
|
174 | 209 |
} |
175 | 210 |
|
176 | 211 |
/* ------------------ View Interface methods -------------------- */ |
... | ... | |
179 | 214 |
return superCollectionCombobox; |
180 | 215 |
} |
181 | 216 |
|
217 |
@Override |
|
218 |
public ToOneRelatedEntityCombobox<Institution> getInstitutionCombobox() { |
|
219 |
return institutionCombobox; |
|
220 |
} |
|
221 |
|
|
182 | 222 |
} |
Also available in: Unified diff
fix #7571 adding intitute field to collection editor