Merged in developer (pull request #1)

Fix al deze kut zooi

KUT ZOOI

src/agenda/Act.java

@@ -96,4 +96,8 @@ public class Act {
             this.artists.add(artist);
         }
     }
+
+    public void setActTime(ActTime actTime) {
+        this.actTime = actTime;
+    }
 }

src/agenda/ActTime.java

@@ -9,7 +9,8 @@ import java.util.GregorianCalendar;
 public class ActTime {
     
 	private GregorianCalendar beginTime, endTime;
-    
+    private String beginString, endString;
+
     public ActTime(int y1, int m1, int d1, int hh1, int mm1, int y2, int m2, int d2, int hh2, int mm2){
     	beginTime = new GregorianCalendar();
     	endTime = new GregorianCalendar();
@@ -18,7 +19,27 @@ public class ActTime {
     }
     
     public ActTime(String beginTime, String endTime){
+        this.beginTime = new GregorianCalendar();
+        this.endTime = new GregorianCalendar();
+        
+        this.beginString = beginTime;
+        this.endString = endTime;
+
+        int y1 = Integer.valueOf(beginTime.substring(0, 4));
+        int m1 = Integer.valueOf(beginTime.substring(5, 7));
+        int d1 = Integer.valueOf(beginTime.substring(8, 10));
+        int hh1 = Integer.valueOf(beginTime.substring(11, 13));
+        int mm1 = Integer.valueOf(beginTime.substring(14, 16));
+
+        int y2 = Integer.valueOf(endTime.substring(0, 4));
+        int m2 = Integer.valueOf(endTime.substring(5, 7));
+        int d2 = Integer.valueOf(endTime.substring(8, 10));
+        int hh2 = Integer.valueOf(endTime.substring(11, 13));
+        int mm2 = Integer.valueOf(endTime.substring(14, 16));
 
+        //2015,02,11,21,00
+        this.beginTime.set(y1, m1, d1, hh1, mm1);
+        this.endTime.set(y2, m2, d2, hh2, mm2);
     }
 
     public void setBeginTime(int y, int m, int d, int hh, int mm){

src/agenda/Agenda.java

@@ -31,10 +31,10 @@ public class Agenda {
         this.artists.add(new Artist("Sabaton", "Power metal"));
 
         //acts
-        this.acts.add(new Act(this.artists.get(0).getName(), this.stages.get(0), "Heavy metal", new ActTime(2015,02,11,21,00  ,2015,02,11,23,00), this.artists.get(0)));
-        this.acts.add(new Act(this.artists.get(1).getName(), this.stages.get(1), "Test metal" , new ActTime(2015,02,11,23,00  ,2015,02,12,04,30), this.artists.get(1)));
-        this.acts.add(new Act(this.artists.get(2).getName(), this.stages.get(0), "Power metal" ,new ActTime(2015,02,11,20,00  ,2015,02,11,23,00), this.artists.get(2)));
-        
+//        this.acts.add(new Act(this.artists.get(0).getName(), this.stages.get(0), "Heavy metal", new ActTime(2015,02,11,21,00  ,2015,02,11,23,00), this.artists.get(0)));
+//        this.acts.add(new Act(this.artists.get(1).getName(), this.stages.get(1), "Test metal" , new ActTime(2015,02,11,23,00  ,2015,02,12,04,30), this.artists.get(1)));
+//        this.acts.add(new Act(this.artists.get(2).getName(), this.stages.get(0), "Power metal" ,new ActTime(2015,02,11,20,00  ,2015,02,11,23,00), this.artists.get(2)));
+//
         System.out.println(this);
     }
     

src/gui/frames/MainFrame.java

@@ -24,7 +24,7 @@ public class MainFrame extends JFrame{
     
     public MainFrame(){
         this.agenda = new Agenda();
-        this.currentPanel = new Table(this.agenda);
+        this.currentPanel = new EditPane(this.agenda);
         this.add(this.currentPanel);
 		this.setResizable(true);
 		this.setBounds(100,100,1440,900);

src/gui/panels/edit/dialogs/ActDialogPanel.java

@@ -17,7 +17,7 @@ public class ActDialogPanel extends JDialog{
 
 
     private Agenda agenda;
-    private JTextField name, genre;
+    private JTextField name, genre, beginTime, endTime;
     private JComboBox stageComboBox;
 
     private DefaultListModel model;
@@ -39,6 +39,7 @@ public class ActDialogPanel extends JDialog{
         main.add(this.dates());
         main.add(this.artistsChooser());
         
+        main.add(timeSetter());
         main.add(this.buttons());
         super.add(main);
         super.setVisible(true);
@@ -67,6 +68,7 @@ public class ActDialogPanel extends JDialog{
         }
         
         main.add(this.artistsChooser());
+        main.add(this.timeSetter());
         main.add(this.buttons());
         super.add(main);
     }
@@ -207,6 +209,39 @@ public class ActDialogPanel extends JDialog{
         artists.add(buttonPanel);
         return artists;
     }
+    
+    private JPanel timeSetter(){
+        this.beginTime = new JTextField();
+        this.endTime = new JTextField();
+
+        JPanel time = new JPanel();
+        time.setLayout(new BoxLayout(time, BoxLayout.Y_AXIS));
+        
+        JPanel begin = new JPanel();
+        begin.setLayout(new GridLayout());
+        begin.add(new JLabel("begin time:"));
+        begin.add(this.beginTime);
+
+        JPanel end = new JPanel();
+        end.setLayout(new GridLayout());
+        end.add(new JLabel("end time:"));
+        end.add(this.endTime);
+        
+        time.add(begin);
+        time.add(end);
+
+        if(this.act == null){
+            System.out.println("default txt.");
+            this.beginTime.setText("2015-10-11-08-10");
+            this.endTime.setText("2015-10-11-12-20");
+        }else{
+            System.out.println("non txt.");
+
+            this.beginTime.setText(this.act.getActTime().getBeginTimeString());
+            this.endTime.setText(this.act.getActTime().getEndTimeString());
+        }
+        return time;
+    }
 
     private JPanel buttons(){
         JPanel buttons = new JPanel();
@@ -256,7 +291,7 @@ public class ActDialogPanel extends JDialog{
         
         
         if(this.act == null){
-            Act act = new Act(this.name.getText(), (Stage) this.stageComboBox.getSelectedItem(), this.genre.getText(), new ActTime(2015,02,11,21,00  ,2015,02,11,23,00), artists);
+            Act act = new Act(this.name.getText(), (Stage) this.stageComboBox.getSelectedItem(), this.genre.getText(), new ActTime(this.beginTime.getText()  ,this.endTime.getText()), artists);
             this.model.addElement(act);
             this.agenda.addAct(act);
         }else{
@@ -264,6 +299,7 @@ public class ActDialogPanel extends JDialog{
             this.act.setGenre(this.genre.getText());
             this.act.setStage((Stage) this.stageComboBox.getSelectedItem());
             this.act.setArtists(artists);
+            this.act.setActTime(new ActTime(this.beginTime.getText()  ,this.endTime.getText()));
             this.model.removeElement(this.act);
             this.model.addElement(act);
         }