Gui

src/efakturaplus/App.java

@@ -1,37 +1,10 @@
 package efakturaplus;
 
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileReader;
-import java.io.InputStreamReader;
-
 import efakturaplus.gui.Window;
-import efakturaplus.models.User;
 
 public class App {
 
 	public static void main(String[] args) {
-		try {	
-			File f = new File("user.enc");
-
-			if(f.exists()) {
-				FileInputStream fis = new FileInputStream(f);
-				BufferedReader br = new BufferedReader(new FileReader(f));
-				StringBuilder sb = new StringBuilder();
-				String line;
-				while((line = br.readLine()) == null) {
-					sb.append(line);
-				}
-
-				User.API_KEY = sb.toString();
-			}
-
-		}catch(Exception e){
-			System.out.println("Error reading a file!");
-		};
-
 		@SuppressWarnings("unused")
 		Window w = new Window();
 	}

src/efakturaplus/gui/InvoiceList.java

@@ -26,6 +26,7 @@
 import javax.swing.border.Border;
 
 import efakturaplus.models.Invoice;
+import efakturaplus.models.InvoiceStatus;
 import efakturaplus.models.InvoiceType;
 import efakturaplus.util.EFakturaUtil;
 import efakturaplus.util.PrintColor;
@@ -350,6 +351,9 @@ private void deselect(InvoiceListItem item) {
 	}
 
 	private void approveOrReject(boolean approve) {
+		if(approve)
+			this.invoice.status = InvoiceStatus.Approved;
+
 		EFakturaUtil util = EFakturaUtil.getInstance();
 
 		util.approveOrReject(this.invoice, approve);

src/efakturaplus/gui/KeyPanel.java

@@ -4,9 +4,6 @@
 import java.awt.event.*;
 import java.io.*;
 import java.security.AlgorithmParameters;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.Key;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.security.spec.InvalidKeySpecException;
@@ -15,47 +12,57 @@
 import javax.crypto.*;
 import javax.crypto.spec.*;
 
-import sun.misc.*;
-
-import java.util.Arrays;
-import java.util.Base64;
-
 import javax.swing.BorderFactory;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
-import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JPasswordField;
 import javax.swing.JTextField;
-import javax.swing.border.Border;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
 
-import ch.randelshofer.util.ArrayUtil;
 import efakturaplus.models.User;
 
 public class KeyPanel extends JPanel {
 
 	private static final long serialVersionUID = 1L;
 
-	private String password;
-	private byte[] iv;
-
 	JLabel keyLabel, passLabel, passLabel2;
 	JTextField keyInput;
 	JPasswordField passInput, passInput2;
 
 	private Window parent;
 
-	private boolean registeredUser;
-
 	public KeyPanel(Window parent, int width, int height) {
 		this.parent = parent;
 		this.setSize(width, height);
 		this.setLayout(null);
 
+		loadAPIKey();
 		addComponents(width, height);
 	}
+
+	private void loadAPIKey() {
+		try {	
+			File f = new File("user.enc");
+
+			if(f.exists()) {
+				FileInputStream fis = new FileInputStream(f);
+				BufferedReader br = new BufferedReader(new FileReader(f));
+				StringBuilder sb = new StringBuilder();
+				String line;
+				while((line = br.readLine()) == null) {
+					sb.append(line);
+				}
+
+				User.API_KEY = sb.toString();
+
+				br.close();
+				fis.close();
+			}
+
+		}catch(Exception e){
+			System.out.println("Error reading a file!");
+		};
+	}
 
 	private void addComponents(int width, int height) {
 
@@ -200,6 +207,8 @@ private void encryptData() throws NoSuchAlgorithmException, InvalidKeySpecExcept
 			fos.write(iv);
 			fos.write(salt);
 			fos.write(ciphertext);
+
+			fos.close();
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -230,6 +239,8 @@ private String decryptData() {
 	        String plaintext = new String(cis.readAllBytes());
 
 	        content = plaintext;
+
+	        cis.close();
 
 	    }catch(Exception e) {
 	    	e.printStackTrace();

src/efakturaplus/gui/MainPanel.java

@@ -37,9 +37,12 @@ public class MainPanel extends JPanel {
 	private JPanel navigator;
 	private JButton purchaseBtn;
 	private JButton salesBtn;
+	private JButton statsBtn;
 
 	private InvoiceList purchaseIl;
 	private InvoiceList salesIl;
+
+	private StatisticsPanel statsPanel;
 
 	public MainPanel(Window parent) {
 		this.parent = parent;
@@ -57,6 +60,9 @@ public MainPanel(Window parent) {
 		salesIl = new InvoiceList();
 		dataPanel.add(salesIl, "SALES");
 
+		statsPanel = new StatisticsPanel();
+		dataPanel.add(statsPanel, "STATS");
+
 		dataPanelLayout.show(dataPanel, "PURCHASE");
 
 		this.add(dataPanel, BorderLayout.CENTER);
@@ -68,10 +74,12 @@ public MainPanel(Window parent) {
 	private void createNavigator() {
 		Image purchaseBtnImg = null;
 		Image salesBtnImg = null;
+		Image statsButtonImg = null;
 		Image logoutImg = null;
 		try {
 			purchaseBtnImg = ImageIO.read(new File("icons/invoice-purchase.png"));
 			salesBtnImg = ImageIO.read(new File("icons/invoice-sales.png"));
+			statsButtonImg = ImageIO.read(new File("icons/stats.png"));
 			logoutImg = ImageIO.read(new File("icons/logout.png"));
 
 			//this.purchaseBtn.add(new JLabel("Sales"));
@@ -99,9 +107,8 @@ public void actionPerformed(ActionEvent e) {
 
 		navigator.add(purchaseBtn, gbc);
 
-		gbc.gridy = 1;
-
 
+		gbc.gridy = 1;
 		this.salesBtn = makeButton(salesBtnImg, "Sales", new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
@@ -111,14 +118,24 @@ public void actionPerformed(ActionEvent e) {
 
 		navigator.add(salesBtn, gbc);
 
+		gbc.gridy = 2;
+		this.statsBtn = makeButton(statsButtonImg, "Statistics", new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				dataPanelLayout.show(dataPanel, "STATS");
+			}
+		});
+
+		navigator.add(statsBtn, gbc);
+
 		JButton logout = makeButton(logoutImg, "Log out", new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				parent.showKeyPanel();
 			}
 		});
 
-		gbc.gridy = 2;
+		gbc.gridy = 3;
 		gbc.anchor = GridBagConstraints.LAST_LINE_END;
 		gbc.weighty = 1;