- Chorem-commits - mailman.cloud.codelutin.com

r276 - trunk/chorem-webmotion/src/main/webapp/WEB-INF
by echatellier＠users.chorem.org 08 Nov '12

08 Nov '12

Author: echatellier Date: 2012-11-08 11:59:01 +0100 (Thu, 08 Nov 2012) New Revision: 276 Url: http://chorem.org/repositories/revision/chorem/276 Log: Fix bug with ;jsessionid present in url Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/web.xml Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/web.xml 2012-10-30 07:45:28 UTC (rev 275) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/web.xml 2012-11-08 10:59:01 UTC (rev 276) @@ -4,7 +4,7 @@ $Id:$ $HeadURL:$ %% - Copyright (C) 2011 - 2012 CodeLutin + Copyright (C) 2011 - 2012 CodeLutin, Chatellier Eric %% 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 @@ -24,4 +24,10 @@ xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee - http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" /> + http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"> + +  + <session-config> + <tracking-mode>COOKIE</tracking-mode> + </session-config> +</web-app>

1 0

r275 - trunk
by tchemit＠users.chorem.org 30 Oct '12

30 Oct '12

Author: tchemit Date: 2012-10-30 08:45:28 +0100 (Tue, 30 Oct 2012) New Revision: 275 Url: http://chorem.org/repositories/revision/chorem/275 Log: Update mavenpom4redmine to 3.4.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-26 11:45:02 UTC (rev 274) +++ trunk/pom.xml 2012-10-30 07:45:28 UTC (rev 275) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.2</version> + <version>3.4.3</version> </parent> <groupId>org.chorem</groupId>

1 0

r274 - trunk
by tchemit＠users.chorem.org 26 Oct '12

26 Oct '12

Author: tchemit Date: 2012-10-26 13:45:02 +0200 (Fri, 26 Oct 2012) New Revision: 274 Url: http://chorem.org/repositories/revision/chorem/274 Log: Update mavenpom4redmine to 3.4.2. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-17 13:26:35 UTC (rev 273) +++ trunk/pom.xml 2012-10-26 11:45:02 UTC (rev 274) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4</version> + <version>3.4.2</version> </parent> <groupId>org.chorem</groupId>

1 0

r273 - in trunk/chorem-webmotion/src/main: java/org/chorem/webmotion/actions webapp/WEB-INF/jsp
by mble＠users.chorem.org 17 Oct '12

17 Oct '12

Author: mble Date: 2012-10-17 15:26:35 +0200 (Wed, 17 Oct 2012) New Revision: 273 Url: http://chorem.org/repositories/revision/chorem/273 Log: added Invoice.execptedDate< in dashboardSummary.jsp line 44 and static final public String solRDateFormat in DashboardAction.java Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 2012-10-17 13:22:20 UTC (rev 272) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 2012-10-17 13:26:35 UTC (rev 273) @@ -82,6 +82,7 @@ static final public String budgetDateFormat = "MM/yyyy"; static final public String summaryDateFormat = "dd/MM/yyyy hh:mm"; + static final public String solRDateFormat = "yyyy-MM-dd'T'hh:mm:ss'Z'"; protected <E> Map<String, List<Attachment>> prepareAttachment(ChoremClient client, Collection<E> ids) { // recherche des attachments de chaque quotation trouvee @@ -294,7 +295,7 @@ return renderView("dashboardSummary.jsp", "date", now, - "now", DateFormatUtils.format(now, summaryDateFormat), + "now", DateFormatUtils.format(now, solRDateFormat), "inOneWeek", DateFormatUtils.format(inOneWeek, summaryDateFormat), "invoiceDebtNb", invoiceDebtNb, "invoiceDebt", invoiceDebt, Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp 2012-10-17 13:22:20 UTC (rev 272) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp 2012-10-17 13:26:35 UTC (rev 273) @@ -41,7 +41,7 @@ factures à payer</a> pour un montant de <f:formatNumber type="currency" value="${invoiceDebt}"/></li> <li>Il y a ${invoiceIncomeNb} - <a href='<c:url value="/report?report=invoiceIncome&end=${now}&query=Invoice.paymentDate=null"/>'> + <a href='<c:url value="/report?report=invoiceIncome&query=Invoice.paymentDate=null Invoice.expectedDate<${now}"/>'> factures impayées</a> pour un montant de <f:formatNumber type="currency" value="${invoiceIncome}"/></li> <li>Il y a ${touchNb} <a href='<c:url value="/wikitty/search?query=${touchQueryString}"/>'>

