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

r266 - in trunk: chorem-entities/src/main/java/org/chorem chorem-webmotion/src/main/java/org/chorem/webmotion/actions 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:27:19 +0200 (Thu, 13 Sep 2012) New Revision: 266 Url: http://chorem.org/repositories/revision/chorem/266 Log: - prise en compte du supplier/customer qui peuvent etre des companies - CA en TTC car il y a la TVA dans les depenses (19.6 dans la jsp) - import cost chorem-topia, tag aussi dans la description Modified: trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp Modified: trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java 2012-09-13 10:16:43 UTC (rev 265) +++ trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java 2012-09-13 16:27:19 UTC (rev 266) @@ -639,6 +639,7 @@ InvoiceImpl invoice = new InvoiceImpl(); invoice.setName(tag); + invoice.setDescription(tag); invoice.setCategory(categoryNameId.get(category)); invoice.setCustomer(codeLutinId); invoice.setAmount(amount); 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 10:16:43 UTC (rev 265) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 2012-09-13 16:27:19 UTC (rev 266) @@ -57,6 +57,7 @@ import org.nuiton.util.DateUtil; import org.nuiton.wikitty.entities.Element; import org.nuiton.wikitty.entities.ElementField; +import org.nuiton.wikitty.entities.WikittyExtension; import org.nuiton.wikitty.query.WikittyQuery; import org.nuiton.wikitty.query.WikittyQueryMaker; import org.nuiton.wikitty.query.WikittyQueryResult; @@ -169,7 +170,7 @@ .bw(Invoice.FQ_FIELD_INVOICE_POSTEDDATE, firstDayYear, now) .containsOne(Invoice.FQ_FIELD_INVOICE_SUPPLIER) .select(Element.ID).or().ideq(companyId).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId).close() - .end(); + .end().setLimit(WikittyQuery.MAX); // toutes les depenses depuis le debut de l'annee WikittyQuery lastYearAnnualDebtQuery = new WikittyQueryMaker() @@ -189,7 +190,7 @@ .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() - .end(); + .end().setLimit(WikittyQuery.MAX); // les factures que notre societe doit payer au plus tard dans 7 jours @@ -212,7 +213,7 @@ .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() - .end(); + .end().setLimit(WikittyQuery.MAX); // les contacts qui doivnet etre pris dans les 7 prochains jours WikittyQuery touchQuery = new WikittyQueryMaker().and() @@ -315,7 +316,7 @@ .isNull(Interval.FQ_FIELD_INTERVAL_BEGINDATE) .isNull(Interval.FQ_FIELD_INTERVAL_ENDDATE) .isNull(Quotation.FQ_FIELD_QUOTATION_POSTEDDATE) - .end(); + .end().setLimit(WikittyQuery.MAX); WikittyQueryResult<Quotation> result = client.findAllByQuery(Quotation.class, quotationQuery); @@ -544,8 +545,14 @@ .isNull(Invoice.FQ_FIELD_INVOICE_POSTEDDATE) .bw(Invoice.FQ_FIELD_INVOICE_EXPECTEDDATE, start, end) .bw(Invoice.FQ_FIELD_INVOICE_PAYMENTDATE, start, end) - .end(); + .end().setLimit(WikittyQuery.MAX); + WikittyExtension ext = client.restoreExtensionLastVersion(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); @@ -582,7 +589,7 @@ String title = "Factures à payer par la société"; String companyId = client.getConfiguration().getDefaultCompany(); String filter = Invoice.FQ_FIELD_INVOICE_CUSTOMER + "={SELECT id WHERE (" + - Employee.FQ_FIELD_EMPLOYEE_COMPANY + "=" + companyId+" OR " + companyId + ")}"; + Employee.FQ_FIELD_EMPLOYEE_COMPANY + "=" + companyId+" OR id=" + companyId + ")}"; return invoiceFilter(client, title, filter, start, end, query); } @@ -591,7 +598,7 @@ String title = "Factures émises par la société"; String companyId = client.getConfiguration().getDefaultCompany(); String filter = Invoice.FQ_FIELD_INVOICE_SUPPLIER + "={SELECT id WHERE (" + - Employee.FQ_FIELD_EMPLOYEE_COMPANY + "=" + companyId+" OR " + companyId + ")}"; + Employee.FQ_FIELD_EMPLOYEE_COMPANY + "=" + companyId+" OR id=" + companyId + ")}"; return invoiceFilter(client, title, filter, start, end, query); } 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 10:16:43 UTC (rev 265) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp 2012-09-13 16:27:19 UTC (rev 266) @@ -46,8 +46,8 @@ <tbody> <tr> <td><w:display wikitty="${q.wikitty}" fqfield="Invoiceable.target" label=""/></td> - <td><w:display wikitty="${q.wikitty}" toString="%Invoice.reference$s" label=""/></td> - <td><w:display wikitty="${q.wikitty}" fqfield="Invoice.description" 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}" 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> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp 2012-09-13 10:16:43 UTC (rev 265) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp 2012-09-13 16:27:19 UTC (rev 266) @@ -49,9 +49,9 @@ </ul> <ul> - <li>Chiffre d'affaire: <f:formatNumber type="currency" value="${annualIncome}"/> (N-1: <f:formatNumber type="currency" value="${lastYearAnnualIncome}"/>) + <li>Chiffre d'affaire TTC: <f:formatNumber type="currency" value="${annualIncome*1.196}"/> (N-1: <f:formatNumber type="currency" value="${lastYearAnnualIncome*1.196}"/>) <li>Dépenses: <f:formatNumber type="currency" value="${annualDebt}"/> (N-1: <f:formatNumber type="currency" value="${lastYearAnnualDebt}"/>) - <li>Bénéfice/perte: <f:formatNumber type="currency" value="${annualIncome-annualDebt}"/> (N-1: <f:formatNumber type="currency" value="${lastYearAnnualIncome-lastYearAnnualDebt}"/>) + <li>Bénéfice/perte: <f:formatNumber type="currency" value="${annualIncome*1.196-annualDebt}"/> (N-1: <f:formatNumber type="currency" value="${lastYearAnnualIncome*1.196-lastYearAnnualDebt}"/>) </ul> </div> </div>

1 0

r265 - trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions
by bpoussin＠users.chorem.org 13 Sep '12

13 Sep '12

