RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr44S15RFNavegacionOrganizacionTraballoItEr43S20: Created textTooltip with name, description, labels, criteria and advance in OrderElements list

Browse source
This commit is contained in:
Lorenzo Tilve 2010-01-21 14:47:52 +01:00 • committed by Javier Moran Rua
parent dc640dc1d3
commit c51bf06691
4 changed files with 66 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
navalplanner-business/src/main/java/org/navalplanner/business/labels/entities/Label.java
View file

@ -100,4 +100,8 @@ public class Label extends BaseEntity {
return false;
}
public String toString() {
return name;
}
}

38
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java
View file

@ -22,6 +22,7 @@ package org.navalplanner.web.orders;
import static org.navalplanner.web.I18nHelper._;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@ -29,10 +30,14 @@ import java.util.Map;
import javax.annotation.Resource;
import org.apache.commons.lang.StringUtils;
import org.navalplanner.business.orders.entities.Order;
import org.navalplanner.business.orders.entities.OrderElement;
import org.navalplanner.business.orders.entities.OrderLine;
import org.navalplanner.business.orders.entities.SchedulingState;
import org.navalplanner.business.orders.entities.SchedulingState.ITypeChangedListener;
import org.navalplanner.business.orders.entities.SchedulingState.Type;
import org.navalplanner.business.requirements.entities.CriterionRequirement;
import org.navalplanner.web.common.Util;
import org.navalplanner.web.common.Util.Getter;
import org.navalplanner.web.common.Util.Setter;
@ -465,4 +470,37 @@ public class OrderElementTreeController extends TreeController<OrderElement> {
tabGeneralData.setSelected(true);
}
@Override
protected String createTooltipText(OrderElement elem) {
StringBuilder tooltipText = new StringBuilder();
tooltipText.append(elem.getName() + ". ");
if ((elem.getDescription() != null)
&& (!elem.getDescription().equals(""))) {
tooltipText.append(elem.getDescription());
tooltipText.append(". ");
}
if ((elem.getLabels() != null) && (!elem.getLabels().isEmpty())) {
tooltipText.append(_(" Labels:"));
tooltipText.append(StringUtils.join(getLabels(), ","));
tooltipText.append(".");
}
if ((elem.getCriterionRequirements() != null)
&& (!elem.getCriterionRequirements().isEmpty())) {
ArrayList<String> criterionNames = new ArrayList<String>();
for(CriterionRequirement each:elem.getCriterionRequirements()) {
criterionNames.add(each.getCriterion().getName());
}
tooltipText.append(_(" Criteria:"));
tooltipText.append(StringUtils.join(criterionNames, ","));
tooltipText.append(".");
}
// To calculate other unit advances implement
// getOtherAdvancesPercentage()
tooltipText.append(_(" Advance:") + elem.getAdvancePercentage());
tooltipText.append(".");
// tooltipText.append(elem.getAdvancePercentage());
return tooltipText.toString();
}
}

21
navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java
View file

@ -19,6 +19,9 @@
*/
package org.navalplanner.web.templates;
import static org.navalplanner.web.I18nHelper._;
import org.apache.commons.lang.StringUtils;
import org.hibernate.validator.ClassValidator;
import org.navalplanner.business.orders.entities.SchedulingState;
import org.navalplanner.business.templates.entities.OrderElementTemplate;
@ -187,4 +190,22 @@ public class TemplatesTreeController extends
return false;
}
@Override
protected String createTooltipText(OrderElementTemplate elem) {
StringBuilder tooltipText = new StringBuilder();
tooltipText.append(elem.getName() + ". ");
if ((elem.getDescription() != null)
&& (!elem.getDescription().equals(""))) {
tooltipText.append(elem.getDescription());
tooltipText.append(". ");
}
if ((elem.getLabels() != null) && (!elem.getLabels().isEmpty())) {
tooltipText.append(_(" Labels:"));
tooltipText.append(StringUtils.join(elem.getLabels(), ","));
tooltipText.append(".");
}
// There are no CriterionRequirement or advances in templates
return tooltipText.toString();
}
}

3
navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java
View file

@ -318,6 +318,7 @@ public abstract class TreeController<T extends ITreeNode<T>> extends
for (Column each : columns) {
each.doCell(this, item, currentElement);
}
item.setTooltiptext(createTooltipText(currentElement));
}
private void applySnapshot(final Treeitem item) {
@ -573,4 +574,6 @@ public abstract class TreeController<T extends ITreeNode<T>> extends
protected abstract boolean isPredicateApplied();
protected abstract String createTooltipText(T currentElement);
}