Author: bleny Date: 2010-12-09 09:18:12 +0000 (Thu, 09 Dec 2010) New Revision: 825 Log: filter sampleRow and contacts on ObsProgram ; fix user admin ui ; misc code style Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration.properties Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-12-08 16:13:54 UTC (rev 824) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-12-09 09:18:12 UTC (rev 825) @@ -41,7 +41,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import java.util.logging.Logger; /** * PgMigrationCallback @@ -51,9 +50,7 @@ * @author fdesbois <fdesbois at codelutin.com> */ public class PostgresMigrationCallback extends WaoMigrationCallBack { - private static final Logger logger = Logger.getLogger(PostgresMigrationCallback.class.getName()); - @Override protected void createUserRoleColumn_1_1a(List<String> queries) { // Evo #2063 @@ -411,6 +408,7 @@ /** Help method to create insertion for initial data in table levels. * @param indicatorTopiaId the topiaId of the concerned indicator (foreign key) + * @param topiaId topiaId for the indicatorLevel to insert * @param level value in the tuple * @param upperBound value in the tuble * @return an SQL "insert" request for table IndicatorLevel Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-12-08 16:13:54 UTC (rev 824) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-12-09 09:18:12 UTC (rev 825) @@ -363,6 +363,11 @@ filter.getTargetSpeciesDCF()); } + // filtering on ObsProgram + if (filter.getObsProgram() != null) { + query.addEquals(sampleRowProperty.obsProgramOrdinal(), filter.getObsProgram().ordinal()); + } + if(logger.isDebugEnabled()) { logger.debug("sampling filter query " + query); } @@ -596,8 +601,13 @@ // ORDER_BY if (StringUtils.isNotEmpty(orderBy)) { query.addOrder(contactProperty.$property(orderBy)); - } + } + // filtering on ObsProgram + if (filter.getObsProgram() != null) { + query.addEquals(contactProperty.obsProgramOrdinal(), filter.getObsProgram().ordinal()); + } + return query; } Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-12-08 16:13:54 UTC (rev 824) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-12-09 09:18:12 UTC (rev 825) @@ -546,8 +546,7 @@ private UserProfile editedProfile; @Persist - @Property - private boolean readOnly; + private Boolean readOnly; @Property private UserRole role; @@ -558,6 +557,17 @@ @Property private boolean refreshUserRoleZone; + public Boolean getReadOnly() { + if (readOnly == null) { + readOnly = false; + } + return readOnly; + } + + public void setReadOnly(Boolean readOnly) { + this.readOnly = readOnly; + } + @Log public UserProfile getEditedProfile() { if (editedProfile == null) { @@ -602,7 +612,10 @@ @Log void onChangeFromReadOnly(boolean value) { - getEditedProfile().setCanWrite( ! value); + if (log.isDebugEnabled()) { + log.debug("readOnly value changed to " + value); + } + setReadOnly(value); } @Log @@ -621,7 +634,7 @@ Object onActionFromAddRole() { if (getEditedProfile() != null && getEditedProfile().getUserRoleOrdinal() != null) { - getEditedProfile().setCanWrite( ! readOnly); + getEditedProfile().setCanWrite( ! getReadOnly()); if (log.isDebugEnabled()) { log.debug("Add user profile : " + getEditedProfile().getDescription()); } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-12-08 16:13:54 UTC (rev 824) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-12-09 09:18:12 UTC (rev 825) @@ -167,6 +167,7 @@ GregorianCalendar beginningOfCurrentYear = new GregorianCalendar(); beginningOfCurrentYear.set(Calendar.DAY_OF_YEAR, 1); contactFilter.setFromDate(beginningOfCurrentYear.getTime()); + contactFilter.setObsProgram(user.getProfile().getObsProgram()); } return contactFilter; } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-12-08 16:13:54 UTC (rev 824) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-12-09 09:18:12 UTC (rev 825) @@ -62,7 +62,6 @@ import java.text.DateFormat; import java.text.NumberFormat; import java.text.SimpleDateFormat; -import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -197,6 +196,7 @@ // Initialize period PeriodDates period = PeriodDates.createMonthsPeriodFromToday(11); filter.setPeriod(period); + filter.setObsProgram(user.getProfile().getObsProgram()); } return filter; } Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration.properties 2010-12-08 16:13:54 UTC (rev 824) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration.properties 2010-12-09 09:18:12 UTC (rev 825) @@ -37,7 +37,7 @@ loginAdministration-label: Identifiant de connexion (email)* active-label: Actif generatePassword-label: G\u00e9n\u00e9rer le password -userRole-label: R\u00f4les +userRole-label: R\u00f4le readOnly-label: Lecture seule # follow statement doesn't work with BeanEditForm userForm-errors-banner: L'utilisateur n'a pas \u00e9t\u00e9 sauvegard\u00e9 \u00e0 cause des erreurs suivantes :