- Cantharella-commits - mailman.cloud.codelutin.com

r89 - in trunk: . cantharella.service
by echatellier＠users.forge.codelutin.com 11 Feb '13

11 Feb '13

Author: echatellier Date: 2013-02-11 10:03:43 +0100 (Mon, 11 Feb 2013) New Revision: 89 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/89 Log: Poi version was not so useless Modified: trunk/cantharella.service/pom.xml trunk/pom.xml Modified: trunk/cantharella.service/pom.xml =================================================================== --- trunk/cantharella.service/pom.xml 2013-02-11 08:57:47 UTC (rev 88) +++ trunk/cantharella.service/pom.xml 2013-02-11 09:03:43 UTC (rev 89) @@ -178,7 +178,6 @@ <dependency> <groupId>org.apache.poi</groupId> <artifactId>poi</artifactId> - <version>${version.poi}</version> <scope>test</scope> </dependency> </dependencies> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-02-11 08:57:47 UTC (rev 88) +++ trunk/pom.xml 2013-02-11 09:03:43 UTC (rev 89) @@ -450,6 +450,13 @@ <artifactId>mail</artifactId> <version>${version.mail}</version> </dependency> + + <dependency> + <groupId>org.apache.poi</groupId> + <artifactId>poi</artifactId> + <version>3.9</version> + <scope>test</scope> + </dependency> </dependencies> </dependencyManagement>

1 0

r88 - trunk
by echatellier＠users.forge.codelutin.com 11 Feb '13

11 Feb '13

Author: echatellier Date: 2013-02-11 09:57:47 +0100 (Mon, 11 Feb 2013) New Revision: 88 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/88 Log: Remove useless property Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-02-11 08:47:19 UTC (rev 87) +++ trunk/pom.xml 2013-02-11 08:57:47 UTC (rev 88) @@ -128,8 +128,6 @@ <version.mail>1.4.6</version.mail> <version.cglib>2.2.2</version.cglib> - <version.poi>3.5-FINAL</version.poi> - <version.servlet-api>2.5</version.servlet-api> <version.wicket>1.5.9</version.wicket>

1 0

r87 - trunk
by echatellier＠users.forge.codelutin.com 11 Feb '13

11 Feb '13

Author: echatellier Date: 2013-02-11 09:47:19 +0100 (Mon, 11 Feb 2013) New Revision: 87 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/87 Log: Update javamail Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-02-11 06:40:16 UTC (rev 86) +++ trunk/pom.xml 2013-02-11 08:47:19 UTC (rev 87) @@ -125,7 +125,7 @@ <version.opencsv>2.3</version.opencsv> <version.javassist>3.8.0.GA</version.javassist> <version.spring>3.2.1.RELEASE</version.spring> - <version.mail>1.4.5</version.mail> + <version.mail>1.4.6</version.mail> <version.cglib>2.2.2</version.cglib> <version.poi>3.5-FINAL</version.poi>

1 0

r86 - trunk/cantharella.data/src/main/resources/commons/sql
by acheype＠users.forge.codelutin.com 11 Feb '13

11 Feb '13

Author: acheype Date: 2013-02-11 07:40:16 +0100 (Mon, 11 Feb 2013) New Revision: 86 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/86 Log: add transaction mode & ";" after each command Modified: trunk/cantharella.data/src/main/resources/commons/sql/dev_update.sql Modified: trunk/cantharella.data/src/main/resources/commons/sql/dev_update.sql =================================================================== --- trunk/cantharella.data/src/main/resources/commons/sql/dev_update.sql 2013-02-06 17:22:48 UTC (rev 85) +++ trunk/cantharella.data/src/main/resources/commons/sql/dev_update.sql 2013-02-11 06:40:16 UTC (rev 86) @@ -23,6 +23,8 @@ -- Mise à jour à appliquer à la base de données -- pour les modifications effectuées pendant le développement + +BEGIN; -- Documents (16/11/2012) create table TypeDocument ( idTypeDocument int4 not null, @@ -32,7 +34,7 @@ nom varchar(60) not null unique, primary key (idTypeDocument), unique (nom) - ) + ); -- Molecules (07/01/2013) create table Molecule ( @@ -50,7 +52,7 @@ createur_idPersonne int4 not null, identifieePar varchar(60), primary key (idMolecule) - ) + ); create table MoleculeProvenance ( id int4 not null, @@ -58,26 +60,28 @@ molecule_idMolecule int4 not null, produit_id int4 not null, primary key (id) - ) + ); alter table Molecule add constraint FKEC979EA61AA103F8 foreign key (campagne_idCampagne) - references Campagne + references Campagne; alter table Molecule add constraint FKEC979EA6822055B9 foreign key (createur_idPersonne) - references Personne + references Personne; alter table MoleculeProvenance add constraint FK8B39E567F44F1B20 foreign key (molecule_idMolecule) - references Molecule + references Molecule; alter table MoleculeProvenance add constraint FK8B39E567FE19187A foreign key (produit_id) - references Produit + references Produit; - create sequence molecule_sequence \ No newline at end of file + create sequence molecule_sequence; + +COMMIT; \ No newline at end of file