Author: bpoussin Date: 2012-09-13 12:16:43 +0200 (Thu, 13 Sep 2012) New Revision: 265 Url: http://chorem.org/repositories/revision/chorem/265 Log: - reprise du dashboard summary pour prendre en compte les changements sur invoices (supplier/customer) Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 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 10:09:57 UTC (rev 264) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 2012-09-13 10:16:43 UTC (rev 265) @@ -158,7 +158,7 @@ .exteq(Invoice.EXT_INVOICE) .bw(Invoice.FQ_FIELD_INVOICE_POSTEDDATE, firstDayYear, now) .containsOne(Invoice.FQ_FIELD_INVOICE_CUSTOMER) - .select(Element.ID).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId) + .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 @@ -168,7 +168,7 @@ .exteq(Invoice.EXT_INVOICE) .bw(Invoice.FQ_FIELD_INVOICE_POSTEDDATE, firstDayYear, now) .containsOne(Invoice.FQ_FIELD_INVOICE_SUPPLIER) - .select(Element.ID).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId) + .select(Element.ID).or().ideq(companyId).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId).close() .end(); // toutes les depenses depuis le debut de l'annee @@ -178,7 +178,7 @@ .exteq(Invoice.EXT_INVOICE) .bw(Invoice.FQ_FIELD_INVOICE_POSTEDDATE, lastYearFirstDay, lastYearNow) .containsOne(Invoice.FQ_FIELD_INVOICE_CUSTOMER) - .select(Element.ID).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId) + .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 @@ -188,7 +188,7 @@ .exteq(Invoice.EXT_INVOICE) .bw(Invoice.FQ_FIELD_INVOICE_POSTEDDATE, lastYearFirstDay, lastYearNow) .containsOne(Invoice.FQ_FIELD_INVOICE_SUPPLIER) - .select(Element.ID).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId) + .select(Element.ID).or().ideq(companyId).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId).close() .end(); @@ -200,7 +200,7 @@ .lt(Invoice.FQ_FIELD_INVOICE_EXPECTEDDATE, inOneWeek) .isNull(Invoice.FQ_FIELD_INVOICE_PAYMENTDATE) .containsOne(Invoice.FQ_FIELD_INVOICE_CUSTOMER) - .select(Element.ID).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId) + .select(Element.ID).or().ideq(companyId).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId).close() .end().setLimit(WikittyQuery.MAX); // les factures qu'auraient du payer nos clients (ils sont en retard) @@ -211,7 +211,7 @@ .lt(Invoice.FQ_FIELD_INVOICE_EXPECTEDDATE, now) .isNull(Invoice.FQ_FIELD_INVOICE_PAYMENTDATE) .containsOne(Invoice.FQ_FIELD_INVOICE_SUPPLIER) - .select(Element.ID).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId) + .select(Element.ID).or().ideq(companyId).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId).close() .end(); // les contacts qui doivnet etre pris dans les 7 prochains jours

1 0

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

13 Sep '12

