- Faxtomail-commits - mailman.cloud.codelutin.com

r164 - in trunk/faxtomail-ui-web/src/main/webapp: WEB-INF/content/admin js
by echatellier＠users.forge.codelutin.com 09 Jun '14

09 Jun '14

Author: echatellier Date: 2014-06-09 19:25:26 +0200 (Mon, 09 Jun 2014) New Revision: 164 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/164 Log: Rappels des charg?\195?\169s de clientelle, adresse de r?\195?\169ponse, domaine de r?\195?\169ponse des dossiers parents Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-09 17:16:45 UTC (rev 163) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-09 17:25:26 UTC (rev 164) @@ -371,6 +371,14 @@ </tr> </thead> <tbody> + <tr ng-repeat="customerResponsible in parentScopeValues.customerResponsibles" class="parentInfos"> + <td> + <span class="fa fa-user"></span> + {{customerResponsible.firstName}} {{customerResponsible.lastName}}</td> + <td> + + </td> + </tr> <tr ng-repeat="customerResponsible in selectedMailFolder.customerResponsibles"> <td> <span class="fa fa-user"></span> @@ -420,6 +428,14 @@ </tr> </thead> <tbody> + <tr ng-repeat="replyAddress in parentScopeValues.replyAddresses" class="parentInfos"> + <td> + <span class="glyphicon glyphicon-user"></span> + {{replyAddress}}</td> + <td> + + </td> + </tr> <tr ng-repeat="replyAddress in selectedMailFolder.replyAddresses track by $index"> <td> <span class="glyphicon glyphicon-user"></span> @@ -458,6 +474,14 @@ </tr> </thead> <tbody> + <tr ng-repeat="replyDomain in parentScopeValues.replyDomains" class="parentInfos"> + <td> + <span class="glyphicon glyphicon-globe"></span> + {{replyDomain}}</td> + <td> + + </td> + </tr> <tr ng-repeat="replyDomain in selectedMailFolder.replyDomains track by $index"> <td> <span class="glyphicon glyphicon-globe"></span> @@ -595,7 +619,7 @@ </tr> </thead> <tbody> - <tr ng-repeat="user in parentScopeValues.parentsWriteRightUsers" class="parentInfos"> + <tr ng-repeat="user in parentScopeValues.writeRightUsers" class="parentInfos"> <td> <span class="fa fa-user"></span> {{user.firstName}} {{user.lastName}} </td> @@ -605,7 +629,7 @@ <label><input type="checkbox" disabled> Déplacement</label> </td> </tr> - <tr ng-repeat="group in parentScopeValues.parentsWriteRightGroups" class="parentInfos"> + <tr ng-repeat="group in parentScopeValues.writeRightGroups" class="parentInfos"> <td> <span class="fa fa-users"></span> {{group.fullPath}} </td> Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-09 17:16:45 UTC (rev 163) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-09 17:25:26 UTC (rev 164) @@ -341,18 +341,24 @@ $scope.selectedMailFolder.allowMoveDemandIntoFolder = $scope.selectedMailFolder.allowMoveDemandIntoFolder || false; $scope.selectedMailFolder.openAttachmentReportNoTaken = $scope.selectedMailFolder.openAttachmentReportNoTaken || false; $scope.selectedMailFolder.printActionEqualTakeAction = $scope.selectedMailFolder.printActionEqualTakeAction || false; - $scope.selectedMailFolder.refuseMail = $scope.selectedMailFolder.refuseMail || false; $scope.selectedMailFolder.rejectUnknownSender = $scope.selectedMailFolder.rejectUnknownSender || false; } // initilaisation des valeurs du parent $scope.parentScopeValues = { - parentsReadRightUsers: [], - parentsReadRightGroups: [], - parentsWriteRightUsers: [], - parentsWriteRightGroups: [], - parentsMoveRightUsers: [], - parentsMoveRightGroups: [] + customerResponsibles: [], + replyAddresses: [], + replyDomains: [], + folderActions: [], + folderTableColumns: [], + etatAttente: [], + //rigths + readRightUsers: [], + readRightGroups: [], + writeRightUsers: [], + writeRightGroups: [], + moveRightUsers: [], + moveRightGroups: [] }; updateParentScopeValues($scope.selectedMailFolder.$parent); } @@ -373,36 +379,58 @@ if (angular.isUndefined($scope.parentScopeValues.printActionEqualTakeAction)) { $scope.parentScopeValues.printActionEqualTakeAction = folder.printActionEqualTakeAction; } - if (angular.isUndefined($scope.parentScopeValues.refuseMail)) { - $scope.parentScopeValues.refuseMail = folder.refuseMail; - } if (angular.isUndefined($scope.parentScopeValues.rejectUnknownSender)) { $scope.parentScopeValues.rejectUnknownSender = folder.rejectUnknownSender; } + if ($scope.parentScopeValues.faxDomain) { + $scope.parentScopeValues.faxDomain = folder.faxDomain; + } + if ($scope.parentScopeValues.ediFolder) { + $scope.parentScopeValues.ediFolder = folder.ediFolder; + } + if ($scope.parentScopeValues.folderActions) { + $scope.parentScopeValues.folderActions = folder.folderActions; + } + if ($scope.parentScopeValues.folderTableColumns) { + $scope.parentScopeValues.folderTableColumns = folder.folderTableColumns; + } + if ($scope.parentScopeValues.etatAttente) { + $scope.parentScopeValues.etatAttente = folder.etatAttente; + } // move to parent first to keed parent order for collection if (folder.$parent) { updateParentScopeValues(folder.$parent); }; + // parents values + if (folder.customerResponsibles) { + $scope.parentScopeValues.customerResponsibles = $scope.parentScopeValues.customerResponsibles.concat(folder.customerResponsibles); + } + if (folder.replyAddresses) { + $scope.parentScopeValues.replyAddresses = $scope.parentScopeValues.replyAddresses.concat(folder.replyAddresses); + } + if (folder.replyDomains) { + $scope.parentScopeValues.replyDomains = $scope.parentScopeValues.replyDomains.concat(folder.replyDomains); + } // manage rigths if (folder.readRightUsers) { - $scope.parentScopeValues.parentsWriteRightUsers = $scope.parentScopeValues.parentsReadRightUsers.concat(folder.readRightUsers); + $scope.parentScopeValues.readRightUsers = $scope.parentScopeValues.readRightUsers.concat(folder.readRightUsers); } if (folder.readRightGroups) { - $scope.parentScopeValues.parentsWriteRightGroups = $scope.parentScopeValues.parentsReadRightGroups.concat(folder.readRightGroups); + $scope.parentScopeValues.readRightGroups = $scope.parentScopeValues.readRightGroups.concat(folder.readRightGroups); } if (folder.writeRightUsers) { - $scope.parentScopeValues.parentsWriteRightUsers = $scope.parentScopeValues.parentsWriteRightUsers.concat(folder.writeRightUsers); + $scope.parentScopeValues.writeRightUsers = $scope.parentScopeValues.writeRightUsers.concat(folder.writeRightUsers); } if (folder.writeRightGroups) { - $scope.parentScopeValues.parentsWriteRightGroups = $scope.parentScopeValues.parentsWriteRightGroups.concat(folder.writeRightGroups); + $scope.parentScopeValues.writeRightGroups = $scope.parentScopeValues.writeRightGroups.concat(folder.writeRightGroups); } if (folder.moveRightUsers) { - $scope.parentScopeValues.parentsMoveRightUsers = $scope.parentScopeValues.parentsMoveRightUsers.concat(folder.moveRightUsers); + $scope.parentScopeValues.moveRightUsers = $scope.parentScopeValues.moveRightUsers.concat(folder.moveRightUsers); } if (folder.moveRightGroups) { - $scope.parentScopeValues.parentsMoveRightGroups = $scope.parentScopeValues.parentsMoveRightGroups.concat(folder.moveRightGroups); + $scope.parentScopeValues.moveRightGroups = $scope.parentScopeValues.moveRightGroups.concat(folder.moveRightGroups); } } };

