();
+ DefaultMutableTreeNode root = new DefaultMutableTreeNode(r);
+ names.put(root, getTreeNodeRepresentation(null, root, r));
- dataset = new DefaultCategoryDataset();
- HashMap names = new HashMap();
- DefaultMutableTreeNode root = new DefaultMutableTreeNode(r);
- names.put(root, getTreeNodeRepresentation(null, root, r));
-
- Timestamp dateTime = start;
- while(end.after(dateTime)) {
+ Timestamp dateTime = start;
+ while(end.after(dateTime))
+ {
+ String label = formatter.format(dateTime);
+ names.putAll(addTreeNodes(dateTime, root, r));
- label = formatter.format(dateTime);
- names.putAll(addTreeNodes(dateTime, root, r));
+ boolean available = isAvailable(r, dateTime);
+ dataset.addValue(available ? dailyCapacity : BigDecimal.ZERO, labelActCap, label);
+ dataset.addValue(available ? calculateLoad(dateTime, r, null) : BigDecimal.ZERO, labelLoadAct, label);
- load = isResourceAvailable(dateTime, r) ? calculateLoad(dateTime, r, null) : BigDecimal.ZERO;
- dataset.addValue(isResourceAvailable(dateTime, r) ? dailyCapacity : BigDecimal.ZERO ,labelActCap, label);
- dataset.addValue(isResourceAvailable(dateTime, r) ? load : BigDecimal.ZERO ,labelLoadAct, label);
+ dateTime = org.compiere.util.TimeUtil.addDays(dateTime, 1); // TODO: teo_sarca: increment should be more general, not only days
+ }
- //dateTime = DateTimeUtil.incrementDay(dateTime);
- dateTime = org.compiere.util.TimeUtil.addDays(dateTime,1);
- }
-
- tree = new JTree(root);
- tree.setCellRenderer(new DiagramTreeCellRenderer(names));
- return true;
+ tree = new JTree(root);
+ tree.setCellRenderer(new DiagramTreeCellRenderer(names));
}
- public BigDecimal calculateLoad(Timestamp dateTime, MResource r, String docStatus) {
-
+ public BigDecimal calculateLoad(Timestamp dateTime, MResource r, String docStatus)
+ {
MResourceType t = MResourceType.get(Env.getCtx(), r.getS_ResourceType_ID());
- MPPOrderNode[] nodes = getPPOrderNodes(dateTime, r);
MUOM uom = MUOM.get(Env.getCtx(), t.getC_UOM_ID());
- MPPOrder o = null;
BigDecimal qtyOpen;
long millis = 0l;
- for(int i = 0; i < nodes.length; i++) {
- o = new MPPOrder(Env.getCtx(), nodes[i].getPP_Order_ID(), null);
- if(docStatus != null && !o.getDocStatus().equals(docStatus)) {
-
- continue;
+ for(MPPOrderNode node : getPPOrderNodes(dateTime, r))
+ {
+ if (docStatus != null)
+ {
+ MPPOrder o = new MPPOrder(node.getCtx(), node.getPP_Order_ID(), node.get_TrxName());
+ if(!o.getDocStatus().equals(docStatus))
+ {
+ continue;
+ }
}
-
- millis += calculateMillisForDay(dateTime, nodes[i], t);
+ millis += calculateMillisForDay(dateTime, node, t);
}
-
+
// Pre-converts to minutes, because its the lowest time unit of compiere
BigDecimal scale = new BigDecimal(1000*60);
BigDecimal minutes = new BigDecimal(millis).divide(scale, 2, BigDecimal.ROUND_HALF_UP);
return convert(minutes);
}
- protected Timestamp[] getDayBorders(Timestamp dateTime, MPPOrderNode node, MResourceType t) {
-
- Timestamp endDayTime = null;
+ /**
+ * Gets {StartDate, EndDate} times for given dateTime.
+ * For calculating this, following factors are considered:
+ * resource type time slot
+ * node DateStartSchedule and DateEndSchedule
+ * @param dateTime
+ * @param node
+ * @param t resouce type
+ * @return array of 2 elements, {StartDate, EndDate}
+ */
+ private Timestamp[] getDayBorders(Timestamp dateTime, MPPOrderNode node, MResourceType t)
+ {
// The theoretical latest time on a day, where the work ends, dependent on
// the resource type's time slot value
- if(t.isTimeSlot()) {
-
- endDayTime = DateTimeUtil.getDayBorder(dateTime, t.getTimeSlotEnd(), true);
- }
- else {
-
- endDayTime = DateTimeUtil.getDayBorder(dateTime, null, true);
- }
-
- // Initialize the end time to the present, if the work ends at this day. Otherwise
- // the earliest possible start time for a day is set.
+ Timestamp endDayTime = t.getDayEnd(dateTime);
+ // Initialize the end time to the present, if the work ends at this day.
+ // Otherwise the earliest possible start time for a day is set.
endDayTime = (endDayTime.before(node.getDateFinishSchedule())) ? endDayTime : node.getDateFinishSchedule();
- Timestamp startDayTime = null;
// The theoretical earliest time on a day, where the work begins, dependent on
// the resource type's time slot value
- if(t.isTimeSlot()) {
-
- startDayTime = DateTimeUtil.getDayBorder(dateTime, t.getTimeSlotStart(), false);
- }
- else {
-
- startDayTime = DateTimeUtil.getDayBorder(dateTime, null, false);
- }
-
- // Initialize the end time to the present, if the work begins at this day. Otherwise
- // the earliest possible start time for a day is set.
+ Timestamp startDayTime = t.getDayStart(dateTime);
+ // Initialize the start time to the present, if the work begins at this day.
+ // Otherwise the latest possible start time for a day is set.
startDayTime = (startDayTime.after(node.getDateStartSchedule())) ? startDayTime : node.getDateStartSchedule();
return new Timestamp[] {startDayTime, endDayTime};
}
- protected long calculateMillisForDay(Timestamp dateTime, MPPOrderNode node, MResourceType t) {
-
+ private long calculateMillisForDay(Timestamp dateTime, MPPOrderNode node, MResourceType t)
+ {
Timestamp[] borders = getDayBorders(dateTime, node, t);
- return DateTimeUtil.getTimeDifference(borders[0], borders[1]);
+ return borders[1].getTime() - borders[0].getTime();
}
-
- protected HashMap addTreeNodes(Timestamp dateTime, DefaultMutableTreeNode root, MResource r) {
- HashMap names = new HashMap();
+ /**
+ * Generates following tree:
+ *
+ * (dateTime)
+ * \-------(root)
+ * \-------(PP Order)
+ * \---------(PP Order Node)
+ *
+ * @param dateTime
+ * @param root
+ * @param r
+ * @return
+ */
+ private HashMap addTreeNodes(Timestamp dateTime, DefaultMutableTreeNode root, MResource r)
+ {
+ HashMap names = new HashMap();
- MPPOrder[] orders = getPPOrders(dateTime, r);
- MPPOrderNode[] nodes = null;
-
DefaultMutableTreeNode parent = new DefaultMutableTreeNode(dateTime);
names.put(parent, getTreeNodeRepresentation(null, parent, r));
-
- DefaultMutableTreeNode child1 = null;
- DefaultMutableTreeNode child2 = null;
root.add(parent);
- for(int i = 0; i < orders.length; i++) {
+ for(MPPOrder order : getPPOrders(dateTime, r))
+ {
+ DefaultMutableTreeNode childOrder = new DefaultMutableTreeNode(order);
+ parent.add(childOrder);
+ names.put(childOrder, getTreeNodeRepresentation(dateTime, childOrder, r));
- child1 = new DefaultMutableTreeNode(orders[i]);
- parent.add(child1);
-
- names.put(child1, getTreeNodeRepresentation(dateTime, child1, r));
-
- nodes = getPPOrderNodes(dateTime, r);
- for(int j = 0; j < nodes.length; j++) {
-
- child2 = new DefaultMutableTreeNode(nodes[j]);
- child1.add(child2);
-
- names.put(child2, getTreeNodeRepresentation(dateTime, child2, r));
+ for(MPPOrderNode node : getPPOrderNodes(dateTime, r))
+ {
+ DefaultMutableTreeNode childNode = new DefaultMutableTreeNode(node);
+ childOrder.add(childNode);
+ names.put(childNode, getTreeNodeRepresentation(dateTime, childNode, r));
}
}
return names;
}
- protected String getTreeNodeRepresentation(Timestamp dateTime, DefaultMutableTreeNode node, MResource r) {
-
+ private String getTreeNodeRepresentation(Timestamp dateTime, DefaultMutableTreeNode node, MResource r)
+ {
String name = null;
- if(node.getUserObject() instanceof MResource) {
-
+ if(node.getUserObject() instanceof MResource)
+ {
MResource res = (MResource) node.getUserObject();
-
name = res.getName();
}
- else if(node.getUserObject() instanceof Timestamp) {
-
+ else if(node.getUserObject() instanceof Timestamp)
+ {
Timestamp d = (Timestamp)node.getUserObject();
SimpleDateFormat df = Env.getLanguage(Env.getCtx()).getDateFormat();
name = df.format(d);
- if(!isResourceAvailable(d, r)) {
-
+ if(!isAvailable(r, d))
+ {
name = "{"+name+"}";
}
}
- else if(node.getUserObject() instanceof MPPOrder) {
-
+ else if(node.getUserObject() instanceof MPPOrder)
+ {
MPPOrder o = (MPPOrder)node.getUserObject();
- MProduct p = new MProduct(Env.getCtx(), o.getM_Product_ID(), null);
+ MProduct p = MProduct.get(Env.getCtx(), o.getM_Product_ID());
name = o.getDocumentNo()+" ("+p.getName()+")";
}
- else if(node.getUserObject() instanceof MPPOrderNode) {
-
+ else if(node.getUserObject() instanceof MPPOrderNode)
+ {
MPPOrderNode on = (MPPOrderNode)node.getUserObject();
- MPPOrderWorkflow owf = new MPPOrderWorkflow(Env.getCtx(), on.getPP_Order_Workflow_ID(), null);
+ MPPOrderWorkflow owf = on.getWorkflow();
MResourceType rt = MResourceType.get(Env.getCtx(), r.getS_ResourceType_ID());
// no function
@@ -270,19 +253,23 @@ public abstract class CRPDatasetFactory extends CRPReasoner implements CRPModel
return name;
}
- protected BigDecimal getMaxRange(MResource r) {
-
- return r.getDailyCapacity().divide(r.getPercentUtilization().divide(new BigDecimal(100)));
-
- }
+ /**
+ * @return Daily Capacity * Utilization / 100
+ */
+ private BigDecimal getMaxRange(MResource r)
+ {
+ BigDecimal utilizationDec = r.getPercentUtilization().divide(Env.ONEHUNDRED, 2, RoundingMode.HALF_UP);
+ int precision = 2; // TODO: hardcoded
+ return r.getDailyCapacity().divide(utilizationDec, precision, RoundingMode.HALF_UP);
+ }
- public CategoryDataset getDataset() {
-
- return dataset;
- }
+ public CategoryDataset getDataset()
+ {
+ return dataset;
+ }
- public JTree getTree() {
-
+ public JTree getTree()
+ {
return tree;
}
}
diff --git a/client/src/org/eevolution/form/crp/CRPModel.java b/client/src/org/eevolution/form/crp/CRPModel.java
index 81fc725bb5..0a10deca5b 100644
--- a/client/src/org/eevolution/form/crp/CRPModel.java
+++ b/client/src/org/eevolution/form/crp/CRPModel.java
@@ -28,12 +28,10 @@ import org.jfree.data.category.CategoryDataset;
* @author Gunther Hoppe, tranSIT GmbH Ilmenau/Germany
* @version 1.0, October 14th 2005
*/
-public interface CRPModel {
-
- public JTree getTree();
-
+public interface CRPModel
+{
+ public JTree getTree();
public CategoryDataset getDataset();
-
public BigDecimal calculateLoad(Timestamp dateTime, MResource r, String docStatus);
}
diff --git a/client/src/org/eevolution/form/crp/DiagramTreeCellRenderer.java b/client/src/org/eevolution/form/crp/DiagramTreeCellRenderer.java
index 97a83a633e..5ea4f862c5 100644
--- a/client/src/org/eevolution/form/crp/DiagramTreeCellRenderer.java
+++ b/client/src/org/eevolution/form/crp/DiagramTreeCellRenderer.java
@@ -28,9 +28,7 @@ import javax.swing.tree.DefaultMutableTreeNode;
import org.compiere.model.MResource;
import org.compiere.util.Env;
-
import org.eevolution.form.tree.MapTreeCellRenderer;
-
import org.eevolution.model.MPPOrder;
import org.eevolution.model.MPPOrderNode;
@@ -38,60 +36,60 @@ import org.eevolution.model.MPPOrderNode;
* @author Gunther Hoppe, tranSIT GmbH Ilmenau/Germany
* @version 1.0, October 14th 2005
*/
-public class DiagramTreeCellRenderer extends MapTreeCellRenderer {
-
- public DiagramTreeCellRenderer(HashMap map) {
+public class DiagramTreeCellRenderer extends MapTreeCellRenderer
+{
+ private static final long serialVersionUID = 1L;
+ public DiagramTreeCellRenderer(HashMap map)
+ {
super(map);
}
-
- public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean expanded, boolean leaf, int row, boolean hasFocus) {
-
- super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus);
-
- String name = (String)getMapping(value);
- ImageIcon icon = getIcon(value);
- if(isNotAvailable(name)) {
-
- final int x1 = getFontMetrics(getFont()).stringWidth(name)+icon.getIconWidth();
- JLabel l = new JLabel(name.substring(1, name.length()-1), icon, JLabel.LEFT) {
-
- public void paint(Graphics g) {
- super.paint(g);
-
- int y = getFont().getSize()/2;
-
- g.drawLine(0, y, x1, y);
- }
- };
- l.setFont(getFont());
- return l;
- }
- return this;
- }
+ @Override
+ public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean expanded, boolean leaf, int row, boolean hasFocus)
+ {
+ Component c = super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus);
+
+ String name = (String)getMapping(value);
+ ImageIcon icon = getIcon(value);
+ if(isNotAvailable(name))
+ {
+ final int x1 = getFontMetrics(getFont()).stringWidth(name) + icon.getIconWidth();
+ JLabel l = new JLabel(name.substring(1, name.length()-1), icon, JLabel.LEFT) {
+ private static final long serialVersionUID = 1L;
+ public void paint(Graphics g) {
+ super.paint(g);
+ int y = getFont().getSize()/2;
+ g.drawLine(0, y, x1, y);
+ }
+ };
+ l.setFont(getFont());
+ return l;
+ }
+ return c;
+ }
- private boolean isNotAvailable(String value) {
-
+ private boolean isNotAvailable(String value)
+ {
return value.startsWith("{") && value.endsWith("}");
}
- protected ImageIcon getIcon(Object value) {
-
+ protected ImageIcon getIcon(Object value)
+ {
ImageIcon icon = null;
DefaultMutableTreeNode node = (DefaultMutableTreeNode)value;
- if(node.getUserObject() instanceof MResource) {
-
+ if(node.getUserObject() instanceof MResource)
+ {
}
- else if(node.getUserObject() instanceof Date) {
-
+ else if(node.getUserObject() instanceof Date)
+ {
icon = Env.getImageIcon("Calendar10.gif");
}
- else if(node.getUserObject() instanceof MPPOrder) {
-
+ else if(node.getUserObject() instanceof MPPOrder)
+ {
}
- else if(node.getUserObject() instanceof MPPOrderNode) {
-
+ else if(node.getUserObject() instanceof MPPOrderNode)
+ {
}
return icon;