Author: bpoussin Date: 2012-09-13 12:09:57 +0200 (Thu, 13 Sep 2012) New Revision: 264 Url: http://chorem.org/repositories/revision/chorem/264 Log: - une facture peut avoir comme supplier/customer: Company, Employee ou Person - ajout de l'import des factures et cout depuis chorem-topia Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremAction.java trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigAction.java trunk/chorem-entities/src/main/java/org/chorem/ChoremMain.java trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java trunk/chorem-entities/src/main/xmi/chorem-model.properties trunk/chorem-entities/src/main/xmi/chorem-model.zargo trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremAction.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/ChoremAction.java 2012-09-10 06:43:45 UTC (rev 263) +++ trunk/chorem-entities/src/main/java/org/chorem/ChoremAction.java 2012-09-13 10:09:57 UTC (rev 264) @@ -25,6 +25,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; +import org.nuiton.wikitty.query.WikittyQuery; +import org.nuiton.wikitty.query.WikittyQueryMaker; +import org.nuiton.wikitty.query.WikittyQueryResult; /** * @@ -46,15 +49,42 @@ } /** - * Remove all data in database, used with caution + * Vide les objets qui porte une certaine extensions + * @param extensionName */ - public void clean() { - System.out.println("Cleaning database ..."); + @ApplicationConfig.Action.Step(0) + public void clean(String extensionName) { + System.out.println("##### EFFACEMENT: " + extensionName + " #####"); ChoremClient proxy = ChoremClient.getClient(config); - proxy.clear(); + WikittyQuery q = new WikittyQueryMaker().exteq(extensionName) + .end().setLimit(WikittyQuery.MAX); + WikittyQueryResult<String> result = proxy.findAllByQuery(q); + proxy.delete(result.getAll()); System.out.println("... clean done"); } + /** + * Vide tous les objets + */ + @ApplicationConfig.Action.Step(0) + public void clear() { + System.out.println("##### EFFACEMENT TOTAL DES DONNEES #####"); + ChoremClient proxy = ChoremClient.getClient(config); + proxy.clear(); + System.out.println("... clear done"); + } + + /** + * Reindex les donnees existantes + */ + @ApplicationConfig.Action.Step(0) + public void reindex() { + System.out.println("##### REINDEXATION #####"); + ChoremClient proxy = ChoremClient.getClient(config); + proxy.syncSearchEngine(); + System.out.println("... reindexation done"); + } + public void configInfo() { config.printConfig(); } Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigAction.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigAction.java 2012-09-10 06:43:45 UTC (rev 263) +++ trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigAction.java 2012-09-13 10:09:57 UTC (rev 264) @@ -37,6 +37,8 @@ HELP(ChoremAction.class.getName() + "#help", "-h", "--help"), INFO(ChoremAction.class.getName() + "#configInfo", "-i", "--config-info" , "--configInfo"), CLEAN(ChoremAction.class.getName() + "#clean", "--clean"), + CLEAR(ChoremAction.class.getName() + "#clear", "--clear"), + REINDEX(ChoremAction.class.getName() + "#reindex", "--reindex"), IMPORT_PERSON(ImportChoremTopia.class.getName() + "#importPerson", "-ip", "--import-person", "--importPerson"), IMPORT_COMPANY(ImportChoremTopia.class.getName() + "#importCompany", @@ -47,6 +49,10 @@ "--import-contract", "--importContract"), IMPORT_CONTRACT_TYPE(ImportChoremTopia.class.getName() + "#importContractType", "--import-contract-type", "--importContractType"), + IMPORT_INVOICE(ImportChoremTopia.class.getName() + "#importInvoices", + "-ii", "--import-invoices", "--importInvoices"), + IMPORT_COST(ImportChoremTopia.class.getName() + "#importCosts", + "--import-costs", "--importCosts"), IMPORT_COMMIT(ImportChoremTopia.class.getName() + "#commit", "--commit"); public String action; Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremMain.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/ChoremMain.java 2012-09-10 06:43:45 UTC (rev 263) +++ trunk/chorem-entities/src/main/java/org/chorem/ChoremMain.java 2012-09-13 10:09:57 UTC (rev 264) @@ -41,9 +41,11 @@ static private Log log = LogFactory.getLog(ChoremMain.class); static public void main(String[] args) throws Exception { +// args = "--clear -ic /tmp/chorem-company.csv -ip /tmp/chorem-person.csv -ie /tmp/chorem-employee.csv --import-contract-type /tmp/chorem-contracttype.csv --import-contract /tmp/chorem-contract.csv --commit".split(" "); +// args = "-ii /tmp/bill.csv --import-costs /tmp/cost.csv --commit".split(" "); + args = "--reindex".split(" "); System.out.println(String.format("Launching ChoremMain ... (args: %s)", Arrays.toString(args))); // getConfig do all: parse and doAllAction -// String[] forceArgs = "--clean -ic /tmp/chorem-company.csv -ip /tmp/chorem-person.csv -ie /tmp/chorem-employee.csv --import-contract-type /tmp/chorem-contracttype.csv --import-contract /tmp/chorem-contract.csv --commit".split(" "); ApplicationConfig config = ChoremConfig.getConfig(null, args); System.exit(0); Modified: trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java 2012-09-10 06:43:45 UTC (rev 263) +++ trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java 2012-09-13 10:09:57 UTC (rev 264) @@ -27,20 +27,32 @@ import java.text.ParseException; import java.util.Date; import java.util.HashMap; +import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Set; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.chorem.entities.Category; +import org.chorem.entities.CategoryImpl; +import org.chorem.entities.Company; import org.chorem.entities.CompanyImpl; import org.chorem.entities.ContactDetailsImpl; +import org.chorem.entities.Employee; import org.chorem.entities.EmployeeImpl; +import org.chorem.entities.Invoice; import org.chorem.entities.InvoiceImpl; +import org.chorem.entities.Person; import org.chorem.entities.PersonImpl; import org.nuiton.util.ApplicationConfig; import org.nuiton.util.ApplicationConfig.Action.Step; import org.nuiton.wikitty.entities.BusinessEntityImpl; +import org.nuiton.wikitty.query.WikittyQuery; +import org.nuiton.wikitty.query.WikittyQueryMaker; +import org.nuiton.wikitty.query.WikittyQueryResult; /** * Les donnees doivent etre exportees de la base postgresql avec les commandes: @@ -53,6 +65,7 @@ * * pour bill * \copy (SELECT subcategory.name AS category, number, issuedate, hopedate, realdate, value, company.name AS company from bill LEFT OUTER JOIN subcategory ON bill.subcategory=subcategory.topiaid LEFT OUTER JOIN task ON bill.task=task.topiaid LEFT OUTER JOIN contact ON bill.contact=contact.topiaid LEFT OUTER JOIN company ON contact.company=company.topiaid order by company.name) TO '/tmp/bill.csv' delimiter ';' CSV HEADER + * \copy (SELECT date,subcategory.name AS category,tag,value from tagvalue LEFT OUTER JOIN subcategory ON tagvalue.subcategory=subcategory.topiaid) TO '/tmp/cost.csv' delimiter ';' CSV HEADER * </pre> * * @author poussin @@ -99,11 +112,17 @@ category,number,issuedate,hopedate,realdate,value,company } + enum COST_HEADER { + date,category,tag,value + } + protected List<ContactDetailsImpl> contacts = new LinkedList<ContactDetailsImpl>(); protected Map<String, CompanyImpl> companies = new HashMap<String, CompanyImpl>(); protected Map<String, PersonImpl> persons = new HashMap<String, PersonImpl>(); protected Map<String, EmployeeImpl> employees = new HashMap<String, EmployeeImpl>(); protected Map<String, InvoiceImpl> invoices = new HashMap<String, InvoiceImpl>(); + protected Map<String, InvoiceImpl> costs = new HashMap<String, InvoiceImpl>(); + protected Map<String, CategoryImpl> categories = new HashMap<String, CategoryImpl>(); // a ne pas stocker dans wikitty protected Map<String, String> contractType = new HashMap<String, String>(); @@ -149,11 +168,14 @@ @Step(99) public void commit() { List<BusinessEntityImpl> data = new LinkedList<BusinessEntityImpl>(); - + + data.addAll(categories.values()); data.addAll(companies.values()); data.addAll(persons.values()); data.addAll(employees.values()); data.addAll(contacts); + data.addAll(invoices.values()); + data.addAll(costs.values()); ChoremClient proxy = ChoremClient.getClient(config); data = proxy.store(data); @@ -429,4 +451,230 @@ System.out.println(String.format("%s contracts loaded", count)); } + @Step(4) + public void importInvoices(String filename) { + System.out.println(String.format("Try to import invoices '%s'", filename)); + try { + ChoremClient proxy = ChoremClient.getClient(config); + + // Pour les invoices existantes + WikittyQuery invoicesQuery = new WikittyQueryMaker() + .exteq(Invoice.EXT_INVOICE).end().setLimit(WikittyQuery.MAX); + WikittyQueryResult<Invoice> invoicesResult = + proxy.findAllByQuery(Invoice.class, invoicesQuery); + Set<String> knowInvoices = new HashSet<String>(); + Set<String> passedInvoices = new HashSet<String>(); + Set<String> rejectedInvoices = new HashSet<String>(); + Set<String> treatedInvoices = new HashSet<String>(); + for (Invoice c : invoicesResult) { + knowInvoices.add(c.getReference()); + } + + // Pour les categories + WikittyQuery categoryQuery = new WikittyQueryMaker() + .exteq(Category.EXT_CATEGORY).end().setLimit(WikittyQuery.MAX); + WikittyQueryResult<Category> categoryResult = + proxy.findAllByQuery(Category.class, categoryQuery); + // key: category name; value: id + Map<String, String> categories = new HashMap<String, String>(); + Set<String> unknowCategories = new HashSet<String>(); + for (Category c : categoryResult) { + categories.put(c.getName(), c.getWikittyId()); + } + + // Pour les customer + WikittyQuery customerQuery = new WikittyQueryMaker() + .exteq(Company.EXT_COMPANY) + .end().setLimit(WikittyQuery.MAX); + WikittyQueryResult<Company> customerResult = + proxy.findAllByQuery(Company.class, customerQuery); + // key: name; value: id + Map<String, String> customers = new HashMap<String, String>(); + Set<String> unknowCustomers = new HashSet<String>(); + for (Company c : customerResult) { + customers.put(c.getName(), c.getWikittyId()); + } + + // Pour les supplier + WikittyQuery supplierQuery = new WikittyQueryMaker() + .eq(Company.FQ_FIELD_COMPANY_NAME, "Code Lutin").end(); + String codeLutinId = proxy.findByQuery(supplierQuery); + + FileReader in = new FileReader(filename); + // separateur ';' String delimiter '"', skip first line (header) + CSVReader reader = new CSVReader(in, ';', '"', 1); + for(String[] line : reader.readAll()) { + String number = line[BILL_HEADER.number.ordinal()]; + if (knowInvoices.contains(number)) { + passedInvoices.add(number); + } else { + String category = line[BILL_HEADER.category.ordinal()]; + String company = line[BILL_HEADER.company.ordinal()]; + if (codeLutinId == null + || !categories.containsKey(category) + || !customers.containsKey(company)) { + rejectedInvoices.add(number); + // check des infos + if (!categories.containsKey(category)) { + unknowCategories.add(category); + } + + if (!customers.containsKey(company)) { + unknowCustomers.add(company); + } + } else { + Double amount = Double.parseDouble(line[BILL_HEADER.value.ordinal()])/100.0; + Date issuedate = parseDate(line[BILL_HEADER.issuedate.ordinal()]); + Date hopedate = parseDate(line[BILL_HEADER.hopedate.ordinal()]); + Date realdate = parseDate(line[BILL_HEADER.realdate.ordinal()]); + + InvoiceImpl invoice = new InvoiceImpl(); + invoice.setCategory(categories.get(category)); + invoice.setSupplier(codeLutinId); + invoice.setCustomer(company); + invoice.setReference(number); + invoice.setAmount(amount); + invoice.setPostedDate(issuedate); + invoice.setExpectedDate(hopedate); + invoice.setPaymentDate(realdate); + + invoices.put(invoice.getWikittyId(), invoice); + treatedInvoices.add(number); + } + } + } + + reader.close(); + + System.out.println("Invoices deja importee: " + passedInvoices); + System.out.println("Invoices a importee: " + treatedInvoices); + if (codeLutinId == null || !unknowCategories.isEmpty() || !unknowCustomers.isEmpty()) { + System.out.println("-- Erreur d'import --"); + System.out.println("Invoices rejetees: " + rejectedInvoices); + System.out.println("Code Lutin id: " + codeLutinId); + System.out.println("Categorie manquante: " + unknowCategories); + System.out.println("Company manquante: " + unknowCustomers); + } + } catch (Exception eee) { + log.fatal(String.format("Can't import file '%s'", filename)); + if (log.isDebugEnabled()) { + log.debug("StackTrace", eee); + } + System.exit(1); + } + System.out.println(String.format("%s invoices loaded", invoices.size())); + } + + protected String invoiceToKey(Invoice c) { + String result = c.getCategory() + ";" + c.getPaymentDate() + ";" + c.getName() + ";" + c.getAmount(); + return result; + } + + @Step(5) + public void importCosts(String filename) { + System.out.println(String.format("Try to import cost '%s'", filename)); + try { + ChoremClient proxy = ChoremClient.getClient(config); + + // Pour les invoices existantes + WikittyQuery invoicesQuery = new WikittyQueryMaker() + .exteq(Invoice.EXT_INVOICE).end().setLimit(WikittyQuery.MAX); + WikittyQueryResult<Invoice> invoicesResult = + proxy.findAllByQuery(Invoice.class, invoicesQuery); + Set<String> knowInvoices = new HashSet<String>(); + Set<String> passedInvoices = new HashSet<String>(); + Set<String> rejectedInvoices = new HashSet<String>(); + Set<String> treatedInvoices = new HashSet<String>(); + for (Invoice c : invoicesResult) { + // on fait une concatenation pour optimiser les futurs recherche + knowInvoices.add(invoiceToKey(c)); + } + + // Pour les categories + WikittyQuery categoryQuery = new WikittyQueryMaker() + .exteq(Category.EXT_CATEGORY).end().setLimit(WikittyQuery.MAX); + WikittyQueryResult<Category> categoryResult = + proxy.findAllByQuery(Category.class, categoryQuery); + // key: category name; value: id + Map<String, String> categoryNameId = new HashMap<String, String>(); + Set<String> unknowCategories = new HashSet<String>(); + for (Category c : categoryResult) { + categoryNameId.put(c.getName(), c.getWikittyId()); + } + + // le customer est code lutin + WikittyQuery customerQuery = new WikittyQueryMaker() + .eq(Company.FQ_FIELD_COMPANY_NAME, "Code Lutin").end(); + String codeLutinId = proxy.findByQuery(customerQuery); + + // la category par defaut ou creer les manquantes + WikittyQuery fraisQuery = new WikittyQueryMaker() + .eq(Category.FQ_FIELD_WIKITTYTREENODE_NAME, "Frais").end(); + String frais = proxy.findByQuery(fraisQuery); + if (frais == null) { + CategoryImpl c = new CategoryImpl(); + c.setName("Frais"); + categories.put(c.getWikittyId(), c); + categoryNameId.put(c.getName(), c.getWikittyId()); + frais = c.getWikittyId(); + } + + FileReader in = new FileReader(filename); + // separateur ';' String delimiter '"', skip first line (header) + CSVReader reader = new CSVReader(in, ';', '"', 1); + for(String[] line : reader.readAll()) { + String tag = line[COST_HEADER.tag.ordinal()]; + String category = line[COST_HEADER.category.ordinal()]; + Date date = parseDate(line[COST_HEADER.date.ordinal()]); + Double amount = Double.parseDouble(line[COST_HEADER.value.ordinal()])/100.0; + + if (StringUtils.isNotBlank(category) && !categoryNameId.containsKey(category)) { + CategoryImpl c = new CategoryImpl(); + c.setName(category); + c.setParent(frais); + categories.put(c.getWikittyId(), c); + categoryNameId.put(c.getName(), c.getWikittyId()); + unknowCategories.add(category); + } + + InvoiceImpl invoice = new InvoiceImpl(); + invoice.setName(tag); + invoice.setCategory(categoryNameId.get(category)); + invoice.setCustomer(codeLutinId); + invoice.setAmount(amount); + invoice.setPostedDate(date); + invoice.setExpectedDate(date); + invoice.setPaymentDate(date); + + String invoiceKey = invoiceToKey(invoice); + if (knowInvoices.contains(invoiceKey)) { + passedInvoices.add(invoiceKey); + } else if (codeLutinId == null || date == null || StringUtils.isBlank(category)) { + rejectedInvoices.add(invoiceKey); + } else { + costs.put(invoice.getWikittyId(), invoice); + treatedInvoices.add(invoiceKey); + } + } + + reader.close(); + + System.out.println("Cost deja importee: " + passedInvoices); + System.out.println("Cost a importee: " + treatedInvoices); + System.out.println("Category creee: " + unknowCategories); + if (codeLutinId == null || !rejectedInvoices.isEmpty()) { + System.out.println("-- Erreur d'import costs--"); + System.out.println("Cost rejetees: " + rejectedInvoices); + System.out.println("Code Lutin id: " + codeLutinId); + } + } catch (Exception eee) { + log.fatal(String.format("Can't import file '%s'", filename)); + if (log.isDebugEnabled()) { + log.debug("StackTrace", eee); + } + System.exit(1); + } + System.out.println(String.format("%s costs loaded", costs.size())); + } + } Modified: trunk/chorem-entities/src/main/xmi/chorem-model.properties =================================================================== --- trunk/chorem-entities/src/main/xmi/chorem-model.properties 2012-09-10 06:43:45 UTC (rev 263) +++ trunk/chorem-entities/src/main/xmi/chorem-model.properties 2012-09-13 10:09:57 UTC (rev 264) @@ -109,7 +109,9 @@ org.chorem.entities.Invoice.attribute.expectedDate.tagvalue.help=La date souhait\u00e9e de paiement org.chorem.entities.Invoice.attribute.paymentDate.tagvalue.help=La date de paiement r\u00e9elle org.chorem.entities.Invoice.attribute.supplier.tagvalue.help=La personne chez Code Lutin qui g\u00e8re la facturation +org.chorem.entities.Invoice.attribute.parent.tagvalue.allowed=Company,Person,Employee org.chorem.entities.Invoice.attribute.customer.tagvalue.help=La personne chez le client \u00e0 qui ont a envoyer la facture +org.chorem.entities.Invoice.attribute.parent.tagvalue.allowed=Company,Person,Employee # # Invoiceable # Modified: trunk/chorem-entities/src/main/xmi/chorem-model.zargo =================================================================== (Binary files differ) 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-10 06:43:45 UTC (rev 263) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 2012-09-13 10:09:57 UTC (rev 264) @@ -582,7 +582,7 @@ String title = "Factures à payer par la société"; String companyId = client.getConfiguration().getDefaultCompany(); String filter = Invoice.FQ_FIELD_INVOICE_CUSTOMER + "={SELECT id WHERE (" + - Employee.FQ_FIELD_EMPLOYEE_COMPANY + "=" + companyId+")}"; + Employee.FQ_FIELD_EMPLOYEE_COMPANY + "=" + companyId+" OR " + companyId + ")}"; return invoiceFilter(client, title, filter, start, end, query); } @@ -591,7 +591,7 @@ String title = "Factures émises par la société"; String companyId = client.getConfiguration().getDefaultCompany(); String filter = Invoice.FQ_FIELD_INVOICE_SUPPLIER + "={SELECT id WHERE (" + - Employee.FQ_FIELD_EMPLOYEE_COMPANY + "=" + companyId+")}"; + Employee.FQ_FIELD_EMPLOYEE_COMPANY + "=" + companyId+" OR " + companyId + ")}"; return invoiceFilter(client, title, filter, start, end, query); } @@ -636,7 +636,7 @@ .select(Invoice.FQ_FIELD_INVOICE_AMOUNT, Aggregate.SUM) .and() .containsOne(Invoice.FQ_FIELD_INVOICE_CUSTOMER) - .select(Element.ID).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId) + .select(Element.ID).or().ideq(companyId).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId).close() .close() .lt(Invoice.FQ_FIELD_INVOICE_EXPECTEDDATE, start) .end() @@ -647,7 +647,7 @@ .select(Invoice.FQ_FIELD_INVOICE_AMOUNT, Aggregate.SUM) .and() .containsOne(Invoice.FQ_FIELD_INVOICE_SUPPLIER) - .select(Element.ID).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId) + .select(Element.ID).or().ideq(companyId).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId).close() .close() .lt(Invoice.FQ_FIELD_INVOICE_EXPECTEDDATE, start) .end() @@ -657,7 +657,7 @@ WikittyQuery invoiceDebt = new WikittyQueryMaker().and() .parse(query) .containsOne(Invoice.FQ_FIELD_INVOICE_CUSTOMER) - .select(Element.ID).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId) + .select(Element.ID).or().ideq(companyId).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId).close() .close() .bw(Invoice.FQ_FIELD_INVOICE_EXPECTEDDATE, start, end) .end() @@ -667,7 +667,7 @@ WikittyQuery invoiceIncome = new WikittyQueryMaker().and() .parse(query) .containsOne(Invoice.FQ_FIELD_INVOICE_SUPPLIER) - .select(Element.ID).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId) + .select(Element.ID).or().ideq(companyId).eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, companyId).close() .close() .bw(Invoice.FQ_FIELD_INVOICE_EXPECTEDDATE, start, end) .end() @@ -787,7 +787,7 @@ Date d = getDate(invoice); String date = DateFormatUtils.format(d, budgetDateFormat); - Category c = invoice.getCategory(true); + Category c = invoice.getCategory(false); double amount = invoice.getAmount(); addAmount(date, c, amount);

