From cf1a9e1016101796d9f639448e25e272fe96e806 Mon Sep 17 00:00:00 2001 From: Kidel Date: Mon, 15 Jun 2015 16:03:14 +0200 Subject: [PATCH] Correzione ultimi bug, upload di specifiche, backup database e credenziali d'accesso. --- WebContent/index.xhtml | 21 +- WebContent/product.xhtml | 6 +- credenziali_accesso.txt | 18 + database.backup | Bin 0 -> 21198 bytes database.sql | 862 ++++++++++++++++++ database.txt | 862 ++++++++++++++++++ specifiche.txt | 113 +++ .../uniroma3/controller/OrderController.java | 2 +- src/it/uniroma3/facade/CustomerFacade.java | 18 - src/it/uniroma3/facade/OrderFacade.java | 6 +- 10 files changed, 1876 insertions(+), 32 deletions(-) create mode 100644 credenziali_accesso.txt create mode 100644 database.backup create mode 100644 database.sql create mode 100644 database.txt create mode 100644 specifiche.txt diff --git a/WebContent/index.xhtml b/WebContent/index.xhtml index d751685..dd9fcde 100644 --- a/WebContent/index.xhtml +++ b/WebContent/index.xhtml @@ -20,11 +20,14 @@
-

A Warm Welcome!

-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. - Ipsa, ipsam, eligendi, in quo sunt possimus non incidunt odit vero - aliquid similique quaerat nam nobis illo aspernatur vitae fugiat - numquam repellat.

+

Welcome to Agave Shop!

+

+ A-Ga-Ve, from our initials, is our project for the + course of Sistemi Informativi su Web (SIW). +

+

It runs on Apache Tomee and it's made using Java with JSF 2.2 + Framework and Open JPA libraries for PostgreSQL. +

#{product.description}

-   + value="More Info" styleClass="btn btn-default" + style="margin-bottom: 5px;">

diff --git a/WebContent/product.xhtml b/WebContent/product.xhtml index 7ff2fbc..d2c2bf8 100644 --- a/WebContent/product.xhtml +++ b/WebContent/product.xhtml @@ -131,7 +131,7 @@ width="60" class="img-rounded" style="margin-right: 10px; float: left" alt="Gravatar for #{sessionScope['customer'].getFullName()}" /> -
- #{review.getCustomerName()} + #{review.getCustomerName()}
diff --git a/credenziali_accesso.txt b/credenziali_accesso.txt new file mode 100644 index 0000000..efd2965 --- /dev/null +++ b/credenziali_accesso.txt @@ -0,0 +1,18 @@ +Credenziali accesso: + +Admin: + +admin@agave.tk +password: siw + + +Example Customers: + +gaetano.bonofiglio@gmail.com +password: siw + +vero.neeja@gmail.com +password: siw + +andrea.salvoni93@gmail.com +password: pepette \ No newline at end of file diff --git a/database.backup b/database.backup new file mode 100644 index 0000000000000000000000000000000000000000..e33e2631d4a331bd56bb56d00ddb973cd7e620d1 GIT binary patch literal 21198 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 getAllClosedOrdersFromCustomer(Long idCustomer) { return em.createQuery("SELECT o " + "FROM Orders o " + "WHERE o.customer.id = :idCustomer " - + "and o.evasionTime is NULL", Orders.class) + + "and o.evasionTime is NULL " + + "and o.creationTime is NOT NULL", Orders.class) .setParameter("idCustomer", idCustomer) .getResultList(); } @@ -287,7 +288,8 @@ public List getAllEvadedOrdersFromCustomer(Long idCustomer) { public List getAllClosedOrders() { return em.createQuery("SELECT o " + "FROM Orders o " - + "WHERE o.evasionTime is NULL", Orders.class) + + "WHERE o.evasionTime is NULL " + + "and o.creationTime is NOT NULL", Orders.class) .getResultList(); }