Author: meynier Date: 2013-07-25 17:22:40 +0200 (Thu, 25 Jul 2013) New Revision: 375 Url: http://chorem.org/projects/chorem/repository/revisions/375 Log: Various modifications on employee edit screen and begined with adc calculation Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/EmployeeEditAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/GanttAction.java Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/EmployeeEditAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/EmployeeEditAction.java 2013-07-23 14:52:56 UTC (rev 374) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/EmployeeEditAction.java 2013-07-25 15:22:40 UTC (rev 375) @@ -1,9 +1,11 @@ package org.chorem.webmotion.actions; +import java.text.NumberFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; import java.util.Collection; +import java.util.Collections; import java.util.Comparator; import java.util.Date; import java.util.GregorianCalendar; @@ -24,6 +26,8 @@ import org.chorem.entities.Company; import org.chorem.entities.CompanyImpl; import org.chorem.entities.Employee; +import org.chorem.entities.EmployeeHR; +import org.chorem.entities.EmployeeHRImpl; import org.chorem.entities.EmployeeImpl; import org.chorem.entities.Interval; import org.chorem.entities.Quotation; @@ -31,6 +35,7 @@ import org.chorem.entities.Task; import org.chorem.entities.Time; import org.chorem.entities.Worker; +import org.chorem.project.AdcCalculation; import org.chorem.project.QuotationCalculation; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.query.WikittyQuery; @@ -72,6 +77,8 @@ for(Employee e : employeeResult.getAll()) { employees.add(new EmployeeData(e, client)); } + + Collections.sort(employees); //simply return them lol return renderView("employeeEdit.jsp", "employees",employees, @@ -120,6 +127,17 @@ return employeeFilter(client, company); } + public Render requestAdc(ChoremClient client, String employeeId) { + EmployeeHR e = new EmployeeHRImpl(client.restore(employeeId)); + AdcCalculation adcCalc = new AdcCalculation(e, client); + System.out.println("Adc created"); + double adc = adcCalc.getAdc(); + System.out.println("ADC calculated"); + return renderJSON("adc", adc); + + + } + public Render editEmployeeValues(ChoremClient client, String employeeId, String salaryStr , String productivityRateStr, String partialTimeStr, String dailyReturnStr) { Wikitty employeeWikitty = client.restore(employeeId); @@ -218,7 +236,7 @@ } - public class EmployeeData { + public class EmployeeData implements Comparable{ private Employee e; private String salary; @@ -241,7 +259,11 @@ this.partialTime = 100; } this.dailyReturn = client.getDailyReturn(e); - this.dailyHoursWorked = client.getDailyHoursWorked(e); + //Simple trick to limit to 2 numbers after digit + int x = (int)(client.getDailyHoursWorked(e)*100); + double y = x/100.0; + this.dailyHoursWorked = y; + this.e = e; } @@ -267,8 +289,14 @@ return partialTime; } + @Override + public int compareTo(Object o) { + EmployeeData e = (EmployeeData)o; + return this.getObject().getPerson(false).getLastName().compareTo(e.getObject().getPerson(false).getLastName()); + } + } } Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/GanttAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/GanttAction.java 2013-07-23 14:52:56 UTC (rev 374) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/GanttAction.java 2013-07-25 15:22:40 UTC (rev 375) @@ -106,7 +106,7 @@ extDate.put(me.getValue() + " " + me.getKey(), "/Date(" + date.getTime() +")/"); } } - + JRender data = new JRender(lTask, extDate, dateStart, dateEnd); return renderJSON("data", data); }