1 0

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

10 Sep '12

Author: bpoussin Date: 2012-09-10 08:43:45 +0200 (Mon, 10 Sep 2012) New Revision: 263 Url: http://chorem.org/repositories/revision/chorem/263 Log: l'utilisateur peut indiquer dans son filtre la plage des resultats souhait?\195?\169s Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java trunk/pom.xml 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-08-25 08:53:18 UTC (rev 262) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java 2012-09-10 06:43:45 UTC (rev 263) @@ -61,6 +61,7 @@ import org.nuiton.wikitty.query.WikittyQueryMaker; import org.nuiton.wikitty.query.WikittyQueryParser; import org.nuiton.wikitty.query.WikittyQueryResult; +import org.nuiton.wikitty.query.conditions.True; /** * @@ -155,20 +156,36 @@ depth = 0; } - WikittyQuery q; + WikittyQueryMaker maker; + // S'il y a des extensions on force la requete sur ces types d'extension if (extension != null) { - q = new WikittyQueryMaker().and() - .extContainsOne(Arrays.asList(extension)) - .parse(query) - .end(); + maker = new WikittyQueryMaker().and() + .extContainsOne(Arrays.asList(extension)); } else { - q = new WikittyQueryMaker() - .parse(query) - .end(); + maker = new WikittyQueryMaker(); } + + // s'il y a un filtre on l'utilise, et on utilisera aussi #offset et #limit + // de ce filtre s'ils sont positionne + WikittyQuery filter = WikittyQueryParser.parse(query); + if (filter != null) { // filter peut-etre null si la requete a une mauvaise syntaxe + maker.condition(filter.getCondition()); + // si l'utilisateur a force le depth dans son filtre on l'utilise + if (StringUtils.containsIgnoreCase(query, WikittyQueryParser.DEPTH)) { + depth = filter.getWikittyFieldSearchDepth(); + } + } + + // on recupere la requete + WikittyQuery q = maker.end(); + q.setWikittyFieldSearchDepth(depth); - + if (filter != null) { + q.setOffset(filter.getOffset()); + q.setLimit(filter.getLimit()); + } + // 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) { Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-25 08:53:18 UTC (rev 262) +++ trunk/pom.xml 2012-09-10 06:43:45 UTC (rev 263) @@ -98,7 +98,7 @@ <nuitonUtilsVersion>2.4.8</nuitonUtilsVersion> <nuitonWebVersion>1.7</nuitonWebVersion> <nuitonI18nVersion>2.3.1</nuitonI18nVersion> - <wikittyVersion>3.8</wikittyVersion> + <wikittyVersion>3.9-SNAPSHOT</wikittyVersion> <slf4jVersion>1.6.1</slf4jVersion> <struts2Version>2.2.3</struts2Version> <struts2jqueryVersion>3.2.0</struts2jqueryVersion>