1 0

r272 - trunk/chorem-webmotion
by jcouteau＠users.chorem.org 17 Oct '12

17 Oct '12

Author: jcouteau Date: 2012-10-17 15:22:20 +0200 (Wed, 17 Oct 2012) New Revision: 272 Url: http://chorem.org/repositories/revision/chorem/272 Log: Test commit Modified: trunk/chorem-webmotion/pom.xml Modified: trunk/chorem-webmotion/pom.xml =================================================================== --- trunk/chorem-webmotion/pom.xml 2012-10-11 02:52:13 UTC (rev 271) +++ trunk/chorem-webmotion/pom.xml 2012-10-17 13:22:20 UTC (rev 272) @@ -273,4 +273,5 @@ </build> + </project>

1 0

r271 - trunk
by tchemit＠users.chorem.org 11 Oct '12

11 Oct '12

Author: tchemit Date: 2012-10-11 04:52:13 +0200 (Thu, 11 Oct 2012) New Revision: 271 Url: http://chorem.org/repositories/revision/chorem/271 Log: updates to mavenpom 3.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-09-15 12:39:27 UTC (rev 270) +++ trunk/pom.xml 2012-10-11 02:52:13 UTC (rev 271) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.6</version> + <version>3.4</version> </parent> <groupId>org.chorem</groupId>

1 0

r270 - in trunk: chorem-entities/src/main/java/org/chorem chorem-webmotion/src/main/java/org/chorem/webmotion/actions
by bpoussin＠users.chorem.org 15 Sep '12

15 Sep '12

