Author: echatellier Date: 2013-05-27 10:18:51 +0200 (Mon, 27 May 2013) New Revision: 231 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/231 Log: Add molecule count on home page Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/HomePage.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/HomePage.java trunk/cantharella.web/src/main/resources/web_en.properties trunk/cantharella.web/src/main/resources/web_fr.properties Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/HomePage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/HomePage.html 2013-05-27 08:17:59 UTC (rev 230) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/HomePage.html 2013-05-27 08:18:51 UTC (rev 231) @@ -103,6 +103,7 @@ <li><span wicket:id="HomePage.Statistics.Lots"/> <wicket:message key="Lots.stat" /></li> <li><span wicket:id="HomePage.Statistics.Extractions"/> <wicket:message key="Extractions.stat" /></li> <li><span wicket:id="HomePage.Statistics.Purifications"/> <wicket:message key="Purifications.stat" /></li> + <li><span wicket:id="HomePage.Statistics.Molecules"/> <wicket:message key="Molecules.stat" /></li> <li><span wicket:id="HomePage.Statistics.TestsBio"/> <wicket:message key="ResultatsTestsBio.stat" /></li> </ul> Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/HomePage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/HomePage.java 2013-05-27 08:17:59 UTC (rev 230) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/HomePage.java 2013-05-27 08:18:51 UTC (rev 231) @@ -33,11 +33,14 @@ import nc.ird.cantharella.service.services.CampagneService; import nc.ird.cantharella.service.services.ExtractionService; import nc.ird.cantharella.service.services.LotService; +import nc.ird.cantharella.service.services.MoleculeService; import nc.ird.cantharella.service.services.PersonneService; import nc.ird.cantharella.service.services.PurificationService; import nc.ird.cantharella.service.services.SpecimenService; import nc.ird.cantharella.service.services.StationService; import nc.ird.cantharella.service.services.TestBioService; +import nc.ird.cantharella.utils.BeanTools.AccessType; +import nc.ird.cantharella.utils.CollectionTools; import nc.ird.cantharella.web.pages.domain.utilisateur.ManageUtilisateurPage; import nc.ird.cantharella.web.pages.domain.utilisateur.ReadUtilisateurPage; import nc.ird.cantharella.web.pages.domain.utilisateur.RegisterPage; @@ -50,11 +53,7 @@ import nc.ird.cantharella.web.utils.models.LoadableDetachableSortableListDataProvider; import nc.ird.cantharella.web.utils.security.AuthContainer; import nc.ird.cantharella.web.utils.security.AuthRole; -import nc.ird.cantharella.utils.BeanTools.AccessType; -import nc.ird.cantharella.utils.CollectionTools; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.apache.wicket.MarkupContainer; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.AjaxFallbackLink; @@ -73,6 +72,8 @@ 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; /** * Home page @@ -115,6 +116,10 @@ @SpringBean private PurificationService purificationService; + /** Service : molecule */ + @SpringBean + private MoleculeService moleculeService; + /** Service : test biologique */ @SpringBean private TestBioService testBioService; @@ -239,6 +244,8 @@ .countExtractions()))); userContent.add(new Label(getResource() + ".Statistics.Purifications", String.valueOf(purificationService .countPurifications()))); + userContent.add(new Label(getResource() + ".Statistics.Molecules", String.valueOf(moleculeService + .countMolecules()))); userContent.add(new Label(getResource() + ".Statistics.TestsBio", String.valueOf(testBioService .countResultatsTestsBio()))); Modified: trunk/cantharella.web/src/main/resources/web_en.properties =================================================================== --- trunk/cantharella.web/src/main/resources/web_en.properties 2013-05-27 08:17:59 UTC (rev 230) +++ trunk/cantharella.web/src/main/resources/web_en.properties 2013-05-27 08:18:51 UTC (rev 231) @@ -4,7 +4,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2009 - 2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) +# Copyright (C) 2009 - 2013 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by @@ -66,6 +66,7 @@ Lots.stat=Samples Extractions.stat=Extractions Purifications.stat=Purifications +Molecules.stat=Molecules ResultatsTestsBio.stat=Bioassay results Modified: trunk/cantharella.web/src/main/resources/web_fr.properties =================================================================== --- trunk/cantharella.web/src/main/resources/web_fr.properties 2013-05-27 08:17:59 UTC (rev 230) +++ trunk/cantharella.web/src/main/resources/web_fr.properties 2013-05-27 08:18:51 UTC (rev 231) @@ -4,7 +4,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2009 - 2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) +# Copyright (C) 2009 - 2013 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by @@ -65,6 +65,7 @@ Lots.stat=Lots Extractions.stat=Extractions Purifications.stat=Purifications +Molecules.stat=Molécules ResultatsTestsBio.stat=Résultats de tests biologiques