1 0

r262 - in trunk: . chorem-webmotion
by tchemit＠users.chorem.org 25 Aug '12

25 Aug '12

Author: tchemit Date: 2012-08-25 10:53:18 +0200 (Sat, 25 Aug 2012) New Revision: 262 Url: http://chorem.org/repositories/revision/chorem/262 Log: fixes #793: Configure pom to add application at release time fixes #792: Configure pom to auto-deploy to demo ignore idea files Modified: trunk/ trunk/chorem-webmotion/pom.xml Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - target *.iml *.iws *.ipr + target *.iml *.iws *.ipr .idea Modified: trunk/chorem-webmotion/pom.xml =================================================================== --- trunk/chorem-webmotion/pom.xml 2012-08-24 15:20:19 UTC (rev 261) +++ trunk/chorem-webmotion/pom.xml 2012-08-25 08:53:18 UTC (rev 262) @@ -26,7 +26,15 @@ <i18n.bundleOutputDir>${basedir}/target/generated-sources/resources </i18n.bundleOutputDir> <i18n.addBundleOuputDirParent>false</i18n.addBundleOuputDirParent> + +  <deployFiles>target/${project.build.finalName}.war</deployFiles> + +  + <redmine.releaseFiles> + target/${project.build.finalName}.war, + </redmine.releaseFiles> + </properties> <dependencies>

1 0

r261 - in trunk: . chorem-entities chorem-webmotion
by maven-release＠users.chorem.org 24 Aug '12

24 Aug '12

