From 21c7d0642bcac2f064e25b0d32837fb86665deac Mon Sep 17 00:00:00 2001
From: ricky barrette <rickbarrette@gmail.com>
Date: Sun, 23 Jan 2011 04:22:27 +0000
Subject: [PATCH] added clear button to the ShowAllPanel.java fixed the export
 save dialog to automatically handle extensions added new order stats to the
 order pane

---
 Order Processor/images/page.png               | Bin 0 -> 1130 bytes
 Order Processor/images/page_process.png       | Bin 0 -> 2068 bytes
 .../java/OrderProcessor/UI/OrderPane.java     |  11 ++-
 .../java/OrderProcessor/UI/SearchPanel.java   |  23 +++---
 .../java/OrderProcessor/UI/SettingsPanel.java |  24 ++++--
 .../java/OrderProcessor/UI/ShowAllPanel.java  |  72 +++++++++++++-----
 Order Processor/version infomation/changelog  |   7 +-
 Order Processor/version infomation/version    |   2 +-
 8 files changed, 98 insertions(+), 41 deletions(-)
 create mode 100644 Order Processor/images/page.png
 create mode 100644 Order Processor/images/page_process.png

diff --git a/Order Processor/images/page.png b/Order Processor/images/page.png
new file mode 100644
index 0000000000000000000000000000000000000000..1cf1e34a862cd24129c9759ff4164a06aa82d919
GIT binary patch
literal 1130
zcmV-w1eN=VP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ<@JU2LRCwB~SIcf3RS-ROZ;xk~(Ij5j(pVUfQOuGBYm_JwD?TAR{)1nDC9GH?
zAtaP7Ux0$d7Rka=<ed{@BrB77&#lAaKKgdMyJtwa(%9{3xzDLnRi~<jB;xt~*|V=E
zCnsMI4~m5m0Y$JS016-g2&g*1UxFm!|C0nrtT&s%i|gxeoO9oc2%65rM~~8Vk>BX`
zddDA~zW?zbFPC_|R7^$%P6k^XSc9!|u-0NU8X<o$NvINlLRFzkQ1!c;o153`_4>y)
z5{(1^IDq);W`X5a@%-;KK0jQ*z&}`w!P(gvdc7WU<wy@6zq@z;9{T<M57#fQ|C!I{
zzZzrqBR~)v1)h9*3;<ZJ)>tnWFxG+rz*<`Y2Y?8ms^M>o!^6Y=a5Vhs;^N}V&1Umk
z8;PRn%b45#K@WreLFHZqsUHzZsSyznz|qn1{Ra=Wzg%8ke&L+^vnd^>D?gD){>gzF
z35dYj^0AZ2$>jX}lcyr`VV<T&0=0YSDxg*p0E`&SW;48*PBEQMF&>Z4PftI1Dk4Xn
z1m5+Ch)>;MfWcsZ`C^XQn;C9zZ_(=&pN+@kpG9P{vj%oWzv~zy7!HSU&V|-gs5)3%
zJYKC<PXK(|q5%IFCA=rq>PLy9C}3*sV7dzMzXP*5nA|OEQJQxJZK0A>NVW|&VwkQT
z?;_N6uP%E&Bfx0e+Tn!Cw@yVBJR4N;yP!p#KurO6*9`VNsyP8osrKL*v2FqieG3BK
z;mVIHp?N2$uL6Xj)tZ8`XLT<hh&hcws!U42k7Xz|QvuxsoN5}axxd%RG|h;dJV_`6
zxcdB42_@mW6(F2b6om#LX;q?1AjlroQ1#IVP(~F3p^h%_*6Ezy8L@4B9v_~HFw{|=
znixGb7HEe8(YM1y2qgUVU6Y9sdbiUUIWrP5HDI>Bb<{xG>p%$V;4My<MP5p;r5c$Z
zxNajVrx!>trJ%*2VgY9P)vPX<sgT+=soU0u&cV4YKtRIa@*+qYER4Ui_VU%PWzIG0
zf<RJt`+%3os>a11Id)~Zg?pOPpw)uQz+F%@`b4J!OubxPN~B?9h=s^h;bBFm0*Vwh
zRYN>`IH6O84Q<GPERZTN!gND6<?_LkYC}tB%u>@{g!C=w)Ohr;WZrcFWc5&zh*K}U
zsDy4RQ{i^`Kxjj!ox5QK&Bt{r$Vw+Lz0hzU1(FX?O9h%1kN7jBp}qr@En0d4h~zO{
z3yBpG7%@J|<bu^Q6aqx)4*~%tc0yQy6d(-5D2y6F{3{$u+e%=$T)w)xx_WMHu}F)F
ww61+MHKHP=DqwY^a&G(HYPEWmKjz;7068O)mtIxYWB>pF07*qoM6N<$f}8F9lmGw#

literal 0
HcmV?d00001

diff --git a/Order Processor/images/page_process.png b/Order Processor/images/page_process.png
new file mode 100644
index 0000000000000000000000000000000000000000..2713c3011453bd1df4e9fa8816895144c6123f8e
GIT binary patch
literal 2068
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

literal 0
HcmV?d00001

diff --git a/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/OrderPane.java b/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/OrderPane.java
index d160106..d7567e3 100644
--- a/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/OrderPane.java	
+++ b/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/OrderPane.java	
@@ -54,7 +54,9 @@ public class OrderPane extends JScrollPane {
 		mOutput.setText(null);
 		BigDecimal possible = new BigDecimal(0);
 		BigDecimal actual = new BigDecimal(0);
+		BigDecimal possibleNew = new BigDecimal(0);
 		int total = 0;
+		int newOrders = 0;
 		
 			for (int i = 0; i < list.size(); i++) {
 				if(mListener != null)
@@ -67,6 +69,8 @@ public class OrderPane extends JScrollPane {
 							break;
 						case NEW:
 							styles.add(TextStyle.BLUE.toString());
+							newOrders++;
+							possibleNew = possibleNew.add(new BigDecimal(list.get(i).getOrderAmount()));
 							break;
 						default:
 							styles.add(TextStyle.REGULAR.toString());
@@ -82,7 +86,12 @@ public class OrderPane extends JScrollPane {
 			}
 
 		updateTextPane(list, styles);
-		updateTextPane("\nPossible sales: $" + possible.setScale(2, BigDecimal.ROUND_DOWN) + "\nActual sales: $" + actual.setScale(2, BigDecimal.ROUND_DOWN) + "\nPossible sold:" + list.size() + "\nTotal sold: " + total, TextStyle.BOLD);
+		updateTextPane("\nPossible sold:" + list.size() 
+				+"\nPossible sales: $" + possible.setScale(2, BigDecimal.ROUND_DOWN)
+				+ "\n\nTotal new sales: "+ newOrders
+				+ "\nPossible new sales: $"+ possibleNew.setScale(2, BigDecimal.ROUND_DOWN) 
+				+ "\n\nTotal sold: " + total
+				+ "\nActual sales: $" + actual.setScale(2, BigDecimal.ROUND_DOWN) , TextStyle.BOLD);
 	}
 	
 	/**
diff --git a/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/SearchPanel.java b/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/SearchPanel.java
index ff64f3a..f4cf093 100644
--- a/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/SearchPanel.java	
+++ b/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/SearchPanel.java	
@@ -53,7 +53,7 @@ public class SearchPanel extends JPanel implements ActionListener, ProgressListe
 	private JCheckBox mExclusiveCheckBox;
 	private JButton mExportButton;
 	private JFileChooser fc;
-	private JCheckBox fcCheckBox;
+//	private JCheckBox fcCheckBox;
 	private JFrame mFrame;
 
 	/**
@@ -120,9 +120,6 @@ public class SearchPanel extends JPanel implements ActionListener, ProgressListe
 		//file chooser
 		fc = new JFileChooser();
         fc.setFileFilter(new FileFilter());
-        fcCheckBox = new JCheckBox("Automatically append extention");
-        fcCheckBox.setSelected(true);
-        fc.setAccessory(fcCheckBox);
 		
 		setVisible(true);
 	}
@@ -161,15 +158,21 @@ public class SearchPanel extends JPanel implements ActionListener, ProgressListe
 	private boolean exportToCSV() {
 		if(fc.showDialog(SearchPanel.this, "Export") == JFileChooser.APPROVE_OPTION){
 			int write = 0;
+			boolean hasExtention;
+			
+			String filename = fc.getSelectedFile().toString();
+		    String ext =filename.substring((filename.lastIndexOf(".")+1),filename.length());
+			
+		    hasExtention = ext.equalsIgnoreCase("csv");
 			
 			//file exists dialog
-			if(fc.getSelectedFile().exists()){
+			if(new File(filename + (( ! hasExtention ) ? ".csv" : "") ).exists()){
 				//default icon, custom title
 				write = JOptionPane.showConfirmDialog(
-				    mFrame,
-				    "Do you want to overwrite"+ fc.getSelectedFile().toString(),
+				    mFrame, "Do you want to overwrite"+ filename + ((! hasExtention ) ? ".csv" : ""),
 				    "Overwrite?",
 				    JOptionPane.YES_NO_OPTION);
+				System.out.print(write);
 			}
 			
 			if(write == 0){
@@ -189,11 +192,7 @@ public class SearchPanel extends JPanel implements ActionListener, ProgressListe
 				}
 				//write to the selceted file
 				try {
-					FileOutputStream theFile;
-					if (fcCheckBox.isSelected())
-						theFile = new FileOutputStream(new File(fc.getSelectedFile().toString()+".csv"));
-					else
-						theFile = new FileOutputStream(fc.getSelectedFile());
+					FileOutputStream theFile = new FileOutputStream(filename + (( ! hasExtention ) ? ".csv" : ""));
 					theFile.write(sb.toString().getBytes());
 					theFile.flush();
 					theFile.close();
diff --git a/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/SettingsPanel.java b/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/SettingsPanel.java
index 782139d..5a87d3c 100644
--- a/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/SettingsPanel.java	
+++ b/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/SettingsPanel.java	
@@ -53,36 +53,42 @@ public class SettingsPanel extends JPanel implements ActionListener {
 		
 		JLabel lblMysqlServerLocation = new JLabel("MYsql server location:");
 		
+		//mql database location
 		mServerLocation = new JTextField();
 		mServerLocation.setColumns(10);
 		
+		//use remote database checkbox
 		mUseRemoteDatabase = new JCheckBox("Use Remote Database?");
 		mUseRemoteDatabase.addActionListener(this);
 		
 		JLabel lblMysqlServerPort = new JLabel("MYsql server port:");
 		
+		//server port number
 		mPortNumber = new JTextField();
 		mPortNumber.setColumns(10);
 		mPortNumber.setText("3306");
 		
 		JLabel lblMysql = new JLabel("MYsql serevr username:");
-		
 		JLabel lblMysqlServerPassword = new JLabel("MYsql server password:");
-		
+		//username
 		mUserName = new JTextField();
 		mUserName.setColumns(10);
 		
+		//user password
 		mUserPassword = new JPasswordField();
 		mUserPassword.setColumns(10);
 		
+		//disable everything
 		mServerLocation.setEnabled(false);
 		mPortNumber.setEnabled(false);
 		mUserName.setEnabled(false);
 		mUserPassword.setEnabled(false);
 		
+		//save button
 		mSaveButton = new JButton("Save");
 		mSaveButton.addActionListener(this);
 		
+		//group layout bullshit
 		GroupLayout groupLayout = new GroupLayout(this);
 		groupLayout.setHorizontalGroup(
 			groupLayout.createParallelGroup(Alignment.LEADING)
@@ -137,9 +143,6 @@ public class SettingsPanel extends JPanel implements ActionListener {
 		// create and load default properties
 		mProps = new Properties();
 		
-
-		
-		mProps = new java.util.Properties();
 		try {
 			FileInputStream in = new FileInputStream(".settings.propertys");
 			mProps.load(in);
@@ -164,8 +167,16 @@ public class SettingsPanel extends JPanel implements ActionListener {
 		}
 	}
 
+	/**
+	 * called when the save button is clicked, or the use remote database check box is clicked
+	 * (non-Javadoc)
+	 * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+	 * @author ricky barrette
+	 */
 	@Override
 	public void actionPerformed(ActionEvent e) {
+		
+		//save button
 		if(e.getSource() == mSaveButton){
 			mProps.put(SERVER_LOCATION, mServerLocation.getText());
 			mProps.put(SERVER_PORT_NUMBER, mPortNumber.getText());
@@ -185,6 +196,7 @@ public class SettingsPanel extends JPanel implements ActionListener {
 			
 		}
 		
+		//use remote database checkbox
 		if(e.getSource() == mUseRemoteDatabase){
 			mProps.put(IS_USING_REMOTE_SERVER, Boolean.toString(mUseRemoteDatabase.isSelected()));
 			try {
@@ -192,10 +204,8 @@ public class SettingsPanel extends JPanel implements ActionListener {
 				mProps.store(out, "---No Comment---");
 				out.close();
 			} catch (FileNotFoundException e1) {
-				// TODO Auto-generated catch block
 				e1.printStackTrace();
 			} catch (IOException e1) {
-				// TODO Auto-generated catch block
 				e1.printStackTrace();
 			}
 			
diff --git a/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/ShowAllPanel.java b/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/ShowAllPanel.java
index 3046edb..cff1207 100644
--- a/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/ShowAllPanel.java	
+++ b/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/ShowAllPanel.java	
@@ -21,7 +21,7 @@ import javax.swing.JProgressBar;
 import com.TwentyCodes.java.OrderProcessor.ProgressListener;
 
 /**
- * This panel will be used to display all Vehicles in the VechicleDB
+ * This panel will be used to display all orders in the order database
  */
 public class ShowAllPanel extends JPanel implements ActionListener, ProgressListener {
 
@@ -29,6 +29,8 @@ public class ShowAllPanel extends JPanel implements ActionListener, ProgressList
 	private JProgressBar mProgressBar;
 	private OrderPane mOutput;
 	private JFrame mFrame;
+	private JButton ok;
+	private JButton clear;
 	
 	/**
 	 * Creates a new ShowAllDialog
@@ -37,41 +39,73 @@ public class ShowAllPanel extends JPanel implements ActionListener, ProgressList
 		super(new BorderLayout());
 		mFrame = frame;
 		
+		JPanel panel = new JPanel();
+		
 //		setTitle("Show All Orders");
 //		setIconImage(new ImageIcon(getClass().getResource("/database.png")).getImage());
 		
-		JButton ok = new JButton("Refresh", new ImageIcon(getClass().getResource("/process.png")));
+		//ok button
+		ok = new JButton("Refresh", new ImageIcon(getClass().getResource("/page_process.png")));
 		ok.addActionListener(this);
+		panel.add(ok);
+		
+		//clear button
+		clear = new JButton("Clear", new ImageIcon(getClass().getResource("/page.png")));
+		clear.addActionListener(this);
+		panel.add(clear);
+		
 		mOutput = new OrderPane();
 		mProgressBar = new JProgressBar();
 		add(mProgressBar, BorderLayout.SOUTH);
 		add(mOutput, BorderLayout.CENTER);
-		add(ok, BorderLayout.NORTH);
-		mProgressBar.setString("Loading from Database");
+		add(panel, BorderLayout.NORTH);
 		mProgressBar.setStringPainted(true);
 		frame.pack();
 		setVisible(true);
 	}	
 
+	/**
+	 * called when the buttons are clicked
+	 * (non-Javadoc)
+	 * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+	 * @author ricky barrette
+	 */
 	@Override
-	public void actionPerformed(ActionEvent arg0) {
-		MainWindow.db.setOnProgressListerner(this);
-		java.util.concurrent.Executors.newSingleThreadExecutor().submit(new Runnable() { 
-			public void run() { 
-				try {
-					mOutput.displayOrders(MainWindow.db.getAllOrders());
-				} catch (SQLException e) {
-					e.printStackTrace();
-				} catch (IOException e) {
-					e.printStackTrace();
-				} catch (ClassNotFoundException e) {
-					e.printStackTrace();
+	public void actionPerformed(ActionEvent e) {
+		
+		//display all the orders
+		if(e.getSource() == ok){
+			MainWindow.db.setOnProgressListerner(this);
+			java.util.concurrent.Executors.newSingleThreadExecutor().submit(new Runnable() { 
+				public void run() { 
+					try {
+						mOutput.displayOrders(MainWindow.db.getAllOrders());
+					} catch (SQLException e) {
+						e.printStackTrace();
+					} catch (IOException e) {
+						e.printStackTrace();
+					} catch (ClassNotFoundException e) {
+						e.printStackTrace();
+					}
+					mFrame.pack();
 				}
-				mFrame.pack();
-			}
-		});
+			});
+		}
+		
+		//clear the output
+		if(e.getSource() == clear){
+			mOutput.setText(null);
+			onProgressUpdate(null, false, 0, 1);
+			mFrame.pack();
+		}
 	}
 
+	/**
+	 * called when there is a progress update
+	 * (non-Javadoc)
+	 * @see com.TwentyCodes.java.OrderProcessor.ProgressListener#onProgressUpdate(java.lang.String, boolean, int, int)
+	 * @author ricky barrette
+	 */
 	@Override
 	public void onProgressUpdate(String string, boolean isIndeterminate, int progress, int max) {
 		mProgressBar.setMaximum(max);
diff --git a/Order Processor/version infomation/changelog b/Order Processor/version infomation/changelog
index 896fba4..853db48 100644
--- a/Order Processor/version infomation/changelog	
+++ b/Order Processor/version infomation/changelog	
@@ -32,4 +32,9 @@ modified the date picker to be easier to use
 
 1.1.1 b 46
 re-added the show all dialog.
-MainWinod.java, reorganized the constructor so the progress bar will be indeterminate when connecting to the database
\ No newline at end of file
+MainWinod.java, reorganized the constructor so the progress bar will be indeterminate when connecting to the database
+
+1.1.2 b 47
+added clear button to the ShowAllPanel.java
+fixed the export save dialog to automatically handle extensions
+added new order stats to the order pane
\ No newline at end of file
diff --git a/Order Processor/version infomation/version b/Order Processor/version infomation/version
index 54d1b07..fca16a3 100644
--- a/Order Processor/version infomation/version	
+++ b/Order Processor/version infomation/version	
@@ -1 +1 @@
-1.1.0 b 35
\ No newline at end of file
+1.1.2 b 47
\ No newline at end of file