Author: bpoussin Date: 2012-09-15 14:39:27 +0200 (Sat, 15 Sep 2012) New Revision: 270 Url: http://chorem.org/repositories/revision/chorem/270 Log: refactoring pour eviter de faire a des endroits different les memes choses sur les requetes Added: trunk/chorem-entities/src/main/java/org/chorem/ChoremQueryHelper.java trunk/chorem-entities/src/main/java/org/chorem/ChoremQueryMaker.java Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java 2012-09-15 12:38:47 UTC (rev 269) +++ trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java 2012-09-15 12:39:27 UTC (rev 270) @@ -253,7 +253,7 @@ } /** - * Retourne la comparny par defaut pour l'utilisateur loggue, si par d'utilisateur + * Retourne la company par defaut pour l'utilisateur loggue, si pas d'utilisateur * alors on prend la company defini dans la configuration general. S'il n'y * a aucune company, on en cree une nouvelle (non stocke) pour que tout * fonctionne bien. Cette company n'existant pas reellement les recherches Added: trunk/chorem-entities/src/main/java/org/chorem/ChoremQueryHelper.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/ChoremQueryHelper.java (rev 0) +++ trunk/chorem-entities/src/main/java/org/chorem/ChoremQueryHelper.java 2012-09-15 12:39:27 UTC (rev 270) @@ -0,0 +1,48 @@ +package org.chorem; + + +import java.util.Collection; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.wikitty.entities.ElementField; +import org.nuiton.wikitty.entities.WikittyExtension; +import org.nuiton.wikitty.query.WikittyQuery; + +/** + * Classe contenant des methodes permettant d'ajouter des elements a une Query. + * Ceci permet de centraliser les modification de query et de les faire evoluer + * pour toutes les requetes facilement. + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class ChoremQueryHelper { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(ChoremQueryHelper.class); + + /** + * Ajoute les tries comme declarer sur les extensions passer en parametre. + * Si extensions est vide ou null, alors on ajoute les tries de toutes les + * extensions connues + * + * @param client + * @param query + * @param extensions les noms des extensions sur lequel il faut faire les tries + * @return query qui etait en parametre + */ + static public WikittyQuery addSort(ChoremClient client, WikittyQuery query, String ... extensions) { + // on essai de trier les resultats au mieux tout en ne faisant qu'un requete + Collection<WikittyExtension> exts = client.restoreExtensionLastVersion(extensions); + for (WikittyExtension ext : exts) { + query.addSortAscending(ext.getSortAscending().toArray(new ElementField[0])); + query.addSortDescending(ext.getSortDescending().toArray(new ElementField[0])); + } + + return query; + } + +} Added: trunk/chorem-entities/src/main/java/org/chorem/ChoremQueryMaker.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/ChoremQueryMaker.java (rev 0) +++ trunk/chorem-entities/src/main/java/org/chorem/ChoremQueryMaker.java 2012-09-15 12:39:27 UTC (rev 270) @@ -0,0 +1,64 @@ +package org.chorem; + + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.entities.Employee; +import org.nuiton.wikitty.query.WikittyQuery; +import org.nuiton.wikitty.query.WikittyQueryMakerAbstract; + +/** + * Extension de WikittyQueryMaker pour ajouter de nouvelle methode qui permette + * de centraliser l'ajout de contrainte que l'on fait dans plusieurs requetes. + * Cet objet peut-etre utiliser directement a la place de WikittyQueryMaker. + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class ChoremQueryMaker extends WikittyQueryMakerAbstract<ChoremQueryMaker> { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(ChoremQueryMaker.class); + + public ChoremQueryMaker() { + super(); + } + + public ChoremQueryMaker(WikittyQuery query) { + super(query); + } + + @Override + protected ChoremQueryMaker asM() { + return this; + } + + /** + * Ajoute une contrainte qui filtre sur une company ou un employer de cette + * company + * + * @param client permet de rechercher l'id de la company par defaut pour l'utilisateur courant + * @return maker qui etait en argument + */ + public ChoremQueryMaker filterOnCompanyOrEmployee(ChoremClient client) { + String companyId = client.getDefaultCompany().getWikittyId(); + filterOnCompanyOrEmployee(companyId); + return this; + } + + /** + * Ajoute une contrainte qui filtre sur une company ou un employer de cette + * company + * + * @param companyId + * @return maker qui etait en argument + */ + public ChoremQueryMaker filterOnCompanyOrEmployee(String companyId) { + this.or().ideq(companyId).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId).close(); + return this; + } + +} Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 2012-09-15 12:38:47 UTC (rev 269) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 2012-09-15 12:39:27 UTC (rev 270) @@ -39,6 +39,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.ChoremClient; +import org.chorem.ChoremQueryHelper; +import org.chorem.ChoremQueryMaker; import org.chorem.entities.Attachment; import org.chorem.entities.Category; import org.chorem.entities.Configuration; @@ -146,23 +148,23 @@ protected WikittyQuery[] getDebtIncomeQuery(Date first, Date last, String companyId) { // toutes les depenses depuis le debut de l'annee - WikittyQuery debtQuery = new WikittyQueryMaker() + WikittyQuery debtQuery = new ChoremQueryMaker() .select(Invoice.FQ_FIELD_INVOICE_AMOUNT, Aggregate.SUM) .and() .exteq(Invoice.EXT_INVOICE) .bw(Invoice.FQ_FIELD_INVOICE_POSTEDDATE, first, last) .containsOne(Invoice.FQ_FIELD_INVOICE_CUSTOMER) - .select(Element.ID).or().ideq(companyId).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId).close() + .select(Element.ID).filterOnCompanyOrEmployee(companyId) .end().setLimit(WikittyQuery.MAX); // toutes les factures emises depuis le debut de l'annee - WikittyQuery incomeQuery = new WikittyQueryMaker() + WikittyQuery incomeQuery = new ChoremQueryMaker() .select(Invoice.FQ_FIELD_INVOICE_AMOUNT, Aggregate.SUM) .and() .exteq(Invoice.EXT_INVOICE) .bw(Invoice.FQ_FIELD_INVOICE_POSTEDDATE, first, last) .containsOne(Invoice.FQ_FIELD_INVOICE_SUPPLIER) - .select(Element.ID).or().ideq(companyId).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId).close() + .select(Element.ID).filterOnCompanyOrEmployee(companyId) .end().setLimit(WikittyQuery.MAX); WikittyQuery[] result = new WikittyQuery[]{ @@ -231,25 +233,25 @@ WikittyQuery[] pastAnnualDebtIncomeQuery = getDebtIncomeQuery(lastYearFirstDay, lastYearNow, companyId); // les factures que notre societe doit payer au plus tard dans 7 jours - WikittyQuery invoiceDebtQuery = new WikittyQueryMaker() + WikittyQuery invoiceDebtQuery = new ChoremQueryMaker() .select(Invoice.FQ_FIELD_INVOICE_AMOUNT, Aggregate.SUM) .and() .exteq(Invoice.EXT_INVOICE) .lt(Invoice.FQ_FIELD_INVOICE_EXPECTEDDATE, inOneWeek) .isNull(Invoice.FQ_FIELD_INVOICE_PAYMENTDATE) .containsOne(Invoice.FQ_FIELD_INVOICE_CUSTOMER) - .select(Element.ID).or().ideq(companyId).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId).close() + .select(Element.ID).filterOnCompanyOrEmployee(companyId) .end().setLimit(WikittyQuery.MAX); // les factures qu'auraient du payer nos clients (ils sont en retard) - WikittyQuery invoiceIncomeQuery = new WikittyQueryMaker() + WikittyQuery invoiceIncomeQuery = new ChoremQueryMaker() .select(Invoice.FQ_FIELD_INVOICE_AMOUNT, Aggregate.SUM) .and() .exteq(Invoice.EXT_INVOICE) .lt(Invoice.FQ_FIELD_INVOICE_EXPECTEDDATE, now) .isNull(Invoice.FQ_FIELD_INVOICE_PAYMENTDATE) .containsOne(Invoice.FQ_FIELD_INVOICE_SUPPLIER) - .select(Element.ID).or().ideq(companyId).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId).close() + .select(Element.ID).filterOnCompanyOrEmployee(companyId) .end().setLimit(WikittyQuery.MAX); // les contacts qui doivnet etre pris dans les 7 prochains jours @@ -584,12 +586,8 @@ .bw(Invoice.FQ_FIELD_INVOICE_PAYMENTDATE, start, end) .end().setLimit(WikittyQuery.MAX); - WikittyExtension ext = client.restoreExtensionLastVersion(Invoice.EXT_INVOICE); + ChoremQueryHelper.addSort(client, invoiceQuery, Invoice.EXT_INVOICE); - invoiceQuery.addSortAscending(ext.getSortAscending().toArray(new ElementField[0])); - invoiceQuery.addSortDescending(ext.getSortDescending().toArray(new ElementField[0])); - - WikittyQueryResult<Invoice> invoices = client.findAllByQuery(Invoice.class, invoiceQuery); @@ -676,42 +674,42 @@ end = DateUtil.setLastDayOfMonth(end); // La somme des factures que la company doit payer jusqu'a la date demandee - WikittyQuery debt = new WikittyQueryMaker() + WikittyQuery debt = new ChoremQueryMaker() .select(Invoice.FQ_FIELD_INVOICE_AMOUNT, Aggregate.SUM) .and() .containsOne(Invoice.FQ_FIELD_INVOICE_CUSTOMER) - .select(Element.ID).or().ideq(companyId).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId).close() + .select(Element.ID).filterOnCompanyOrEmployee(companyId) .close() .lt(Invoice.FQ_FIELD_INVOICE_EXPECTEDDATE, start) .end() .setLimit(WikittyQuery.MAX); // La somme des factures que la company doit percevoir jusqu'a la date demandee - WikittyQuery income = new WikittyQueryMaker() + WikittyQuery income = new ChoremQueryMaker() .select(Invoice.FQ_FIELD_INVOICE_AMOUNT, Aggregate.SUM) .and() .containsOne(Invoice.FQ_FIELD_INVOICE_SUPPLIER) - .select(Element.ID).or().ideq(companyId).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId).close() + .select(Element.ID).filterOnCompanyOrEmployee(companyId) .close() .lt(Invoice.FQ_FIELD_INVOICE_EXPECTEDDATE, start) .end() .setLimit(WikittyQuery.MAX); // La liste des factures entre les deux dates que l'on doit payer - WikittyQuery invoiceDebt = new WikittyQueryMaker().and() + WikittyQuery invoiceDebt = new ChoremQueryMaker().and() .parse(query) .containsOne(Invoice.FQ_FIELD_INVOICE_CUSTOMER) - .select(Element.ID).or().ideq(companyId).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId).close() + .select(Element.ID).filterOnCompanyOrEmployee(companyId) .close() .bw(Invoice.FQ_FIELD_INVOICE_EXPECTEDDATE, start, end) .end() .setLimit(WikittyQuery.MAX); // La liste des factures entre les deux dates que l'on doit payer - WikittyQuery invoiceIncome = new WikittyQueryMaker().and() + WikittyQuery invoiceIncome = new ChoremQueryMaker().and() .parse(query) .containsOne(Invoice.FQ_FIELD_INVOICE_SUPPLIER) - .select(Element.ID).or().ideq(companyId).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId).close() + .select(Element.ID).filterOnCompanyOrEmployee(companyId) .close() .bw(Invoice.FQ_FIELD_INVOICE_EXPECTEDDATE, start, end) .end() Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java 2012-09-15 12:38:47 UTC (rev 269) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java 2012-09-15 12:39:27 UTC (rev 270) @@ -30,6 +30,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import java.util.HashSet; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.LinkedList; @@ -46,6 +47,7 @@ import org.apache.commons.logging.LogFactory; import org.chorem.ChoremClient; import org.chorem.ChoremConfigOption; +import org.chorem.ChoremQueryHelper; import org.debux.webmotion.server.WebMotionController; import org.debux.webmotion.server.call.Call; import org.debux.webmotion.server.call.UploadFile; @@ -187,13 +189,8 @@ } // on essai de trier les resultats au mieux tout en ne faisant qu'un requete - Collection<WikittyExtension> exts = client.restoreExtensionLastVersion(extension); - for (WikittyExtension ext : exts) { - q.addSortAscending(ext.getSortAscending().toArray(new ElementField[0])); - q.addSortDescending(ext.getSortDescending().toArray(new ElementField[0])); - } + ChoremQueryHelper.addSort(client, q, extension); - WikittyQueryResult<Wikitty> results = client.findAllByQuery(Wikitty.class, q); @@ -201,19 +198,24 @@ Map<String, List<Wikitty>> map = new MapWithDefault<String, List<Wikitty>>( new TreeMap<String, List<Wikitty>>(), new LinkedList<Wikitty>()); + + Set<String> exts = null; + if (extension != null && extension.length > 0) { + exts = new HashSet<String>(Arrays.asList(extension)); + } + + Set<String> extExcluded = new HashSet<String>(client.getConfig().getOptionAsList( + ChoremConfigOption.CHOREM_EXTENSION_SEARCH_EXCLUSION.key).getOption()); + for (Wikitty w : results) { for (WikittyExtension ext : w.getExtensions()) { - if (exts.contains(ext)) { + // on ne garde que les extensions demandees et qui ne sont pas exclus sauf si demandee explicitement + if ((exts == null && !extExcluded.contains(ext.getName())) + || (exts != null && exts.contains(ext.getName()))) { map.get(ext.getName()).add(w); } } } - - List<String> extExcluded = client.getConfig().getOptionAsList( - ChoremConfigOption.CHOREM_EXTENSION_SEARCH_EXCLUSION.key).getOption(); - for (String ext : extExcluded) { - map.remove(ext); - } if (extension != null) { for (String ext : extension) {