Author: maven-release Date: 2012-08-24 17:20:19 +0200 (Fri, 24 Aug 2012) New Revision: 261 Url: http://chorem.org/repositories/revision/chorem/261 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/chorem-entities/pom.xml trunk/chorem-webmotion/pom.xml trunk/pom.xml Modified: trunk/chorem-entities/pom.xml =================================================================== --- trunk/chorem-entities/pom.xml 2012-08-24 15:20:17 UTC (rev 260) +++ trunk/chorem-entities/pom.xml 2012-08-24 15:20:19 UTC (rev 261) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> - <version>0.2</version> + <version>0.3-SNAPSHOT</version> </parent> <groupId>org.chorem.chorem</groupId> Modified: trunk/chorem-webmotion/pom.xml =================================================================== --- trunk/chorem-webmotion/pom.xml 2012-08-24 15:20:17 UTC (rev 260) +++ trunk/chorem-webmotion/pom.xml 2012-08-24 15:20:19 UTC (rev 261) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> - <version>0.2</version> + <version>0.3-SNAPSHOT</version> </parent> <groupId>org.chorem.chorem</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-24 15:20:17 UTC (rev 260) +++ trunk/pom.xml 2012-08-24 15:20:19 UTC (rev 261) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> - <version>0.2</version> + <version>0.3-SNAPSHOT</version> <modules> <module>chorem-entities</module> @@ -74,11 +74,11 @@ </developers> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/chorem/tags/chorem-0.2</connection> + <connection>scm:svn:http://svn.chorem.org/svn/chorem/trunk</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/chorem/tags/chorem-0.2 + scm:svn:http://svn.chorem.org/svn/chorem/trunk </developerConnection> - <url>http://www.chorem.org/repositories/browse/chorem/tags/chorem-0.2</url> + <url>http://www.chorem.org/repositories/browse/chorem/trunk</url> </scm> <distributionManagement>

1 0

r260 - tags
by maven-release＠users.chorem.org 24 Aug '12

24 Aug '12

Author: maven-release Date: 2012-08-24 17:20:17 +0200 (Fri, 24 Aug 2012) New Revision: 260 Url: http://chorem.org/repositories/revision/chorem/260 Log: [maven-release-plugin] copy for tag chorem-0.2 Added: tags/chorem-0.2/

1 0

r259 - in trunk: . chorem-entities chorem-webmotion
by maven-release＠users.chorem.org 24 Aug '12

24 Aug '12

Author: maven-release Date: 2012-08-24 17:20:06 +0200 (Fri, 24 Aug 2012) New Revision: 259 Url: http://chorem.org/repositories/revision/chorem/259 Log: [maven-release-plugin] prepare release chorem-0.2 Modified: trunk/chorem-entities/pom.xml trunk/chorem-webmotion/pom.xml trunk/pom.xml Modified: trunk/chorem-entities/pom.xml =================================================================== --- trunk/chorem-entities/pom.xml 2012-08-24 14:50:51 UTC (rev 258) +++ trunk/chorem-entities/pom.xml 2012-08-24 15:20:06 UTC (rev 259) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> - <version>0.2-SNAPSHOT</version> + <version>0.2</version> </parent> <groupId>org.chorem.chorem</groupId> Modified: trunk/chorem-webmotion/pom.xml =================================================================== --- trunk/chorem-webmotion/pom.xml 2012-08-24 14:50:51 UTC (rev 258) +++ trunk/chorem-webmotion/pom.xml 2012-08-24 15:20:06 UTC (rev 259) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> - <version>0.2-SNAPSHOT</version> + <version>0.2</version> </parent> <groupId>org.chorem.chorem</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-24 14:50:51 UTC (rev 258) +++ trunk/pom.xml 2012-08-24 15:20:06 UTC (rev 259) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> - <version>0.2-SNAPSHOT</version> + <version>0.2</version> <modules> <module>chorem-entities</module> @@ -74,11 +74,11 @@ </developers> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/chorem/trunk</connection> + <connection>scm:svn:http://svn.chorem.org/svn/chorem/tags/chorem-0.2</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/chorem/trunk + scm:svn:http://svn.chorem.org/svn/chorem/tags/chorem-0.2 </developerConnection> - <url>http://www.chorem.org/repositories/browse/chorem/trunk</url> + <url>http://www.chorem.org/repositories/browse/chorem/tags/chorem-0.2</url> </scm> <distributionManagement>

1 0

r258 - trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions
by bpoussin＠users.chorem.org 24 Aug '12

24 Aug '12

