Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mejoras de visualizacion de menus y traducciones #10

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 57 additions & 0 deletions error.log
Original file line number Diff line number Diff line change
Expand Up @@ -21756,3 +21756,60 @@ Caused by: java.sql.SQLSyntaxErrorException: PROCEDURE onlinestore.DeletetItem d
at com.datamasters.DAO.DaoImpl.ItemDaoImpl.remove(ItemDaoImpl.java:201)
... 43 more

Timestamp: 2023-11-24T21:49:38.175871
An exception occurred:
com.datamasters.DAO.DAOException: Error in SQL
at com.datamasters.DAO.DaoImpl.ItemDaoImpl.insert(ItemDaoImpl.java:75)
at com.datamasters.controlador.Controller.addItem(Controller.java:61)
at com.datamasters.vista.ManageOS.addItems(ManageOS.java:146)
at com.datamasters.vista.ManageOS.manageItems(ManageOS.java:64)
at com.datamasters.vista.ManageOS.run(ManageOS.java:35)
at com.datamasters.vista.OnlineStore.main(OnlineStore.java:10)
Caused by: java.sql.SQLSyntaxErrorException: PROCEDURE onlinestore.InsertItem does not exist
at com.mysql.cj.jdbc.exceptions.SQLError.createSQLException(SQLError.java:121)
at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:122)
at com.mysql.cj.jdbc.ClientPreparedStatement.executeInternal(ClientPreparedStatement.java:916)
at com.mysql.cj.jdbc.ClientPreparedStatement.execute(ClientPreparedStatement.java:354)
at com.mysql.cj.jdbc.CallableStatement.execute(CallableStatement.java:847)
at com.datamasters.DAO.DaoImpl.ItemDaoImpl.insert(ItemDaoImpl.java:71)
... 5 more

Timestamp: 2023-11-24T21:52:34.762068700
An exception occurred:
com.datamasters.DAO.DAOException: Error in SQL
at com.datamasters.DAO.DaoImpl.ItemDaoImpl.insert(ItemDaoImpl.java:75)
at com.datamasters.controlador.Controller.addItem(Controller.java:61)
at com.datamasters.vista.ManageOS.addItems(ManageOS.java:146)
at com.datamasters.vista.ManageOS.manageItems(ManageOS.java:64)
at com.datamasters.vista.ManageOS.run(ManageOS.java:35)
at com.datamasters.vista.OnlineStore.main(OnlineStore.java:10)
Caused by: java.sql.SQLSyntaxErrorException: PROCEDURE onlinestore.InsertItem does not exist
at com.mysql.cj.jdbc.exceptions.SQLError.createSQLException(SQLError.java:121)
at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:122)
at com.mysql.cj.jdbc.ClientPreparedStatement.executeInternal(ClientPreparedStatement.java:916)
at com.mysql.cj.jdbc.ClientPreparedStatement.execute(ClientPreparedStatement.java:354)
at com.mysql.cj.jdbc.CallableStatement.execute(CallableStatement.java:847)
at com.datamasters.DAO.DaoImpl.ItemDaoImpl.insert(ItemDaoImpl.java:71)
... 5 more

Timestamp: 2023-11-24T22:08:17.934465800
An exception occurred:
java.lang.IllegalArgumentException: No enum constant com.datamasters.modelo.CustomerType.STABDAR
at java.base/java.lang.Enum.valueOf(Unknown Source)
at com.datamasters.modelo.CustomerType.valueOf(CustomerType.java:1)
at com.datamasters.vista.ManageOS.addCustomer(ManageOS.java:181)
at com.datamasters.vista.ManageOS.manageCustomers(ManageOS.java:88)
at com.datamasters.vista.ManageOS.run(ManageOS.java:38)
at com.datamasters.vista.OnlineStore.main(OnlineStore.java:10)

Timestamp: 2023-11-24T23:06:44.472302600
An exception occurred:
java.lang.IllegalArgumentException: No enum constant com.datamasters.modelo.CustomerType.
at java.base/java.lang.Enum.valueOf(Unknown Source)
at com.datamasters.modelo.CustomerType.valueOf(CustomerType.java:1)
at com.datamasters.vista.ManageOS.addCustomer(ManageOS.java:205)
at com.datamasters.vista.ManageOS.addOrder(ManageOS.java:278)
at com.datamasters.vista.ManageOS.manageOrders(ManageOS.java:139)
at com.datamasters.vista.ManageOS.run(ManageOS.java:47)
at com.datamasters.vista.OnlineStore.main(OnlineStore.java:10)

