reports

saribricka · Jan 15, 2022 · 334a3b2 · 334a3b2
1 parent c1ec2e2
commit 334a3b2
Show file tree

Hide file tree

Showing 141 changed files with 163 additions and 984 deletions.
diff --git a/Item.txt b/Item.txt
@@ -2,6 +2,5 @@
 
 
 
-1;marmellata;20;3.1;null;null;fruits
-4;corte dei mori rosso;50;8.6;null;null;beverage
-2;crunchy;100;3.2;null;null;snacks
+
+4;vino rosso;50;8.6;null;null;beverage
diff --git a/Shop.txt b/Shop.txt
@@ -0,0 +1 @@
+2022-01-15 22:29:56	11	simonetta cornacchia	74.7
diff --git a/bin/main/java/controller/AccountingController.class b/bin/main/java/controller/AccountingController.class
diff --git a/bin/main/java/controller/InvoiceController.class b/bin/main/java/controller/InvoiceController.class
diff --git a/bin/main/java/controller/InvoiceControllerImpl.class b/bin/main/java/controller/InvoiceControllerImpl.class
diff --git a/bin/main/java/controller/ItemController.class b/bin/main/java/controller/ItemController.class
diff --git a/bin/main/java/controller/ItemControllerImpl.class b/bin/main/java/controller/ItemControllerImpl.class
diff --git a/bin/main/java/controller/ShopController.class b/bin/main/java/controller/ShopController.class
diff --git a/bin/main/java/controller/ShopControllerImpl.class b/bin/main/java/controller/ShopControllerImpl.class
diff --git a/bin/main/java/controller/UserControllerImpl.class b/bin/main/java/controller/UserControllerImpl.class
diff --git a/bin/main/java/model/Item.class b/bin/main/java/model/Item.class
diff --git a/bin/main/java/model/ItemImpl.class b/bin/main/java/model/ItemImpl.class
diff --git a/bin/main/java/model/UserImpl$UserBuilder.class b/bin/main/java/model/UserImpl$UserBuilder.class
diff --git a/bin/main/java/model/UserImpl.class b/bin/main/java/model/UserImpl.class
diff --git a/bin/main/java/model/file/FileItemImpl.class b/bin/main/java/model/file/FileItemImpl.class
diff --git a/bin/main/java/model/file/FileShopImpl.class b/bin/main/java/model/file/FileShopImpl.class
diff --git a/bin/main/java/model/file/FileUserImpl.class b/bin/main/java/model/file/FileUserImpl.class
diff --git a/bin/main/java/view/AccountingView$1.class b/bin/main/java/view/AccountingView$1.class
diff --git a/bin/main/java/view/AccountingView$2.class b/bin/main/java/view/AccountingView$2.class
diff --git a/bin/main/java/view/AccountingView$3.class b/bin/main/java/view/AccountingView$3.class
diff --git a/bin/main/java/view/AccountingView$4.class b/bin/main/java/view/AccountingView$4.class
diff --git a/bin/main/java/view/AccountingView.class b/bin/main/java/view/AccountingView.class
diff --git a/bin/main/java/view/AddCustomerView$1.class b/bin/main/java/view/AddCustomerView$1.class
diff --git a/bin/main/java/view/AddCustomerView$2.class b/bin/main/java/view/AddCustomerView$2.class
diff --git a/bin/main/java/view/AddCustomerView.class b/bin/main/java/view/AddCustomerView.class
diff --git a/bin/main/java/view/AddItemView$1.class b/bin/main/java/view/AddItemView$1.class
diff --git a/bin/main/java/view/AddItemView$2.class b/bin/main/java/view/AddItemView$2.class
diff --git a/bin/main/java/view/AddItemView.class b/bin/main/java/view/AddItemView.class
diff --git a/bin/main/java/view/AddUserView$1.class b/bin/main/java/view/AddUserView$1.class
diff --git a/bin/main/java/view/AddUserView$2.class b/bin/main/java/view/AddUserView$2.class
diff --git a/bin/main/java/view/AddUserView.class b/bin/main/java/view/AddUserView.class
diff --git a/bin/main/java/view/CashierView$1.class b/bin/main/java/view/CashierView$1.class
diff --git a/bin/main/java/view/CashierView$2.class b/bin/main/java/view/CashierView$2.class
diff --git a/bin/main/java/view/CashierView$3.class b/bin/main/java/view/CashierView$3.class
diff --git a/bin/main/java/view/CashierView.class b/bin/main/java/view/CashierView.class
diff --git a/bin/main/java/view/CustomerView$1.class b/bin/main/java/view/CustomerView$1.class
diff --git a/bin/main/java/view/CustomerView$2.class b/bin/main/java/view/CustomerView$2.class
diff --git a/bin/main/java/view/CustomerView$3.class b/bin/main/java/view/CustomerView$3.class
diff --git a/bin/main/java/view/CustomerView.class b/bin/main/java/view/CustomerView.class
diff --git a/bin/main/java/view/EditStockView$1.class b/bin/main/java/view/EditStockView$1.class
diff --git a/bin/main/java/view/EditStockView$2.class b/bin/main/java/view/EditStockView$2.class
diff --git a/bin/main/java/view/EditStockView$3.class b/bin/main/java/view/EditStockView$3.class
diff --git a/bin/main/java/view/EditStockView$4.class b/bin/main/java/view/EditStockView$4.class
diff --git a/bin/main/java/view/EditStockView.class b/bin/main/java/view/EditStockView.class
diff --git a/bin/main/java/view/HomeView$1.class b/bin/main/java/view/HomeView$1.class
diff --git a/bin/main/java/view/HomeView$2.class b/bin/main/java/view/HomeView$2.class
diff --git a/bin/main/java/view/HomeView$3.class b/bin/main/java/view/HomeView$3.class
diff --git a/bin/main/java/view/HomeView$4.class b/bin/main/java/view/HomeView$4.class
diff --git a/bin/main/java/view/HomeView$5.class b/bin/main/java/view/HomeView$5.class
diff --git a/bin/main/java/view/HomeView.class b/bin/main/java/view/HomeView.class
diff --git a/bin/main/java/view/InvoiceLookupView$1.class b/bin/main/java/view/InvoiceLookupView$1.class
diff --git a/bin/main/java/view/InvoiceLookupView$2.class b/bin/main/java/view/InvoiceLookupView$2.class
diff --git a/bin/main/java/view/InvoiceLookupView$3.class b/bin/main/java/view/InvoiceLookupView$3.class
diff --git a/bin/main/java/view/InvoiceLookupView$4.class b/bin/main/java/view/InvoiceLookupView$4.class
diff --git a/bin/main/java/view/InvoiceLookupView$5.class b/bin/main/java/view/InvoiceLookupView$5.class
diff --git a/bin/main/java/view/InvoiceLookupView$6.class b/bin/main/java/view/InvoiceLookupView$6.class
diff --git a/bin/main/java/view/InvoiceLookupView.class b/bin/main/java/view/InvoiceLookupView.class
diff --git a/bin/main/java/view/InvoiceView$7.class b/bin/main/java/view/InvoiceView$7.class
diff --git a/bin/main/java/view/InvoiceView$8.class b/bin/main/java/view/InvoiceView$8.class
diff --git a/bin/main/java/view/InvoiceView.class b/bin/main/java/view/InvoiceView.class
diff --git a/bin/main/java/view/ItemReportView$1.class b/bin/main/java/view/ItemReportView$1.class
diff --git a/bin/main/java/view/ItemReportView$2.class b/bin/main/java/view/ItemReportView$2.class
diff --git a/bin/main/java/view/ItemReportView$3.class b/bin/main/java/view/ItemReportView$3.class
diff --git a/bin/main/java/view/ItemReportView.class b/bin/main/java/view/ItemReportView.class
diff --git a/bin/main/java/view/ItemView$1.class b/bin/main/java/view/ItemView$1.class
diff --git a/bin/main/java/view/ItemView$2.class b/bin/main/java/view/ItemView$2.class
diff --git a/bin/main/java/view/ItemView$3.class b/bin/main/java/view/ItemView$3.class
diff --git a/bin/main/java/view/ItemView.class b/bin/main/java/view/ItemView.class
diff --git a/bin/main/java/view/LoginView$1.class b/bin/main/java/view/LoginView$1.class
diff --git a/bin/main/java/view/LoginView$2.class b/bin/main/java/view/LoginView$2.class
diff --git a/bin/main/java/view/LoginView$3.class b/bin/main/java/view/LoginView$3.class
diff --git a/bin/main/java/view/LoginView$4.class b/bin/main/java/view/LoginView$4.class
diff --git a/bin/main/java/view/LoginView.class b/bin/main/java/view/LoginView.class
diff --git a/bin/main/java/view/ManagementView$1.class b/bin/main/java/view/ManagementView$1.class
diff --git a/bin/main/java/view/ManagementView$2.class b/bin/main/java/view/ManagementView$2.class
diff --git a/bin/main/java/view/ManagementView$3.class b/bin/main/java/view/ManagementView$3.class
diff --git a/bin/main/java/view/ManagementView$4.class b/bin/main/java/view/ManagementView$4.class
diff --git a/bin/main/java/view/ManagementView$5.class b/bin/main/java/view/ManagementView$5.class
diff --git a/bin/main/java/view/ManagementView$6.class b/bin/main/java/view/ManagementView$6.class
diff --git a/bin/main/java/view/ManagementView.class b/bin/main/java/view/ManagementView.class
diff --git a/bin/main/java/view/PurchaseReportView$1.class b/bin/main/java/view/PurchaseReportView$1.class
diff --git a/bin/main/java/view/PurchaseReportView$2.class b/bin/main/java/view/PurchaseReportView$2.class
diff --git a/bin/main/java/view/PurchaseReportView$3.class b/bin/main/java/view/PurchaseReportView$3.class
diff --git a/bin/main/java/view/PurchaseReportView.class b/bin/main/java/view/PurchaseReportView.class
diff --git a/bin/main/java/view/SalaryView$1.class b/bin/main/java/view/SalaryView$1.class
diff --git a/bin/main/java/view/SalaryView$2.class b/bin/main/java/view/SalaryView$2.class
diff --git a/bin/main/java/view/SalaryView$3.class b/bin/main/java/view/SalaryView$3.class
diff --git a/bin/main/java/view/SalaryView$4.class b/bin/main/java/view/SalaryView$4.class
diff --git a/bin/main/java/view/SalaryView.class b/bin/main/java/view/SalaryView.class
diff --git a/bin/main/java/view/StockReceiveView$1.class b/bin/main/java/view/StockReceiveView$1.class
diff --git a/bin/main/java/view/StockReceiveView$2.class b/bin/main/java/view/StockReceiveView$2.class
diff --git a/bin/main/java/view/StockReceiveView.class b/bin/main/java/view/StockReceiveView.class
diff --git a/bin/main/java/view/StockReportView$1.class b/bin/main/java/view/StockReportView$1.class
diff --git a/bin/main/java/view/StockReportView$2.class b/bin/main/java/view/StockReportView$2.class
diff --git a/bin/main/java/view/StockReportView$3.class b/bin/main/java/view/StockReportView$3.class
diff --git a/bin/main/java/view/StockReportView$4.class b/bin/main/java/view/StockReportView$4.class
diff --git a/bin/main/java/view/StockReportView.class b/bin/main/java/view/StockReportView.class
diff --git a/bin/main/java/view/StockView$1.class b/bin/main/java/view/StockView$1.class
diff --git a/bin/main/java/view/StockView$2.class b/bin/main/java/view/StockView$2.class
diff --git a/bin/main/java/view/StockView$3.class b/bin/main/java/view/StockView$3.class
diff --git a/bin/main/java/view/StockView.class b/bin/main/java/view/StockView.class
diff --git a/bin/main/java/view/UserView$1.class b/bin/main/java/view/UserView$1.class
diff --git a/bin/main/java/view/UserView$2.class b/bin/main/java/view/UserView$2.class
diff --git a/bin/main/java/view/UserView$3.class b/bin/main/java/view/UserView$3.class
diff --git a/bin/main/java/view/UserView.class b/bin/main/java/view/UserView.class
diff --git a/bin/test/java/model/ItemTest.class b/bin/test/java/model/ItemTest.class
diff --git a/src/main/java/controller/AccountingController.java b/src/main/java/controller/AccountingController.java
diff --git a/src/main/java/controller/InvoiceController.java b/src/main/java/controller/InvoiceController.java
@@ -6,8 +6,6 @@ public interface InvoiceController {
 
 	Double calculateTotal();
 
-	boolean recalculateQuantity();
-
 	boolean addToCart(String cartLine);
 
 	boolean newInvoice();

diff --git a/src/main/java/controller/InvoiceControllerImpl.java b/src/main/java/controller/InvoiceControllerImpl.java
@@ -40,12 +40,6 @@ public Double calculateTotal() {
 		return cartTotal;
 	}
 
-	@Override
-	public boolean recalculateQuantity() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
 	@Override
 	public boolean addToCart(String cartLine) {
 		return fileInvoice.writeInFile(cartLine);
@@ -55,7 +49,6 @@ public boolean addToCart(String cartLine) {
 	public boolean newInvoice() {
 		return fileInvoice.emptyFile();
 	}
-
 
 
 }
diff --git a/src/main/java/controller/ItemController.java b/src/main/java/controller/ItemController.java
@@ -3,7 +3,6 @@
 import java.util.Set;
 
 import main.java.model.Item;
-import main.java.model.ItemImpl;
 
 public interface ItemController {
 
@@ -47,4 +46,18 @@ public interface ItemController {
 	 * @return an array of all the values till quantity
 	 */
 	Set<Integer> fromOneToQuantity(Item item);
+
+	/**
+	 * For the sold item, calculate unsold stocks.
+	 * @param barcode
+	 * @param nSold
+	 * @return the new quantity.
+	 */
+	int recalculateQuantity(String barcode, int nSold);
+
+	/**
+	 * Show all the stock.
+	 * @return all items in stock.
+	 */
+	Set<String> showUnsold();
 }
diff --git a/src/main/java/controller/ItemControllerImpl.java b/src/main/java/controller/ItemControllerImpl.java
@@ -112,4 +112,28 @@ public Set<Integer> fromOneToQuantity(Item item) {
 		return qtys;
 	}
 
+	@Override
+	public int recalculateQuantity(String barcode, int nSold) {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public Set<String> showUnsold() {
+		Set<String> ides = getAllId();
+		Set<String> rows = new HashSet<>();
+		for(String id : ides) {
+			Item i = searchItem(id);
+
+			String barcode = i.getBarcode();
+			String name = i.getName();
+			ItemCategory cat = i.getCategory();
+			int qty = i.getQuantity();
+			Double price = i.getUnitPrice();
+
+			String row = barcode + "\t" + name + "\t" + cat + "\t" + qty + "\t" + price + "\n";
+			rows.add(row);
+		}
+		return rows;
+	}
 }
diff --git a/src/main/java/controller/ShopController.java b/src/main/java/controller/ShopController.java
@@ -6,7 +6,5 @@ public interface ShopController {
 
 	boolean addPayment(int userId, Double tot);
 
-	Set<String> searchByUser(String target);
-
-	Set<String> searchByDate(String target);
+	Set<String> showPayments();
 }
diff --git a/src/main/java/controller/ShopControllerImpl.java b/src/main/java/controller/ShopControllerImpl.java
@@ -1,32 +1,45 @@
 package main.java.controller;
 
-import java.io.File;
 import java.time.Instant;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
 import java.util.Set;
 
+import main.java.model.User;
 import main.java.model.file.FileShopImpl;
 import main.java.model.file.FileStrategy;
 
 public class ShopControllerImpl implements ShopController {
 
-	private static final char ATTR_SEP = File.pathSeparatorChar;
 	private FileStrategy fileShop = new FileShopImpl();
+	private UserController userController = new UserControllerImpl();
 
 	@Override
 	public boolean addPayment(int userId, Double tot) {
-		String time = Instant.now().toString();
-		String paymentLine = "start" + ATTR_SEP + userId + ATTR_SEP + tot + ATTR_SEP + time + ATTR_SEP + "end" + "\n";
+		DateTimeFormatter formatter = DateTimeFormatter
+				.ofPattern("yyyy-MM-dd HH:mm:ss")
+				.withZone(ZoneId.from(ZoneOffset.UTC));
+		String time = formatter.format(Instant.now());
+		User u = userController.searchUser(userId);
+		String paymentLine = time + "\t" + userId + "\t" + u.getName() + " " + u.getLastname() + "\t" + tot + "\n";
 		return fileShop.writeInFile(paymentLine);
 	}
-	
+
 	@Override
-	public Set<String> searchByUser(String target){
-		return null;
+	public Set<String> showPayments() {
+		Set<String> payments = fileShop.fileReader();
+		return payments;
 	}
 
-
-	@Override
-	public Set<String> searchByDate(String target){
-		return null;
-	}
+//	@Override
+//	public Set<String> searchByUser(String target){
+//		return null;
+//	}
+//	
+//	
+//	@Override
+//	public Set<String> searchByDate(String target){
+//		return null;
+//	}
 }
diff --git a/src/main/java/controller/UserController.java b/src/main/java/controller/UserController.java
@@ -1,6 +1,5 @@
 package main.java.controller;
 
-import java.util.List;
 import java.util.Set;
 
 import main.java.model.User;

diff --git a/src/main/java/controller/UserControllerImpl.java b/src/main/java/controller/UserControllerImpl.java
@@ -1,20 +1,12 @@
 package main.java.controller;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Optional;
 import java.util.Set;
 
 import org.junit.platform.commons.util.StringUtils;
 
-import main.java.model.Item;
-import main.java.model.ItemCategory;
-import main.java.model.ItemImpl;
 import main.java.model.User;
 import main.java.model.UserImpl;
 import main.java.model.UserRole;
-import main.java.model.file.FileItemImpl;
 import main.java.model.file.FileStrategy;
 import main.java.model.file.FileUserImpl;
 

diff --git a/src/main/java/model/Item.java b/src/main/java/model/Item.java
@@ -1,7 +1,5 @@
 package main.java.model;
 
-import java.util.Date;
-
 public interface Item {
 
 	/**
@@ -27,19 +25,7 @@ public interface Item {
 	 * @return a double with price per unit.
 	 */
 	public double getUnitPrice();
-
-	/**
-	 * Get received date of selected item.
-	 * @return Date
-	 */
-	Date getReceivedDate();
-
-	/**
-	 * Get expiration date of selected item.
-	 * @return Date
-	 */
-	Date getExpirationDate();
-
+
 	/**
 	 * Get category of selected item.
 	 * @return category from enum ItemCategory.

diff --git a/src/main/java/model/ItemImpl.java b/src/main/java/model/ItemImpl.java
@@ -4,11 +4,6 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.Optional;
-import java.util.OptionalInt;
-import java.util.UUID;
-
-import main.java.model.UserImpl.UserBuilder;
 
 public class ItemImpl implements Item{
 
@@ -68,16 +63,6 @@ public double getUnitPrice() {
 		return this.unitPrice;
 	}
 
-	@Override
-	public Date getReceivedDate() {
-		return receivedDate;
-	}
-
-	@Override
-	public Date getExpirationDate() {
-		return expirationDate;
-	}
-
 	@Override
 	public ItemCategory getCategory() {
 		return category;

diff --git a/src/main/java/model/UserImpl.java b/src/main/java/model/UserImpl.java
@@ -2,7 +2,6 @@
 
 import java.io.File;
 import java.util.Optional;
-import java.util.UUID;
 
 
 public class UserImpl implements User{

diff --git a/src/main/java/model/file/FileItemImpl.java b/src/main/java/model/file/FileItemImpl.java
@@ -10,20 +10,13 @@
 import java.io.PrintWriter;
 import java.nio.file.Files;
 import java.nio.file.StandardOpenOption;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.stream.Collectors;
 
-import main.java.controller.ItemControllerImpl;
-import main.java.model.ItemCategory;
-import main.java.model.ItemImpl;
-
 public class FileItemImpl implements FileStrategy{
 
     private static final String ITEM_FILE = "Item.txt";
@@ -96,8 +89,6 @@ public String searchInFile(String target) {
 	public boolean deleteLine(String target) {
 		try {
 			File file = createFile();
-		    File temp = new File("_temp_");
-		    BufferedWriter writer = new BufferedWriter(new FileWriter(temp));
 		    List<String> out = Files.lines(file.toPath())
 		        .filter(line -> !line.contains(target.toLowerCase()))
 		        .collect(Collectors.toList());

diff --git a/src/main/java/model/file/FileShopImpl.java b/src/main/java/model/file/FileShopImpl.java
@@ -7,7 +7,6 @@
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.text.SimpleDateFormat;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.TreeSet;

diff --git a/src/main/java/model/file/FileStrategy.java b/src/main/java/model/file/FileStrategy.java
@@ -1,6 +1,5 @@
 package main.java.model.file;
 
-import java.io.File;
 import java.util.Set;
 
 public interface FileStrategy {

diff --git a/src/main/java/model/file/FileUserImpl.java b/src/main/java/model/file/FileUserImpl.java
@@ -51,7 +51,7 @@ public Set<String> fileReader() {
 
 	@Override
 	public boolean writeInFile(String objectToString) {
-		createFile(); //it also checks if the file exists
+		createFile(); 
 		try(BufferedWriter writer = new BufferedWriter(new FileWriter(USER_FILE, true))) {
 			writer.newLine();
 			writer.write(objectToString);
@@ -87,8 +87,6 @@ public String searchInFile(String target) {
 	public boolean deleteLine(String target) {
 		try {
 			File file = createFile();
-		    File temp = new File("_temp_");
-		    BufferedWriter writer = new BufferedWriter(new FileWriter(temp));
 		    List<String> out = Files.lines(file.toPath())
 		        .filter(line -> !line.contains(target.toLowerCase()))
 		        .collect(Collectors.toList());
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		2022-01-15 22:29:56 11 simonetta cornacchia 74.7