Author: echatellier Date: 2013-02-20 15:49:43 +0100 (Wed, 20 Feb 2013) New Revision: 138 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/138 Log: Fix provenance table in molecule read page Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ReadMoleculePage.java Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ReadMoleculePage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ReadMoleculePage.java 2013-02-20 14:35:29 UTC (rev 137) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ReadMoleculePage.java 2013-02-20 14:49:43 UTC (rev 138) @@ -281,18 +281,28 @@ } }); - item.add( - new Label("Molecule.provenance.List.presence", new DisplayDecimalPropertyModel(provenanceModel, + item.add(new Label("Molecule.provenance.List.presence", new DisplayDecimalPropertyModel(provenanceModel, "pourcentage", DecimalDisplFormat.SMALL, getLocale()))).add( new ReplaceEmptyLabelBehavior()); - item.add(new Label("Molecule.provenance.List.lot.ref", new PropertyModel<String>(provenanceModel, - "pourcentage")).add(new ReplaceEmptyLabelBehavior())); - item.add(new Label("Molecule.provenance.List.genre", new PropertyModel<String>(provenanceModel, - "pourcentage")).add(new ReplaceEmptyLabelBehavior())); - item.add(new Label("Molecule.provenance.List.espece", new PropertyModel<String>(provenanceModel, - "pourcentage")).add(new ReplaceEmptyLabelBehavior())); - item.add(new Label("Molecule.provenance.List.campagne", new PropertyModel<String>(provenanceModel, - "pourcentage")).add(new ReplaceEmptyLabelBehavior())); + if (provenanceModel.getObject().getProduit() instanceof Fraction) { + item.add(new Label("Molecule.provenance.List.lot.ref", new PropertyModel<String>(provenanceModel, + "produit.purification.lotSource.ref"))); + item.add(new Label("Molecule.provenance.List.genre", new PropertyModel<String>(provenanceModel, + "produit.purification.lotSource.specimenRef.genre"))); + item.add(new Label("Molecule.provenance.List.espece", new PropertyModel<String>(provenanceModel, + "produit.purification.lotSource.specimenRef.espece"))); + item.add(new Label("Molecule.provenance.List.campagne", new PropertyModel<String>(provenanceModel, + "produit.purification.lotSource.campagne.nom"))); + } else { + item.add(new Label("Molecule.provenance.List.lot.ref", new PropertyModel<String>(provenanceModel, + "produit.extraction.lot.ref"))); + item.add(new Label("Molecule.provenance.List.genre", new PropertyModel<String>(provenanceModel, + "produit.extraction.lot.specimenRef.genre"))); + item.add(new Label("Molecule.provenance.List.espece", new PropertyModel<String>(provenanceModel, + "produit.extraction.lot.specimenRef.espece"))); + item.add(new Label("Molecule.provenance.List.campagne", new PropertyModel<String>(provenanceModel, + "produit.extraction.lot.campagne.nom"))); + } } }; provenanceTable.add(provenanceListView);