Author: bpoussin Date: 2012-08-24 16:50:51 +0200 (Fri, 24 Aug 2012) New Revision: 258 Url: http://chorem.org/repositories/revision/chorem/258 Log: Evolution #738: Order the linked objects Added: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/MapWithDefault.java Modified: 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-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 2012-08-24 13:33:48 UTC (rev 257) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 2012-08-24 14:50:51 UTC (rev 258) @@ -23,8 +23,16 @@ package org.chorem.webmotion.actions; +import java.util.Calendar; +import java.util.Collection; +import java.util.Date; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateFormatUtils; import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; @@ -34,17 +42,20 @@ import org.chorem.entities.Category; import org.chorem.entities.Configuration; import org.chorem.entities.Employee; +import org.chorem.entities.Interval; import org.chorem.entities.Invoice; import org.chorem.entities.Quotation; import org.chorem.entities.QuotationStatus; import org.chorem.entities.Task; import org.chorem.entities.TaskStatus; import org.chorem.entities.Time; +import org.chorem.entities.Touch; import org.chorem.entities.Vacation; import org.chorem.entities.VacationStatus; import org.debux.webmotion.server.WebMotionController; import org.debux.webmotion.server.render.Render; -import org.nuiton.util.ObjectUtil; +import org.nuiton.util.DateUtil; +import org.nuiton.wikitty.entities.Element; import org.nuiton.wikitty.entities.ElementField; import org.nuiton.wikitty.query.WikittyQuery; import org.nuiton.wikitty.query.WikittyQueryMaker; @@ -52,22 +63,6 @@ import org.nuiton.wikitty.query.WikittyQueryResultTreeNode; import org.nuiton.wikitty.query.conditions.Aggregate; -import java.util.Arrays; -import java.util.Calendar; -import java.util.Collection; -import java.util.Date; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import org.apache.commons.lang3.StringUtils; -import org.chorem.entities.Interval; -import org.chorem.entities.Touch; -import org.nuiton.util.DateUtil; -import org.nuiton.wikitty.entities.Element; - /** * * @author poussin @@ -84,134 +79,6 @@ static final public String budgetDateFormat = "MM/yyyy"; static final public String summaryDateFormat = "dd/MM/yyyy hh:mm"; - /** - * Permet de decore une map dont toutes les valeurs manquant lorsqu'on les - * demandent sont initialise avec l'objet passe dans le constructeur. - * L'objet initialise est pousse dans la map avant d'etre retourne. - * - * TODO poussin 20120526 move this class to nuiton-utils - * - * @param <K> - * @param <V> - */ - static public class MapWithDefault<K, V> implements Map<K, V>, Cloneable { - protected Map<K, V> map; - protected Object defaultValue; - protected Collection args; - - @Override - public Object clone() throws CloneNotSupportedException { - MapWithDefault result = (MapWithDefault)super.clone(); - // class cast exception if map is not cloneable - result.map = (Map)ObjectUtil.clone((Cloneable)map); - return result; - } - - /** - * L'objet par default utilise est l'objet passe en parametre s'il n'est - * pas clonable ou un clone de l'objet s'il est clonable. - * @param map la map a decore - * @param defaultValue la valeur par default - */ - public MapWithDefault(Map<K, V> map, V defaultValue) { - this.map = map; - this.defaultValue = defaultValue; - } - - /** - * L'objet par defaut est construit via le constructeur de la classe - * passe en parametre prenant les arguments args. - * @param map la map a decore - * @param defaultValue la class de la valeur par defaut - * @param args les arguments du construteur pour la classe - */ - public MapWithDefault(Map<K, V> map, Class<V> defaultValue, Object... args) { - this.map = map; - this.defaultValue = defaultValue; - if (ArrayUtils.isNotEmpty(args)) { - this.args = Arrays.asList(args); - } - } - - /** - * Get new instance of defaultValue if defaultValue is clonable or - * return directly defaultValue otherwize. - * @return - */ - protected V getDefaultValue() { - try { - Object result = defaultValue; - if (defaultValue instanceof Class) { - if (args == null) { - result = ((Class)defaultValue).newInstance(); - } else { - result = ObjectUtil.newInstance(((Class)defaultValue), args, true); - } - } else if (defaultValue instanceof Cloneable) { - result = ObjectUtil.clone(((Cloneable)defaultValue)); - } - return (V)result; - } catch (Exception eee) { - throw new RuntimeException(eee); - } - } - - // on surcharge le get pour creer automatiquement les objets - @Override - public V get(Object key) { - V result = map.get(key); - if (result == null) { - result = getDefaultValue(); - put((K)key, result); - } - return result; - } - - public int size() { - return map.size(); - } - - public boolean isEmpty() { - return map.isEmpty(); - } - - public boolean containsKey(Object key) { - return map.containsKey(key); - } - - public boolean containsValue(Object value) { - return map.containsValue(value); - } - - public V put(K key, V value) { - return map.put(key, value); - } - - public V remove(Object key) { - return map.remove(key); - } - - public void putAll(Map<? extends K, ? extends V> m) { - map.putAll(m); - } - - public void clear() { - map.clear(); - } - - public Set<K> keySet() { - return map.keySet(); - } - - public Collection<V> values() { - return map.values(); - } - - public Set<Entry<K, V>> entrySet() { - return map.entrySet(); - } - } - protected <E> Map<String, List<Attachment>> prepareAttachment(ChoremClient client, Collection<E> ids) { // recherche des attachments de chaque quotation trouvee WikittyQuery attachmentQuery = new WikittyQueryMaker().and() @@ -271,7 +138,7 @@ //////////////////////////////////////////////////////////////////////////// // - // C O N T A C T + // A C C U E I L // //////////////////////////////////////////////////////////////////////////// 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-08-24 13:33:48 UTC (rev 257) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java 2012-08-24 14:50:51 UTC (rev 258) @@ -23,6 +23,7 @@ package org.chorem.webmotion.actions; import com.google.common.collect.LinkedHashMultimap; +import com.google.common.collect.Multimaps; import java.io.ByteArrayInputStream; import java.net.MalformedURLException; import java.util.ArrayList; @@ -35,6 +36,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.TreeMap; import javax.servlet.ServletContext; import javax.servlet.http.HttpSession; import org.apache.commons.lang3.ArrayUtils; @@ -148,7 +150,7 @@ */ // depth est un Integer car si c'est un int et qu'il n'existe pas dans les parametres // l'appel plante au lieu de passer 0 comme valeur par defaut - public LinkedHashMultimap<String, Wikitty> searchAsMap(ChoremClient client, String[] extension, String query, Integer depth) { + public Map<String, List<Wikitty>> searchAsMap(ChoremClient client, String[] extension, String query, Integer depth) { if (depth == null) { depth = 0; } @@ -179,11 +181,13 @@ client.findAllByQuery(Wikitty.class, q); // on classe par extension demande les resultats - LinkedHashMultimap<String, Wikitty> map = LinkedHashMultimap.create(); + Map<String, List<Wikitty>> map = + new MapWithDefault<String, List<Wikitty>>( + new TreeMap<String, List<Wikitty>>(), new LinkedList<Wikitty>()); for (Wikitty w : results) { for (WikittyExtension ext : w.getExtensions()) { if (exts.contains(ext)) { - map.put(ext.getName(), w); + map.get(ext.getName()).add(w); } } } @@ -191,16 +195,14 @@ List<String> extExcluded = client.getConfig().getOptionAsList( ChoremConfigOption.CHOREM_EXTENSION_SEARCH_EXCLUSION.key).getOption(); for (String ext : extExcluded) { - map.removeAll(ext); + map.remove(ext); } if (extension != null) { for (String ext : extension) { // The wanted extensions should be present, even without wikitties... - Set<Wikitty> wikitties = map.get(ext); - if (wikitties == null || wikitties.isEmpty() ) { - map.put(ext, null); - } + // just get, create entry + map.get(ext); } } return map; @@ -208,7 +210,7 @@ } public Render search(ChoremClient client, String[] extension, String query) { - LinkedHashMultimap<String, Wikitty> map = searchAsMap(client, extension, query, 1); + Map<String, List<Wikitty>> map = searchAsMap(client, extension, query, 1); return renderView("search.jsp", "result", map); } @@ -245,22 +247,23 @@ // query += " AND ("+extensionRestriction+")"; // } - LinkedHashMultimap<String, Wikitty> map = searchAsMap(client, extension, query, 1); + Map<String, List<Wikitty>> map = searchAsMap(client, extension, query, 1); List<Map<String, String>> result = new ArrayList<Map<String, String>>(map.size()); - for (Map.Entry<String, Wikitty> e : map.entries()) { + for (Map.Entry<String, List<Wikitty>> e : map.entrySet()) { String extName = e.getKey(); - Wikitty value = e.getValue(); - // Avoid potential null value - if (value != null) { - String id = value.getWikittyId(); - String label = value.toString(extName); - Map<String, String> item = new LinkedHashMap<String, String>(); - item.put("extension", extName); - item.put("label", label); - item.put("value", label); - item.put("name", label); - item.put("id", id); - result.add(item); + for (Wikitty value : e.getValue()) { + // Avoid potential null value + if (value != null) { + String id = value.getWikittyId(); + String label = value.toString(extName); + Map<String, String> item = new LinkedHashMap<String, String>(); + item.put("extension", extName); + item.put("label", label); + item.put("value", label); + item.put("name", label); + item.put("id", id); + result.add(item); + } } } return renderJSON(result); @@ -561,7 +564,7 @@ */ public Render searchRelated(ChoremClient client, String id) { String query = id + " AND id != " + id; - LinkedHashMultimap<String, Wikitty> map = searchAsMap(client, null, query, 0); + Map<String, List<Wikitty>> map = searchAsMap(client, null, query, 0); return renderView("search.jsp", "result", map); } Added: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/MapWithDefault.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/MapWithDefault.java (rev 0) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/MapWithDefault.java 2012-08-24 14:50:51 UTC (rev 258) @@ -0,0 +1,148 @@ +package org.chorem.webmotion.actions; + +import java.util.Arrays; +import java.util.Collection; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import org.apache.commons.lang3.ArrayUtils; +import org.nuiton.util.ObjectUtil; + +/** + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +/** + * Permet de decore une map dont toutes les valeurs manquant lorsqu'on les + * demandent sont initialise avec l'objet passe dans le constructeur. + * L'objet initialise est pousse dans la map avant d'etre retourne. + * + * TODO poussin 20120526 move this class to nuiton-utils + * + * @param <K> + * @param <V> + */ +public class MapWithDefault<K, V> implements Map<K, V>, Cloneable { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + protected Map<K, V> map; + protected Object defaultValue; + protected Collection args; + + @Override + public Object clone() throws CloneNotSupportedException { + MapWithDefault result = (MapWithDefault) super.clone(); + // class cast exception if map is not cloneable + result.map = (Map) ObjectUtil.clone((Cloneable) map); + return result; + } + + /** + * L'objet par default utilise est l'objet passe en parametre s'il n'est + * pas clonable ou un clone de l'objet s'il est clonable. + * @param map la map a decore + * @param defaultValue la valeur par default + */ + public MapWithDefault(Map<K, V> map, V defaultValue) { + this.map = map; + this.defaultValue = defaultValue; + } + + /** + * L'objet par defaut est construit via le constructeur de la classe + * passe en parametre prenant les arguments args. + * @param map la map a decore + * @param defaultValue la class de la valeur par defaut + * @param args les arguments du construteur pour la classe + */ + public MapWithDefault(Map<K, V> map, Class<V> defaultValue, Object... args) { + this.map = map; + this.defaultValue = defaultValue; + if (ArrayUtils.isNotEmpty(args)) { + this.args = Arrays.asList(args); + } + } + + /** + * Get new instance of defaultValue if defaultValue is clonable or + * return directly defaultValue otherwize. + * @return + */ + protected V getDefaultValue() { + try { + Object result = defaultValue; + if (defaultValue instanceof Class) { + if (args == null) { + result = ((Class) defaultValue).newInstance(); + } else { + result = ObjectUtil.newInstance((Class) defaultValue, args, true); + } + } else if (defaultValue instanceof Cloneable) { + result = ObjectUtil.clone((Cloneable) defaultValue); + } + return (V) result; + } catch (Exception eee) { + throw new RuntimeException(eee); + } + } + + // on surcharge le get pour creer automatiquement les objets + @Override + public V get(Object key) { + V result = map.get(key); + if (result == null) { + result = getDefaultValue(); + put((K) key, result); + } + return result; + } + + public int size() { + return map.size(); + } + + public boolean isEmpty() { + return map.isEmpty(); + } + + public boolean containsKey(Object key) { + return map.containsKey(key); + } + + public boolean containsValue(Object value) { + return map.containsValue(value); + } + + public V put(K key, V value) { + return map.put(key, value); + } + + public V remove(Object key) { + return map.remove(key); + } + + public void putAll(Map<? extends K, ? extends V> m) { + map.putAll(m); + } + + public void clear() { + map.clear(); + } + + public Set<K> keySet() { + return map.keySet(); + } + + public Collection<V> values() { + return map.values(); + } + + public Set<Entry<K, V>> entrySet() { + return map.entrySet(); + } + +}

