Author: kmorin Date: 2014-06-10 20:57:47 +0200 (Tue, 10 Jun 2014) New Revision: 184 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/184 Log: prise en compte de la configuration des actions du menu contextuel des dossiers Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.css 2014-06-10 09:29:34 UTC (rev 183) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.css 2014-06-10 18:57:47 UTC (rev 184) @@ -37,12 +37,14 @@ actionIcon: compute; text: "faxtomail.demandeList.action.computeQuantitiesByRange"; toolTipText: "faxtomail.demandeList.action.computeQuantitiesByRange.tip"; + enabled: { model.isComputeQuantitiesByRangeEnabled() }; } #newDemandMenu { actionIcon: new-demand; text: "faxtomail.demandeList.action.newDemand"; toolTipText: "faxtomail.demandeList.action.newDemand.tip"; + enabled: { model.isNewDemandEnabled() }; } #demandNbLabel { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-06-10 09:29:34 UTC (rev 183) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-06-10 18:57:47 UTC (rev 184) @@ -31,6 +31,7 @@ import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; +import com.franciaflex.faxtomail.persistence.entities.FolderAction; import com.franciaflex.faxtomail.persistence.entities.MailField; import com.franciaflex.faxtomail.persistence.entities.History; import com.franciaflex.faxtomail.persistence.entities.HistoryImpl; @@ -117,6 +118,16 @@ model.addPropertyChangeListener(DemandeListUIModel.PROPERTY_SELECTED_FOLDER, new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { + MailFolder folder = (MailFolder) evt.getNewValue(); + while (folder.getParent() != null && !folder.isUseCurrentLevelFolderActions()) { + folder = folder.getParent(); + } + DemandeListUIModel model = getModel(); + model.setComputeQuantitiesByRangeEnabled(folder != null + && folder.containsFolderActions(FolderAction.COMPUTE_RANGE)); + model.setNewDemandEnabled(folder != null + && folder.containsFolderActions(FolderAction.NEW_DEMANDE)); + LoadFolderEmailsAction loadFolderEmailsAction = getContext().getActionFactory().createLogicAction(DemandeListUIHandler.this, LoadFolderEmailsAction.class); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java 2014-06-10 09:29:34 UTC (rev 183) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java 2014-06-10 18:57:47 UTC (rev 184) @@ -46,6 +46,8 @@ public static final String PROPERTY_SAV_NB = "savNb"; public static final String PROPERTY_REPLY_ENABLED = "replyEnabled"; public static final String PROPERTY_ARCHIVE_ENABLED = "archiveEnabled"; + public static final String PROPERTY_COMPUTE_QUANTITIES_BY_RANGE_ENABLED = "computeQuantitiesByRangeEnabled"; + public static final String PROPERTY_NEW_DEMAND_ENABLED = "newDemandEnabled"; protected List<MailFolder> folders; @@ -61,6 +63,10 @@ protected boolean archiveEnabled; + protected boolean computeQuantitiesByRangeEnabled; + + protected boolean newDemandEnabled; + protected int quotationNb; protected int pfNb; @@ -160,12 +166,32 @@ return archiveEnabled; } - public void setArchiveEnabled(boolean qrchiveEnabled) { + public void setArchiveEnabled(boolean archiveEnabled) { Object oldValue = isArchiveEnabled(); this.archiveEnabled = archiveEnabled; firePropertyChange(PROPERTY_ARCHIVE_ENABLED, oldValue, archiveEnabled); } + public boolean isComputeQuantitiesByRangeEnabled() { + return computeQuantitiesByRangeEnabled; + } + + public void setComputeQuantitiesByRangeEnabled(boolean computeQuantitiesByRangeEnabled) { + Object oldValue = isComputeQuantitiesByRangeEnabled(); + this.computeQuantitiesByRangeEnabled = computeQuantitiesByRangeEnabled; + firePropertyChange(PROPERTY_COMPUTE_QUANTITIES_BY_RANGE_ENABLED, oldValue, computeQuantitiesByRangeEnabled); + } + + public boolean isNewDemandEnabled() { + return newDemandEnabled; + } + + public void setNewDemandEnabled(boolean newDemandEnabled) { + Object oldValue = isNewDemandEnabled(); + this.newDemandEnabled = newDemandEnabled; + firePropertyChange(PROPERTY_NEW_DEMAND_ENABLED, oldValue, newDemandEnabled); + } + public int getQuotationNb() { return quotationNb; } Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java 2014-06-10 09:29:34 UTC (rev 183) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java 2014-06-10 18:57:47 UTC (rev 184) @@ -92,22 +92,22 @@ try { - // schedule mail job (toutes les 20 minutes) + // schedule mail job (toutes les 5 minutes) Trigger trigger = TriggerBuilder .newTrigger() .withIdentity("mailFiltering", "mailFilteringTrigger") - .withSchedule(CronScheduleBuilder.cronSchedule("0 0/20 * * * ?")) + .withSchedule(CronScheduleBuilder.cronSchedule("0 0/5 * * * ?")) .build(); Scheduler scheduler = new StdSchedulerFactory().getScheduler(); scheduler.start(); scheduler.scheduleJob(mailFilteringJob, trigger); - // schedule EDI job (toutes les 5 heures) + // schedule EDI job (toutes les 5 minutes) trigger = TriggerBuilder .newTrigger() .withIdentity("ediManagement", "ediManagementTrigger") - .withSchedule(CronScheduleBuilder.cronSchedule("0 0 0/5 * * ?")) + .withSchedule(CronScheduleBuilder.cronSchedule("0 0/5 * * * ?")) .build(); scheduler = new StdSchedulerFactory().getScheduler();