1 0

r269 - trunk/chorem-entities/src/main/java/org/chorem
by bpoussin＠users.chorem.org 15 Sep '12

15 Sep '12

Author: bpoussin Date: 2012-09-15 14:38:47 +0200 (Sat, 15 Sep 2012) New Revision: 269 Url: http://chorem.org/repositories/revision/chorem/269 Log: les donnes de chorem-topia sont TTC, on les converti en HT Modified: trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java Modified: trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java 2012-09-14 00:02:58 UTC (rev 268) +++ trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java 2012-09-15 12:38:47 UTC (rev 269) @@ -524,6 +524,8 @@ } } else { Double amount = Double.parseDouble(line[BILL_HEADER.value.ordinal()])/100.0; + // on enleve la TVA, sur chorem-topia estelle mettait avec la TVA les factures + amount = amount * 100.0 / 119.6; Date issuedate = parseDate(line[BILL_HEADER.issuedate.ordinal()]); Date hopedate = parseDate(line[BILL_HEADER.hopedate.ordinal()]); Date realdate = parseDate(line[BILL_HEADER.realdate.ordinal()]);

1 0

r268 - in trunk/chorem-webmotion/src/main: java/org/chorem/webmotion/actions webapp/WEB-INF/jsp
by bpoussin＠users.chorem.org 14 Sep '12