1 0

r163 - trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service
by kmorin＠users.forge.codelutin.com 09 Jun '14

09 Jun '14

Author: kmorin Date: 2014-06-09 19:16:45 +0200 (Mon, 09 Jun 2014) New Revision: 163 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/163 Log: champs obligatoires en fonction du type de document Modified: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestData.java Modified: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestData.java =================================================================== --- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestData.java 2014-06-09 17:14:06 UTC (rev 162) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestData.java 2014-06-09 17:16:45 UTC (rev 163) @@ -35,6 +35,7 @@ import java.util.List; import java.util.Map; +import com.franciaflex.faxtomail.persistence.entities.MailField; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -239,7 +240,7 @@ getEmailService().addToHistory(email.getTopiaId(), HistoryType.OPENING, user, now); DemandType demandType = types.get(0); - if (demandType.getRangeNeeded()) { + if (demandType.containsFields(MailField.RANGE_ROW)) { for (int j = 0; j < 4; j++) { RangeRow rangeRow = rangeRowDao.create(RangeRow.PROPERTY_RANGE, ranges.get(j), RangeRow.PROPERTY_COMMAND_NUMBER, RandomStringUtils.randomNumeric(6), RangeRow.PROPERTY_PRODUCT_QUANTITY, @@ -272,7 +273,7 @@ if (opened) { getEmailService().addToHistory(email.getTopiaId(), HistoryType.OPENING, user, now); DemandType demandType = types.get(0); - if (demandType.getRangeNeeded()) { + if (demandType.containsFields(MailField.RANGE_ROW)) { for (int j = 0; j < 4; j++) { RangeRow rangeRow = rangeRowDao.create(RangeRow.PROPERTY_RANGE, ranges.get(j), RangeRow.PROPERTY_COMMAND_NUMBER, RandomStringUtils.randomNumeric(6), RangeRow.PROPERTY_PRODUCT_QUANTITY,

1 0

r162 - in trunk: faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util
by kmorin＠users.forge.codelutin.com 09 Jun '14

09 Jun '14

Author: kmorin Date: 2014-06-09 19:14:06 +0200 (Mon, 09 Jun 2014) New Revision: 162 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/162 Log: champs obligatoires en fonction du type de document Added: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIModel.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.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/DemandeUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java trunk/faxtomail-ui-swing/src/main/resources/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel-error-validation.xml trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-06-09 17:07:41 UTC (rev 161) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-06-09 17:14:06 UTC (rev 162) @@ -46,6 +46,7 @@ import javax.activation.FileDataSource; import javax.mail.MessagingException; +import com.franciaflex.faxtomail.persistence.entities.MailField; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.Predicate; import org.apache.commons.io.IOUtils; @@ -217,7 +218,7 @@ && email.getClient() != null && email.getDemandType() != null && StringUtils.isNotBlank(email.getProjectReference()) - && (!email.getDemandType().isRangeNeeded() || CollectionUtils.isNotEmpty(email.getRangeRow()))) { + && (!email.getDemandType().containsFields(MailField.RANGE_ROW) || CollectionUtils.isNotEmpty(email.getRangeRow()))) { email.setDemandStatus(DemandStatus.TRANSMITTED_TO_EDI); transmissionToEdi = historyDao.create(History.PROPERTY_TYPE, HistoryType.TRANSMISSION_TO_EDI, Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java 2014-06-09 17:07:41 UTC (rev 161) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java 2014-06-09 17:14:06 UTC (rev 162) @@ -38,6 +38,7 @@ import java.util.Map; import java.util.Random; +import com.franciaflex.faxtomail.persistence.entities.MailField; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -407,7 +408,7 @@ getEmailService().addToHistory(email.getTopiaId(), HistoryType.OPENING, user, now); DemandType demandType = types.get(random.nextInt(types.size())); - if (demandType.getRangeNeeded()) { + if (demandType.containsFields(MailField.RANGE_ROW)) { for (int j = 0; j < random.nextInt(4) + 1; j++) { RangeRow rangeRow = rangeRowDao.create(RangeRow.PROPERTY_RANGE, ranges.get(random.nextInt(ranges.size())), RangeRow.PROPERTY_COMMAND_NUMBER, RandomStringUtils.randomNumeric(6), @@ -453,7 +454,7 @@ if (opened) { getEmailService().addToHistory(email.getTopiaId(), HistoryType.OPENING, user, now); DemandType demandType = types.get(random.nextInt(types.size())); - if (demandType.getRangeNeeded()) { + if (demandType.containsFields(MailField.RANGE_ROW)) { for (int j = 0; j < random.nextInt(4) + 1; j++) { RangeRow rangeRow = rangeRowDao.create(RangeRow.PROPERTY_RANGE, ranges.get(random.nextInt(ranges.size())), RangeRow.PROPERTY_COMMAND_NUMBER, RandomStringUtils.randomNumeric(6), Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css 2014-06-09 17:07:41 UTC (rev 161) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css 2014-06-09 17:14:06 UTC (rev 162) @@ -116,6 +116,10 @@ focusPainted: false; } +#status { + showClock: false; + showMemoryStatus: false; +} /* #showHelp { actionIcon:"show-help"; 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-09 17:07:41 UTC (rev 161) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-06-09 17:14:06 UTC (rev 162) @@ -26,6 +26,8 @@ import com.ezware.oxbow.swingbits.table.filter.ITableFilter; import com.ezware.oxbow.swingbits.table.filter.JTableFilter; import com.ezware.oxbow.swingbits.table.filter.TableRowFilterSupport; +import com.franciaflex.faxtomail.persistence.entities.Attachment; +import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; @@ -418,8 +420,17 @@ } public void print() { - //TODO - log.debug("print"); + //TODO kmorin 20140606 print a result page and maybe a page to separate the demands + List<DemandeUIModel> currentEmails = getModel().getCurrentEmails(); + for (DemandeUIModel demandeUIModel : currentEmails) { + for (Attachment attachment : demandeUIModel.getAttachment()) { + AttachmentFile attachmentFile = attachment.getEditedFile(); + if (attachmentFile == null) { + attachmentFile = attachment.getOriginalFile(); + } + FaxToMailUIUtil.print(attachmentFile, true); + } + } } public void reply() { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.jaxx 2014-06-09 17:07:41 UTC (rev 161) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.jaxx 2014-06-09 17:14:06 UTC (rev 162) @@ -72,6 +72,10 @@ <field name='demandType' component='docTypeComboBox'/> <field name='projectReference' component='projectReferenceField'/> <field name='validRangeRowModels' component='rangePanel'/> + <field name="priority" component="priorityComboBox"/> + <field name="etatAttente" component="etatAttenteComboBox"/> + <field name="companyReference" component="companyReferenceField"/> + <field name="comment" component="commentPane"/> </BeanValidator> <JToolBar id='topToolBar'> Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 2014-06-09 17:07:41 UTC (rev 161) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 2014-06-09 17:14:06 UTC (rev 162) @@ -28,6 +28,7 @@ import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.EtatAttente; import com.franciaflex.faxtomail.persistence.entities.HistoryType; +import com.franciaflex.faxtomail.persistence.entities.MailField; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.persistence.entities.Range; import com.franciaflex.faxtomail.persistence.entities.RangeRow; @@ -115,10 +116,11 @@ DemandType oldType = (DemandType) evt.getOldValue(); if (newType != null && (oldType == null - || !Objects.equals(oldType.getRangeNeeded(), newType.getRangeNeeded()))) { + || !Objects.equals(oldType.containsFields(MailField.RANGE_ROW), + newType.containsFields(MailField.RANGE_ROW)))) { JSplitPane leftVerticalSplitPanel = getUI().getLeftVerticalSplitPanel(); - if (Boolean.TRUE.equals(newType.getRangeNeeded())) { + if (Boolean.TRUE.equals(newType.containsFields(MailField.RANGE_ROW))) { if (dividerLocation < 0) { dividerLocation = leftVerticalSplitPanel.getLeftComponent().getPreferredSize().height + 10; } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-06-09 17:07:41 UTC (rev 161) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-06-09 17:14:06 UTC (rev 162) @@ -34,6 +34,7 @@ import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.History; import com.franciaflex.faxtomail.persistence.entities.HistoryType; +import com.franciaflex.faxtomail.persistence.entities.MailField; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.persistence.entities.Priority; import com.franciaflex.faxtomail.persistence.entities.RangeRow; @@ -44,6 +45,7 @@ import com.google.common.base.Predicate; import com.google.common.collect.Collections2; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.Charsets; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; @@ -410,7 +412,7 @@ public boolean isRangePanelVisible() { DemandType demandType = getDemandType(); - return demandType != null && demandType.isRangeNeeded(); + return demandType != null && demandType.containsFields(MailField.RANGE_ROW); } public DemandStatus getDemandStatus() { @@ -860,6 +862,45 @@ firePropertyChanged(PROPERTY_VALID_RANGE_ROW_MODELS, oldValue, validRangeRowModels); } + public boolean isValid(String field) { + boolean result = getDemandType() == null; + if (!result) { + if (PROPERTY_CLIENT_CODE.equals(field)) { + result = !getDemandType().containsFields(MailField.CLIENT) + || StringUtils.isNotBlank(getClientCode()); + + } else if (PROPERTY_VALID_RANGE_ROW_MODELS.equals(field)) { + result = !getDemandType().containsFields(MailField.RANGE_ROW) + || CollectionUtils.isNotEmpty(getValidRangeRowModels()); + + } else if (Email.PROPERTY_PROJECT_REFERENCE.equals(field)) { + result = !getDemandType().containsFields(MailField.PROJECT_REFERENCE) + || StringUtils.isNotBlank(getProjectReference()); + + } else if (Email.PROPERTY_OBJECT.equals(field)) { + result = !getDemandType().containsFields(MailField.OBJECT) + || StringUtils.isNotBlank(getObject()); + + } else if (Email.PROPERTY_COMMENT.equals(field)) { + result = !getDemandType().containsFields(MailField.COMMENT) + || StringUtils.isNotBlank(getComment()); + + } else if (Email.PROPERTY_COMPANY_REFERENCE.equals(field)) { + result = !getDemandType().containsFields(MailField.COMPANY_REFERENCE) + || StringUtils.isNotBlank(getCompanyReference()); + + } else if (Email.PROPERTY_PRIORITY.equals(field)) { + result = !getDemandType().containsFields(MailField.PRIORITY) + || getPriority() != null; + + } else if (Email.PROPERTY_ETAT_ATTENTE.equals(field)) { + result = !getDemandType().containsFields(MailField.ETAT_ATTENTE) + || getEtatAttente() != null; + } + } + return result; + } + @Override protected Email newEntity() { return new EmailImpl(); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 2014-06-09 17:07:41 UTC (rev 161) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 2014-06-09 17:14:06 UTC (rev 162) @@ -543,6 +543,6 @@ } public void print() { - FaxToMailUIUtil.print(getModel().getEditedFile()); + FaxToMailUIUtil.print(getModel().getEditedFile(), false); } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUI.css 2014-06-09 17:07:41 UTC (rev 161) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUI.css 2014-06-09 17:14:06 UTC (rev 162) @@ -36,6 +36,5 @@ actionIcon: validate; text: "faxtomail.chooseAttachmentToPrint.action.validate"; toolTipText: "faxtomail.chooseAttachmentToPrint.action.validate.tip"; - //_applicationAction: {com.franciaflex.faxtomail.ui.swing.actions.TransmitAction.class}; - enabled: { model.getMailFolder() != null }; + enabled: { !model.getAttachmentsToPrint().isEmpty() }; } \ No newline at end of file Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUI.jaxx 2014-06-09 17:07:41 UTC (rev 161) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUI.jaxx 2014-06-09 17:14:06 UTC (rev 162) @@ -22,7 +22,7 @@ #L% --> <JPanel id='attachmentToPrintChooser' layout='{new BorderLayout()}' - implements='com.franciaflex.faxtomail.ui.swing.util.FaxToMailUI<com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel, AttachmentToPrintChooserUIHandler>'> + implements='com.franciaflex.faxtomail.ui.swing.util.FaxToMailUI<AttachmentToPrintChooserUIModel, AttachmentToPrintChooserUIHandler>'> <import> com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel @@ -36,14 +36,16 @@ <script><![CDATA[ - public AttachmentToPrintChooserUI(FaxToMailUI parentUI, DemandeUIModel model) { + public AttachmentToPrintChooserUI(FaxToMailUI parentUI, DemandeUIModel demande) { FaxToMailUIUtil.setParentUI(this, parentUI); + AttachmentToPrintChooserUIModel model = new AttachmentToPrintChooserUIModel(); + model.setDemand(demande); setContextValue(model); } ]]></script> - <DemandeUIModel id='model' javaBean='getContextValue(DemandeUIModel.class)'/> + <AttachmentToPrintChooserUIModel id='model' javaBean='getContextValue(AttachmentToPrintChooserUIModel.class)'/> <JLabel id="message" constraints='BorderLayout.NORTH'/> @@ -54,7 +56,7 @@ <JPanel layout='{ new GridLayout(1, 0) }' constraints='BorderLayout.SOUTH'> <JButton id='cancelButton' onActionPerformed='handler.cancel()'/> - <JButton id='validateButton'/> + <JButton id='validateButton' onActionPerformed="handler.print()"/> </JPanel> </JPanel> \ No newline at end of file Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java 2014-06-09 17:07:41 UTC (rev 161) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java 2014-06-09 17:14:06 UTC (rev 162) @@ -24,30 +24,31 @@ * #L% */ -import static org.nuiton.i18n.I18n.t; - -import java.sql.Blob; - -import javax.swing.JCheckBox; -import javax.swing.JComponent; -import javax.swing.JPanel; - -import jaxx.runtime.validator.swing.SwingValidator; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import com.franciaflex.faxtomail.persistence.entities.Attachment; import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailUIHandler; import com.franciaflex.faxtomail.ui.swing.util.Cancelable; +import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; +import jaxx.runtime.validator.swing.SwingValidator; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import javax.swing.*; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.util.ArrayList; +import java.util.List; + +import static org.nuiton.i18n.I18n.t; + /** * @author Kevin Morin (Code Lutin) * @since x.x */ -public class AttachmentToPrintChooserUIHandler extends AbstractFaxToMailUIHandler<DemandeUIModel, AttachmentToPrintChooserUI> +public class AttachmentToPrintChooserUIHandler extends AbstractFaxToMailUIHandler<AttachmentToPrintChooserUIModel, AttachmentToPrintChooserUI> implements Cancelable { private static final Log log = LogFactory.getLog(AttachmentToPrintChooserUIHandler.class); @@ -56,30 +57,47 @@ public void afterInit(AttachmentToPrintChooserUI attachmentToPrintChooserUI) { initUI(attachmentToPrintChooserUI); - DemandeUIModel model = getModel(); + AttachmentToPrintChooserUIModel model = getModel(); + DemandeUIModel demand = model.getDemand(); JPanel attachmentPanel = ui.getAttachmentPanel(); JCheckBox checkBox = new JCheckBox(t("faxtomail.chooseMailFolder.element"), false); attachmentPanel.add(checkBox); - for (Attachment attachment : model.getAttachment()) { - checkBox = new JCheckBox(attachment.getOriginalFile().getFilename(), true); - attachmentPanel.add(checkBox); + for (Attachment attachment : demand.getAttachment()) { + createCheckBox(attachment.getOriginalFile()); - AttachmentFile file = attachment.getEditedFile(); + final AttachmentFile file = attachment.getEditedFile(); if (file != null) { - checkBox = new JCheckBox(file.getFilename(), true); - attachmentPanel.add(checkBox); + createCheckBox(file); } } } + protected void createCheckBox(final AttachmentFile attachmentFile) { + JCheckBox checkBox = new JCheckBox(attachmentFile.getFilename(), true); + ui.getAttachmentPanel().add(checkBox); + getModel().addAttachmentToPrint(attachmentFile); + + checkBox.addItemListener(new ItemListener() { + @Override + public void itemStateChanged(ItemEvent e) { + log.info("state changed " + e.getStateChange()); + if (e.getStateChange() == ItemEvent.SELECTED) { + getModel().addAttachmentToPrint(attachmentFile); + } else { + getModel().removeAttachmentToPrint(attachmentFile); + } + } + }); + } + @Override public void onCloseUI() { } @Override - public SwingValidator<DemandeUIModel> getValidator() { + public SwingValidator<AttachmentToPrintChooserUIModel> getValidator() { return null; } @@ -93,4 +111,9 @@ return ui.getAttachmentPanel(); } + public void print() { + for (AttachmentFile attachmentFile : getModel().getAttachmentsToPrint()) { + FaxToMailUIUtil.print(attachmentFile, true); + } + } } Added: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIModel.java (rev 0) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIModel.java 2014-06-09 17:14:06 UTC (rev 162) @@ -0,0 +1,59 @@ +package com.franciaflex.faxtomail.ui.swing.content.print; + +import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; +import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jdesktop.beans.AbstractBean; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +/** + * @author Kevin Morin (Code Lutin) + * @since x.x + */ +public class AttachmentToPrintChooserUIModel extends AbstractBean { + + private static final Log log = LogFactory.getLog(AttachmentToPrintChooserUIModel.class); + + public static final String PROPERTY_ATTACHEMENTS_TO_PRINT = "attachmentsToPrint"; + + protected DemandeUIModel demand; + + protected Collection<AttachmentFile> attachmentsToPrint = new HashSet<AttachmentFile>(); + + public DemandeUIModel getDemand() { + return demand; + } + + public void setDemand(DemandeUIModel demand) { + this.demand = demand; + } + + public Collection<AttachmentFile> getAttachmentsToPrint() { + return attachmentsToPrint; + } + + public void setAttachmentsToPrint(Collection<AttachmentFile> attachmentsToPrint) { + Object oldValue = new HashSet<AttachmentFile>(this.attachmentsToPrint); + this.attachmentsToPrint.clear(); + this.attachmentsToPrint.addAll(attachmentsToPrint); + firePropertyChange(PROPERTY_ATTACHEMENTS_TO_PRINT, oldValue, this.attachmentsToPrint); + } + + public void addAttachmentToPrint(AttachmentFile attachmentFile) { + Object oldValue = new HashSet<AttachmentFile>(this.attachmentsToPrint); + this.attachmentsToPrint.add(attachmentFile); + firePropertyChange(PROPERTY_ATTACHEMENTS_TO_PRINT, oldValue, this.attachmentsToPrint); + } + + public void removeAttachmentToPrint(AttachmentFile attachmentFile) { + Object oldValue = new HashSet<AttachmentFile>(this.attachmentsToPrint); + this.attachmentsToPrint.remove(attachmentFile); + firePropertyChange(PROPERTY_ATTACHEMENTS_TO_PRINT, oldValue, this.attachmentsToPrint); + } +} Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-06-09 17:07:41 UTC (rev 161) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-06-09 17:14:06 UTC (rev 162) @@ -32,20 +32,23 @@ import jaxx.runtime.JAXXObject; import jaxx.runtime.JAXXUtil; -import org.apache.commons.collections4.ComparatorUtils; -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.application.ApplicationBusinessException; import org.nuiton.jaxx.application.ApplicationTechnicalException; import org.nuiton.jaxx.application.swing.util.ApplicationUIUtil; import org.nuiton.util.FileUtil; -import javax.activation.DataHandler; -import javax.activation.DataSource; -import javax.mail.BodyPart; -import javax.mail.Part; -import javax.mail.internet.MimeMultipart; +import javax.print.Doc; +import javax.print.DocFlavor; +import javax.print.DocPrintJob; +import javax.print.PrintException; +import javax.print.PrintService; +import javax.print.PrintServiceLookup; +import javax.print.ServiceUI; +import javax.print.SimpleDoc; +import javax.print.attribute.HashPrintRequestAttributeSet; +import javax.print.attribute.PrintRequestAttributeSet; import javax.swing.*; import javax.swing.event.HyperlinkEvent; import javax.swing.event.HyperlinkListener; @@ -57,9 +60,8 @@ import javax.swing.tree.TreePath; import java.awt.*; -import java.io.File; -import java.io.FileOutputStream; -import java.net.URI; +import java.io.FileInputStream; +import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -255,19 +257,62 @@ return desktop; } - public static void print(AttachmentFile attachmentFile) { + public static void print(AttachmentFile attachmentFile, boolean defaultPrinter) { - Desktop desktop = getDesktopForPrint(); - File file = attachmentFile.getFile(); - try { - desktop.print(file); + FileInputStream textStream = new FileInputStream(attachmentFile.getFile()); - } catch (Exception e) { + DocFlavor flavor = DocFlavor.INPUT_STREAM.AUTOSENSE; + Doc mydoc = new SimpleDoc(textStream, flavor, null); + PrintRequestAttributeSet aset = new HashPrintRequestAttributeSet(); + + PrintService[] services = PrintServiceLookup.lookupPrintServices(flavor, aset); + PrintService defaultService = PrintServiceLookup.lookupDefaultPrintService(); + + if (defaultPrinter) { + DocPrintJob job; + + if (defaultService == null) { + if (services.length == 0) { + throw new ApplicationBusinessException(t("jaxx.application.error.noPrinter")); + } + job = services[0].createPrintJob(); + + } else { + job = defaultService.createPrintJob(); + } + job.print(mydoc, aset); + + } else { + + if (services.length == 0) { + if(defaultService == null) { + throw new ApplicationBusinessException(t("jaxx.application.error.noPrinter")); + + } else { + services = new PrintService[] { + defaultService + }; + } + } + + //built in UI for printing you may not use this + PrintService service = ServiceUI.printDialog(null, 200, 200, services, defaultService, flavor, aset); + + System.out.print("service " + service); + if (service != null) { + DocPrintJob job = service.createPrintJob(); + job.print(mydoc, aset); + } + } + + } catch (PrintException | IOException e) { + throw new ApplicationTechnicalException( t("jaxx.application.error.cannot.print"), e); } + } public static String getEditedFileName(AttachmentFile originalFile) { Modified: trunk/faxtomail-ui-swing/src/main/resources/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel-error-validation.xml =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel-error-validation.xml 2014-06-09 17:07:41 UTC (rev 161) +++ trunk/faxtomail-ui-swing/src/main/resources/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel-error-validation.xml 2014-06-09 17:14:06 UTC (rev 162) @@ -30,35 +30,82 @@ <validators> -  -  -  -  -  + <field name="demandType"> + <field-validator type="required" short-circuit="true"> + <message>faxtomail.validator.error.email.demandType.required</message> + </field-validator> + </field> <field name="clientCode"> - <field-validator type="requiredstring" short-circuit="true"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ isValid("clientCode") ]]> + </param> <message>faxtomail.validator.error.email.clientCode.required</message> </field-validator> </field> - <field name="demandType"> - <field-validator type="required" short-circuit="true"> - <message>faxtomail.validator.error.email.demandType.required</message> + <field name="projectReference"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ isValid("projectReference") ]]> + </param> + <message>faxtomail.validator.error.email.projectReference.required</message> </field-validator> </field> - <field name="projectReference"> - <field-validator type="requiredstring" short-circuit="true"> - <message>faxtomail.validator.error.email.projectReference.required</message> + <field name="object"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ isValid("object") ]]> + </param> + <message>faxtomail.validator.error.email.object.required</message> </field-validator> </field> <field name="validRangeRowModels"> <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"><![CDATA[ !isRangePanelVisible() || validRangeRowModels != null && !validRangeRowModels.isEmpty() ]]></param> + <param name="expression"> + <![CDATA[ isValid("validRangeRowModels") ]]> + </param> <message>faxtomail.validator.error.email.rangeRow.required</message> </field-validator> </field> + <field name="priority"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ isValid("priority") ]]> + </param> + <message>faxtomail.validator.error.email.priority.required</message> + </field-validator> + </field> + + <field name="etatAttente"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ isValid("etatAttente") ]]> + </param> + <message>faxtomail.validator.error.email.etatAttente.required</message> + </field-validator> + </field> + + <field name="comment"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ isValid("comment") ]]> + </param> + <message>faxtomail.validator.error.email.comment.required</message> + </field-validator> + </field> + + <field name="companyReference"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ isValid("companyReference") ]]> + </param> + <message>faxtomail.validator.error.email.companyReference.required</message> + </field-validator> + </field> + </validators> Modified: trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-06-09 17:07:41 UTC (rev 161) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-06-09 17:14:06 UTC (rev 162) @@ -276,8 +276,12 @@ faxtomail.searchToGroup.title=Recherche de l'élément avec lequel grouper l'élément %s faxtomail.systemUser=Système faxtomail.validator.error.email.clientCode.required=Code client requis +faxtomail.validator.error.email.comment.required= +faxtomail.validator.error.email.companyReference.required= faxtomail.validator.error.email.demandType.required=Type de demande requis +faxtomail.validator.error.email.etatAttente.required= faxtomail.validator.error.email.object.required=Objet requis +faxtomail.validator.error.email.priority.required= faxtomail.validator.error.email.projectReference.required=Référence chantier requise faxtomail.validator.error.email.rangeRow.required=Tableau des gammes requis faxtomail.validator.error.reply.from.required= @@ -285,6 +289,7 @@ jaxx.application.error.cannot.print= jaxx.application.error.desktop.not.supported= jaxx.application.error.desktop.print.not.supported= +jaxx.application.error.noPrinter= swing.error.cannot.copy.file= swing.error.cannot.open.file= test=

1 0

r161 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin faxtomail-ui-web/src/main/webapp/js
by echatellier＠users.forge.codelutin.com 09 Jun '14

09 Jun '14

Author: echatellier Date: 2014-06-09 19:07:41 +0200 (Mon, 09 Jun 2014) New Revision: 161 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/161 Log: Suppression des ?\195?\169tats d'attente Added: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EtatAttenteTopiaDao.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js Added: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EtatAttenteTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EtatAttenteTopiaDao.java (rev 0) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EtatAttenteTopiaDao.java 2014-06-09 17:07:41 UTC (rev 161) @@ -0,0 +1,46 @@ +package com.franciaflex.faxtomail.persistence.entities; + +/* + * #%L + * FaxToMail :: Persistence + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2014 Franciaflex + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class EtatAttenteTopiaDao extends AbstractEtatAttenteTopiaDao<EtatAttente> { + + public Map<String, Long> getEtatAttenteCountByFolder() { + String query = "SELECT etatAttente.topiaId, count(*) FROM " + Email.class.getName() + " group by etatAttente.topiaId"; + + Map<String, Long> result = new HashMap<>(); + + List<Object[]> queryResuts = findAll(query); + for (Object[] queryResut : queryResuts) { + String etatAttente = (String)queryResut[0]; + Long count = (Long)queryResut[1]; + result.put(etatAttente, count); + } + return result; + } +} //EtatAttenteTopiaDao Property changes on: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EtatAttenteTopiaDao.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java 2014-06-09 16:41:07 UTC (rev 160) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java 2014-06-09 17:07:41 UTC (rev 161) @@ -49,6 +49,7 @@ import com.franciaflex.faxtomail.persistence.entities.DemandTypeTopiaDao; import com.franciaflex.faxtomail.persistence.entities.EmailAccount; import com.franciaflex.faxtomail.persistence.entities.EmailAccountTopiaDao; +import com.franciaflex.faxtomail.persistence.entities.EmailTopiaDao; import com.franciaflex.faxtomail.persistence.entities.EtatAttente; import com.franciaflex.faxtomail.persistence.entities.EtatAttenteImpl; import com.franciaflex.faxtomail.persistence.entities.EtatAttenteTopiaDao; @@ -97,6 +98,12 @@ return new ArrayList<>(dao.findAll()); } + public Map<String, Long> getEtatAttentesUsage() { + EtatAttenteTopiaDao dao = getPersistenceContext().getEtatAttenteDao(); + Map<String, Long> result = dao.getEtatAttenteCountByFolder(); + return result; + } + public void saveEtatAttente(Collection<EtatAttente> etatAttentes) { Binder<EtatAttente, EtatAttente> binderEtatAttente = BinderFactory.newBinder(EtatAttente.class); @@ -126,6 +133,9 @@ etatAttenteDAO.create(currentEtatAttente); } } + + // delete remaining + etatAttenteDAO.deleteAll(allEtatAttenteIndex.values()); getPersistenceContext().commit(); } Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java 2014-06-09 16:41:07 UTC (rev 160) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java 2014-06-09 17:07:41 UTC (rev 161) @@ -77,6 +77,8 @@ protected List<EtatAttente> etatAttentes; + protected Map<String, Long> etatAttentesUsage; + protected List<DemandType> demandTypes; protected List<MailFolder> mailFolders; @@ -100,6 +102,7 @@ @Action("configuration-input") public String input() throws Exception { etatAttentes = referentielService.getAllEtatAttente(); + etatAttentesUsage = referentielService.getEtatAttentesUsage(); demandTypes = referentielService.getAllDemandType(); mailFolders = mailFolderService.getRootMailFolders(); mailFoldersUsage = mailFolderService.getMailFoldersUsage(); @@ -155,6 +158,10 @@ this.etatAttentes = getGson().fromJson(json, type); } + public Map<String, Long> getEtatAttentesUsage() { + return etatAttentesUsage; + } + public List<DemandType> getDemandTypes() { return demandTypes; } Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-09 16:41:07 UTC (rev 160) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-09 17:07:41 UTC (rev 161) @@ -42,6 +42,7 @@ // datas 'configuration': <s:property value="toJson(configuration)" escapeHtml="false"/>, 'etatAttentes': <s:property value="toJson(etatAttentes)" escapeHtml="false"/>, + 'etatAttentesUsage': <s:property value="toJson(etatAttentesUsage)" escapeHtml="false"/>, 'demandTypes': <s:property value="toJson(demandTypes)" escapeHtml="false"/>, 'mailFolders': <s:property value="toJson(mailFolders)" escapeHtml="false"/>, 'mailFoldersUsage': <s:property value="toJson(mailFoldersUsage)" escapeHtml="false"/>, @@ -140,7 +141,13 @@ <tr ng-repeat="etatAttente in etatAttentes" ng-class="{'info' : etatAttente == selectedEtatAttente}" ng-click="editEtatAttente(etatAttente)"> - <td>{{etatAttente.label}}</td> + <td>{{etatAttente.label}} + + <a class="pull-right btn btn-danger btn-xs" data-nodrag ng-click="deleteEtatAttente($index)" + ng-disabled="etatAttentesUsage[etatAttente.topiaId] > 0" + tooltip="{{etatAttentesUsage[etatAttente.topiaId] > 0 && 'Cet état d\'attente est utilisé et ne peut pas être supprimé'|| 'Supprimer cet état d\'attente'}}"> + <span class="glyphicon glyphicon-remove"></span></a> + </td> </tr> </tbody> </table> Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-09 16:41:07 UTC (rev 160) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-09 17:07:41 UTC (rev 161) @@ -124,7 +124,8 @@ */ ConfigurationModule.controller('ConfigurationEtatAttenteController', ['$scope', '$window', 'ConfigurationData', function($scope, $window, ConfigurationData) { - + //{Map} Usage des états d'attente + $scope.etatAttentesUsage = ConfigurationData.etatAttentesUsage; //{Object} etat d'attente selectionné $scope.selectedEtatAttente; @@ -157,6 +158,13 @@ } }; + // suppression d'un etat d'attente non utilisé + $scope.deleteEtatAttente = function(index) { + if ($window.confirm("Êtes-vous sûr de vouloir supprimer cet état d'attente ?")) { + $scope.etatAttentes.splice(index, 1); + } + }; + // selection/deselection d'une action $scope.changeEtatAttenteValidAction = function(action) { var index = $scope.selectedEtatAttente.validFormDisabledActions.indexOf(action);

1 0

r160 - in trunk: faxtomail-persistence/src/main/xmi faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service
by echatellier＠users.forge.codelutin.com 09 Jun '14

09 Jun '14

Author: echatellier Date: 2014-06-09 18:41:07 +0200 (Mon, 09 Jun 2014) New Revision: 160 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/160 Log: Remove rangeRowNeeded. Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo =================================================================== (Binary files differ) Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java 2014-06-09 16:20:09 UTC (rev 159) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java 2014-06-09 16:41:07 UTC (rev 160) @@ -142,15 +142,15 @@ if (count == 0) { List<DemandType> types = Lists.newArrayList( - demandTypeDao.create(DemandType.PROPERTY_LABEL, "Commande", DemandType.PROPERTY_RANGE_NEEDED, true), - demandTypeDao.create(DemandType.PROPERTY_LABEL, "Commande Réponse", DemandType.PROPERTY_RANGE_NEEDED, false), - demandTypeDao.create(DemandType.PROPERTY_LABEL, "Commande Annulation/Modification", DemandType.PROPERTY_RANGE_NEEDED, false), - demandTypeDao.create(DemandType.PROPERTY_LABEL, "Devis Diffus", DemandType.PROPERTY_RANGE_NEEDED, true), - demandTypeDao.create(DemandType.PROPERTY_LABEL, "Devis Chantier", DemandType.PROPERTY_RANGE_NEEDED, true), - demandTypeDao.create(DemandType.PROPERTY_LABEL, "Devis Gros Chantier", DemandType.PROPERTY_RANGE_NEEDED, true), - demandTypeDao.create(DemandType.PROPERTY_LABEL, "Devis Réponse/Modification", DemandType.PROPERTY_RANGE_NEEDED, false), - demandTypeDao.create(DemandType.PROPERTY_LABEL, "Réclamation", DemandType.PROPERTY_RANGE_NEEDED, false), - demandTypeDao.create(DemandType.PROPERTY_LABEL, "Autres", DemandType.PROPERTY_RANGE_NEEDED, false) + demandTypeDao.create(DemandType.PROPERTY_LABEL, "Commande"), + demandTypeDao.create(DemandType.PROPERTY_LABEL, "Commande Réponse"), + demandTypeDao.create(DemandType.PROPERTY_LABEL, "Commande Annulation/Modification"), + demandTypeDao.create(DemandType.PROPERTY_LABEL, "Devis Diffus"), + demandTypeDao.create(DemandType.PROPERTY_LABEL, "Devis Chantier"), + demandTypeDao.create(DemandType.PROPERTY_LABEL, "Devis Gros Chantier"), + demandTypeDao.create(DemandType.PROPERTY_LABEL, "Devis Réponse/Modification"), + demandTypeDao.create(DemandType.PROPERTY_LABEL, "Réclamation"), + demandTypeDao.create(DemandType.PROPERTY_LABEL, "Autres") ); EtatAttenteTopiaDao etatAttenteDao = getPersistenceContext().getEtatAttenteDao();

1 0

r159 - in trunk: faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-web/src/main/webapp/js
by echatellier＠users.forge.codelutin.com 09 Jun '14

09 Jun '14

Author: echatellier Date: 2014-06-09 18:20:09 +0200 (Mon, 09 Jun 2014) New Revision: 159 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/159 Log: Verification qu'un charg?\195?\169 de clientelle n'est pas d?\195?\169j?\195?\160 responsable d'un autre dossier Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java 2014-06-09 16:11:24 UTC (rev 158) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java 2014-06-09 16:20:09 UTC (rev 159) @@ -196,9 +196,9 @@ FaxToMailUserGroupTopiaDao userGroupDao = getPersistenceContext().getFaxToMailUserGroupDao(); userGroupDao.create(FaxToMailUserGroup.PROPERTY_NAME, "Chargés de clientèle", FaxToMailUserGroup.PROPERTY_FULL_PATH, "Franciaflex/Chargés de clientèle"); - FaxToMailUserGroup commerciaux = userGroupDao.create(FaxToMailUserGroup.PROPERTY_NAME, "Commerciaux", + FaxToMailUserGroup commerciauxGroup = userGroupDao.create(FaxToMailUserGroup.PROPERTY_NAME, "Commerciaux", FaxToMailUserGroup.PROPERTY_FULL_PATH, "Franciaflex/Commerciaux"); - userGroupDao.create(FaxToMailUserGroup.PROPERTY_NAME, "SAV", + FaxToMailUserGroup savGroup = userGroupDao.create(FaxToMailUserGroup.PROPERTY_NAME, "SAV", FaxToMailUserGroup.PROPERTY_FULL_PATH, "Franciaflex/SAV"); userGroupDao.create(FaxToMailUserGroup.PROPERTY_NAME, "Administrateurs", FaxToMailUserGroup.PROPERTY_FULL_PATH, "Franciaflex/Administrateurs"); @@ -208,7 +208,7 @@ FaxToMailUser.PROPERTY_FIRST_NAME, "Marc", FaxToMailUser.PROPERTY_LOGIN, "mlefebvre", FaxToMailUser.PROPERTY_TRIGRAPH, "MLE", - FaxToMailUser.PROPERTY_USER_GROUPS, Collections.singletonList(commerciaux)); + FaxToMailUser.PROPERTY_USER_GROUPS, Collections.singletonList(commerciauxGroup)); FaxToMailUser cyril = userDao.create(FaxToMailUser.PROPERTY_LAST_NAME, "Baillet", FaxToMailUser.PROPERTY_FIRST_NAME, "Cyril", FaxToMailUser.PROPERTY_LOGIN, "cbaillet", @@ -217,7 +217,7 @@ FaxToMailUser.PROPERTY_FIRST_NAME, "Frédéric", FaxToMailUser.PROPERTY_LOGIN, "fviala", FaxToMailUser.PROPERTY_TRIGRAPH, "FVI", - FaxToMailUser.PROPERTY_USER_GROUPS, Collections.singletonList(commerciaux)); + FaxToMailUser.PROPERTY_USER_GROUPS, Collections.singletonList(commerciauxGroup)); FaxToMailUser claire = userDao.create(FaxToMailUser.PROPERTY_LAST_NAME, "Marquis", FaxToMailUser.PROPERTY_FIRST_NAME, "Claire", FaxToMailUser.PROPERTY_LOGIN, "cmarquis", @@ -225,12 +225,13 @@ FaxToMailUser agathe = userDao.create(FaxToMailUser.PROPERTY_LAST_NAME, "Borde", FaxToMailUser.PROPERTY_FIRST_NAME, "Agathe", FaxToMailUser.PROPERTY_LOGIN, "aborde", - FaxToMailUser.PROPERTY_TRIGRAPH, "ABO"); + FaxToMailUser.PROPERTY_TRIGRAPH, "ABO", + FaxToMailUser.PROPERTY_USER_GROUPS, Collections.singletonList(savGroup)); FaxToMailUser jeanne = userDao.create(FaxToMailUser.PROPERTY_LAST_NAME, "Bourgoin", FaxToMailUser.PROPERTY_FIRST_NAME, "Jeanne", FaxToMailUser.PROPERTY_LOGIN, "jbourgoin", FaxToMailUser.PROPERTY_TRIGRAPH, "JBO", - FaxToMailUser.PROPERTY_USER_GROUPS, Collections.singletonList(commerciaux)); + FaxToMailUser.PROPERTY_USER_GROUPS, Collections.singletonList(commerciauxGroup)); MailFolderTopiaDao folderDao = getPersistenceContext().getMailFolderDao(); Map<String, MailFolder> folders = new HashMap<>(); Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java 2014-06-09 16:11:24 UTC (rev 158) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java 2014-06-09 16:20:09 UTC (rev 159) @@ -230,7 +230,7 @@ FaxToMailUser result = null; FaxToMailUserTopiaDao faxtomailUserDao = getPersistenceContext().getFaxToMailUserDao(); - FaxToMailUser user = faxtomailUserDao.findByTopiaId(userTopiaId); + FaxToMailUser user = faxtomailUserDao.forTopiaIdEquals(userTopiaId).findUniqueOrNull(); if (user != null) { Binder<FaxToMailUser, FaxToMailUser> faxToMailUserBinder = BinderFactory.newBinder(FaxToMailUser.class); result = new FaxToMailUserImpl(); Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-09 16:11:24 UTC (rev 158) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-09 16:20:09 UTC (rev 159) @@ -421,10 +421,45 @@ result(resultArray); }; + // recursive find folder where user is already responsible + var checkUserResponsible = function(folders, user) { + var result; + angular.forEach(folders, function(folder) { + if (folder.customerResponsibles) { + angular.forEach(folder.customerResponsibles, function(responsible) { + if (responsible.topiaId == user.topiaId) { + result = folder; + } + }); + } + if (!result && folder.children) { + result = checkUserResponsible(folder.children, user); + } + }); + return result; + }; + // add customer responsible $scope.addCustomerResponsible = function() { - $scope.selectedMailFolder.customerResponsibles.push($scope.newCustomerResponsible); - delete $scope.newCustomerResponsible; + + // check it user is already responsible of another folder + var otherFolder = checkUserResponsible($scope.mailFolders, $scope.newCustomerResponsible); + if (angular.isDefined(otherFolder)) { + if ($window.confirm("Cet utilisateur est déjà reponsable du dossier '" + otherFolder.$fullPath + + "'. Voulez-vous continuer et changer son dossier de responsabilité ?")) { + + // remove from previous + var index = otherFolder.customerResponsibles.indexOf($scope.newCustomerResponsible); + otherFolder.customerResponsibles.splice(index, 1); + + // add to current + $scope.selectedMailFolder.customerResponsibles.push($scope.newCustomerResponsible); + delete $scope.newCustomerResponsible; + } + } else { + $scope.selectedMailFolder.customerResponsibles.push($scope.newCustomerResponsible); + delete $scope.newCustomerResponsible; + } }; // remove customer responsible

1 0

r158 - trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities
by echatellier＠users.forge.codelutin.com 09 Jun '14

09 Jun '14

Author: echatellier Date: 2014-06-09 18:11:24 +0200 (Mon, 09 Jun 2014) New Revision: 158 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/158 Log: Remove save action. Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailAction.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailAction.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailAction.java 2014-06-09 15:52:02 UTC (rev 157) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailAction.java 2014-06-09 16:11:24 UTC (rev 158) @@ -30,7 +30,6 @@ */ public enum MailAction { - SAVE, TRANSMIT, PRINT, ARCHIVE,

1 0

r157 - in trunk/faxtomail-ui-web/src/main/webapp: WEB-INF/content/admin css
by echatellier＠users.forge.codelutin.com 09 Jun '14

09 Jun '14

Author: echatellier Date: 2014-06-09 17:52:02 +0200 (Mon, 09 Jun 2014) New Revision: 157 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/157 Log: Add required field Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-input.jsp trunk/faxtomail-ui-web/src/main/webapp/css/faxtomail.css Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-09 15:26:32 UTC (rev 156) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-09 15:52:02 UTC (rev 157) @@ -834,10 +834,13 @@ <h3>Édition du chef de groupe</h3> <div class="form-inline"> - <div class="form-group"> + <div class="form-group required"> <label for="groupChefUserGroupField" class="control-label">Chef du groupe : </label> - <select id="groupChefUserGroupField" class="form-control" ng-model="selectedGroupChef.userGroup" - ng-options="group as group.fullPath for group in groups"></select> + <select id="groupChefUserGroupField" class="form-control" ng-required="selectedGroupChef" + ng-model="selectedGroupChef.userGroup" + ng-options="group as group.fullPath for group in groups"> + <option value="" ng-if="!selectedGroupChef.userGroup"></option> + </select> </div> </div> Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-input.jsp 2014-06-09 15:26:32 UTC (rev 156) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-input.jsp 2014-06-09 15:52:02 UTC (rev 157) @@ -38,7 +38,7 @@ <s:form id="main_form" action="import" method="post" enctype="multipart/form-data"> - <div class="form-group form-inline"> + <div class="form-group"> <label for="clientField" class="control-label">Fichier client :</label> <input type="file" id="clientField" name="clientFile" class="form-control"> <p class="help-block">Format du fichier csv : <code>Id_Correspondance;Societe;Nom;Caracteristique1;Caracteristique2;Caracteristique3;Client_Top;Numero_Fax;Adresse_Mail;Code_Client;Objet_Message;Destination</code></p> Modified: trunk/faxtomail-ui-web/src/main/webapp/css/faxtomail.css =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/css/faxtomail.css 2014-06-09 15:26:32 UTC (rev 156) +++ trunk/faxtomail-ui-web/src/main/webapp/css/faxtomail.css 2014-06-09 15:52:02 UTC (rev 157) @@ -70,4 +70,9 @@ .ui-sortable { cursor:move; -} \ No newline at end of file +} + +.form-group.required .control-label:after { + content:"*"; + color:red; +}

1 0

r156 - in trunk: faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin
by echatellier＠users.forge.codelutin.com 09 Jun '14

09 Jun '14

Author: echatellier Date: 2014-06-09 17:26:32 +0200 (Mon, 09 Jun 2014) New Revision: 156 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/156 Log: Affichage des utilsateurs suivant la configuration des chefs de groupe Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/UserFolderAction.java trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-06-09 14:52:18 UTC (rev 155) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-06-09 15:26:32 UTC (rev 156) @@ -24,6 +24,7 @@ * #L% */ +import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.List; @@ -46,6 +47,8 @@ import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserGroup; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserGroupTopiaDao; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserTopiaDao; +import com.franciaflex.faxtomail.persistence.entities.GroupChef; +import com.franciaflex.faxtomail.persistence.entities.GroupChefTopiaDao; import com.franciaflex.faxtomail.persistence.entities.MailFilter; import com.franciaflex.faxtomail.persistence.entities.MailFilterTopiaDao; import com.franciaflex.faxtomail.persistence.entities.MailFolder; @@ -205,7 +208,6 @@ public void saveUserFolders(Map<String, Collection<MailFolder>> userFolders) { log.warn("user folders = " + userFolders); - //MailFolderTopiaDao mailFolderTopiaDao = getPersistenceContext().getMailFolderDao(); FaxToMailUserTopiaDao faxToMailUserTopiaDao = getPersistenceContext().getFaxToMailUserDao(); for (Map.Entry<String, Collection<MailFolder>> entry : userFolders.entrySet()) { @@ -227,4 +229,41 @@ FaxToMailUserGroupTopiaDao faxToMailUserGroupDao = getPersistenceContext().getFaxToMailUserGroupDao(); return faxToMailUserGroupDao.forAll().setOrderByArguments(FaxToMailUserGroup.PROPERTY_FULL_PATH).findAll(); } + + /** + * Retourne l'ensemble des utilisateurs appartenant aux groupes gérés par les groupes chef. + * + * @param user current user + * @return all managed users + */ + public List<FaxToMailUser> getUserManagedUsers(FaxToMailUser user) { + + List<FaxToMailUser> result = new ArrayList<>(); + + // s'il n'y a pas de group, il ne peut pas y avoir de droits + if (user.getUserGroups() != null) { + + // recuperation de tout les groupes chef dont l'utilsateur est membre + GroupChefTopiaDao groupChefTopiaDao = getPersistenceContext().getGroupChefDao(); + List<GroupChef> groupChefs = groupChefTopiaDao.forUserGroupIn(user.getUserGroups()).findAll(); + + // recuperation de tous les users des groups gérés + FaxToMailUserTopiaDao faxToMailUserTopiaDao = getPersistenceContext().getFaxToMailUserDao(); + for (GroupChef groupChef : groupChefs) { + // groups + if (groupChef.getManagedGroups() != null) { + for (FaxToMailUserGroup group : groupChef.getManagedGroups()) { + List<FaxToMailUser> users = faxToMailUserTopiaDao.forUserGroupsContains(group).findAll(); + result.addAll(users); + } + } + // users + if (groupChef.getManagedUsers() != null) { + result.addAll(groupChef.getManagedUsers()); + } + } + } + + return result; + } } Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/UserFolderAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/UserFolderAction.java 2014-06-09 14:52:18 UTC (rev 155) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/UserFolderAction.java 2014-06-09 15:26:32 UTC (rev 156) @@ -26,9 +26,11 @@ import java.lang.reflect.Type; import java.util.Collection; +import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.convention.annotation.Action; @@ -37,7 +39,6 @@ import org.apache.struts2.convention.annotation.Result; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; -import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserGroup; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.services.service.ConfigurationService; import com.franciaflex.faxtomail.services.service.MailFolderService; @@ -60,8 +61,6 @@ protected List<FaxToMailUser> users; - protected List<FaxToMailUserGroup> groups; - protected Map<String, Collection<MailFolder>> userFolders; public void setConfigurationService(ConfigurationService configurationService) { @@ -76,8 +75,13 @@ @Action("user-folder-input") public String input() throws Exception { mailFolders = mailFolderService.getAllMailFolders(); - users = configurationService.getAllUsers(); - groups = configurationService.getAllGroups(); + users = configurationService.getUserManagedUsers(getSession().getAuthenticatedFaxToMailUser()); + + // build display map + userFolders = new HashMap<>(); + for (FaxToMailUser user : users) { + userFolders.put(user.getTopiaId(), CollectionUtils.emptyIfNull(user.getAffectedFolders())); + } return INPUT; } @@ -97,10 +101,6 @@ return users; } - public List<FaxToMailUserGroup> getGroups() { - return groups; - } - public Map<String, Collection<MailFolder>> getUserFolders() { return userFolders; } Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp 2014-06-09 14:52:18 UTC (rev 155) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp 2014-06-09 15:26:32 UTC (rev 156) @@ -36,10 +36,16 @@ UserFolderModule.value('UserFolderData', { 'mailFolders': <s:property value="toJson(mailFolders)" escapeHtml="false"/>, 'users': <s:property value="toJson(users)" escapeHtml="false"/>, - 'groups': <s:property value="toJson(groups)" escapeHtml="false"/>, 'userFolders': <s:property value="toJson(userFolders)" escapeHtml="false"/> }); </script> + +  </head> <body> @@ -51,11 +57,8 @@ <s:form id="main_form" action="user-folder" method="post" ng-controller="UserFolderController"> <s:hidden name="userFoldersJson" value="{{userFolders}}" /> - <div class="form-group"> - <label>Groupe : - <select ng-model="selectedGroup" ng-options="group as group.fullPath for group in groups"></select> - </label> - </div> + Voici la liste des utilisateurs dont vous avez la gestion car vous faites partit d'un groupe + capable de gérer les utilisateurs suivants : <table id='table-snapshot' class="table table-bordered"> <thead> @@ -73,6 +76,9 @@ </div> </td> </tr> + <tr ng-if="!users || users.length == 0"> + <td class="emptyTable" colspan="2">Aucun utilisateur trouvé</td> + </tr> </tbody> </table>

1 0

r155 - trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin
by echatellier＠users.forge.codelutin.com 09 Jun '14

09 Jun '14

Author: echatellier Date: 2014-06-09 16:52:18 +0200 (Mon, 09 Jun 2014) New Revision: 155 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/155 Log: Ajout d'un bouton valider par type d'import Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-input.jsp Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-input.jsp 2014-06-09 14:45:04 UTC (rev 154) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-input.jsp 2014-06-09 14:52:18 UTC (rev 155) @@ -38,41 +38,45 @@ <s:form id="main_form" action="import" method="post" enctype="multipart/form-data"> - <div class="form-group"> - <label for="clientField">Fichier client</label> - <input type="file" id="clientField" name="clientFile"> + <div class="form-group form-inline"> + <label for="clientField" class="control-label">Fichier client :</label> + <input type="file" id="clientField" name="clientFile" class="form-control"> <p class="help-block">Format du fichier csv : <code>Id_Correspondance;Societe;Nom;Caracteristique1;Caracteristique2;Caracteristique3;Client_Top;Numero_Fax;Adresse_Mail;Code_Client;Objet_Message;Destination</code></p> </div> - + <button type="submit" class="btn btn-primary navbar-btn">Valider</button> + <hr /> + <div class="form-group"> - <label for="etatAttenteField">Fichier état d'attente</label> - <input type="file" id="etatAttenteField" name="etatAttenteFile"> + <label for="etatAttenteField" class="control-label">Fichier état d'attente :</label> + <input type="file" id="etatAttenteField" name="etatAttenteFile" class="form-control"> <p class="help-block">Format du fichier csv : <code>etatattente</code></p> </div> - + <button type="submit" class="btn btn-primary navbar-btn">Valider</button> + <hr /> + <div class="form-group"> - <label for="demandTypeField">Fichier types de demande</label> - <input type="file" id="demandTypeField" name="demandTypeFile"> + <label for="demandTypeField" class="control-label">Fichier types de demande :</label> + <input type="file" id="demandTypeField" name="demandTypeFile" class="form-control"> <p class="help-block">Format du fichier csv : <code>demandetype</code></p> </div> - + <button type="submit" class="btn btn-primary navbar-btn">Valider</button> + <hr /> + <div class="form-group"> - <label for="rangeField">Fichier gamme</label> - <input type="file" id="rangeField" name="rangeFile"> + <label for="rangeField" class="control-label">Fichier gamme :</label> + <input type="file" id="rangeField" name="rangeFile" class="form-control"> <p class="help-block">Format du fichier csv : <code>gamme</code></p> </div> - + <button type="submit" class="btn btn-primary navbar-btn">Valider</button> + <hr /> + <div class="form-group"> - <label for="priorityField">Fichier priorite</label> - <input type="file" id="priorityField" name="priorityFile"> + <label for="priorityField" class="control-label">Fichier priorite :</label> + <input type="file" id="priorityField" name="priorityFile" class="form-control"> <p class="help-block">Format du fichier csv : <code>priorite</code></p> </div> - - <nav class="navbar navbar-default navbar-fixed-bottom"> - <div class="container"> - <button type="submit" class="btn btn-primary navbar-btn pull-right">Valider</button> - </div> - </nav> + <button type="submit" class="btn btn-primary navbar-btn">Valider</button> + </s:form> </div> </body>

1 0