Author: echatellier Date: 2013-01-07 17:52:33 +0100 (Mon, 07 Jan 2013) New Revision: 47 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/47 Log: Improve molecule reading Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ListMoleculesPage.java 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/ListMoleculesPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ListMoleculesPage.java 2013-01-07 16:23:51 UTC (rev 46) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ListMoleculesPage.java 2013-01-07 16:52:33 UTC (rev 47) @@ -29,8 +29,6 @@ import nc.ird.cantharella.service.services.MoleculeService; import nc.ird.cantharella.web.config.WebContext; import nc.ird.cantharella.web.pages.TemplatePage; -import nc.ird.cantharella.web.pages.domain.lot.ListLotsPage; -import nc.ird.cantharella.web.pages.domain.lot.ReadLotPage; import nc.ird.cantharella.web.utils.CallerPage; import nc.ird.cantharella.web.utils.columns.LinkPropertyColumn; import nc.ird.cantharella.web.utils.columns.LinkableImagePropertyColumn; @@ -66,7 +64,7 @@ public ListMoleculesPage() { super(ListMoleculesPage.class); - final CallerPage currentPage = new CallerPage(ListLotsPage.class); + final CallerPage currentPage = new CallerPage(ListMoleculesPage.class); add(new Link<Void>(getResource() + ".NewMolecule") { @Override @@ -99,7 +97,7 @@ getString("Read")) { @Override public void onClick(Item<ICellPopulator<Molecule>> item, String componentId, IModel<Molecule> model) { - setResponsePage(new ReadLotPage(model.getObject().getIdMolecule(), currentPage)); + setResponsePage(new ReadMoleculePage(model.getObject().getIdMolecule(), currentPage)); } }); 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-01-07 16:23:51 UTC (rev 46) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ReadMoleculePage.java 2013-01-07 16:52:33 UTC (rev 47) @@ -22,11 +22,19 @@ */ package nc.ird.cantharella.web.pages.domain.molecule; +import nc.ird.cantharella.data.model.Lot; +import nc.ird.cantharella.data.model.Molecule; import nc.ird.cantharella.web.pages.TemplatePage; import nc.ird.cantharella.web.utils.CallerPage; +import nc.ird.cantharella.web.utils.behaviors.ReplaceEmptyLabelBehavior; +import nc.ird.cantharella.web.utils.models.GenericLoadableDetachableModel; import nc.ird.cantharella.web.utils.security.AuthRole; import nc.ird.cantharella.web.utils.security.AuthRoles; +import org.apache.wicket.markup.html.basic.Label; +import org.apache.wicket.model.IModel; +import org.apache.wicket.model.PropertyModel; + /** * Lecture d'une molécule. * @@ -35,8 +43,27 @@ @AuthRoles( { AuthRole.ADMIN, AuthRole.USER }) public class ReadMoleculePage extends TemplatePage { + /** Modèle : molecule */ + private final IModel<Molecule> moleculeModel; + public ReadMoleculePage(Integer idMolecule, final CallerPage callerPage) { super(ReadMoleculePage.class); + + // Initialisation du modèle + moleculeModel = new GenericLoadableDetachableModel<Molecule>(Molecule.class, idMolecule); + + add(new Label("Molecule.idMolecule", new PropertyModel<String>(moleculeModel, "idMolecule"))); + add(new Label("Molecule.nomCommun", new PropertyModel<String>(moleculeModel, "nomCommun")).add(new ReplaceEmptyLabelBehavior())); + add(new Label("Molecule.familleChimique", new PropertyModel<String>(moleculeModel, "familleChimique")).add(new ReplaceEmptyLabelBehavior())); + add(new Label("Molecule.formuleDevMol", new PropertyModel<String>(moleculeModel, "formuleDevMol")).add(new ReplaceEmptyLabelBehavior())); + add(new Label("Molecule.nomIupca", new PropertyModel<String>(moleculeModel, "nomIupca")).add(new ReplaceEmptyLabelBehavior())); + add(new Label("Molecule.formuleBrute", new PropertyModel<String>(moleculeModel, "formuleBrute")).add(new ReplaceEmptyLabelBehavior())); + add(new Label("Molecule.idMolecule", new PropertyModel<String>(moleculeModel, "idMolecule")).add(new ReplaceEmptyLabelBehavior())); + add(new Label("Molecule.idMolecule", new PropertyModel<String>(moleculeModel, "idMolecule")).add(new ReplaceEmptyLabelBehavior())); + add(new Label("Molecule.idMolecule", new PropertyModel<String>(moleculeModel, "idMolecule")).add(new ReplaceEmptyLabelBehavior())); + add(new Label("Molecule.idMolecule", new PropertyModel<String>(moleculeModel, "idMolecule")).add(new ReplaceEmptyLabelBehavior())); + add(new Label("Molecule.idMolecule", new PropertyModel<String>(moleculeModel, "idMolecule")).add(new ReplaceEmptyLabelBehavior())); + add(new Label("Molecule.idMolecule", new PropertyModel<String>(moleculeModel, "idMolecule")).add(new ReplaceEmptyLabelBehavior())); } }