localhorst
/
e-commerce
Archived
4
1
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Merge pull request 'Fix display order in various locations. closes #120' (#121) from feateure/display_order_intern into master 

Reviewed-on: #121
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
This commit is contained in:
Jannik 2020-06-24 18:59:14 +02:00
parent e87d0d8cdd 0d547c8903
commit 5d506a1526
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
prototype/src/main/java/org/hso/ecommerce/controller/intern/WarehouseController.java
View File

@ -21,7 +21,7 @@ public class WarehouseController {
Model model, Model model,
HttpServletRequest request HttpServletRequest request
) { ) {
model.addAttribute("bookings", warehouseBookingRepository.findAll()); model.addAttribute("bookings", warehouseBookingRepository.findAllDesc());
return "intern/warehouse/index"; return "intern/warehouse/index";
} }
} }

2
prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/SupplierOrderController.java
View File

@ -47,7 +47,7 @@ public class SupplierOrderController {
List<UImodelSupplierOrder> totals = new ArrayList<UImodelSupplierOrder>(); List<UImodelSupplierOrder> totals = new ArrayList<UImodelSupplierOrder>();
for (SupplierOrder order : supplierOrderRepository.findAll()) { for (SupplierOrder order : supplierOrderRepository.findAllDesc()) {
final Article article = articleRepository.findArticleByArticleOffer(order.ordered).orElse(null); final Article article = articleRepository.findArticleByArticleOffer(order.ordered).orElse(null);
totals.add(new UImodelSupplierOrder(order, article)); totals.add(new UImodelSupplierOrder(order, article));
} }

15
prototype/src/main/java/org/hso/ecommerce/repos/supplier/SupplierOrderRepository.java
View File

@ -1,22 +1,25 @@
package org.hso.ecommerce.repos.supplier; package org.hso.ecommerce.repos.supplier;
import java.util.List;
import org.hso.ecommerce.entities.supplier.SupplierOrder; import org.hso.ecommerce.entities.supplier.SupplierOrder;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query; import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param; import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import java.util.List;
@Repository @Repository
public interface SupplierOrderRepository extends JpaRepository<SupplierOrder, Long> { public interface SupplierOrderRepository extends JpaRepository<SupplierOrder, Long> {
@Query("SELECT SUM(so.numberOfUnits) FROM SupplierOrder so JOIN so.ordered ao WHERE ao.articleNumber = :articleNumber AND so.delivered IS NULL") @Query("SELECT SUM(so.numberOfUnits) FROM SupplierOrder so JOIN so.ordered ao WHERE ao.articleNumber = :articleNumber AND so.delivered IS NULL")
Integer countUndeliveredReorders(String articleNumber); Integer countUndeliveredReorders(String articleNumber);
@Query(value = "SELECT * FROM supplier_orders as a WHERE a.supplier_id = :supplierId", nativeQuery = true) @Query(value = "SELECT * FROM supplier_orders as a WHERE a.supplier_id = :supplierId ORDER BY a.id DESC", nativeQuery = true)
List<SupplierOrder> findOrderBySupplierID(@Param("supplierId") long supplierId); List<SupplierOrder> findOrderBySupplierID(@Param("supplierId") long supplierId);
@Query("SELECT a FROM SupplierOrder a") @Query("SELECT a FROM SupplierOrder a")
List<SupplierOrder> findAll(); List<SupplierOrder> findAll();
@Query("SELECT a FROM SupplierOrder a ORDER BY a.id DESC")
List<SupplierOrder> findAllDesc();
} }

3
prototype/src/main/java/org/hso/ecommerce/repos/warehouse/WarehouseBookingRepository.java
View File

@ -13,5 +13,8 @@ public interface WarehouseBookingRepository extends JpaRepository<WarehouseBooki
@Query("Select b FROM WarehouseBooking b WHERE b.isDone = 0") @Query("Select b FROM WarehouseBooking b WHERE b.isDone = 0")
List<WarehouseBooking> findNotDone(); List<WarehouseBooking> findNotDone();
@Query("Select b FROM WarehouseBooking b ORDER BY b.id DESC")
List<WarehouseBooking> findAllDesc();
} }