Author: bpoussin Date: 2013-02-24 05:26:50 +0100 (Sun, 24 Feb 2013) New Revision: 323 Url: http://chorem.org/projects/chorem/repository/revisions/323 Log: remplacement de Invoice par FinancialTransaction la ou c'est possible 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 2013-02-24 03:03:40 UTC (rev 322) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 2013-02-24 04:26:50 UTC (rev 323) @@ -317,10 +317,10 @@ // La premiere annee WikittyQuery dateQuery = new WikittyQueryMaker() .select() - .min(Invoice.FQ_FIELD_FINANCIALTRANSACTION_EMITTEDDATE, "firstDate") - .max(Invoice.FQ_FIELD_FINANCIALTRANSACTION_EMITTEDDATE, "lastDate") + .min(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_EMITTEDDATE, "firstDate") + .max(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_EMITTEDDATE, "lastDate") .where() - .exteq(Invoice.EXT_INVOICE) + .exteq(FinancialTransaction.EXT_FINANCIALTRANSACTION) .end().setLimit(WikittyQuery.MAX); Map<String, Date> dates = client.findByQueryAsMap(Date.class, dateQuery); @@ -376,13 +376,13 @@ // les factures que notre societe doit payer au plus tard dans 7 jours WikittyQuery invoiceDebtQuery = new ChoremQueryMaker() - .select().sum(Invoice.FQ_FIELD_FINANCIALTRANSACTION_AMOUNT) + .select().sum(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_AMOUNT) .and() .exteq(FinancialTransaction.EXT_FINANCIALTRANSACTION) .ne(Invoice.FQ_FIELD_INVOICE_STATUS, InvoiceStatus.CANCELED.name()) - .lt(Invoice.FQ_FIELD_FINANCIALTRANSACTION_EXPECTEDDATE, inOneWeek) - .isNull(Invoice.FQ_FIELD_FINANCIALTRANSACTION_PAYMENTDATE) - .containsOne(Invoice.FQ_FIELD_FINANCIALTRANSACTION_PAYER) + .lt(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_EXPECTEDDATE, inOneWeek) + .isNull(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_PAYMENTDATE) + .containsOne(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_PAYER) .select(Element.ID).filterOnCompanyOrEmployee(companyId) .end().setLimit(WikittyQuery.MAX); @@ -392,9 +392,9 @@ .and() .exteq(FinancialTransaction.EXT_FINANCIALTRANSACTION) .ne(Invoice.FQ_FIELD_INVOICE_STATUS, InvoiceStatus.CANCELED.name()) - .lt(Invoice.FQ_FIELD_FINANCIALTRANSACTION_EXPECTEDDATE, now) - .isNull(Invoice.FQ_FIELD_FINANCIALTRANSACTION_PAYMENTDATE) - .containsOne(Invoice.FQ_FIELD_FINANCIALTRANSACTION_BENEFICIARY) + .lt(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_EXPECTEDDATE, now) + .isNull(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_PAYMENTDATE) + .containsOne(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_BENEFICIARY) .select(Element.ID).filterOnCompanyOrEmployee(companyId) .end().setLimit(WikittyQuery.MAX); @@ -709,6 +709,9 @@ end = DateUtils.setMonths(start, Calendar.DECEMBER); } + start = DateUtil.setMinTimeOfDay(start); + end = DateUtil.setMaxTimeOfDay(end); + // recuperation des factures WikittyQuery invoiceQuery = new WikittyQueryMaker().and() .parse(filter) @@ -724,14 +727,16 @@ ChoremQueryHelper.addSort(client, invoiceQuery, FinancialTransaction.EXT_FINANCIALTRANSACTION); - WikittyQueryResult<Invoice> invoices = - client.findAllByQuery(Invoice.class, invoiceQuery); + WikittyQueryResult<FinancialTransaction> invoices = + client.findAllByQuery(FinancialTransaction.class, invoiceQuery); + log.debug(String.format("InvoiceFilter result(%s) query=%s", invoices.size(), invoiceQuery)); + double amount = 0; double amountPaid = 0; double amountExpected = 0; // calcul des amounts - for (Invoice i : invoices) { + for (FinancialTransaction i : invoices) { double v = i.getAmount(); amount += v; if (i.getPaymentDate() == null) { @@ -759,7 +764,7 @@ Date start, Date end, String query) { String title = "Factures à payer par la société"; String companyId = client.getConfiguration().getDefaultCompany(); - String filter = Invoice.FQ_FIELD_FINANCIALTRANSACTION_PAYER + "={SELECT id WHERE (" + + String filter = FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_PAYER + "={SELECT id WHERE (" + Employee.FQ_FIELD_EMPLOYEE_COMPANY + "=" + companyId+" OR id=" + companyId + ")}"; return invoiceFilter(client, title, filter, start, end, query); } @@ -768,7 +773,7 @@ Date start, Date end, String query) { String title = "Factures émises par la société"; String companyId = client.getConfiguration().getDefaultCompany(); - String filter = Invoice.FQ_FIELD_FINANCIALTRANSACTION_BENEFICIARY + "={SELECT id WHERE (" + + String filter = FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_BENEFICIARY + "={SELECT id WHERE (" + Employee.FQ_FIELD_EMPLOYEE_COMPANY + "=" + companyId+" OR id=" + companyId + ")}"; return invoiceFilter(client, title, filter, start, end, query); } @@ -865,18 +870,18 @@ WikittyQuery invoiceDebt = new ChoremQueryMaker().and() .parse(query) .exteq(FinancialTransaction.EXT_FINANCIALTRANSACTION) - .containsOne(Invoice.FQ_FIELD_FINANCIALTRANSACTION_PAYER) + .containsOne(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_PAYER) .select(Element.ID).filterOnCompanyOrEmployee(companyId) .close() .not().eq(Invoice.FQ_FIELD_INVOICE_STATUS, InvoiceStatus.CANCELED) .or() .and() - .isNotNull(Invoice.FQ_FIELD_FINANCIALTRANSACTION_PAYMENTDATE) - .bw(Invoice.FQ_FIELD_FINANCIALTRANSACTION_PAYMENTDATE, start, end) + .isNotNull(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_PAYMENTDATE) + .bw(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_PAYMENTDATE, start, end) .close() .and() - .isNull(Invoice.FQ_FIELD_FINANCIALTRANSACTION_PAYMENTDATE) - .bw(Invoice.FQ_FIELD_FINANCIALTRANSACTION_EXPECTEDDATE, start, end) + .isNull(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_PAYMENTDATE) + .bw(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_EXPECTEDDATE, start, end) .end() .setLimit(WikittyQuery.MAX); @@ -884,18 +889,18 @@ WikittyQuery invoiceIncome = new ChoremQueryMaker().and() .parse(query) .exteq(FinancialTransaction.EXT_FINANCIALTRANSACTION) - .containsOne(Invoice.FQ_FIELD_FINANCIALTRANSACTION_BENEFICIARY) + .containsOne(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_BENEFICIARY) .select(Element.ID).filterOnCompanyOrEmployee(companyId) .close() .not().eq(Invoice.FQ_FIELD_INVOICE_STATUS, InvoiceStatus.CANCELED) .or() .and() - .isNotNull(Invoice.FQ_FIELD_FINANCIALTRANSACTION_PAYMENTDATE) - .bw(Invoice.FQ_FIELD_FINANCIALTRANSACTION_PAYMENTDATE, start, end) + .isNotNull(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_PAYMENTDATE) + .bw(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_PAYMENTDATE, start, end) .close() .and() - .isNull(Invoice.FQ_FIELD_FINANCIALTRANSACTION_PAYMENTDATE) - .bw(Invoice.FQ_FIELD_FINANCIALTRANSACTION_EXPECTEDDATE, start, end) + .isNull(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_PAYMENTDATE) + .bw(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_EXPECTEDDATE, start, end) .end() .setLimit(WikittyQuery.MAX); @@ -1128,13 +1133,13 @@ .and() .parse(query) .exteq(FinancialTransaction.EXT_FINANCIALTRANSACTION) - .containsOne(Invoice.FQ_FIELD_FINANCIALTRANSACTION_PAYER) + .containsOne(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_PAYER) .select(Element.ID).filterOnCompanyOrEmployee(companyId) .close() .ne(Invoice.FQ_FIELD_INVOICE_STATUS, InvoiceStatus.CANCELED) .isNotNull(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_VAT) .ne(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_VAT, 0) - .bw(Invoice.FQ_FIELD_FINANCIALTRANSACTION_EMITTEDDATE, start, end) + .bw(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_EMITTEDDATE, start, end) .end() .setLimit(WikittyQuery.MAX); @@ -1160,7 +1165,7 @@ .ne(Invoice.FQ_FIELD_INVOICE_STATUS, InvoiceStatus.CANCELED) .isNotNull(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_VAT) .ne(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_VAT, 0) - .bw(Invoice.FQ_FIELD_FINANCIALTRANSACTION_PAYMENTDATE, start, end) + .bw(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_PAYMENTDATE, start, end) .end() .setLimit(WikittyQuery.MAX);