Author: bpoussin Date: 2013-02-25 15:45:26 +0100 (Mon, 25 Feb 2013) New Revision: 325 Url: http://chorem.org/projects/chorem/repository/revisions/325 Log: le javascript chorem n'est pas gere par nuiton-js pour permettre un debuggage plus simple correction bug dans js de Jean (il manquait le id en attribut) 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/wro.xml trunk/chorem-webmotion/src/main/webapp/js/chorem.js trunk/pom.xml 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 13:10:40 UTC (rev 324) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 2013-02-25 14:45:26 UTC (rev 325) @@ -65,6 +65,8 @@ import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.Element; import org.nuiton.wikitty.entities.ElementField; +import org.nuiton.wikitty.query.FacetSortType; +import org.nuiton.wikitty.query.FacetTopic; import org.nuiton.wikitty.query.WikittyQuery; import org.nuiton.wikitty.query.WikittyQueryMaker; import org.nuiton.wikitty.query.WikittyQueryResult; @@ -298,9 +300,9 @@ aggregate.putAll(m); } - aggregate.put("debtsQuery", ((Select)debt.getCondition()).getSubCondition().toString()); - aggregate.put("incomesQuery", ((Select)income.getCondition()).getSubCondition().toString()); - aggregate.put("extraIncomesQuery", ((Select)extraIncome.getCondition()).getSubCondition().toString()); + aggregate.put("debtsQuery", debt.getWhere().toString()); + aggregate.put("incomesQuery", income.getWhere().toString()); + aggregate.put("extraIncomesQuery", extraIncome.getWhere().toString()); return aggregate; } @@ -314,23 +316,31 @@ String companyId = client.getConfiguration().getDefaultCompany(); - // La premiere annee - WikittyQuery dateQuery = new WikittyQueryMaker() - .select() - .min(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_EMITTEDDATE, "firstDate") - .max(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_EMITTEDDATE, "lastDate") - .where() - .exteq(FinancialTransaction.EXT_FINANCIALTRANSACTION) - .end().setLimit(WikittyQuery.MAX); + long timeStart = System.currentTimeMillis(); - Map<String, Date> dates = client.findByQueryAsMap(Date.class, dateQuery); - Date firstDay = DateUtil.setFirstDayOfYear(dates.get("firstDate")); - Date lastDay = DateUtil.setLastDayOfYear(dates.get("lastDate")); + // Recuperation de la 1er et derniere annee, via les facets, c'est le plus rapide + // via un select > 5s, via les facets ~0.150s + WikittyQuery dateQueryFacet = new WikittyQueryMaker() + .exteq(FinancialTransaction.EXT_FINANCIALTRANSACTION) + .end().setLimit(0).addFacetField( + Element.get(FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_EMITTEDDATE)) + .setFacetSort(FacetSortType.name) + .setFacetLimit(WikittyQuery.MAX); + WikittyQueryResult<String> resultFacet = client.findAllByQuery(dateQueryFacet); + List<FacetTopic> topics = resultFacet.getFacets().get( + FinancialTransaction.FQ_FIELD_FINANCIALTRANSACTION_EMITTEDDATE); + + Date firstDay = WikittyUtil.toDate(topics.get(0).getTopicName()); + Date lastDay = WikittyUtil.toDate(topics.get(topics.size()-1).getTopicName()); + + firstDay = DateUtil.setFirstDayOfYear(firstDay); + lastDay = DateUtil.setLastDayOfYear(lastDay); + firstDay = DateUtil.setMinTimeOfDay(firstDay); lastDay = DateUtil.setMaxTimeOfDay(lastDay); - log.debug(String.format("date: %s", dates)); + log.debug(String.format("annualProfit: %s to %s", firstDay, lastDay)); Map<Date, Map<String, Object>> result = new TreeMap<Date, Map<String, Object>>(); Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2013-02-24 13:10:40 UTC (rev 324) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2013-02-25 14:45:26 UTC (rev 325) @@ -34,14 +34,17 @@ <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" /> <meta charset="UTF-8"/> + <%-- import via nuiton-js to add js or css show WEB-INF/wro.xml --%> + <link href="<c:url value='/nuiton-js/chorem-lib.css'/>" rel="stylesheet" type="text/css"/> + + <link href="<c:url value='/css/chorem.less'/>" rel="stylesheet/less"> <link href="<c:url value='/css/chorem-crm.css'/>" rel="stylesheet" type="text/css"/> <link href="<c:url value='/css/chorem-sales.css'/>" rel="stylesheet" type="text/css"/> + <%-- import via nuiton-js to add js or css show WEB-INF/wro.xml --%> + <script type="text/javascript" src="<c:url value='/nuiton-js/chorem-lib.js'/>"></script> - <link rel="stylesheet/less" href="<c:url value='/css/chorem.less '/>"> - <%-- import via nuiton-js to add js or css show WEB-INF/wro.xml --%> - <link href="<c:url value='/nuiton-js/chorem.css'/>" rel="stylesheet" type="text/css"/> - <script type="text/javascript" src="<c:url value='/nuiton-js/chorem.js?minimize=false'/>"></script> + <script type="text/javascript" src="<c:url value='/js/chorem.js'/>"></script> </head> <body> <div class="navbar navbar-fixed-top"> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml 2013-02-24 13:10:40 UTC (rev 324) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml 2013-02-25 14:45:26 UTC (rev 325) @@ -1,6 +1,6 @@ <groups xmlns="http://www.isdc.ro/wro"> - <group name='chorem'> + <group name='chorem-lib'> <group-ref>jquery</group-ref> <group-ref>bootstrap-responsive</group-ref> <group-ref>jquery-ui</group-ref> @@ -21,7 +21,6 @@ <js>/js/jquery-ui-timepicker-fr.js</js> <js>/js/less-1.2.1.min.js</js> - <js>/js/chorem.js</js> </group> </groups> Modified: trunk/chorem-webmotion/src/main/webapp/js/chorem.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/chorem.js 2013-02-24 13:10:40 UTC (rev 324) +++ trunk/chorem-webmotion/src/main/webapp/js/chorem.js 2013-02-25 14:45:26 UTC (rev 325) @@ -222,7 +222,7 @@ var oldQuotation = $(this).parent(); $.get("/chorem/sales/funnel/json/answer/" + id,function(data){ //success - + var wikittyId = data.meta.id; var wikitty = data.data; var li = $("<li></li>").addClass("salesFunnelItem draft"); @@ -263,6 +263,7 @@ //button var aSend = $('<a/>') + .attr('wikittyId', wikittyId) .addClass("btn btn-success pull-right salesFunnelItemButton draft") .text("Envoyer") .click(draftToSent); @@ -303,6 +304,7 @@ $.get("/chorem/sales/funnel/json/send/" + id,function(data){ //success + var wikittyId = data.meta.id; var wikitty = data.data; var li = $("<li></li>").addClass("salesFunnelItem draft"); @@ -343,10 +345,12 @@ //button var aAccepted = $('<a/>') + .attr('wikittyId', wikittyId) .addClass("btn btn-success pull-right salesFunnelItemButton sent toAccepted") .text("Accepté") .click(sentToAccepted); var aRejected = $('<a/>') + .attr('wikittyId', wikittyId) .addClass("btn btn-danger pull-right salesFunnelItemButton sent toRejected") .text("Rejeté") .click(sentToRejected); Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-02-24 13:10:40 UTC (rev 324) +++ trunk/pom.xml 2013-02-25 14:45:26 UTC (rev 325) @@ -98,7 +98,7 @@ <nuitonUtilsVersion>2.6.9</nuitonUtilsVersion> <nuitonWebVersion>1.7</nuitonWebVersion> <nuitonI18nVersion>2.3.1</nuitonI18nVersion> - <wikittyVersion>3.9</wikittyVersion> + <wikittyVersion>3.10-SNAPSHOT</wikittyVersion> <slf4jVersion>1.6.1</slf4jVersion> <javaxMailVersion>1.4.3</javaxMailVersion> <servletApiVersion>2.5</servletApiVersion>