Skip to content

Commit

Permalink
Merge pull request #115 from SubmergedDuck/ViewTesting
Browse files Browse the repository at this point in the history 
View Testing PR
  • Loading branch information
@SubmergedDuck
SubmergedDuck authored Dec 3, 2023
2 parents 9d8bb9d + 438d900 commit df0c068
Show file tree
Hide file tree
Showing 10 changed files with 678 additions and 295 deletions.
216 changes: 108 additions & 108 deletions src/view/EventDetailsBasicView.java
View file
Original file line number Diff line number Diff line change
@@ -1,81 +1,45 @@
package view;

import entity.Events.Event;
import interface_adapter.get_event_details.GetEventDetailsController;
import interface_adapter.get_event_details.GetEventDetailsState;
import interface_adapter.get_event_details.GetEventDetailsViewModel;
import interface_adapter.join_event.JoinEventController;
import interface_adapter.join_event.JoinEventState;
import use_case.get_event_details.GetEventDetailsInteractor;

import javax.swing.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;

public class EventDetailsBasicView extends JPanel implements ActionListener, PropertyChangeListener {
public final String viewName = "event details";

private final GetEventDetailsViewModel getEventDetailsViewModel;
private final GetEventDetailsController getEventDetailsController;
private final JoinEventController joinEventController;

//TODO private final GoBackController goBackController; --> the constructor will need to change too.

private final JButton join;
private final JButton back;
private final Event event;

public EventDetailsBasicView(GetEventDetailsViewModel viewModel,
GetEventDetailsController controller,
JoinEventController joinEventController,
Event event) {
this.getEventDetailsViewModel = viewModel;
this.getEventDetailsController = controller;
this.joinEventController = joinEventController;
this.event = event; // Not sure if we should store the event whose details is displayed here.

getEventDetailsViewModel.addPropertyChangeListener(this);

JLabel title = new JLabel("View event details");
JPanel eventDetails = new JPanel();

join = new JButton("Join");
back = new JButton("back");
JPanel buttons = new JPanel();
buttons.add(join);
buttons.add(back);

this.add(buttons);

join.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
if (e.getSource().equals(join)) {
// TODO: need to figure out where to obtain user
// joinEventController.execute(event, user);
}

}
});

back.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
if (e.getSource().equals(back)) {
// TODO: Add GoBack controller after the use case is implemented
// goBackController.execute();
}
}
});
}


