august/IP_PIbd-21_Balberova_D.N.
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

сохранение перед исправлениями

Browse Source
This commit is contained in:
dasha 2023-04-17 14:12:12 +04:00
parent 7a95e50ac3
commit 1544973e7b
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
front/src/pages/components/SessionItem.jsx
View File

@ -2,7 +2,7 @@ import React, { useEffect, useState } from "react"
import MyButton from './MyButton'
export default function SessionItem(props) {
const date = new Date(props.item.timestamp).toLocaleString('RU-ru')
const date = new Date(props.item.timestamp).toLocaleDateString('ru-RU')
return (
<tr>

4
src/main/java/com/labwork1/app/student/repository/OrderRepository.java
View File

@ -3,14 +3,10 @@ package com.labwork1.app.student.repository;
import com.labwork1.app.student.model.Order;
import com.labwork1.app.student.model.OrderSession;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
public interface OrderRepository extends JpaRepository<Order, Long> {
@Query("Select os from OrderSession os where os.order.id = :orderId and os.session.id = :sessionId")
OrderSession getOrderSession(@Param("orderId") Long orderId, @Param("sessionId") Long sessionId);
@Modifying
@Query("delete from OrderSession os where os.order.id = :orderId and os.session.id = :sessionId")
void deleteSessionInOrder(@Param("orderId") Long orderId, @Param("sessionId") Long sessionId);
}

3
src/main/java/com/labwork1/app/student/repository/SessionRepository.java
View File

@ -3,10 +3,13 @@ package com.labwork1.app.student.repository;
import com.labwork1.app.student.model.Session;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import java.util.List;
public interface SessionRepository extends JpaRepository<Session, Long> {
@Query("Select s from Session s where s.capacity > 0")
List<Session> findAllSessionsWithCapacity();
@Query("Select sum(os.count) from OrderSession os where os.session.id = :sessionId")
Integer getCapacity(@Param("sessionId") Long sessionId);
}

2
src/main/java/com/labwork1/app/student/service/OrderService.java
View File

@ -46,8 +46,6 @@ public class OrderService {
currentSession.getCapacity(), count));
}
currentSession.setCapacity(currentSession.getCapacity() - count);
/*final Session updatedSession = sessionService.updateSession(currentSession.getId(),
currentSession.getPrice(), currentSession.getCapacity() - count);*/
if (currentOrderSession == null) {
currentOrder.addSession(new OrderSession(currentOrder, currentSession, count));
}