14 Sep '12

Author: bpoussin Date: 2012-09-14 02:02:58 +0200 (Fri, 14 Sep 2012) New Revision: 268 Url: http://chorem.org/repositories/revision/chorem/268 Log: ajout d'un dashboard: annual profit Added: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardAnnualProfit.jsp Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/report.jsp Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 2012-09-13 16:55:55 UTC (rev 267) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 2012-09-14 00:02:58 UTC (rev 268) @@ -31,6 +31,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.TreeMap; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateFormatUtils; @@ -143,56 +144,92 @@ // //////////////////////////////////////////////////////////////////////////// - public Render summary(ChoremClient client) { - Date now = new Date(); - Date inOneWeek = DateUtils.addDays(now, 7); - Date firstDayYear = DateUtil.setFirstDayOfYear(now); - Date lastYearNow = DateUtils.addYears(now, -1); - Date lastYearFirstDay = DateUtil.setFirstDayOfYear(lastYearNow); - - String companyId = client.getConfiguration().getDefaultCompany(); - + protected WikittyQuery[] getDebtIncomeQuery(Date first, Date last, String companyId) { // toutes les depenses depuis le debut de l'annee - WikittyQuery annualDebtQuery = new WikittyQueryMaker() + WikittyQuery debtQuery = new WikittyQueryMaker() .select(Invoice.FQ_FIELD_INVOICE_AMOUNT, Aggregate.SUM) .and() .exteq(Invoice.EXT_INVOICE) - .bw(Invoice.FQ_FIELD_INVOICE_POSTEDDATE, firstDayYear, now) + .bw(Invoice.FQ_FIELD_INVOICE_POSTEDDATE, first, last) .containsOne(Invoice.FQ_FIELD_INVOICE_CUSTOMER) .select(Element.ID).or().ideq(companyId).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId).close() .end().setLimit(WikittyQuery.MAX); // toutes les factures emises depuis le debut de l'annee - WikittyQuery annualIncomeQuery = new WikittyQueryMaker() + WikittyQuery incomeQuery = new WikittyQueryMaker() .select(Invoice.FQ_FIELD_INVOICE_AMOUNT, Aggregate.SUM) .and() .exteq(Invoice.EXT_INVOICE) - .bw(Invoice.FQ_FIELD_INVOICE_POSTEDDATE, firstDayYear, now) + .bw(Invoice.FQ_FIELD_INVOICE_POSTEDDATE, first, last) .containsOne(Invoice.FQ_FIELD_INVOICE_SUPPLIER) .select(Element.ID).or().ideq(companyId).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId).close() .end().setLimit(WikittyQuery.MAX); + + WikittyQuery[] result = new WikittyQuery[]{ + debtQuery, incomeQuery + }; + return result; + } - // toutes les depenses depuis le debut de l'annee - WikittyQuery lastYearAnnualDebtQuery = new WikittyQueryMaker() - .select(Invoice.FQ_FIELD_INVOICE_AMOUNT, Aggregate.SUM) - .and() - .exteq(Invoice.EXT_INVOICE) - .bw(Invoice.FQ_FIELD_INVOICE_POSTEDDATE, lastYearFirstDay, lastYearNow) - .containsOne(Invoice.FQ_FIELD_INVOICE_CUSTOMER) - .select(Element.ID).or().ideq(companyId).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId).close() - .end().setLimit(WikittyQuery.MAX); + /** + * Dashbord qui indique pour toutes les annees du systeme le CA et les depenses + * @param client + * @return + */ + public Render annualProfit(ChoremClient client) { + Map<Date, Double[]> result = new TreeMap<Date, Double[]>(); - // toutes les factures emises depuis le debut de l'annee - WikittyQuery lastYearAnnualIncomeQuery = new WikittyQueryMaker() - .select(Invoice.FQ_FIELD_INVOICE_AMOUNT, Aggregate.SUM) - .and() - .exteq(Invoice.EXT_INVOICE) - .bw(Invoice.FQ_FIELD_INVOICE_POSTEDDATE, lastYearFirstDay, lastYearNow) - .containsOne(Invoice.FQ_FIELD_INVOICE_SUPPLIER) - .select(Element.ID).or().ideq(companyId).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId).close() + String companyId = client.getConfiguration().getDefaultCompany(); + + // La premiere annee + WikittyQuery firstDateQuery = new WikittyQueryMaker() + .select(Invoice.FQ_FIELD_INVOICE_POSTEDDATE, Aggregate.MIN) + .exteq(Invoice.EXT_INVOICE) .end().setLimit(WikittyQuery.MAX); + // La derniere annee + WikittyQuery lastDateQuery = new WikittyQueryMaker() + .select(Invoice.FQ_FIELD_INVOICE_POSTEDDATE, Aggregate.MAX) + .exteq(Invoice.EXT_INVOICE) + .end().setLimit(WikittyQuery.MAX); + Date[] dates = client.findByQuery(Date.class, firstDateQuery, lastDateQuery); + Date firstDay = DateUtil.setFirstDayOfYear(dates[0]); + Date lastDay = DateUtil.setLastDayOfYear(dates[1]); + log.debug(String.format("first date: %s last date: %s", dates[0], dates[1])); + + Date currentFirst = firstDay; + Date currentLast = DateUtil.setLastDayOfYear(firstDay); + while (currentLast.compareTo(lastDay) <= 0) { + WikittyQuery[] annualDebtIncomeQuery = + getDebtIncomeQuery(currentFirst, currentLast, companyId); + Double[] values = client.findByQuery(Double.class, + annualDebtIncomeQuery[0], annualDebtIncomeQuery[1]); + result.put(currentFirst, values); + currentFirst = DateUtils.addYears(currentFirst, 1); + currentLast = DateUtils.addYears(currentLast, 1); + } + return renderView("dashboardAnnualProfit.jsp", "annualProfit", result); + } + + /** + * Dashbord pour la page d'accueil + * @param client + * @return + */ + public Render summary(ChoremClient client) { + Date now = new Date(); + Date inOneWeek = DateUtils.addDays(now, 7); + Date firstDayYear = DateUtil.setFirstDayOfYear(now); + Date lastYearNow = DateUtils.addYears(now, -1); + Date lastYearFirstDay = DateUtil.setFirstDayOfYear(lastYearNow); + + String companyId = client.getConfiguration().getDefaultCompany(); + + // toutes les depenses depuis le debut de l'annee + WikittyQuery[] annualDebtIncomeQuery = getDebtIncomeQuery(firstDayYear, now, companyId); + WikittyQuery[] pastAnnualDebtIncomeQuery = getDebtIncomeQuery(lastYearFirstDay, lastYearNow, companyId); + // les factures que notre societe doit payer au plus tard dans 7 jours WikittyQuery invoiceDebtQuery = new WikittyQueryMaker() .select(Invoice.FQ_FIELD_INVOICE_AMOUNT, Aggregate.SUM) @@ -225,8 +262,8 @@ WikittyQueryResult<Double>[] invoices = client.findAllByQuery(Double.class, invoiceDebtQuery, invoiceIncomeQuery, - annualDebtQuery, annualIncomeQuery, - lastYearAnnualDebtQuery, lastYearAnnualIncomeQuery); + annualDebtIncomeQuery[0], annualDebtIncomeQuery[1], + pastAnnualDebtIncomeQuery[0], pastAnnualDebtIncomeQuery[1]); WikittyQueryResult<String> touchs = client.findAllByQuery(touchQuery); Copied: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardAnnualProfit.jsp (from rev 263, trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardWorkingProjectDaysByEmployee.jsp) =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardAnnualProfit.jsp (rev 0) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardAnnualProfit.jsp 2012-09-14 00:02:58 UTC (rev 268) @@ -0,0 +1,46 @@ +<%-- + #%L + Chorem webmotion + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2011 - 2012 CodeLutin + %% + 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 + 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 Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="f" %> + +<h1>Bénéfice ou perte par année</h1> + +<table class="table table-striped table-bordered table-condensed"> + <tr> + <th>Année</th> + <th>CA HT</th> + <th>CA TTC</th> + <th>Dépense</th> + <th>Bénéfice/perte</th> + </tr> + <c:forEach var="q" items="${annualProfit.keySet()}"> + <tr> + <th><f:formatDate pattern="yyyy" value="${q}"/></th> + <td><f:formatNumber type="currency" value="${annualProfit.get(q)[1]}"/></td> + <td><f:formatNumber type="currency" value="${annualProfit.get(q)[1]*1.196}"/></td> + <td><f:formatNumber type="currency" value="${annualProfit.get(q)[0]}"/></td> + <td><f:formatNumber type="currency" value="${annualProfit.get(q)[1]*1.196 - annualProfit.get(q)[0]}"/></td> + </tr> + </c:forEach> +</table> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2012-09-13 16:55:55 UTC (rev 267) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2012-09-14 00:02:58 UTC (rev 268) @@ -152,6 +152,7 @@ <li><a href="<c:url value="/report?report=invoiceIncome"/>">Income</a></li> <li><a href="<c:url value="/report?report=profitability"/>">Profitability</a></li> <li><a href="<c:url value="/report?report=budget"/>">Budget</a></li> + <li><a href="<c:url value="/report?report=annualProfit"/>">Annual profit</a></li> </ul> </li> <li class="dropdown nav-group"> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/report.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/report.jsp 2012-09-13 16:55:55 UTC (rev 267) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/report.jsp 2012-09-14 00:02:58 UTC (rev 268) @@ -55,3 +55,6 @@ <c:if test="${report == null || report == '' || report.contains('budget')}"> <jsp:include page="/fragment/dashboard/budget"/> </c:if> + <c:if test="${report == null || report == '' || report.contains('annualProfit')}"> + <jsp:include page="/fragment/dashboard/annualProfit"/> + </c:if>