// // Another constructor that has no attributes just for testing out the view
// public EventDetailsBasicView() {
//package view;
//
//import entity.Events.Event;
//import interface_adapter.get_event_details.GetEventDetailsController;
//import interface_adapter.get_event_details.GetEventDetailsState;
//import interface_adapter.get_event_details.GetEventDetailsViewModel;
//import interface_adapter.join_event.JoinEventController;
//import interface_adapter.join_event.JoinEventState;
//import use_case.get_event_details.GetEventDetailsInteractor;
//
//import javax.swing.*;
//import java.awt.event.ActionEvent;
//import java.awt.event.ActionListener;
//import java.beans.PropertyChangeEvent;
//import java.beans.PropertyChangeListener;
//
//public class EventDetailsBasicView extends JPanel implements ActionListener, PropertyChangeListener {
// public final String viewName = "event details";
//
// private final GetEventDetailsViewModel getEventDetailsViewModel;
// private final GetEventDetailsController getEventDetailsController;
// private final JoinEventController joinEventController;
//
// //TODO private final GoBackController goBackController; --> the constructor will need to change too.
//
// private final JButton join;
// private final JButton back;
// private final Event event;
//
// public EventDetailsBasicView(GetEventDetailsViewModel viewModel,
// GetEventDetailsController controller,
// JoinEventController joinEventController,
// Event event) {
// this.getEventDetailsViewModel = viewModel;
// this.getEventDetailsController = controller;
// this.joinEventController = joinEventController;
// this.event = event; // Not sure if we should store the event whose details is displayed here.
//
// getEventDetailsViewModel.addPropertyChangeListener(this);
//
// JLabel title = new JLabel("View event details");
// JPanel eventDetails = new JPanel();
//
// join = new JButton("Join");
// back = new JButton("back");
Expand All @@ -88,8 +52,9 @@ public void actionPerformed(ActionEvent e) {
// join.addActionListener(new ActionListener() {
// @Override
// public void actionPerformed(ActionEvent e) {
// if (e.getSource().equals(join)){
// System.out.println("Join");;
// if (e.getSource().equals(join)) {
// // TODO: need to figure out where to obtain user
// // joinEventController.execute(event, user);
// }
//
// }
Expand All @@ -99,39 +64,74 @@ public void actionPerformed(ActionEvent e) {
// @Override
// public void actionPerformed(ActionEvent e) {
// if (e.getSource().equals(back)) {
// System.out.println("Go back");
// // TODO: Add GoBack controller after the use case is implemented
// // goBackController.execute();
// }
// }
// });
// }
//
@Override
public void actionPerformed(ActionEvent e) {
;
}

@Override
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getPropertyName().equals("state")) {
GetEventDetailsState state = (GetEventDetailsState) evt.getNewValue();
JOptionPane.showMessageDialog(this, new String[] {state.getEventName(), state.getEventAddress(),
state.getEventDate(), state.getEventDescription(), state.getEventCapacity()});
} else if (evt.getPropertyName().equals("join event")) { // The change is caused by a user made a JoinEvent action
JoinEventState state = (JoinEventState) evt.getNewValue();
if (state.isSuccess()) {
JOptionPane.showMessageDialog(this, "You have successfully joined this event!");
} else {
JOptionPane.showMessageDialog(this, state.getError());
}
}

}
//
// public static void main(String[] args) {
// EventDetailsBasicView view = new EventDetailsBasicView();
// JFrame frame = new JFrame();
// frame.setSize(400,300);
// frame.add(view);
// frame.setVisible(true);
//
//// // Another constructor that has no attributes just for testing out the view
//// public EventDetailsBasicView() {
////
//// JLabel title = new JLabel("View event details");
////
//// join = new JButton("Join");
//// back = new JButton("back");
//// JPanel buttons = new JPanel();
//// buttons.add(join);
//// buttons.add(back);
////
//// this.add(buttons);
////
//// join.addActionListener(new ActionListener() {
//// @Override
//// public void actionPerformed(ActionEvent e) {
//// if (e.getSource().equals(join)){
//// System.out.println("Join");;
//// }
////
//// }
//// });
////
//// back.addActionListener(new ActionListener() {
//// @Override
//// public void actionPerformed(ActionEvent e) {
//// if (e.getSource().equals(back)) {
//// System.out.println("Go back");
//// }
//// }
//// });
//// }
////
// @Override
// public void actionPerformed(ActionEvent e) {
// ;
// }
//
// @Override
// public void propertyChange(PropertyChangeEvent evt) {
// if (evt.getPropertyName().equals("state")) {
// GetEventDetailsState state = (GetEventDetailsState) evt.getNewValue();
// JOptionPane.showMessageDialog(this, new String[] {state.getEventName(), state.getEventAddress(),
// state.getEventDate(), state.getEventDescription(), state.getEventCapacity()});
// } else if (evt.getPropertyName().equals("join event")) { // The change is caused by a user made a JoinEvent action
// JoinEventState state = (JoinEventState) evt.getNewValue();
// if (state.isSuccess()) {
// JOptionPane.showMessageDialog(this, "You have successfully joined this event!");
// } else {
// JOptionPane.showMessageDialog(this, state.getError());
// }
// }
//
// }
}
////
//// public static void main(String[] args) {
//// EventDetailsBasicView view = new EventDetailsBasicView();
//// JFrame frame = new JFrame();
//// frame.setSize(400,300);
//// frame.add(view);
//// frame.setVisible(true);
//// }
//}
68 changes: 34 additions & 34 deletions src/view/EventLabelRenderer.java
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
package view;

import javax.swing.*;
import java.awt.*;

public class EventLabelRenderer extends JLabel implements javax.swing.ListCellRenderer {
@Override
public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {

if (isSelected) {
setBackground(list.getSelectionBackground());
setForeground(list.getSelectionForeground());
} else {
setBackground(list.getBackground());
setForeground(list.getForeground());
}

this.setText((String) value);
this.setSize(1000, 100);
//this.setEnabled(true);
return this;
//return new JTextField(String.valueOf(value));

//Set the icon and text. If icon was null, say so.
// ImageIcon icon = images[selectedIndex];
// String pet = petStrings[selectedIndex];
// setIcon(icon);
// if (icon != null) {
// setText(pet);
// setFont(list.getFont());
//package view;
//
//import javax.swing.*;
//import java.awt.*;
//
//public class EventLabelRenderer extends JLabel implements javax.swing.ListCellRenderer {
// @Override
// public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
//
// if (isSelected) {
// setBackground(list.getSelectionBackground());
// setForeground(list.getSelectionForeground());
// } else {
// setUhOhText(pet + " (no image available)",
// list.getFont());
// setBackground(list.getBackground());
// setForeground(list.getForeground());
// }
}
}
//
// this.setText((String) value);
// this.setSize(1000, 100);
// //this.setEnabled(true);
// return this;
// //return new JTextField(String.valueOf(value));
//
// //Set the icon and text. If icon was null, say so.
//// ImageIcon icon = images[selectedIndex];
//// String pet = petStrings[selectedIndex];
//// setIcon(icon);
//// if (icon != null) {
//// setText(pet);
//// setFont(list.getFont());
//// } else {
//// setUhOhText(pet + " (no image available)",
//// list.getFont());
//// }
// }
//}
Loading

0 comments on commit df0c068

Please sign in to comment.