27 changes: 16 additions & 11 deletions src/main/java/com/datamasters/modelo/Customer.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ public abstract class Customer {
private double membershipFee;
private double shippingDiscount;

public Customer(String name, String address, String id, String email, CustomerType customerType, double membershipFee, double shippingDiscount) {
public Customer(String name, String address, String id, String email, CustomerType customerType,
double membershipFee, double shippingDiscount) {
this.name = name;
this.address = address;
this.id = id;
Expand Down Expand Up @@ -51,7 +52,9 @@ public void setEmail(String email) {
this.email = email;
}

public double getMembershipFee() { return this.membershipFee; }
public double getMembershipFee() {
return this.membershipFee;
}

public void setMembershipFee(double membershipFee) {
this.membershipFee = membershipFee;
Expand All @@ -60,6 +63,7 @@ public void setMembershipFee(double membershipFee) {
public CustomerType getCustomerType() {
return customerType;
}

public void setCustomerType(CustomerType customerType) {
this.customerType = customerType;
}
Expand All @@ -80,14 +84,15 @@ public void setShippingDiscount(double shippingDiscount) {

@Override
public String toString() {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rompe Lost Test

return "Customer{" +
"name='" + name + '\'' +
", address='" + address + '\'' +
", id='" + id + '\'' +
", email='" + email + '\'' +
", customerType=" + customerType +
", membershipFee=" + membershipFee +
", shippingDiscount=" + shippingDiscount +
'}';
StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append("Nombre: ").append(name).append("\n");
stringBuilder.append("Direccion: ").append(address).append("\n");
stringBuilder.append("ID: ").append(id).append("\n");
stringBuilder.append("Correo electronico: ").append(email).append("\n");
stringBuilder.append("Tipo de cliente: ").append(customerType).append("\n");
stringBuilder.append("Tarifa de membresia: ").append(String.format("%.2f", membershipFee)).append("\n");
stringBuilder.append("Descuento de envio: ").append(String.format("%.2f", shippingDiscount)).append("\n");
stringBuilder.append("\n----------------------------------------").append("\n");
return stringBuilder.toString();
}
}
19 changes: 10 additions & 9 deletions src/main/java/com/datamasters/modelo/Item.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.datamasters.modelo;

public class Item {
public class Item {
private String code;
private String description;
private double sellingPrice;
Expand Down Expand Up @@ -76,13 +76,14 @@ public void setPreparationTimeMinutes(int preparationTimeMinutes) {

@Override
public String toString() {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rompe Lost Test

return "Item{" +
"code='" + this.code + '\'' +
", description='" + this.description + '\'' +
", sellingPrice=" + this.sellingPrice +
", shippingCost=" + this.shippingCost +
", preparationTimeMinutes=" + this.preparationTimeMinutes +
'}';
StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append("Codigo: ").append(this.code).append("\n");
stringBuilder.append("Descripcion: ").append(this.description).append("\n");
stringBuilder.append("Precio de venta: ").append(this.sellingPrice).append("\n");
stringBuilder.append("Costo de envio: ").append(this.shippingCost).append("\n");
stringBuilder.append("Tiempo de preparacion (minutos): ").append(this.preparationTimeMinutes).append("\n");
stringBuilder.append("\n----------------------------------------").append("\n");
return stringBuilder.toString();
}
}

}
32 changes: 18 additions & 14 deletions src/main/java/com/datamasters/modelo/Orders.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ public Orders(int orderNumber, Customer customer, Item item, int quantityUnits,
this.item = item;
this.quantityUnits = quantityUnits;
this.orderDateTime = orderDateTime;
this.preparationTimeMinutes = item.getPreparationTimeMinutes()*quantityUnits;
this.preparationTimeMinutes = item.getPreparationTimeMinutes() * quantityUnits;
}

public int getOrderNumber() {
return orderNumber;
}
Expand Down Expand Up @@ -87,18 +88,21 @@ public boolean isCancelable(LocalDateTime currentTime) {

@Override
public String toString() {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rompe Lost Test

return "Order{" +
"orderNumber=" + orderNumber +
", customer=" + customer.getId() + customer.getName() +
", item=" + item.getCode() +item.getDescription() +
", quantityUnits=" + quantityUnits +
", Item price= " + item.getSellingPrice()+
", Order price= " + calculateOrderPrice() +
", orderDateTime=" + orderDateTime +
", preparationTimeMinutes=" + this.preparationTimeMinutes +
", orderIsCancelable=" + isCancelable(LocalDateTime.now()) +
", shippingCost= " + item.getShippingCost()+
", orderIsSent=" + orderIsSent(LocalDateTime.now()) +
'}';
StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append("Numero de pedido: ").append(orderNumber).append("\n");
stringBuilder.append("Cliente: ").append(customer.getId()).append(", ").append(customer.getName()).append("\n");
stringBuilder.append("Articulo: ").append(item.getCode()).append(", ").append(item.getDescription())
.append("\n");
stringBuilder.append("Cantidad de unidades: ").append(quantityUnits).append("\n");
stringBuilder.append("Precio del articulo: ").append(item.getSellingPrice()).append("\n");
stringBuilder.append("Precio del pedido: ").append(calculateOrderPrice()).append("\n");
stringBuilder.append("Fecha y hora del pedido: ").append(orderDateTime).append("\n");
stringBuilder.append("Tiempo de preparacion (minutos): ").append(preparationTimeMinutes).append("\n");
stringBuilder.append("Es posible cancelar el pedido: ").append(isCancelable(LocalDateTime.now())).append("\n");
stringBuilder.append("Costo de envio: ").append(item.getShippingCost()).append("\n");
stringBuilder.append("El pedido ha sido enviado: ").append(orderIsSent(LocalDateTime.now())).append("\n");
stringBuilder.append("\n----------------------------------------").append("\n");
return stringBuilder.toString();
}

}
23 changes: 13 additions & 10 deletions src/main/java/com/datamasters/modelo/PremiumCustomer.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package com.datamasters.modelo;

public class PremiumCustomer extends Customer {
public PremiumCustomer(String name, String address, String id, String email, double membershipFee, double shippingDiscount) {
public PremiumCustomer(String name, String address, String id, String email, double membershipFee,
double shippingDiscount) {
super(name, address, id, email, CustomerType.PREMIUM, membershipFee, shippingDiscount);
}

Expand All @@ -22,14 +23,16 @@ public double shippingDiscount() {

@Override
public String toString() {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rompe Lost Test

return "PremiumCustomer{" +
"name='" + getName() + '\'' +
", address='" + getAddress() + '\'' +
", id='" + getId() + '\'' +
", email='" + getEmail() + '\'' +
", customerType=" + getCustomerType() +
", membershipFee=" + getMembershipFee() +
", shippingDiscount=" + getShippingDiscount() +
'}';
StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append("Nombre: ").append(getName()).append("\n");
stringBuilder.append("Dirección: ").append(getAddress()).append("\n");
stringBuilder.append("ID: ").append(getId()).append("\n");
stringBuilder.append("Correo electrónico: ").append(getEmail()).append("\n");
stringBuilder.append("Tipo de cliente: ").append(getCustomerType()).append("\n");
stringBuilder.append("Tarifa de membresía: ").append(String.format("%.2f", getMembershipFee())).append("\n");
stringBuilder.append("Descuento de envío: ").append(String.format("%.2f", getShippingDiscount())).append("\n");
stringBuilder.append("\n----------------------------------------").append("\n");
return stringBuilder.toString();
}

}
16 changes: 9 additions & 7 deletions src/main/java/com/datamasters/modelo/StandardCustomer.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,14 @@ public double shippingDiscount() {

@Override
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rompe Lost Test

public String toString() {
return "StandardCustomer{" +
"name='" + getName() + '\'' +
", address='" + getAddress() + '\'' +
", id='" + getId() + '\'' +
", email='" + getEmail() + '\'' +
", customerType=" + getCustomerType() +
'}';
StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append("Nombre: ").append(getName()).append("\n");
stringBuilder.append("Dirección: ").append(getAddress()).append("\n");
stringBuilder.append("ID: ").append(getId()).append("\n");
stringBuilder.append("Correo electrónico: ").append(getEmail()).append("\n");
stringBuilder.append("Tipo de cliente: ").append(getCustomerType()).append("\n");
stringBuilder.append("\n----------------------------------------").append("\n");
return stringBuilder.toString();
}

}
Loading