1 0

r85 - trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule
by echatellier＠users.forge.codelutin.com 06 Feb '13

06 Feb '13

Author: echatellier Date: 2013-02-06 18:22:48 +0100 (Wed, 06 Feb 2013) New Revision: 85 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/85 Log: Improve provenance edition Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.html 2013-02-06 17:20:39 UTC (rev 84) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.html 2013-02-06 17:22:48 UTC (rev 85) @@ -154,16 +154,16 @@ <input type="text" class="tiny" id="Molecule.provenance.presence" wicket:id="Molecule.provenance.presence" /> </td> <td> - todo lot + <span id="Molecule.provenance.lot.ref" wicket:id="Molecule.provenance.lot.ref" /> </td> <td> - todo genre + <span id="Molecule.provenance.genre" wicket:id="Molecule.provenance.genre" /> </td> <td> - todo espece + <span id="Molecule.provenance.espece" wicket:id="Molecule.provenance.espece" /> </td> <td> - todo campagne + <span id="Molecule.provenance.campagne" wicket:id="Molecule.provenance.campagne" /> </td> <td> <input wicket:id="Molecule.provenance.Add" type="submit" wicket:message="value:Add" /> Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java 2013-02-06 17:20:39 UTC (rev 84) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java 2013-02-06 17:22:48 UTC (rev 85) @@ -49,22 +49,20 @@ import nc.ird.cantharella.web.utils.behaviors.JSConfirmationBehavior; import nc.ird.cantharella.web.utils.behaviors.MoleculeEditorBehavior; import nc.ird.cantharella.web.utils.behaviors.MoleculeViewBehavior; -import nc.ird.cantharella.web.utils.behaviors.ReplaceEmptyLabelBehavior; import nc.ird.cantharella.web.utils.forms.AutoCompleteTextFieldString; +import nc.ird.cantharella.web.utils.forms.AutoCompleteTextFieldString.ComparisonMode; import nc.ird.cantharella.web.utils.forms.SubmittableButton; import nc.ird.cantharella.web.utils.forms.SubmittableButtonEvents; -import nc.ird.cantharella.web.utils.forms.AutoCompleteTextFieldString.ComparisonMode; import nc.ird.cantharella.web.utils.models.DisplayDecimalPropertyModel; import nc.ird.cantharella.web.utils.models.DisplayDecimalPropertyModel.DecimalDisplFormat; import nc.ird.cantharella.web.utils.panels.PropertyLabelLinkProduitPanel; import nc.ird.cantharella.web.utils.security.AuthRole; import nc.ird.cantharella.web.utils.security.AuthRoles; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.apache.wicket.AttributeModifier; import org.apache.wicket.MarkupContainer; import org.apache.wicket.ajax.AjaxRequestTarget; +import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior; import org.apache.wicket.ajax.markup.html.form.AjaxFallbackButton; import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink; import org.apache.wicket.markup.html.WebMarkupContainer; @@ -79,10 +77,13 @@ import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.markup.html.list.ListItem; import org.apache.wicket.markup.html.list.ListView; +import org.apache.wicket.model.AbstractPropertyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; import org.apache.wicket.spring.injection.annot.SpringBean; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Manage molecule page. @@ -378,17 +379,28 @@ }); 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())); + provenanceModel, "pourcentage", DecimalDisplFormat.SMALL, getLocale()))); + if (provenance.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"))); + } + // Action : suppression d'un résultat de test Button deleteButton = new AjaxFallbackButton("Molecule.provenance.List.Delete", formView) { @Override @@ -432,7 +444,65 @@ presenceInput.setOutputMarkupId(true); presenceInput.setOutputMarkupPlaceholderTag(true); provenanceTable.add(presenceInput); + + final Label lotRefLabel = new Label("Molecule.provenance.lot.ref", new AbstractPropertyModel<String>(newProvenanceModel) { + @Override + protected String propertyExpression() { + if (newProvenanceModel.getObject().getProduit() instanceof Fraction) { + return "produit.purification.lotSource.ref"; + } else { + return "produit.extraction.lot.ref"; + } + } + }); + lotRefLabel.setOutputMarkupId(true); + provenanceTable.add(lotRefLabel); + + final Label genreLabel = new Label("Molecule.provenance.genre", new AbstractPropertyModel<String>(newProvenanceModel) { + @Override + protected String propertyExpression() { + if (newProvenanceModel.getObject().getProduit() instanceof Fraction) { + return "produit.purification.lotSource.specimenRef.genre"; + } else { + return "produit.extraction.lot.specimenRef.genre"; + } + } + }); + genreLabel.setOutputMarkupId(true); + provenanceTable.add(genreLabel); + final Label especeLabel = new Label("Molecule.provenance.espece", new AbstractPropertyModel<String>(newProvenanceModel) { + @Override + protected String propertyExpression() { + if (newProvenanceModel.getObject().getProduit() instanceof Fraction) { + return "produit.purification.lotSource.specimenRef.espece"; + } else { + return "produit.extraction.lot.specimenRef.espece"; + } + } + }); + especeLabel.setOutputMarkupId(true); + provenanceTable.add(especeLabel); + + final Label campagneLabel = new Label("Molecule.provenance.campagne", new AbstractPropertyModel<String>(newProvenanceModel) { + @Override + protected String propertyExpression() { + if (newProvenanceModel.getObject().getProduit() instanceof Fraction) { + return "produit.purification.lotSource.campagne.nom"; + } else { + return "produit.extraction.lot.campagne.nom"; + } + } + }); + campagneLabel.setOutputMarkupId(true); + provenanceTable.add(campagneLabel); + + produitChoice.add(new AjaxFormComponentUpdatingBehavior("onchange") { + protected void onUpdate(AjaxRequestTarget target) { + target.add(lotRefLabel, genreLabel, especeLabel, campagneLabel); + } + }); + // Bouton AJAX pour ajouter un résultat de test addProvenanceButton = new AjaxFallbackButton("Molecule.provenance.Add", formView) { @Override

1 0

r84 - trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model
by echatellier＠users.forge.codelutin.com 06 Feb '13

06 Feb '13

Author: echatellier Date: 2013-02-06 18:20:39 +0100 (Wed, 06 Feb 2013) New Revision: 84 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/84 Log: Fix notnull property on pourcentage Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/MoleculeProvenance.java Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/MoleculeProvenance.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/MoleculeProvenance.java 2013-02-06 16:17:15 UTC (rev 83) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/MoleculeProvenance.java 2013-02-06 17:20:39 UTC (rev 84) @@ -54,6 +54,7 @@ @Min(value = 0) @Max(value = 100) @Column(precision = DataContext.DECIMAL_PRECISION, scale = DataContext.DECIMAL_SCALE) + @NotNull private BigDecimal pourcentage; /** Molecule dont fait partie la provenance */

1 0

r83 - trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule
by echatellier＠users.forge.codelutin.com 06 Feb '13

06 Feb '13

Author: echatellier Date: 2013-02-06 17:17:15 +0100 (Wed, 06 Feb 2013) New Revision: 83 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/83 Log: Correction des droits pour editer les provenances d'une mol?\195?\169cule, mais pas la mol?\195?\169cule elle m?\195?\170me 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/ManageMoleculePage.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.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-02-06 14:19:19 UTC (rev 82) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ListMoleculesPage.java 2013-02-06 16:17:15 UTC (rev 83) @@ -142,12 +142,7 @@ // pas de lien d'édition si l'utilisateur n'a pas les droits @Override public void populateItem(Item<ICellPopulator<Molecule>> item, String componentId, IModel<Molecule> model) { - if (moleculeService.updateOrdeleteMoleculeEnabled(model.getObject(), getSession().getUtilisateur())) { - item.add(new LinkableImagePanel(item, componentId, model)); - } else { - // label vide - item.add(new Label(componentId)); - } + item.add(new LinkableImagePanel(item, componentId, model)); } @Override Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.html 2013-02-06 14:19:19 UTC (rev 82) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.html 2013-02-06 16:17:15 UTC (rev 83) @@ -39,8 +39,8 @@ </div> <div class="property"> - <label for="Molecule.formuleDevMol"><wicket:message key="Molecule.formuleDevMol" /></label> - <input type="hidden" id="Molecule.formuleDevMol" wicket:id="Molecule.formuleDevMol" /> + <label><wicket:message key="Molecule.formuleDevMol" /></label> + <input type="hidden" wicket:id="Molecule.formuleDevMol" /> </div> <div class="property"> Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java 2013-02-06 14:19:19 UTC (rev 82) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java 2013-02-06 16:17:15 UTC (rev 83) @@ -48,6 +48,7 @@ import nc.ird.cantharella.web.utils.CallerPage; import nc.ird.cantharella.web.utils.behaviors.JSConfirmationBehavior; import nc.ird.cantharella.web.utils.behaviors.MoleculeEditorBehavior; +import nc.ird.cantharella.web.utils.behaviors.MoleculeViewBehavior; import nc.ird.cantharella.web.utils.behaviors.ReplaceEmptyLabelBehavior; import nc.ird.cantharella.web.utils.forms.AutoCompleteTextFieldString; import nc.ird.cantharella.web.utils.forms.SubmittableButton; @@ -182,16 +183,31 @@ final Form<Void> formView = new Form<Void>("Form"); initProvenanceFields(formView, currentPage); + + // page can be accessed by anyone for editing provenance + // but molecule fields can be edited only by administrators or + // molecule creator + Utilisateur utilisateur = getSession().getUtilisateur(); + boolean editEnabled = createMode || moleculeService.updateOrdeleteMoleculeEnabled(moleculeModel.getObject(), utilisateur); + + formView.add(new TextField<String>("Molecule.nomCommun", new PropertyModel<String>(moleculeModel, "nomCommun")).setEnabled(editEnabled)); + formView.add(new TextField<String>("Molecule.familleChimique", new PropertyModel<String>(moleculeModel, "familleChimique")).setEnabled(editEnabled)); + + if (editEnabled) { + formView.add(new HiddenField<String>("Molecule.formuleDevMol", new PropertyModel<String>(moleculeModel, "formuleDevMol")) + .add(new MoleculeEditorBehavior(new PropertyModel<String>(moleculeModel, "formuleDevMol")))); + } else { + formView.add(new HiddenField<String>("Molecule.formuleDevMol", new PropertyModel<String>(moleculeModel, "formuleDevMol")) + .setEnabled(false) // important otherwise, loose data + .add(new MoleculeViewBehavior(new PropertyModel<String>(moleculeModel, "formuleDevMol"), 500, 300))); + } + + formView.add(new TextField<String>("Molecule.nomIupca", new PropertyModel<String>(moleculeModel, "nomIupca")).setEnabled(editEnabled)); + formView.add(new TextField<String>("Molecule.formuleBrute", new PropertyModel<String>(moleculeModel, "formuleBrute")).setEnabled(editEnabled)); - formView.add(new TextField<String>("Molecule.nomCommun", new PropertyModel<String>(moleculeModel, "nomCommun"))); - formView.add(new TextField<String>("Molecule.familleChimique", new PropertyModel<String>(moleculeModel, "familleChimique"))); - formView.add(new HiddenField<String>("Molecule.formuleDevMol", new PropertyModel<String>(moleculeModel, "formuleDevMol")) - .add(new MoleculeEditorBehavior(new PropertyModel<String>(moleculeModel, "formuleDevMol")))); //moleculeModel.getObject().getFormuleDevMol()))); - formView.add(new TextField<String>("Molecule.nomIupca", new PropertyModel<String>(moleculeModel, "nomIupca"))); - formView.add(new TextField<String>("Molecule.formuleBrute", new PropertyModel<String>(moleculeModel, "formuleBrute"))); - TextField<String> masseMolaireField = new TextField<String>("Molecule.masseMolaire", new PropertyModel<String>(moleculeModel, "masseMolaire")); masseMolaireField.setRequired(true); + masseMolaireField.setEnabled(editEnabled); formView.add(masseMolaireField); @@ -211,15 +227,16 @@ protected boolean wantOnSelectionChangedNotifications() { return true; } - }); + }.setEnabled(editEnabled)); AutoCompleteTextFieldString identifieeParInput = new AutoCompleteTextFieldString("Molecule.identifieePar", new PropertyModel<String>(moleculeModel, "identifieePar"), organismes, ComparisonMode.CONTAINS); + identifieeParInput.setEnabled(editEnabled); nouvMoleculRefresh.add(identifieeParInput); DropDownChoice<Campagne> campagnesInput = new DropDownChoice<Campagne>("Molecule.campagne", new PropertyModel<Campagne>(moleculeModel, "campagne"), campagnes); - //campagnesInput.setNullValid(false); + campagnesInput.setEnabled(editEnabled); nouvMoleculRefresh.add(campagnesInput); // Action : création d'une nouvelle campagne @@ -235,11 +252,13 @@ protected void onError(AjaxRequestTarget target, Form<?> form) { setResponsePage(new ManageCampagnePage(currentPage, false)); } - }); + }.setVisibilityAllowed(editEnabled)); - nouvMoleculRefresh.add(new TextArea<String>("Molecule.publiOrigine", new PropertyModel<String>(moleculeModel, "publiOrigine"))); + nouvMoleculRefresh.add(new TextArea<String>("Molecule.publiOrigine", new PropertyModel<String>(moleculeModel, "publiOrigine")) + .setEnabled(editEnabled)); - formView.add(new TextArea<String>("Molecule.complement", new PropertyModel<String>(moleculeModel, "complement"))); + formView.add(new TextArea<String>("Molecule.complement", new PropertyModel<String>(moleculeModel, "complement")) + .setEnabled(editEnabled)); // Créateur en lecture seule formView.add(new TextField<String>("Molecule.createur", new PropertyModel<String>(moleculeModel, "createur")) 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-06 14:19:19 UTC (rev 82) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ReadMoleculePage.java 2013-02-06 16:17:15 UTC (rev 83) @@ -142,8 +142,6 @@ setResponsePage(new ManageMoleculePage(getModelObject().getIdMolecule(), currentPage)); } }; - updateLink.setVisibilityAllowed(moleculeService.updateOrdeleteMoleculeEnabled(moleculeModel.getObject(), getSession() - .getUtilisateur())); formView.add(updateLink); // Action : suppression

1 0

r82 - in trunk: cantharella.data/src/main/java/nc/ird/cantharella/data/model cantharella.data/src/main/resources/commons/sql cantharella.web/src/main/resources/commons
by echatellier＠users.forge.codelutin.com 06 Feb '13

06 Feb '13

Author: echatellier Date: 2013-02-06 15:19:19 +0100 (Wed, 06 Feb 2013) New Revision: 82 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/82 Log: Correction des champs requis et des message d'erreurs pour l'edition des mol?\195?\169cules Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Molecule.java trunk/cantharella.data/src/main/resources/commons/sql/dev_update.sql trunk/cantharella.web/src/main/resources/commons/web_en.properties trunk/cantharella.web/src/main/resources/commons/web_fr.properties Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Molecule.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Molecule.java 2013-02-06 13:59:48 UTC (rev 81) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Molecule.java 2013-02-06 14:19:19 UTC (rev 82) @@ -76,13 +76,11 @@ /** Nom commun */ @Length(max = LENGTH_LONG_TEXT) - @NotNull @Field(index=Index.YES, analyze=Analyze.YES, store=Store.YES) private String nomCommun; /** Famille chimique */ @Length(max = LENGTH_MEDIUM_TEXT) - @NotNull @Field(index=Index.YES, analyze=Analyze.YES, store=Store.YES) private String familleChimique; @@ -93,7 +91,6 @@ /** Nom IUPAC */ @Length(max = LENGTH_BIG_TEXT) - @NotNull @Field(index=Index.YES, analyze=Analyze.YES, store=Store.YES) private String nomIupca; Modified: trunk/cantharella.data/src/main/resources/commons/sql/dev_update.sql =================================================================== --- trunk/cantharella.data/src/main/resources/commons/sql/dev_update.sql 2013-02-06 13:59:48 UTC (rev 81) +++ trunk/cantharella.data/src/main/resources/commons/sql/dev_update.sql 2013-02-06 14:19:19 UTC (rev 82) @@ -38,12 +38,12 @@ create table Molecule ( idMolecule int4 not null, complement text, - familleChimique varchar(60) not null, + familleChimique varchar(60), formuleBrute varchar(60) not null, formuleDevMol text, masseMolaire numeric(9, 4) check (masseMolaire<=99999 AND masseMolaire>=0), - nomCommun varchar(100) not null, - nomIupca varchar(255) not null, + nomCommun varchar(100), + nomIupca varchar(255), nouvMolecul boolean not null, publiOrigine text, campagne_idCampagne int4, Modified: trunk/cantharella.web/src/main/resources/commons/web_en.properties =================================================================== --- trunk/cantharella.web/src/main/resources/commons/web_en.properties 2013-02-06 13:59:48 UTC (rev 81) +++ trunk/cantharella.web/src/main/resources/commons/web_en.properties 2013-02-06 14:19:19 UTC (rev 82) @@ -371,7 +371,9 @@ MethodePurification.parametres.index.IConverter.Integer=The index must be an integer MethodePurification.parametres.index=Index -Molecule.provenanceNotAccessibles=Certains produits associés ne sont pas affichés car vous n'avez pas les droits nécéssaires +Molecule.provenanceNotAccessibles=Some related products are not displayed because you don't have the required rights +Molecule.masseMolaire.Required=Molar mass - can’t be null +Molecule.masseMolaire.IConverter.BigDecimal=Molar mass - must be a decimal number TestBio.date.IConverter.Date= The date is incorrectly formatted (DD/MM/YY) TestBio.concMasseDefaut.IConverter.BigDecimal=Default Conc./Mass - must be a decimal number Modified: trunk/cantharella.web/src/main/resources/commons/web_fr.properties =================================================================== --- trunk/cantharella.web/src/main/resources/commons/web_fr.properties 2013-02-06 13:59:48 UTC (rev 81) +++ trunk/cantharella.web/src/main/resources/commons/web_fr.properties 2013-02-06 14:19:19 UTC (rev 82) @@ -370,6 +370,8 @@ MethodePurification.parametres.index=Index Molecule.provenanceNotAccessibles=Certains produits associés ne sont pas affichés car vous n'avez pas les droits nécéssaires +Molecule.masseMolaire.Required=Masse molaire - ne peut être nul +Molecule.masseMolaire.IConverter.BigDecimal=Masse molaire - doit être un nombre décimal TestBio.date.IConverter.Date=La date est mal formatée (JJ/MM/AA) TestBio.concMasseDefaut.IConverter.BigDecimal=Conc./Masse par défaut - doit être un nombre décimal

1 0

r81 - trunk/cantharella.web/src/main/webapp/css
by echatellier＠users.forge.codelutin.com 06 Feb '13

06 Feb '13

Author: echatellier Date: 2013-02-06 14:59:48 +0100 (Wed, 06 Feb 2013) New Revision: 81 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/81 Log: Improve molecule viewer and editor Modified: trunk/cantharella.web/src/main/webapp/css/general.css Modified: trunk/cantharella.web/src/main/webapp/css/general.css =================================================================== --- trunk/cantharella.web/src/main/webapp/css/general.css 2013-02-06 13:57:53 UTC (rev 80) +++ trunk/cantharella.web/src/main/webapp/css/general.css 2013-02-06 13:59:48 UTC (rev 81) @@ -421,6 +421,11 @@ { content: '*\0000a0'; color: #e81111; +} +/* FIXME echatellier 20130206 hack pour chemdoodle en edition */ +#content div.property div +{ + margin-left:21%; } #content form input[type="text"],#content form input[type="password"],#content form select,#content form textarea

1 0

r80 - in trunk/cantharella.web/src/main: java/nc/ird/cantharella/web/pages/domain/molecule java/nc/ird/cantharella/web/pages/domain/search java/nc/ird/cantharella/web/utils/behaviors webapp/js
by echatellier＠users.forge.codelutin.com 06 Feb '13

06 Feb '13

Author: echatellier Date: 2013-02-06 14:57:53 +0100 (Wed, 06 Feb 2013) New Revision: 80 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/80 Log: Improve molecule viewer and editor 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/search/SearchPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/behaviors/MoleculeViewBehavior.java trunk/cantharella.web/src/main/webapp/js/molviewer.js 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-06 13:20:16 UTC (rev 79) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ReadMoleculePage.java 2013-02-06 13:57:53 UTC (rev 80) @@ -108,7 +108,7 @@ 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 MoleculeViewBehavior(new PropertyModel<String>(moleculeModel, "formuleDevMol")))); + .add(new MoleculeViewBehavior(new PropertyModel<String>(moleculeModel, "formuleDevMol"), 500, 300))); 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.masseMolaire", new DisplayDecimalPropertyModel(moleculeModel, "masseMolaire", DecimalDisplFormat.SMALL, getLocale())).add(new ReplaceEmptyLabelBehavior())); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.java 2013-02-06 13:20:16 UTC (rev 79) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.java 2013-02-06 13:57:53 UTC (rev 80) @@ -104,7 +104,7 @@ protected SearchService searchService; /** Nombre d'extraits affichés dans la colonne de résumés des extraits. */ - private static int MAX_EXTRAITS_DISPLAY = 4; + private static final int MAX_EXTRAITS_DISPLAY = 4; /** * Constructor. Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/behaviors/MoleculeViewBehavior.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/behaviors/MoleculeViewBehavior.java 2013-02-06 13:20:16 UTC (rev 79) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/behaviors/MoleculeViewBehavior.java 2013-02-06 13:57:53 UTC (rev 80) @@ -41,13 +41,32 @@ */ public class MoleculeViewBehavior extends AttributeModifier { + /** Canvas width. */ + protected int width; + + /** Canvas height. */ + protected int height; + /** + * Constructor with default canvas size. + * + * @param replaceModel replace model + */ + public MoleculeViewBehavior(IModel<?> replaceModel) { + this(replaceModel, 100, 100); + } + + /** * Constructor. * * @param replaceModel replace model + * @param width canvas width + * @param height canvas height */ - public MoleculeViewBehavior(IModel<?> replaceModel) { + public MoleculeViewBehavior(IModel<?> replaceModel, int width, int height) { super("formula", replaceModel); + this.width = width; + this.height = height; } /** {@inheritDoc} */ @@ -84,7 +103,7 @@ response.write(JavaScriptUtils.SCRIPT_OPEN_TAG); - response.write("addViewerMolecule('"+id+"');"); + response.write("addViewerMolecule('"+id+"', " + width + "," + height + ");"); response.write(JavaScriptUtils.SCRIPT_CLOSE_TAG); } Modified: trunk/cantharella.web/src/main/webapp/js/molviewer.js =================================================================== --- trunk/cantharella.web/src/main/webapp/js/molviewer.js 2013-02-06 13:20:16 UTC (rev 79) +++ trunk/cantharella.web/src/main/webapp/js/molviewer.js 2013-02-06 13:57:53 UTC (rev 80) @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -function addViewerMolecule(tagId) { +function addViewerMolecule(tagId, width, height) { if (tagId) { tagId = '#' + tagId.replace( /(:|\.)/g, "\\$1" ); } else { @@ -35,7 +35,7 @@ $(formulaTag).replaceWith("<canvas id='"+id+"'/>"); //initialize component and set visual specifications - var viewerCanvas = new ChemDoodle.ViewerCanvas(id, 100, 100); + var viewerCanvas = new ChemDoodle.ViewerCanvas(id, width, height); viewerCanvas.specs.bonds_width_2D = .6; viewerCanvas.specs.bonds_saturationWidth_2D = .18; viewerCanvas.specs.bonds_hashSpacing_2D = 2.5; @@ -44,7 +44,13 @@ viewerCanvas.specs.atoms_displayTerminalCarbonLabels_2D = true; var formula = ChemDoodle.readMOL(formulaString); + + // function to scale molecul to canvas + var size = formula.getDimension(); + var scale = Math.min(viewerCanvas.width/size.x, viewerCanvas.height/size.y); viewerCanvas.loadMolecule(formula); + viewerCanvas.specs.scale = scale*.8; + viewerCanvas.repaint(); }); }

1 0