diff --git a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/ActivityPanel.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/ActivityPanel.java index 0a182a3..cccdcfc 100644 --- a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/ActivityPanel.java +++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/ActivityPanel.java @@ -9,6 +9,7 @@ import javax.swing.BorderFactory; import javax.swing.JButton; import javax.swing.JOptionPane; import javax.swing.JPanel; +import javax.swing.JTextField; import java.awt.Color; import java.awt.Dimension; import java.awt.FlowLayout; @@ -61,8 +62,12 @@ public class ActivityPanel extends JPanel implements Comparable { add(totalComment); add(today); add(remains); + name.setHorizontalAlignment(JTextField.LEFT); + comment.setHorizontalAlignment(JTextField.LEFT); + ticket.setHorizontalAlignment(JTextField.LEFT); -// JButton moveThisButton = new SmallTButton("Move "); + + // JButton moveThisButton = new SmallTButton("Move "); // JButton moveBeforeButton = new SmallTButton("Here"); JButton copyButton = new SmallTButton("Copy"); JButton deleteButton = new SmallTButton("Delete"); @@ -241,6 +246,9 @@ public class ActivityPanel extends JPanel implements Comparable { subject.setText(activity.createSubject()); totalComment.setText(activity.createTotalComment()); sortkey.setText(String.valueOf(activity.getSortkey())); + name.setFont(SwingUtils.VERY_SMALL_FONT); + comment.setFont(SwingUtils.VERY_SMALL_FONT); + ticket.setFont(SwingUtils.VERY_SMALL_FONT); this.activityRepository = activityRepository; //this.setBorder(BorderFactory.createLineBorder(Color.ORANGE, 1)); setAlignmentX(LEFT_ALIGNMENT); diff --git a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/DayPanel.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/DayPanel.java index 142bb39..6ea3304 100644 --- a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/DayPanel.java +++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/DayPanel.java @@ -214,13 +214,16 @@ public class DayPanel extends JPanel { double done = 0d; double todo = 8d; for(ActivityPanel ap:list) { - panelInsideScrollPane.add(ap); + double now = ap.getActivity().getSpentHours() + ap.getActivity().getSpentMinutes() / 60d; done = done + now; todo = todo - now; ap.today.setText(TTime.ofMilliseconds((int)(done * 60d * 60d * 1000d)).toString().substring(0,5)); ap.remains.setText(TTime.ofMilliseconds((int)(todo * 60d * 60d * 1000d)).toString().substring(0,5)); + panelInsideScrollPane.add(ap); + ap.revalidate(); } + revalidate(); }