1 0

r257 - in trunk: . chorem-entities/src/main/java/org/chorem chorem-webmotion chorem-webmotion/src/main/java/org/chorem/webmotion src/site/rst
by maven-release＠users.chorem.org 24 Aug '12

24 Aug '12

Author: maven-release Date: 2012-08-24 15:33:48 +0200 (Fri, 24 Aug 2012) New Revision: 257 Url: http://chorem.org/repositories/revision/chorem/257 Log: updates to mavenpom 3.3.6 optimize dependencies make rst site ok add missing license headers Modified: trunk/chorem-entities/src/main/java/org/chorem/Saint.java trunk/chorem-webmotion/pom.xml trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/ChoremWebMotionUtil.java trunk/pom.xml trunk/src/site/rst/chorem-cdc.rst trunk/src/site/rst/doc-devel.rst trunk/src/site/rst/index.rst trunk/src/site/rst/requisite.rst Modified: trunk/chorem-entities/src/main/java/org/chorem/Saint.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/Saint.java 2012-08-24 09:42:09 UTC (rev 256) +++ trunk/chorem-entities/src/main/java/org/chorem/Saint.java 2012-08-24 13:33:48 UTC (rev 257) @@ -10,12 +10,12 @@ * 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% @@ -67,4 +67,4 @@ return result; } -} \ No newline at end of file +} Modified: trunk/chorem-webmotion/pom.xml =================================================================== --- trunk/chorem-webmotion/pom.xml 2012-08-24 09:42:09 UTC (rev 256) +++ trunk/chorem-webmotion/pom.xml 2012-08-24 13:33:48 UTC (rev 257) @@ -74,6 +74,11 @@ <artifactId>commons-collections</artifactId> </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </dependency> +  <dependency> Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/ChoremWebMotionUtil.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/ChoremWebMotionUtil.java 2012-08-24 09:42:09 UTC (rev 256) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/ChoremWebMotionUtil.java 2012-08-24 13:33:48 UTC (rev 257) @@ -1,4 +1,26 @@ package org.chorem.webmotion; +/* + * #%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% + */ import javax.servlet.http.HttpServletRequest; Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-24 09:42:09 UTC (rev 256) +++ trunk/pom.xml 2012-08-24 13:33:48 UTC (rev 257) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.4</version> + <version>3.3.6</version> </parent> <groupId>org.chorem</groupId> @@ -44,7 +44,7 @@ <email>martel at codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> - <timezone>+1</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>developer</role> </roles> @@ -55,7 +55,7 @@ <email>chemit at codelutin.com</email> <organization>Code Lutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> - <timezone>+1</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>developer</role> </roles> @@ -66,7 +66,7 @@ <email>poussin at codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> - <timezone>+1</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>developer</role> </roles> @@ -98,7 +98,7 @@ <nuitonUtilsVersion>2.4.8</nuitonUtilsVersion> <nuitonWebVersion>1.7</nuitonWebVersion> <nuitonI18nVersion>2.3.1</nuitonI18nVersion> - <wikittyVersion>3.8-SNAPSHOT</wikittyVersion> + <wikittyVersion>3.8</wikittyVersion> <slf4jVersion>1.6.1</slf4jVersion> <struts2Version>2.2.3</struts2Version> <struts2jqueryVersion>3.2.0</struts2jqueryVersion> Modified: trunk/src/site/rst/chorem-cdc.rst =================================================================== --- trunk/src/site/rst/chorem-cdc.rst 2012-08-24 09:42:09 UTC (rev 256) +++ trunk/src/site/rst/chorem-cdc.rst 2012-08-24 13:33:48 UTC (rev 257) @@ -20,6 +20,7 @@ .. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - + ====== Chorem ====== Chorem est composé de plusieurs modules Modified: trunk/src/site/rst/doc-devel.rst =================================================================== --- trunk/src/site/rst/doc-devel.rst 2012-08-24 09:42:09 UTC (rev 256) +++ trunk/src/site/rst/doc-devel.rst 2012-08-24 13:33:48 UTC (rev 257) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * chorem +.. * $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% +.. - + ========================= Documentation développeur ========================= Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2012-08-24 09:42:09 UTC (rev 256) +++ trunk/src/site/rst/index.rst 2012-08-24 13:33:48 UTC (rev 257) @@ -20,6 +20,7 @@ .. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - + ====== Chorem ====== TODO en exercice \ No newline at end of file Modified: trunk/src/site/rst/requisite.rst =================================================================== --- trunk/src/site/rst/requisite.rst 2012-08-24 09:42:09 UTC (rev 256) +++ trunk/src/site/rst/requisite.rst 2012-08-24 13:33:48 UTC (rev 257) @@ -20,6 +20,7 @@ .. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - + Contact ======= Avoir un champs langue sur le contact, qui permet d'indiquer la langue

1 0