Menu
▾
▴
[TCO-Tool_cvs] TCO-Tool/src/org/tcotool/standard/report ReportComplete.java, 1.4, 1.5 ReportTco.java, 1.6, 1.7 ReportTool.java, 1.9, 1.10 ReportStaff.java, 1.6, 1.7 ReportInvestment.java, 1.5, 1.6
|
From: Hirzel P. <ph...@us...> - 2008-05-18 15:43:13
|
Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/report In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5227/src/org/tcotool/standard/report Modified Files: ReportComplete.java ReportTco.java ReportTool.java ReportStaff.java ReportInvestment.java Log Message: Minor/Cosmetical changes Index: ReportInvestment.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/report/ReportInvestment.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ReportInvestment.java 19 Jun 2007 07:03:57 -0000 1.5 --- ReportInvestment.java 18 May 2008 15:43:17 -0000 1.6 *************** *** 25,28 **** --- 25,29 ---- import org.tcotool.model.TcoPackage; import org.tcotool.tools.Calculator; + import org.tcotool.tools.ModelUtility; import ch.softenvironment.client.ResourceManager; *************** *** 86,90 **** // print data by CostType try { ! Iterator types = ListUtils.sort(codes, new DbObjectEvaluator(), DbObject.PROPERTY_NAME).iterator(); while (types.hasNext()) { encodeCostBlockColumns(root, types.next()); --- 87,91 ---- // print data by CostType try { ! Iterator types = ListUtils.sort(codes, new DbObjectEvaluator(ModelUtility.getCodeTypeLocale()), DbObject.PROPERTY_NAME).iterator(); while (types.hasNext()) { encodeCostBlockColumns(root, types.next()); Index: ReportComplete.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/report/ReportComplete.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ReportComplete.java 13 Jun 2007 20:17:33 -0000 1.4 --- ReportComplete.java 18 May 2008 15:43:17 -0000 1.5 *************** *** 23,27 **** import ch.softenvironment.jomm.mvc.model.DbCodeType; - import ch.softenvironment.util.NlsUtils; import ch.softenvironment.client.ResourceManager; --- 23,26 ---- *************** *** 130,139 **** tableData("" + ModelUtility.getMultitudeFactor(object)); endElement(/*tr*/); - if (object.getBaseDate() != null) { - startTableRow(); - tableData(ResourceManager.getResource(ServiceDetailView.class, "LblBaseDate_text"), abstractCell); - tableData(NlsUtils.formatDate(object.getBaseDate())); - endTableRow(); - } if (object instanceof Service) { encodeCompleteEnum(ResourceManager.getResource(ServiceDetailView.class, "LblCategory_text"), ((Service)object).getCategory()); --- 129,132 ---- Index: ReportTco.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/report/ReportTco.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ReportTco.java 19 Jun 2007 07:03:57 -0000 1.6 --- ReportTco.java 18 May 2008 15:43:17 -0000 1.7 *************** *** 20,23 **** --- 20,24 ---- import org.tcotool.model.*; import org.tcotool.tools.Calculator; + import org.tcotool.tools.ModelUtility; import org.tcotool.application.*; *************** *** 83,89 **** endTableRow(); ! // print data by CostType try { ! Iterator types = ListUtils.sort(codes, new DbObjectEvaluator(), DbObject.PROPERTY_NAME).iterator(); while (types.hasNext()) { encodeCostBlockColumns(root, types.next()); --- 84,90 ---- endTableRow(); ! // print data by CostCause try { ! Iterator types = ListUtils.sort(codes, new DbObjectEvaluator(ModelUtility.getCodeTypeLocale()), DbObject.PROPERTY_NAME).iterator(); while (types.hasNext()) { encodeCostBlockColumns(root, types.next()); *************** *** 94,98 **** } ! // print totals // List totalPersonal = calculator.getTotalCosts(root, Calculator.PERSONAL_TCO); // List totalFacts = calculator.getTotalCosts(root, Calculator.FACT_TCO); --- 95,99 ---- } ! // print total bottom lines // List totalPersonal = calculator.getTotalCosts(root, Calculator.PERSONAL_TCO); // List totalFacts = calculator.getTotalCosts(root, Calculator.FACT_TCO); *************** *** 164,191 **** /** * Print Columns for TCO in HTML: ! * [CostType] [PersonTotal] [[FactTotal] [TCO_Y1] [TCO_Y2]...] ! * @param service print to data of given service (null for all services) */ ! private void encodeCostBlockColumns(TcoObject root, Object code) throws IOException { ! // ch.softenvironment.jomm.serialize.AttributeList attrs = getAlignRight(); ! startTableRow(); ! // name of CostType ! //tableData(getCodeName(code)); ! tableDataCode(code); ! ! List factCosts = null; ! List personalCosts = new ArrayList(); ! // if (reportKind == TCO) { ! // total FactCost's at all ! factCosts = calculator.getCosts(root, Calculator.FACT_TCO, code); ! // total PersonalCost's at all ! personalCosts = calculator.getCosts(root, Calculator.PERSONAL_TCO, code); ! // double personalTotal = Calculator.getValue(personalCosts, Calculator.INDEX_TOTAL); ! // tableDataAmount(personalTotal, false); ! // } ! ! // tableDataAmount(Calculator.getValue(factCosts, Calculator.INDEX_TOTAL), false); ! // sum Personal- & FactCost's together for TCO-Year-columns int year = 0; double sumTcoOverUsage = 0.0; --- 165,178 ---- /** * Print Columns for TCO in HTML: ! * [CostType] [TCO_Y1 (P+F)] [TCO_Y2 (P+F)]... ! * @param root @see Calculater#getCosts() */ ! protected void encodeCostBlockColumns(TcoObject root, Object code) throws IOException { ! List factCosts = calculator.getCosts(root, Calculator.FACT_TCO, code); ! List personalCosts = calculator.getCosts(root, Calculator.PERSONAL_TCO, code); ! startTableRow(); ! tableDataCode(code); ! // sum Personal- & FactCost's together for each TCO-Year[n]-column int year = 0; double sumTcoOverUsage = 0.0; Index: ReportTool.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/report/ReportTool.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ReportTool.java 19 Jun 2007 08:21:14 -0000 1.9 --- ReportTool.java 18 May 2008 15:43:17 -0000 1.10 *************** *** 46,51 **** */ public abstract class ReportTool extends ch.softenvironment.jomm.serialize.HtmlSerializer { ! public static final String PERSONAL_COST_INTERNAL = "PC_INTERN"; ! public static final String PERSONAL_COST_EXTERNAL = "PC_EXTERN"; private static final long DEFAULT_DURATION = 48; protected Calculator calculator = null; --- 46,50 ---- */ public abstract class ReportTool extends ch.softenvironment.jomm.serialize.HtmlSerializer { ! public static final int PERCENTAGE_FRACTION_DIGITS = 1; private static final long DEFAULT_DURATION = 48; protected Calculator calculator = null; Index: ReportStaff.java =================================================================== RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/standard/report/ReportStaff.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ReportStaff.java 19 Jun 2007 07:03:57 -0000 1.6 --- ReportStaff.java 18 May 2008 15:43:17 -0000 1.7 *************** *** 63,70 **** TcoObject element = (TcoObject)rootObject; if (element instanceof TcoPackage) { ! double totalPersonalInternalHours = Calculator.getValue(calculator.getCosts(element, Calculator.PERSONAL_TCO, Calculator.HOURS_INTERNAL), Calculator.INDEX_TOTAL);//Calculator.getValue(hours, 0); ! double totalPersonalExternalHours = Calculator.getValue(calculator.getCosts(element, Calculator.PERSONAL_TCO, Calculator.HOURS_EXTERNAL), Calculator.INDEX_TOTAL); ! double totalPersonalInternalLumpSum = Calculator.getValue(calculator.getCosts(element, Calculator.PERSONAL_TCO, Calculator.COST_INTERNAL_LUMP), Calculator.INDEX_TOTAL); ! double totalPersonalExternalLumpSum = Calculator.getValue(calculator.getCosts(element, Calculator.PERSONAL_TCO, Calculator.COST_EXTERNAL_LUMP), Calculator.INDEX_TOTAL); SystemParameter sysPar = LauncherView.getInstance().getUtility().getSystemParameter(); --- 63,70 ---- TcoObject element = (TcoObject)rootObject; if (element instanceof TcoPackage) { ! double totalPersonalInternalHours = Calculator.getValue(calculator.getCosts(element, Calculator.PERSONAL_TCO, Calculator.PERSONAL_HOURS_INTERNAL), Calculator.INDEX_TOTAL);//Calculator.getValue(hours, 0); ! double totalPersonalExternalHours = Calculator.getValue(calculator.getCosts(element, Calculator.PERSONAL_TCO, Calculator.PERSONAL_HOURS_EXTERNAL), Calculator.INDEX_TOTAL); ! double totalPersonalInternalLumpSum = Calculator.getValue(calculator.getCosts(element, Calculator.PERSONAL_TCO, Calculator.PERSONAL_COST_INTERNAL_LUMP), Calculator.INDEX_TOTAL); ! double totalPersonalExternalLumpSum = Calculator.getValue(calculator.getCosts(element, Calculator.PERSONAL_TCO, Calculator.PERSONAL_COST_EXTERNAL_LUMP), Calculator.INDEX_TOTAL); SystemParameter sysPar = LauncherView.getInstance().getUtility().getSystemParameter(); *************** *** 110,118 **** endTableRow(); startTableRow(); ! tableDataLinked(ReportTool.PERSONAL_COST_INTERNAL, StringUtils.getBooleanString(Boolean.TRUE), false); tableDataAmount(totalPersonalInternalLumpSum, false); endTableRow(); startTableRow(); ! tableDataLinked(ReportTool.PERSONAL_COST_EXTERNAL, StringUtils.getBooleanString(Boolean.FALSE), false); tableDataAmount(totalPersonalExternalLumpSum, false); endTableRow(); --- 110,118 ---- endTableRow(); startTableRow(); ! tableDataLinked(Calculator.PERSONAL_COST_INTERNAL, StringUtils.getBooleanString(Boolean.TRUE), false); tableDataAmount(totalPersonalInternalLumpSum, false); endTableRow(); startTableRow(); ! tableDataLinked(Calculator.PERSONAL_COST_EXTERNAL, StringUtils.getBooleanString(Boolean.FALSE), false); tableDataAmount(totalPersonalExternalLumpSum, false); endTableRow(); *************** *** 130,137 **** endParagraph(); startParagraph(); ! encodeCostBlock(null, element.getObjectServer().retrieveCodes(Role.class), Calculator.ROLE_UNDEFINED, ResourceManager.getResource(RoleDetailView.class, "FrmWindow_text")); endParagraph(); startParagraph(); ! encodeCostBlock(null, element.getObjectServer().retrieveCodes(Activity.class), Calculator.ACTIVITY_UNDEFINED, ResourceManager.getResourceAsNonLabeled(PersonalCostDetailView.class, "LblActivity_text")); endParagraph(); } --- 130,137 ---- endParagraph(); startParagraph(); ! encodeCostBlock(null, element.getObjectServer().retrieveCodes(Role.class), Calculator.PERSONAL_ROLE_UNDEFINED, ResourceManager.getResource(RoleDetailView.class, "FrmWindow_text")); endParagraph(); startParagraph(); ! encodeCostBlock(null, element.getObjectServer().retrieveCodes(Activity.class), Calculator.PERSONAL_ACTIVITY_UNDEFINED, ResourceManager.getResourceAsNonLabeled(PersonalCostDetailView.class, "LblActivity_text")); endParagraph(); } *************** *** 158,162 **** // print data by CostType try { ! Iterator types = ListUtils.sort(codes, new DbObjectEvaluator(), DbObject.PROPERTY_NAME).iterator(); while (types.hasNext()) { encodeCostBlockColumns(root, types.next()); --- 158,162 ---- // print data by CostType try { ! Iterator types = ListUtils.sort(codes, new DbObjectEvaluator(ModelUtility.getCodeTypeLocale()), DbObject.PROPERTY_NAME).iterator(); while (types.hasNext()) { encodeCostBlockColumns(root, types.next()); |