1 0

r267 - trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp
by bpoussin＠users.chorem.org 13 Sep '12

13 Sep '12

Author: bpoussin Date: 2012-09-13 18:55:55 +0200 (Thu, 13 Sep 2012) New Revision: 267 Url: http://chorem.org/repositories/revision/chorem/267 Log: si on ne trouve pas de description on utilise le nom Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp 2012-09-13 16:27:19 UTC (rev 266) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp 2012-09-13 16:55:55 UTC (rev 267) @@ -47,7 +47,7 @@ <tr> <td><w:display wikitty="${q.wikitty}" fqfield="Invoiceable.target" label=""/></td> <td><w:display wikitty="${q.wikitty}" toString="%Invoice.reference|no reference$s" label=""/></td> - <td><w:display wikitty="${q.wikitty}" toString="%Invoice.description|no description$s" label=""/></td> + <td><w:display wikitty="${q.wikitty}" toString="%Invoice.description|Invoiceable.name$s" label=""/></td> <td><w:display wikitty="${q.wikitty}" fqfield="Invoice.customer" label=""/></td> <td><w:display wikitty="${q.wikitty}" fqfield="Invoice.supplier" label=""/></td> <td class="currency"><w:display wikitty="${q.wikitty}" fqfield="Invoice.amount" label=""/></td>

1 0