Author: ymartel Date: 2014-03-12 18:19:26 +0100 (Wed, 12 Mar 2014) New Revision: 408 Url: http://forge.chorem.org/projects/chorem/repository/revisions/408 Log: clean some code Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java trunk/chorem-entities/src/main/java/org/chorem/ChoremMain.java trunk/chorem-entities/src/main/java/org/chorem/project/Calculation.java trunk/chorem-entities/src/main/java/org/chorem/project/QuotationCalculation.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/HrAction.java trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java trunk/pom.xml Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java 2014-02-19 16:38:14 UTC (rev 407) +++ trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java 2014-03-12 17:19:26 UTC (rev 408) @@ -22,6 +22,12 @@ */ package org.chorem; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; + import org.chorem.entities.Attachment; import org.chorem.entities.ChoremUser; import org.chorem.entities.Company; @@ -51,12 +57,6 @@ import org.nuiton.wikitty.query.WikittyQueryResult; import org.parboiled.common.StringUtils; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; - /** * Proxy pour l'application. Certaines methodes specifiques pour l'application * peuvent y etre ajoutees (ex: des find particulier) @@ -447,7 +447,7 @@ double dailyHoursWorked = 0; - if(companyW.hasExtension(CompanyHR.EXT_COMPANYHR) && + if(companyW != null && companyW.hasExtension(CompanyHR.EXT_COMPANYHR) && companyW.getFieldAsDouble(CompanyHR.EXT_COMPANYHR,CompanyHR.FIELD_COMPANYHR_DAILYHOURSWORKED) != 0) { if(w.hasExtension(EmployeeHR.EXT_EMPLOYEEHR) && w.getFieldAsDouble(EmployeeHR.EXT_EMPLOYEEHR, EmployeeHR.FIELD_EMPLOYEEHR_PARTIALTIME) != 0) { dailyHoursWorked = companyW.getFieldAsDouble(CompanyHR.EXT_COMPANYHR, CompanyHR.FIELD_COMPANYHR_DAILYHOURSWORKED) * Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremMain.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/ChoremMain.java 2014-02-19 16:38:14 UTC (rev 407) +++ trunk/chorem-entities/src/main/java/org/chorem/ChoremMain.java 2014-03-12 17:19:26 UTC (rev 408) @@ -22,12 +22,11 @@ */ package org.chorem; +import java.util.Arrays; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.config.ApplicationConfig; -import java.util.Arrays; - /** * * @author poussin @@ -49,7 +48,8 @@ // args = "--reindex".split(" "); System.out.println(String.format("Launching ChoremMain ... (args: %s)", Arrays.toString(args))); // getConfig do all: parse and doAllAction - ApplicationConfig config = ChoremConfig.getConfig(null, args); + //XXX ymartel 2014/03/12 : not used. +// ApplicationConfig config = ChoremConfig.getConfig(null, args); System.exit(0); } Modified: trunk/chorem-entities/src/main/java/org/chorem/project/Calculation.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/project/Calculation.java 2014-02-19 16:38:14 UTC (rev 407) +++ trunk/chorem-entities/src/main/java/org/chorem/project/Calculation.java 2014-03-12 17:19:26 UTC (rev 408) @@ -119,17 +119,20 @@ */ public Map<Employee, Double> getTimePercentages() { Map<Employee, Double> times = getTimes(); - Map<Employee, Double> timePercentages = new HashMap<Employee, Double>(); + Map<Employee, Double> timePercentages = new HashMap<Employee, Double>(times.size()); double sum = 0; - Set<Employee> keySet = times.keySet(); - for (Employee key : keySet) { - sum+= times.get(key); + Set<Employee> employees = times.keySet(); + for (Employee employee : employees) { + sum+= times.get(employee); } - for (Employee key : keySet) { - timePercentages.put(key, (times.get(key)/sum)*100); + // calculate percentage + for (Map.Entry<Employee, Double> employeeTime : times.entrySet()) { + Employee employee = employeeTime.getKey(); + Double time = employeeTime.getValue(); + timePercentages.put(employee, (time /sum)*100); + } - return timePercentages; } /** @@ -163,11 +166,12 @@ } double realReturn = 0; Set<Employee> keySet = times.keySet(); - for(Employee key : keySet) { + for (Map.Entry<Employee, Double> employeeTime : times.entrySet()) { + Employee key = employeeTime.getKey(); double srp = client.getDailyReturn(key); double hoursPerDay = client.getDailyHoursWorked(key); - realReturn += srp* ( times.get(key) / hoursPerDay ) ; + realReturn += srp* ( employeeTime.getValue() / hoursPerDay ) ; } realReturn = realReturn/getRealDays(); Modified: trunk/chorem-entities/src/main/java/org/chorem/project/QuotationCalculation.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/project/QuotationCalculation.java 2014-02-19 16:38:14 UTC (rev 407) +++ trunk/chorem-entities/src/main/java/org/chorem/project/QuotationCalculation.java 2014-03-12 17:19:26 UTC (rev 408) @@ -69,16 +69,15 @@ for(Task t : tasks) { Map<Employee, Double> taskPercentages = new TaskCalculation(t, client).getPercentages(); - for(Employee emp : taskPercentages.keySet()) { + for (Map.Entry<Employee, Double> employeeTime : taskPercentages.entrySet()) { double rate = (t.getEstimatedDays()/totalDays); - if(percentages.containsKey(emp)) { - //We temporaly put the sum in the map. - percentages.put(emp, percentages.get(emp) + taskPercentages.get(emp)*rate); + Employee emp = employeeTime.getKey(); + Double employeePercentage = percentages.get(emp); + if (employeePercentage == null) { + // the value was not found : init to 0 + employeePercentage = 0d; } - else { - percentages.put(emp, taskPercentages.get(emp)*rate); - } - + percentages.put(emp, employeePercentage + employeeTime.getValue() * rate); } } Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/HrAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/HrAction.java 2014-02-19 16:38:14 UTC (rev 407) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/HrAction.java 2014-03-12 17:19:26 UTC (rev 408) @@ -27,12 +27,15 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; -import org.chorem.entities.*; import java.util.Map; + import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.ChoremClient; +import org.chorem.entities.EmployeeHR; +import org.chorem.entities.Vacation; +import org.chorem.entities.VacationRequest; import org.debux.webmotion.server.call.Call; import org.debux.webmotion.server.render.Render; import org.nuiton.wikitty.WikittyUtil; @@ -51,7 +54,6 @@ */ static private Log log = LogFactory.getLog(HrAction.class); private Map<String, Object> params = new HashMap<String, Object>(); - private String dateDuJour = ""; // mettre isAnswer à true si on arrive en tant qu'administrateur pour saisir une réponse private boolean isAnswer = true; @@ -95,6 +97,14 @@ } // ajout des id Vacation liés à la VacationRequest + for (Map.Entry<String, List<Wikitty>> relatedEntry : wRelated.entrySet()) { + List<Wikitty> relatedWikitties = relatedEntry.getValue(); + int size = relatedWikitties.size(); + for (int ii = 0; ii < size; ii++) { + String wid = relatedWikitties.get(ii).getWikittyId(); + ids += separator + wid; + } + } for (String ws : wRelated.keySet()) { int size = wRelated.get(ws).size(); for (int ii = 0; ii < size; ii++) { @@ -120,7 +130,7 @@ String typeLeave = ""; Wikitty wEmployeeReq = null; - this.dateDuJour = WikittyUtil.toString((new java.util.Date())); + String dateDuJour = WikittyUtil.toString((new java.util.Date())); this.params = call.getExtractParameters(); String keyParams = ""; @@ -147,7 +157,7 @@ if (!this.isAnswer) { // on enregistre la date de demande updateVacationRequestField(w, VacationRequest.EXT_VACATIONREQUEST, - VacationRequest.FIELD_VACATIONREQUEST_DATEREQUEST, this.dateDuJour); + VacationRequest.FIELD_VACATIONREQUEST_DATEREQUEST, dateDuJour); // pour chaque période (Vacation) on enregistre le champ vacationRequest pour lier la période à la demande updateVacationRequestField(w, Vacation.EXT_VACATION, Vacation.FIELD_VACATION_VACATIONREQUEST, idVR); @@ -155,7 +165,7 @@ } else { // on enregistre la date de réponse updateVacationRequestField(w, VacationRequest.EXT_VACATIONREQUEST, - VacationRequest.FIELD_VACATIONREQUEST_DATEANSWER, this.dateDuJour); + VacationRequest.FIELD_VACATIONREQUEST_DATEANSWER, dateDuJour); // si l'ancien status de la demande est différent de "ACCEPTEE" ou "FERMETURE ANNUELLE" // si le nouveau status (réponse) est "ACCEPTEE" : pour chaque période demandée on met à jour les soldes de l'Employé Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java 2014-02-19 16:38:14 UTC (rev 407) +++ trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java 2014-03-12 17:19:26 UTC (rev 408) @@ -23,31 +23,31 @@ package org.wikitty.web.jsptag; +import java.io.IOException; +import java.math.BigDecimal; +import java.text.NumberFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.servlet.ServletContext; +import javax.servlet.jsp.JspException; +import javax.servlet.jsp.JspWriter; +import javax.servlet.jsp.PageContext; +import javax.servlet.jsp.tagext.DynamicAttributes; +import javax.servlet.jsp.tagext.SimpleTagSupport; + import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateFormatUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.FieldType; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyExtension; -import javax.servlet.ServletContext; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.tagext.DynamicAttributes; -import javax.servlet.jsp.tagext.SimpleTagSupport; -import java.io.IOException; -import java.math.BigDecimal; -import java.text.NumberFormat; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - /** * * @author poussin @@ -173,11 +173,11 @@ } protected String getDynamicAttribute() { - String result = ""; + StringBuilder result = new StringBuilder(); for (Map.Entry<String, Object> e : dynamicAttribute.entrySet()) { - result += " " + e.getKey() + "=\"" + e.getValue() + "\""; + result.append(" " + e.getKey() + "=\"" + e.getValue() + "\""); } - return result; + return result.toString(); } @@ -392,18 +392,19 @@ } String sep = ""; - String prePopulate = "["; + StringBuilder builder = new StringBuilder("["); if (values != null) { for (Wikitty w :values) { if (w != null) { - prePopulate += String.format("%s{id:'%s', label:'%s'}", sep, + builder.append(String.format("%s{id:'%s', label:'%s'}", sep, StringEscapeUtils.escapeEcmaScript(w.getWikittyId()), - StringEscapeUtils.escapeEcmaScript(w.toString())); + StringEscapeUtils.escapeEcmaScript(w.toString()))); sep = ","; } } } - prePopulate += "]"; + builder.append("]"); + String prePopulate = builder.toString(); /*{ <script type="text/javascript"> $(document).ready(function () { Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-02-19 16:38:14 UTC (rev 407) +++ trunk/pom.xml 2014-03-12 17:19:26 UTC (rev 408) @@ -115,6 +115,8 @@ <!-- Java Version --> <javaVersion>1.7</javaVersion> + <signatureArtifactId>java17</signatureArtifactId> + <signatureVersion>1.0</signatureVersion> </properties>