Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-oshita

# Conflicts:
#	src/main/resources/templates/select_course.html

src/main/java/com/example/demo/aop/aspect/SessionCheckAspect.java

@@ -10,6 +10,7 @@ import org.aspectj.lang.annotation.Pointcut;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import com.example.demo.app.presentation.controller.pageproperty.SessionKeyword;
 import com.example.demo.exception.NoSessionException;
 
 
@@ -32,7 +33,7 @@ public class SessionCheckAspect {
 	public void checkSession() {
 		HttpSession session = request.getSession(false);
 
-		if (session == null || session.getAttribute("loginUser") == null) {
+		if (session == null || session.getAttribute(SessionKeyword.LOGIN_USER) == null) {
 			throw new NoSessionException("不正なログインです");
 		}
 

src/main/java/com/example/demo/aop/handler/GlobalExceptionHandler.java

@@ -12,6 +12,8 @@ import org.springframework.web.HttpRequestMethodNotSupportedException;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 
+import com.example.demo.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
+import com.example.demo.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
 import com.example.demo.exception.NoSessionException;
 
 @ControllerAdvice
@@ -30,27 +32,27 @@ public class GlobalExceptionHandler {
 		LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE_ILLEGAL_TRANSITION, e);
 
 		model.addAttribute(
-                "errorMessage",
+                PageReturnAttributeKeyword.ERROR_MESSAGE,
                 "システムエラーが発生しました。"
                 + "初めからやり直してください。");
 
-        return "redirect:/login";
+        return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.LOGIN;
 		
 	}
 
 	@ExceptionHandler(HttpRequestMethodNotSupportedException.class)
 	public String handleBadRequestException(Model model, Exception e, HttpSession session) {
-		model.addAttribute("error", SEVERE_ERROR_MESSAGE_BAD_REQUEST);
+		model.addAttribute(PageReturnAttributeKeyword.ERROR, SEVERE_ERROR_MESSAGE_BAD_REQUEST);
-		model.addAttribute("status", HttpStatus.BAD_REQUEST.value());
+		model.addAttribute(PageReturnAttributeKeyword.STATUS, HttpStatus.BAD_REQUEST.value());
 
 		e.printStackTrace();
 
 		LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE_ILLEGAL_TRANSITION, e);
 		
-		System.out.println("session invalidated method not supported exception");
+		System.out.println("session invalidated");
     	session.invalidate();
 
-		return "error";
+		return TransitionTargetPageNameKeyword.ERROR_HTML;
 	}
 	
 	@ExceptionHandler(Exception.class)
@@ -58,9 +60,8 @@ public class GlobalExceptionHandler {
 
 		e.printStackTrace();
 
-
+		System.out.println("session invalidated exception");
-		System.out.println(" .well-known/appspecific/com.chrome.devtools.json for request error");
+		session.invalidate();
-		
+		return TransitionTargetPageNameKeyword.ERROR_HTML;
-		return "error";
 	}
 }

src/main/java/com/example/demo/app/domain/service/AllocationService.java

@@ -8,6 +8,4 @@ public interface AllocationService {
 	
 	public List<AllocationModel> findAll();
 	
-	public List<AllocationModel> save(List<AllocationModel> allocationModelList);
-
 }

src/main/java/com/example/demo/app/domain/service/CourseService.java

@@ -3,6 +3,7 @@ package com.example.demo.app.domain.service;
 import java.util.List;
 
 import com.example.demo.app.domain.model.CourseModel;
+import com.example.demo.app.presentation.form.AllocationFormList;
 
 public interface CourseService {
 	
@@ -12,12 +13,14 @@ public interface CourseService {
 	
 	public Long findByName(String courName);
 	
-	public CourseModel save(CourseModel courseModel, Long userId);
+	public CourseModel save(CourseModel courseModel, Long userId, AllocationFormList allocationFormList);
 
 	public List<CourseModel> findAllByUserId(Long userId);
 	
 	public List<CourseModel> findAllByNull();
 
+	public String deleteCourse(Long courseId, Long userId);
+	
 }
 
 

src/main/java/com/example/demo/app/domain/service/impl/AllocationServiceImpl.java

@@ -1,6 +1,5 @@
 package com.example.demo.app.domain.service.impl;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import org.springframework.stereotype.Service;
@@ -26,26 +25,5 @@ public class AllocationServiceImpl implements AllocationService {
 		return AllocationEntity.createAllocationModelList(allocationRepository.findAll());
 	}
 
-	public List<AllocationModel> save(List<AllocationModel> allocationModelList) {
-
-		List<AllocationEntity> allocationEntityList = new ArrayList<>();
-
-		allocationModelList.forEach(allocationModel -> {
-			allocationEntityList.add(
-					AllocationModel.convertTo(
-							categoryRepository.findById(allocationModel.getCategoryId()).get(),
-							courseRepository.findById(allocationModel.getCourseId()).get(),
-							allocationModel.getAllocationRatio()));
-
-		});
-
-		List<AllocationModel> result = new ArrayList<>();
-		for (AllocationEntity allocationEntity : allocationEntityList) {
-			result.add(AllocationModel.convertFrom(allocationRepository.save(allocationEntity)));
-		}
-
-		
-		return result;
-	}
 
 }

src/main/java/com/example/demo/app/domain/service/impl/CourseServiceImpl.java

@@ -7,14 +7,19 @@ import jakarta.transaction.Transactional;
 
 import org.springframework.stereotype.Service;
 
+import com.example.demo.app.domain.model.AllocationModel;
 import com.example.demo.app.domain.model.CourseModel;
 import com.example.demo.app.domain.service.CourseService;
+import com.example.demo.app.infra.entity.AllocationEntity;
 import com.example.demo.app.infra.entity.CourseEntity;
 import com.example.demo.app.infra.entity.CourseOwnerEntity;
 import com.example.demo.app.infra.entity.UserEntity;
+import com.example.demo.app.infra.repository.AllocationRepository;
+import com.example.demo.app.infra.repository.CategoryRepository;
 import com.example.demo.app.infra.repository.CourseOwnerRepository;
 import com.example.demo.app.infra.repository.CourseRepository;
 import com.example.demo.app.infra.repository.UserRepository;
+import com.example.demo.app.presentation.form.AllocationFormList;
 
 import lombok.RequiredArgsConstructor;
 
@@ -22,9 +27,12 @@ import lombok.RequiredArgsConstructor;
 @RequiredArgsConstructor
 public class CourseServiceImpl implements CourseService {
 
+	private final AllocationRepository allocationRepository;
+
 	private final CourseRepository courseRepository;
 	private final UserRepository userRepository;
 	private final CourseOwnerRepository courseOwnerRepository;
+	private final CategoryRepository categoryRepository;
 
 	public List<CourseModel> findAll() {
 
@@ -49,12 +57,43 @@ public class CourseServiceImpl implements CourseService {
 	}
 
 	@Transactional
-	public CourseModel save(CourseModel courseModel, Long userId) {
+	public CourseModel save(CourseModel courseModel, Long userId, AllocationFormList allocationFormList) {
 
 		List<UserEntity> userEntityList = new ArrayList<>();
 		userEntityList.add(userRepository.findById(userId).get());
 		CourseEntity result = courseRepository.save(CourseModel.convertTo(courseModel));
 
+		List<AllocationModel> allocationModelList = new ArrayList<>();
+
+		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId4(),
+				result.getCourseId(),
+				allocationFormList.getAllocationRatio4()));
+		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId5(),
+				result.getCourseId(),
+				allocationFormList.getAllocationRatio5()));
+		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId6(),
+				result.getCourseId(),
+				allocationFormList.getAllocationRatio6()));
+		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId7(),
+				result.getCourseId(),
+				allocationFormList.getAllocationRatio7()));
+		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId8(),
+				result.getCourseId(),
+				allocationFormList.getAllocationRatio8()));
+		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId9(),
+				result.getCourseId(),
+				allocationFormList.getAllocationRatio9()));
+		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId10(),
+				result.getCourseId(),
+				allocationFormList.getAllocationRatio10()));
+		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId11(),
+				result.getCourseId(),
+				allocationFormList.getAllocationRatio11()));
+
+		allocationModelList.stream().forEach(allocation -> {
+			System.out.println(allocation.getCourseId());
+		});
+
 		UserEntity user = userRepository.findById(userId).orElse(null);
 
 		user.setCourseEntity(result);
@@ -67,8 +106,44 @@ public class CourseServiceImpl implements CourseService {
 
 		courseOwnerRepository.save(courseOwnerEntity);
 
+		List<AllocationEntity> allocationEntityList = new ArrayList<>();
+
+		allocationModelList.forEach(allocationModel -> {
+			allocationEntityList.add(
+					AllocationModel.convertTo(
+							categoryRepository.findById(allocationModel.getCategoryId()).get(),
+							courseRepository.findById(allocationModel.getCourseId()).get(),
+							allocationModel.getAllocationRatio()));
+
+		});
+
+		List<AllocationModel> resultList = new ArrayList<>();
+		for (AllocationEntity allocationEntity : allocationEntityList) {
+			resultList.add(AllocationModel.convertFrom(allocationRepository.save(allocationEntity)));
+		}
+
 		return CourseModel.convertFrom(result);
 
+	}
+
+	@Transactional
+	public String deleteCourse(Long courseId, Long userId) {
+
+		UserEntity userEntity = userRepository.findById(userId).orElse(null);
+		System.out.println("***********************ここでエラー1");
+		if (userEntity.getCourseEntity().getCourseId() == courseId) {
+			return "selected";
+		} else if (courseId <= 6) {
+			return "original";
+		}
+		System.out.println("***********************ここでエラー2");
+		allocationRepository.deleteByCourseId(courseId);
+		System.out.println("***********************ここでエラー3");
+		courseOwnerRepository.deleteByCourseId(courseId);
+		System.out.println("***********************ここでエラー4");
+		courseRepository.deleteById(courseId);
+		System.out.println("***********************ここでエラー5");
+		return "ok";
 
 	}
 }

src/main/java/com/example/demo/app/domain/service/impl/LoginServiceImpl.java

@@ -25,6 +25,8 @@ public class LoginServiceImpl implements LoginService {
 
 		if (userEntity == null) {
 			return null;
+		} else if (userEntity.getDeleteFlag() == 1) {
+			return null;
 		}
 
 		boolean isValidPassword = false;

src/main/java/com/example/demo/app/infra/repository/AllocationRepository.java

@@ -3,6 +3,7 @@ package com.example.demo.app.infra.repository;
 import java.util.List;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 
 import com.example.demo.app.domain.model.CourseInfoModel;
@@ -29,4 +30,8 @@ public interface AllocationRepository extends JpaRepository<AllocationEntity, Al
 			+ " a.categoryEntity.categoryId ASC ")
 	List<CourseInfoModel> findAllJoinedAllocation();
 	
+	@Modifying
+	@Query("delete from AllocationEntity a where a.courseEntity.courseId = :courseId")
+	void deleteByCourseId(Long courseId);
+
 }

src/main/java/com/example/demo/app/infra/repository/CourseOwnerRepository.java

@@ -1,9 +1,15 @@
 package com.example.demo.app.infra.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 
 import com.example.demo.app.infra.entity.CourseOwnerEntity;
 
 public interface CourseOwnerRepository extends JpaRepository<CourseOwnerEntity, Long>{
 
+	@Modifying
+	@Query("delete from CourseOwnerEntity c where c.courseEntity.courseId = :courseId")
+	public void deleteByCourseId(Long courseId);
+	
 }

src/main/java/com/example/demo/app/presentation/controller/CourseController.java

@@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import com.example.demo.aop.aspect.SessionCheck;
-import com.example.demo.app.domain.model.AllocationModel;
 import com.example.demo.app.domain.model.CourseModel;
 import com.example.demo.app.domain.model.LoginModel;
 import com.example.demo.app.domain.service.AllocationService;
@@ -111,57 +110,48 @@ public class CourseController {
 
 		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
 
-		CourseForm form = CourseForm
+		model.addAttribute("courseForm", courseForm);
-				.convertFrom(courseService.save(CourseForm.convertTo(courseForm), loginUser.getUserId()));
-
-		session.setAttribute(PageReturnAttributeKeyword.COURSE_ID, form.getCourseId());
 
 		return TransitionTargetPageNameKeyword.COURSE_CREATE_RATIO_HTML;
 	}
 
 	@SessionCheck
 	@PostMapping(TransitionTargetPageNameKeyword.COURSE_CREATE)
-	public String createCoursePost(@ModelAttribute AllocationFormList allocationFormList, HttpSession session) {
+	public String createCoursePost(@ModelAttribute CourseForm courseForm,
+			@ModelAttribute AllocationFormList allocationFormList, HttpSession session) {
+		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
 
-		List<AllocationModel> allocationModelList = new ArrayList<>();
+		courseService.save(CourseForm.convertTo(courseForm), loginUser.getUserId(), allocationFormList);
-
-		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId1(),
-				(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID),
-				allocationFormList.getAllocationRatio1()));
-		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId2(),
-				(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID),
-				allocationFormList.getAllocationRatio2()));
-		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId3(),
-				(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID),
-				allocationFormList.getAllocationRatio3()));
-		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId4(),
-				(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID),
-				allocationFormList.getAllocationRatio4()));
-		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId5(),
-				(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID),
-				allocationFormList.getAllocationRatio5()));
-		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId6(),
-				(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID),
-				allocationFormList.getAllocationRatio6()));
-		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId7(),
-				(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID),
-				allocationFormList.getAllocationRatio7()));
-		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId8(),
-				(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID),
-				allocationFormList.getAllocationRatio8()));
-		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId9(),
-				(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID),
-				allocationFormList.getAllocationRatio9()));
-		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId10(),
-				(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID),
-				allocationFormList.getAllocationRatio10()));
-		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId11(),
-				(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID),
-				allocationFormList.getAllocationRatio11()));
-
-		allocationService.save(allocationModelList);
 
 		return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE;
 	}
 
+	@SessionCheck
+	@PostMapping("/course/delete")
+	public String createCoursePost(@RequestParam Long courseId, HttpSession session, Model model) {
+
+		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
+
+		System.out.println("**********************cousrId: " + courseId);
+		String condition = courseService.deleteCourse(courseId, loginUser.getUserId());
+
+		if (condition.equals("selected")) {
+
+			model.addAttribute("message", "適用中のコースは選べません");
+
+			return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE;
+
+		} else if (condition.equals("original")) {
+			model.addAttribute("message", "既存のデータは削除できません");
+
+			return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE;
+		} else if (condition.equals("ok")) {
+			return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE;
+		} 
+		model.addAttribute("message", "エラーが発生しました");
+
+		return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE;
+
+	}
+
 }

src/main/java/com/example/demo/app/presentation/controller/ErrorController.java

@@ -12,8 +12,4 @@ public class ErrorController {
 	        return TransitionTargetPageNameKeyword.ERROR_HTML;
 	    }
 	    
-	    @GetMapping(".well-known/appspecific/com.chrome.devtools")
-	    public void nothing() {
-	    	
-	    }
 }

src/main/java/com/example/demo/app/presentation/controller/GoalController.java

@@ -57,6 +57,8 @@ public class GoalController {
 
 		Long userId = loginUser.getUserId();
 
+		LocalDate today = LocalDate.now();
+
 		goalService.updateGoalComplete(userId);
 
 		List<GoalModel> goalModelList = goalService.getGoalByUserId(userId);
@@ -64,7 +66,8 @@ public class GoalController {
 		List<GoalForm> goalFormList1 = GoalForm.convertFrom(goalModelList);
 
 		List<GoalForm> goalFormList = goalFormList1.stream()
-				.filter(goalForm -> goalForm.getGoalComplete() == 0)
+				.filter(goalForm -> goalForm.getGoalComplete() == 0
+						&& !goalForm.getDeadline().isBefore(today))
 				.collect(Collectors.toList());
 
 		model.addAttribute(
@@ -107,8 +110,6 @@ public class GoalController {
 				1,
 				1);
 
-		LocalDate today = LocalDate.now();
-
 		Map<LocalDate, List<TransactionForm>> transactionFormMap = new HashMap<>();
 
 		transactionService
@@ -238,7 +239,6 @@ public class GoalController {
 
 		GoalForm goalForm = GoalForm.convertFrom(goalService.getGoalById(goalId));
 
-
 		model.addAttribute(PageReturnAttributeKeyword.GOAL_FORM, goalForm);
 		return TransitionTargetPageNameKeyword.GOAL_EDIT_HTML;
 
@@ -275,7 +275,9 @@ public class GoalController {
 
 		int currentAmount = goalService.getCurrentAmount(userId);
 
-		model.addAttribute("currentAmount", currentAmount);
+		System.out.println("************************currentAmount : " + currentAmount);
+		
+		session.setAttribute(PageReturnAttributeKeyword.CURRENT_AMOUNT, currentAmount);
 
 		return TransitionTargetPageNameKeyword.GOAL_CREATE_HTML;
 	}
@@ -305,7 +307,8 @@ public class GoalController {
 		if (record == null) {
 			return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.GOAL;
 		} else {
-			return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.GOAL + TransitionTargetPageNameKeyword.RECORD;
+			return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.GOAL
+					+ TransitionTargetPageNameKeyword.RECORD;
 		}
 
 	}
@@ -314,6 +317,8 @@ public class GoalController {
 	@GetMapping(TransitionTargetPageNameKeyword.RECORD)
 	public String getRecord(HttpSession session, Model model) {
 
+		LocalDate today = LocalDate.now();
+
 		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
 
 		Long userId = loginUser.getUserId();
@@ -325,7 +330,13 @@ public class GoalController {
 		List<GoalForm> goalCompleteFormList = new ArrayList<>();
 
 		goalFormList.stream().forEach(goalForm -> {
-			if (goalForm.getGoalComplete() == 1) {
+			if (goalForm.getGoalComplete() == 1 || goalForm.getDeadline().isBefore(today)) {
+
+				goalForm.setStatus(
+						goalForm.getGoalComplete() == 1
+								? "達成"
+								: "未達成");
+
 				goalCompleteFormList.add(goalForm);
 			}
 		});

src/main/java/com/example/demo/app/presentation/controller/TransactionController.java

@@ -238,7 +238,7 @@ public class TransactionController {
 
 		model.addAttribute(PageReturnAttributeKeyword.TRANSACTION_FORM, transactionForm);
 		
-		session.setAttribute("tType", String.valueOf(transactionForm.getTransactionType()));
+		session.setAttribute(SessionKeyword.T_TYPE, String.valueOf(transactionForm.getTransactionType()));
 		
 		model.addAttribute(PageReturnAttributeKeyword.CATEGORY_FORM_LIST, categoryFormList);
 
@@ -297,6 +297,23 @@ public class TransactionController {
 				transactionService.findMoneyRecord(transactionId),
 				CategoryForm.convertFrom(categoryService.findByTransactionId(transactionId)).getTransactionType());
 
+		List<CategoryForm> expenseList = new ArrayList<CategoryForm>();
+
+		List<CategoryForm> incomeList = new ArrayList<CategoryForm>();
+
+		for (CategoryForm categoryForm : categoryFormList) {
+
+			if (categoryForm.getTransactionType() == 0) {
+				expenseList.add(categoryForm);
+			} else {
+				incomeList.add(categoryForm);
+			}
+
+		}
+
+		model.addAttribute(PageReturnAttributeKeyword.EXPENSE_LIST, expenseList);
+		model.addAttribute(PageReturnAttributeKeyword.INCOME_LIST, incomeList);
+		
 		model.addAttribute(PageReturnAttributeKeyword.TRANSACTION_ID, transactionId);
 
 		model.addAttribute(PageReturnAttributeKeyword.TRANSACTION_FORM, transactionForm);
@@ -305,6 +322,8 @@ public class TransactionController {
 
 		model.addAttribute(PageReturnAttributeKeyword.TODAY, today);
 		
+		session.setAttribute(SessionKeyword.T_TYPE, transactionForm.getTransactionType());
+
 		return TransitionTargetPageNameKeyword.TRANSACTION_UPDATE_HTML;
 
 	}
@@ -353,29 +372,29 @@ public class TransactionController {
 			@RequestParam(required = false, defaultValue = "0") String months) {
 
 		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
-		System.out.println("******************************************::1");
+
 		LocalDate today = LocalDate.now();
-		System.out.println("******************************************::2");
+
 		int year = (years.equals("0")) ? today.getYear() : Integer.parseInt(years);
-		System.out.println("******************************************::3");
+
 		int month = (months.equals("0")) ? today.getMonthValue() : Integer.parseInt(months);
-		System.out.println("******************************************::4");
+
 		YearMonth yearMonth = YearMonth.of(year, month);
-		System.out.println("******************************************::5");
+
 		int lastDay = yearMonth.lengthOfMonth();
-		System.out.println("******************************************::6");
+
 		int firstDayOfWeek = yearMonth.atDay(1).getDayOfWeek().getValue() % 7;
-		System.out.println("******************************************::7");
+
 		YearMonth previousYearMonth = yearMonth.minusMonths(1);
-		System.out.println("******************************************::8");
+
 		int previousYear = previousYearMonth.getYear();
 		int previousMonth = previousYearMonth.getMonthValue();
-		System.out.println("******************************************::9");
+
 		YearMonth nextYearMonth = yearMonth.plusMonths(1);
-		System.out.println("******************************************::10");
+
 		int nextYear = nextYearMonth.getYear();
 		int nextMonth = nextYearMonth.getMonthValue();
-		System.out.println("******************************************::11");
+
 		model.addAttribute(PageReturnAttributeKeyword.YEAR, year);
 		model.addAttribute(PageReturnAttributeKeyword.MONTH, month);
 		model.addAttribute(PageReturnAttributeKeyword.DAY, today.getDayOfMonth());
@@ -388,34 +407,34 @@ public class TransactionController {
 
 		model.addAttribute(PageReturnAttributeKeyword.NEXT_YEAR, nextYear);
 		model.addAttribute(PageReturnAttributeKeyword.NEXT_MONTH, nextMonth);
-		System.out.println("******************************************::12");
+
 		LocalDate startDate = yearMonth.atDay(1);
 		LocalDate endDate = yearMonth.atEndOfMonth();
-		System.out.println("******************************************::13");
+
 		List<Income> incomeList = transactionService.findTotalIncomeList(startDate, endDate, loginUser.getUserId());
-		System.out.println("******************************************::14");
+
 		List<Expense> expenseList = transactionService.findTotalExpenseList(startDate, endDate, loginUser.getUserId());
-		System.out.println("******************************************::15");
+
 		model.addAttribute(PageReturnAttributeKeyword.INCOME_LIST, incomeList);
 		model.addAttribute(PageReturnAttributeKeyword.EXPENSE_LIST, expenseList);
-		System.out.println("******************************************::16");
+
 		int totalIncome = transactionService.findTotalIncome(startDate, endDate, loginUser.getUserId());
 
 		int totalExpense = transactionService.findTotalExpense(startDate, endDate, loginUser.getUserId());
-		System.out.println("******************************************::17");
+
 		model.addAttribute(PageReturnAttributeKeyword.TOTAL_INCOME, totalIncome);
 		model.addAttribute(PageReturnAttributeKeyword.TOTAL_EXPENSE, totalExpense);
-		System.out.println("******************************************::18");
+
 		List<GoalForm> goalForm = GoalForm.convertFrom(goalService.getGoalByUserId(loginUser.getUserId()));
-		System.out.println("******************************************::19");
+
 		UserForm userForm = UserForm.convertFrom(userService.findByUserId(loginUser.getUserId()));
-		System.out.println("******************************************::20");
+
-		List<GoalForm> resultList = goalForm.stream().filter(goal -> goal.getGoalComplete() == 0)
+		List<GoalForm> resultList = goalForm.stream().filter(goal -> goal.getGoalComplete() == 0 && goal.getDeadline().isAfter(today) )
 				.collect(Collectors.toList());
-		System.out.println("******************************************::21");
+
 		if (!resultList.isEmpty()) {
 			GoalForm result = resultList.getFirst();
-			System.out.println("******************************************::22");
+
 			model.addAttribute(PageReturnAttributeKeyword.ACHIEVEMENT_RATE, result.getAchievementRate());
 
 			model.addAttribute(PageReturnAttributeKeyword.CURRENT_AMOUNT, result.getCurrentAmount());

src/main/java/com/example/demo/app/presentation/controller/UserController.java

@@ -16,6 +16,7 @@ import com.example.demo.app.domain.service.QuestionService;
 import com.example.demo.app.domain.service.UserService;
 import com.example.demo.app.infra.entity.QuestionEntity;
 import com.example.demo.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
+import com.example.demo.app.presentation.controller.pageproperty.SessionKeyword;
 import com.example.demo.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
 import com.example.demo.app.presentation.form.UserForm;
 
@@ -58,7 +59,7 @@ public class UserController {
 			model.addAttribute(PageReturnAttributeKeyword.SELECTED_COURSE_NAME, courseService.findById(courseId).getCourseName());
 		}
 
-		session.setAttribute(PageReturnAttributeKeyword.SELECTED_COURSE_NAME, courseService.findById(courseId).getCourseName());
+		session.setAttribute(SessionKeyword.SELECTED_COURSE_NAME, courseService.findById(courseId).getCourseName());
 		model.addAttribute(PageReturnAttributeKeyword.COURSE_ID, courseId);
 		model.addAttribute(PageReturnAttributeKeyword.USER_FORM, userForm);
 
@@ -70,11 +71,9 @@ public class UserController {
 			String selectedCourseName, Model model,
 			HttpSession session) {
 
-		model.addAttribute(PageReturnAttributeKeyword.SELECTED_COURSE_NAME, (String) session.getAttribute("selectedCourseName"));
+		model.addAttribute(PageReturnAttributeKeyword.SELECTED_COURSE_NAME, (String) session.getAttribute(SessionKeyword.SELECTED_COURSE_NAME));
 		
-		session.setAttribute("questionId", userForm.getSecretQuestionId());
+		session.setAttribute(SessionKeyword.QUESTION_ID, userForm.getSecretQuestionId());
-		
-		System.out.println("return questionId: ****************************:" + userForm.getSecretQuestionId());
 		
 		return TransitionTargetPageNameKeyword.USER_RESISTER_CONFIRM_HTML;
 		
@@ -86,11 +85,9 @@ public class UserController {
 			Model model, 
 			HttpSession session) {
 
-		Long courseId = courseService.findByName((String) session.getAttribute(PageReturnAttributeKeyword.SELECTED_COURSE_NAME));
+		Long courseId = courseService.findByName((String) session.getAttribute(SessionKeyword.SELECTED_COURSE_NAME));
 		
-		Long questionId = (Long) session.getAttribute("questionId");
+		Long questionId = (Long) session.getAttribute(SessionKeyword.QUESTION_ID);
-		
-		System.out.println("confirm questionId: ****************************:" + questionId);
 		
 		userForm.setSecretQuestionId(questionId);
 		

src/main/java/com/example/demo/app/presentation/controller/pageproperty/PageReturnAttributeKeyword.java

@@ -4,7 +4,8 @@ public class PageReturnAttributeKeyword {
 
 	public static final String ERROR_MESSAGE = "errorMessage";
 	public static final String MESSAGE = "message";
-	
+	public static final String ERROR = "error";
+	public static final String STATUS = "status";
 	
 	public static final String QUESTION_LIST = "questionList";
 	public static final String USER_FORM = "userForm";

src/main/java/com/example/demo/app/presentation/controller/pageproperty/SessionKeyword.java

@@ -3,4 +3,10 @@ package com.example.demo.app.presentation.controller.pageproperty;
 public class SessionKeyword {
 	// SESSION情報として格納したいログイン者の情報
     public static final String LOGIN_USER = "loginUser";
+    
+    public static final String SELECTED_COURSE_NAME = "selectedCourseName";
+
+    public static final String QUESTION_ID = "questionId";
+    
+    public static final String T_TYPE = "tType";
 }

src/main/java/com/example/demo/app/presentation/form/GoalForm.java

@@ -29,6 +29,8 @@ public class GoalForm {
 
 	private Integer goalComplete;
 	
+	private String status;
+	
 	private Integer achievementRate; // 達成率
 	
 	private Integer currentAmount; // 現在の資産
@@ -43,6 +45,7 @@ public class GoalForm {
 				goalModel.getTargetAmount(),
 				goalModel.getDeadline(),
 				goalModel.getGoalComplete(),
+				null,
 				goalModel.getAchievementRate(),
 				goalModel.getCurrentAmount(),
 				goalModel.getUserId());

src/main/resources/static/css/style.css

@@ -46,6 +46,10 @@ body {
     border-top: 1px solid #d0d7de;
 }
 
+.a-footer {
+	text-decoration: none;
+}
+
 /* =======================
    カード
 ======================= */
@@ -178,6 +182,10 @@ td:hover {
     text-align: right;
 }
 
+.a-calender {
+	text-decoration: none;
+}
+
 /* =======================
    金額表示
 ======================= */
@@ -206,6 +214,10 @@ td:hover {
     vertical-align: middle;
 }
 
+.goal {
+	min-width: 300px;
+}
+
 /* =======================
    ボタン
 ======================= */

src/main/resources/templates/analysis.html

@@ -35,7 +35,7 @@
 	<table class="table text-center">
         <thead>
 	        <tr>
-                <th scope="col">カテゴリ別</th>
+                <th scope="col"></th>
 			    <th scope="col">支出</th>
 			    <th scope="col">前月比</th>
 			</tr>
@@ -47,7 +47,7 @@
 					0
 				  </td>
 			      <td th:text="${analysisForm.totalDifferenceAmount >= 0}
-					      ? '＋' + ${analysisForm.totalDifferenceAmount}
+					      ? '+' + ${analysisForm.totalDifferenceAmount}
 						  : ${analysisForm.totalDifferenceAmount}"
 				      th:class="${analysisForm.totalDifferenceAmount >= 0}
 					      ? 'text-danger'
@@ -73,16 +73,14 @@
 			
 	      <th scope="row"
 		      th:text="${category.categoryName}">
-			  食費
 		  </th>
 		  
 	      <td th:text="'￥' + ${category.currentMonthAmount}">
-			0
 		  </td>
 		  
 	      <td>
 			<span th:text="${category.monthDifferenceAmount >= 0}
-			          ? '＋' + ${category.monthDifferenceAmount}
+			          ? '+' + ${category.monthDifferenceAmount}
 				      : ${category.monthDifferenceAmount}"
 			      th:class="${category.monthDifferenceAmount >= 0}
 				      ? 'text-danger'
@@ -90,7 +88,7 @@
 			</span>
 			<br>
 			<span th:text="${category.courseDifferenceAmount >= 0}
-				      ? '＋' + ${category.courseDifferenceAmount}
+				      ? '+' + ${category.courseDifferenceAmount}
 					  : ${category.courseDifferenceAmount}"
 			      th:class="${category.courseDifferenceAmount >= 0}
 				      ? 'text-danger'

src/main/resources/templates/category_create.html

@@ -25,7 +25,7 @@
 					<div class="mb-3">
 						<label class="form-label" for="categoryName">カテゴリ名</label>
 
-						<input class="form-control" type="text" id="categoryName" th:field="*{categoryName}">
+						<input class="form-control" type="text" id="categoryName" th:field="*{categoryName}" required>
 					</div>
 
 					<br>
@@ -33,7 +33,7 @@
 					<div class="mb-3">
 						<label class="form-label" for="transactionType">収入・支出</label>
 
-						<select class="form-select" id="transactionType" th:field="*{transactionType}">
+						<select class="form-select" id="transactionType" th:field="*{transactionType}" required>
 
 							<option value="">選択してください</option>
 							<option value="0">支出</option>

src/main/resources/templates/category_list.html

@@ -9,13 +9,13 @@
 	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
 </head>
 
-<body class="pb-5 pt-5">
+<body style="padding-top:80px; padding-bottom:80px;">
 
 	<div th:replace="~{header :: header}"></div>
 	<div class="main-container">
 
 		<div>
-			<ul>
+			<ul class="list-unstyled p-0 m-0">
 				<li class="card shadow-sm mb-3" th:each="categoryForm : ${categoryFormList}">
 					<div class="card-body">
 						<div class="d-flex justify-content-between">
@@ -49,20 +49,30 @@
 
 						</div>
 
-						<hr>
-						<hr>
 					</div>
 				</li>
 			</ul>
 		</div>
 		
-
+		<div class="d-grid mt-4">
 
 			<form th:action="@{/category/create}" method="get">
-			<input type="hidden" name="today" id="today" th:value="${today}">
+
-			<button type="submit">新規登録</button>
+				<input type="hidden"
+			           name="today"
+					   id="today"
+			           th:value="${today}">
+
+			    <button class="btn btn-success w-100" type="submit">
+					新規登録
+				</button>
+
 			</form>
 
+		</div>
+		
+	</div>
+
 		<div th:replace="~{footer :: footer}"></div>
 </body>
 

src/main/resources/templates/category_update.html

@@ -25,7 +25,7 @@
 					<div class="mb-3">
 						<label class="form-label" for="categoryName">カテゴリ名</label>
 
-						<input class="form-control" type="text" id="categoryName" th:field="*{categoryName}">
+						<input class="form-control" type="text" id="categoryName" th:field="*{categoryName}" required>
 					</div>
 
 					<br>
@@ -33,7 +33,7 @@
 					<div class="mb-3">
 						<label class="form-label" for="transactionType">収入・支出</label>
 
-						<select class="form-select" id="transactionType" th:field="*{transactionType}">
+						<select class="form-select" id="transactionType" th:field="*{transactionType}" required>
 
 							<option value="">選択してください</option>
 							<option value="0">支出</option>
@@ -47,7 +47,7 @@
 					<input type="hidden" name="categoryId" th:value="${categoryId}">
 
 					<div class="d-grid">
-						<button type="submit" class="btn btn-primary">登録</button>
+						<button type="submit" class="btn btn-primary">更新</button>
 					</div>
 				</form>
 			</div>

src/main/resources/templates/course_create.html

@@ -23,7 +23,7 @@
 					<div class="mb-3">
 						<label class="form-label" for="courseName">コース名</label>
 
-						<input class="form-control" type="text" id="courseName" th:field="*{courseName}">
+						<input class="form-control" type="text" id="courseName" th:field="*{courseName}" required>
 					</div>
 
 					<br>

src/main/resources/templates/course_create_ratio.html

@@ -22,95 +22,113 @@
 				<form th:action="@{/course/create}" th:object="${allocationFormList}" method="post">
 
 
-					<div class="mb-3">
-						<label class="form-label" for="allocationRatio1">給与</label>
-						<input class="form-control" type="number" id="allocationRatio1" th:field="*{allocationRatio1}">
-					</div>
-
-					<br>
-
-					<div class="mb-3">
-						<label class="form-label" for="allocationRatio2">賞与</label>
-						<input class="form-control" type="number" id="allocationRatio2" th:field="*{allocationRatio2}">
-					</div>
-
-					<br>
-
-					<div class="mb-3">
-						<label class="form-label" for="allocationRatio3">その他</label>
-						<input class="form-control" type="number" id="allocationRatio3" th:field="*{allocationRatio3}">
-					</div>
-
-					<br>
-
 					<div class="mb-3">
 						<label class="form-label" for="allocationRatio4">固定費</label>
-						<input class="form-control" type="number" id="allocationRatio4" th:field="*{allocationRatio4}">
+						<input class="form-control" type="number" min="0" max="100" onchange="inputChange()"
+							id="allocationRatio4" th:field="*{allocationRatio4}" required>
 					</div>
 
 					<br>
 
 					<div class="mb-3">
 						<label class="form-label" for="allocationRatio5">食費</label>
-						<input class="form-control" type="number" id="allocationRatio5" th:field="*{allocationRatio5}">
+						<input class="form-control" type="number" min="0" max="100" onchange="inputChange()"
+							id="allocationRatio5" th:field="*{allocationRatio5}" required>
 					</div>
 
 					<br>
 
 					<div class="mb-3">
 						<label class="form-label" for="allocationRatio6">交通費</label>
-						<input class="form-control" type="number" id="allocationRatio6" th:field="*{allocationRatio6}">
+						<input class="form-control" type="number" min="0" max="100" onchange="inputChange()"
+							id="allocationRatio6" th:field="*{allocationRatio6}" required>
 					</div>
 
 					<br>
 
 					<div class="mb-3">
 						<label class="form-label" for="allocationRatio7">日用品費</label>
-						<input class="form-control" type="number" id="allocationRatio7" th:field="*{allocationRatio7}">
+						<input class="form-control" type="number" min="0" max="100" onchange="inputChange()"
+							id="allocationRatio7" th:field="*{allocationRatio7}" required>
 					</div>
 
 					<br>
 
 					<div class="mb-3">
 						<label class="form-label" for="allocationRatio8">被服/美容費</label>
-						<input class="form-control" type="number" id="allocationRatio8" th:field="*{allocationRatio8}">
+						<input class="form-control" type="number" min="0" max="100" onchange="inputChange()"
+							id="allocationRatio8" th:field="*{allocationRatio8}" required>
 					</div>
 
 					<br>
 
 					<div class="mb-3">
 						<label class="form-label" for="allocationRatio9">医療費</label>
-						<input class="form-control" type="number" id="allocationRatio9" th:field="*{allocationRatio9}">
+						<input class="form-control" type="number" min="0" max="100" onchange="inputChange()"
+							id="allocationRatio9" th:field="*{allocationRatio9}" required>
 					</div>
 
 					<br>
 
 					<div class="mb-3">
 						<label class="form-label" for="allocationRatio10">趣味/娯楽費</label>
-						<input class="form-control" type="number" id="allocationRatio10"
+						<input class="form-control" type="number" min="0" max="100" onchange="inputChange()"
-							th:field="*{allocationRatio10}">
+							id="allocationRatio10" th:field="*{allocationRatio10}" required>
 					</div>
 
 					<br>
 
 					<div class="mb-3">
 						<label class="form-label" for="allocationRatio11">その他</label>
-						<input class="form-control" type="number" id="allocationRatio11"
+						<input class="form-control" type="number" min="0" max="100" onchange="inputChange()"
-							th:field="*{allocationRatio11}">
+							id="allocationRatio11" th:field="*{allocationRatio11}" required>
+					</div>
+
+					<div class="mb-3">
+						<label class="form-label" for="allocationRatioTotal">合計(%)</label>
+						<input class="form-control" type="number" value="0" id="allocationRatioTotal" readonly>
 					</div>
 
 					<br>
 					<div class="d-grid">
-						<button type="submit" class="btn btn-primary">登録</button>
+						<button type="submit" class="btn btn-primary" id="submit" disabled="true">登録</button>
 
 					</div>
-				</form>
+
+					<span th:object="${courseForm}">
+
+						<input type="hidden" id="courseName" th:field="*{courseName}" required>
+						<br>
+
+						<input type="hidden" id="description" th:field="*{description}">
+					</span>
+			</div>
 		</div>
 	</div>
 	</div>
 
 	<div th:replace="~{footer :: footer}"></div>
 
+	<script>
+
+		function inputChange() {
+			let total = 0;
+
+			for (let i = 4; i <= 11; i++) {
+				total += Number(document.getElementById(`allocationRatio${i}`).value || 0);
+				if (total == 100) {
+					document.getElementById('submit').disabled = false;
+				} else {
+					document.getElementById('submit').disabled = true;
+				}
+			}
+
+
+			document.getElementById("allocationRatioTotal").value = total;
+
+		}
+
+	</script>
 
 </body>
 

src/main/resources/templates/fixed_cost.html

@@ -10,7 +10,7 @@
 	<link rel="stylesheet" th:href="@{/css/style.css}">
 </head>
 
-<body class="pb-5 pt-5">
+<body style="padding-top:80px; padding-bottom:80px;">
 
 	<div th:replace="~{header :: header}"></div>
 	<div class="main-container">
@@ -19,7 +19,7 @@
 		<h2 class="page-title" th:text="${today}"></h2>
 
 		<div>
-			<ul>
+			<ul class="list-unstyled p-0 m-0">
 				<li th:each="fixedCostForm : ${fixedCostFormList}" class="card shadow-sm mb-3">
 
 					<div class="card-body">
@@ -52,21 +52,29 @@
 
 						</div>
 
-						<hr>
-						<hr>
 					</div>
 				</li>
-		</div>
 			</ul>
 		</div>
-
+		<div class="d-grid mt-4">
-
 
 			<form th:action="@{/fixed-cost/create}" method="get">
-		<input type="hidden" name="today" id="today" th:value="${today}">
+
-		<button type="submit">新規登録</button>
+				<input type="hidden"
+					   name="today"
+					   id="today"
+					   th:value="${today}">
+
+				<button class="btn btn-success w-100" type="submit">
+			    	新規登録
+				</button>
+
 			</form>
 
+		</div>
+		
+	</div>
+
 	<div th:replace="~{footer :: footer}"></div>
 </body>
 

src/main/resources/templates/fixed_cost_create.html

@@ -37,11 +37,11 @@
 					<div class="mb-3">
 						<label class="form-label" for="transactionType">収入・支出</label>
 
-						<select class="form-select" id="transactionType">
+						<select class="form-select" id="transactionType" required>
 
 							<option value="">選択してください</option>
-							<option value="1">支出</option>
+							<option value="0">支出</option>
-							<option value="2">収入</option>
+							<option value="1">収入</option>
 
 						</select>
 					</div>
@@ -51,7 +51,7 @@
 					<div class="mb-3">
 						<label class="form-label" for="categoryId">カテゴリ</label>
 
-						<select class="form-select" id="categoryId" th:field="*{categoryId}">
+						<select class="form-select" id="categoryId" th:field="*{categoryId}" required>
 							<option value="">選択してください</option>
 
 							<option class="expenseListClass" th:each="category : ${expenseList}"
@@ -70,7 +70,7 @@
 					<div class="mb-3">
 						<label class="form-label" for="amount">金額</label>
 
-						<input class="form-control" type="number" id="amount" th:field="*{amount}" min="0" placeholder="金額を入力してください"
+						<input class="form-control" type="number" id="amount" th:field="*{amount}" min="1" placeholder="金額を入力してください"
 							required>
 					</div>
 
@@ -94,7 +94,7 @@
 					
 					transactionType.addEventListener("change", function () {
 
-						if (this.value === "1") {
+						if (this.value === "0") {
 
 							for (let i = 0; i < expenseList.length; i++) {
 								expenseList[i].style.display = "";
@@ -104,7 +104,7 @@
 								incomeList[i].style.display = "none";
 							}
 
-						} else if (this.value === "2") {
+						} else if (this.value === "1") {
 
 							for (let i = 0; i < expenseList.length; i++) {
 								expenseList[i].style.display = "none";

src/main/resources/templates/footer.html

@@ -15,22 +15,22 @@
 		  <div class="row">
 		    <div class="col border-end">
 		      <button type="button" class="btn btn-link text-black text-decoration-none">
-				<a th:href="@{/transaction/create}">入力</a>
+				<a th:href="@{/transaction/create}" class="a-footer">入力</a>
 			  </button>
 		    </div>
 		    <div class="col border-end">
 			  <button type="button" class="btn btn-link text-black text-decoration-none">
-				<a th:href="@{/transaction/list}">一覧</a>
+				<a th:href="@{/transaction/list}" class="a-footer">一覧</a>
 			  </button>
 		    </div>
 		    <div class="col border-end">
 			  <button type="button" class="btn btn-link text-black text-decoration-none">
-		        <a th:href="@{/analysis}">分析</a>
+		        <a th:href="@{/analysis}" class="a-footer">分析</a>
 			  </button>
 		    </div>
 			<div class="col border-end">
 			  <button type="button" class="btn btn-link text-black text-decoration-none">
-				<a th:href="@{/goal}">目標</a>
+				<a th:href="@{/goal}" class="a-footer">目標</a>
 			  </button>
 		    </div>
 		  </div>

src/main/resources/templates/goal_create.html

@@ -26,18 +26,20 @@
 
 					<div>
 						<label>目標名</label>
-						<input type="text" th:field="*{goalTitle}" required>
+						<input type="text" th:field="*{goalTitle}">
 					</div>
 
 					<div>
 						<label>目標説明</label>
-						<textarea th:field="*{goalSubtitle}" required></textarea>
+						<textarea th:field="*{goalSubtitle}"></textarea>
 					</div>
 
 					<div>
 						<label>目標金額</label>
 						<input type="number" th:field="*{targetAmount}" required min="1">
-						<span th:text="|所持金：${currentAmount}円|"></span>
+						<br>
+						<span th:text="|所持金：${session.currentAmount}円|"></span>
+						<input type="hidden" name="currentAmount" th:value="${currentAmount}">
 						<span th:if="${message != null}">
 							<span th:text="${message}" style="color: red;"></span>
 						</span>
@@ -52,8 +54,11 @@
 
 				</form>
 				
-				<div th:replace="~{footer :: footer}"></div>
+			</div>
+		</div>
+	</div>
 	
+	<div th:replace="~{footer :: footer}"></div>
 
 </body>
 

src/main/resources/templates/goal_record.html

@@ -8,7 +8,7 @@
 	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
 </head>
 
-<body class="pb-5 pt-5">
+<body style="padding-top:80px; padding-bottom:80px;">
 
 	<div th:replace="~{header :: header}"></div>
 
@@ -47,6 +47,12 @@
 
 								<br>
 
+								状態：
+								<span class="fw-bold" th:text="${goalForm.status}">
+								</span>
+
+								<br>
+
 							</p>
 
 							</form>
@@ -74,16 +80,16 @@
 				</ul>
 
 			</div>
+		</div>
+		
 		<div class="d-grid mt-4">
 			<form th:action="@{/goal}" method="get">
-
 				<button class="btn btn-success w-100" type="submit">
 					戻る
 				</button>
-
 			</form>
 		</div>
-		</div>
+		
 	</div>
 
 	<div th:replace="~{footer :: footer}"></div>

src/main/resources/templates/goal_view.html

@@ -128,27 +128,32 @@
 
 								<tr>
 									<th>目標名</th>
-									<td th:text="${goalForm.goalTitle}"></td>
+									<td th:text="${goalForm.goalTitle}" 
+									    class="goal"></td>
 								</tr>
 
 								<tr>
 									<th>目標説明</th >
-									<td th:text="${goalForm.goalSubtitle}"></td>
+									<td th:text="${goalForm.goalSubtitle}"
+									    class="goal"></td>
 								</tr>
 
 								<tr>
 									<th>目標金額</th>
-									<td th:text="${goalForm.targetAmount}"></td>
+									<td th:text="${goalForm.targetAmount}"
+									    class="goal"></td>
 								</tr>
 
 								<tr>
 									<th>目標達成期限</th>
-									<td th:text="${goalForm.deadline}"></td>
+									<td th:text="${goalForm.deadline}"
+									    class="goal"></td>
 								</tr>
 
 								<tr>
 									<th>達成率</th>
-									<td th:text="${goalForm.achievementRate} + '%'"></td>
+									<td th:text="${goalForm.achievementRate} + '%'"
+									    class="goal"></td>
 								</tr>
 
 							</table>
@@ -189,6 +194,8 @@
 
 	</div>
 
+	<div class="d-grid gap-2 mt-4">
+		
 	<form th:action="@{/goal/create}" method="get">
 
 		<button type="submit" class="btn btn-success w-100">
@@ -205,6 +212,8 @@
 
 	</form>
 	
+	</div>
+
 	<div th:replace="~{footer :: footer}"></div>
 
 </body>

src/main/resources/templates/menu.html

@@ -8,10 +8,9 @@
 
 	<title>Calendar</title>
 
-	<link rel="stylesheet" th:href="@{/css/style.css}">
-
 	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
 
+	<link rel="stylesheet" th:href="@{/css/style.css}">
 </head>
 
 <body>
@@ -64,7 +63,7 @@
 					<a th:if="${week * 7 + weekDay - firstDayOfWeek + 1 >= 1
 					           and week * 7 + weekDay - firstDayOfWeek + 1 <= lastDay}" th:href="@{/transaction/detail(
 					       todayDates=${T(java.time.LocalDate).of(year, month, week * 7 + weekDay - firstDayOfWeek + 1)}
-					   )}">
+					   )}" class="a-footer">
 
 
 						<div

src/main/resources/templates/profile_edit.html

@@ -100,17 +100,17 @@
 		                           min="0"
 								   max="10000000"
 		                           required>
-		                </div>
-
 		                </div>
 						
 						<div class="d-grid">
 							<button type="submit"
 							        class="btn btn-primary">
-	                        確定
+								編集
 							</button>
 						</div>
 
+		        	</div>
+				
 				</form>
 
 		    </div>

src/main/resources/templates/select_course.html

@@ -5,21 +5,25 @@
 	<meta charset="UTF-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
+	<link rel="stylesheet" th:href="@{/css/style.css}">
 	<title>コース選択</title>
 </head>
 
-<body style="padding-bottom: 120px; padding-top: 60px;">
+<body style="padding-bottom: 120px; padding-top: 80px;">
 	<div th:replace="~{header :: header}"></div>
 	<h1 class="page-title">コース選択</h1>
 
+	<div class="d-grid gap-2 mt-4">
 	    <th:block th:if="${mode == 'change'}">
 		    <form th:action="@{/course/create}" method="get">
-			<button type="submit">新規登録</button>
+			    <button class="btn btn-success w-100" type="submit">
+					新規登録
+				</button>
 		    </form>
-
+	    </th:block>
 
 	</th:block>
-	<form th:action="${mode == 'regist'} ? @{/user/register/return}: @{/change}" method="post">
+	<form th:action="${mode == 'regist'} ? @{/user/register/return}: @{/change}" id="totalForm" method="post">
 		<button type="submit" class="btn btn-primary w-100">確定</button>
 
 		<div class="accordion" id="accordionExample">
@@ -32,6 +36,9 @@
 						aria-controls="'collapse' + ${course.courseId}">
 						<span th:text="${course.courseName}"></span>
 					</button>
+					
+					<p th:if="${course.courseId > 6}" style="width: 120px;"><button type="button" class="btn btn-danger w-100"
+							th:attr="data-course-id=${course.courseId}" onclick="deleteCourse(this)">削除</button></p>
 				</h2>
 				<div th:id="'collapse' + ${course.courseId}" class="accordion-collapse collapse"
 					data-bs-parent="#accordionExample" style="padding-bottom: 120px;">
@@ -53,11 +60,49 @@
 			</div>
 		</div>
 	</form>
+	</div>
 
 	<th:block th:if="${mode=='change'}">
 		<div th:replace="~{footer :: footer}"></div>
 	</th:block>
 
+	<script th:inline="javascript">
+
+		const message = /*[[${message}]]*/ null;
+
+		if (message != null) {
+			alert(message);
+		}
+
+		function deleteCourse(button) {
+
+			const courseId = button.dataset.courseId;
+
+			const totalForm = document.getElementById("totalForm");
+
+			const input = document.createElement("input");
+
+			const radioButtons = totalForm.querySelectorAll('input[name="courseId"]');
+			radioButtons.forEach(radio => {
+				radio.disabled = true;
+			});
+
+			input.type = "hidden";
+			input.name = "courseId";
+			input.value = courseId;
+
+			totalForm.appendChild(input);
+
+			totalForm.action = "/course/delete";
+			totalForm.method = "post";
+			courseId.value = courseId;
+
+			totalForm.submit();
+		}
+
+
+	</script>
+
 	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/js/bootstrap.bundle.min.js"></script>
 </body>
 

src/main/resources/templates/transaction_create.html

@@ -3,10 +3,9 @@
 
 <head>
 	<meta charset="UTF-8" name="viewport" content="width=device-width, initial-scale=1" http-equiv="Content-Type">
-	<title>取引登録</title>
-	<link rel="stylesheet" th:href="@{/css/menu.css}">
-
 	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
+	<link rel="stylesheet" th:href="@{/css/style.css}">
+	<title>取引登録</title>
 </head>
 
 <body style="padding-top:80px; padding-bottom:80px;">
@@ -45,11 +44,11 @@
 								選択してください
 							</option>
 
-							<option value="1">
+							<option value="0">
 								支出
 							</option>
 
-							<option value="2">
+							<option value="1">
 								収入
 							</option>
 
@@ -114,7 +113,7 @@
 
 	<div th:replace="~{footer :: footer}"></div>
 
-	<script inline="javascript">
+	<script th:inline="javascript">
 			const transactionType = document.getElementById("transactionType");
 			const categoryId = document.getElementById("categoryId");
 
@@ -123,16 +122,19 @@
 
 			const tType = '[[${session.tType}]]';
 			
-		if (tType == "0") {
+			console.log("tType: " + tType);
-			transactionType.value = 1;
+			
-		} else {
+			if (tType.includes("0")) {
-			transactionType.value = 2;
+				console.log("okokokokokokokkkokokokoko");
+				transactionType.value = "0";
+			} else if (tType.includes("1")) {
+				transactionType.value = "1";
 			}
 
 			
-		transactionType.addEventListener("change", function () {
+			function toggleCategory() {
 
-			if (this.value === "1") {
+			    if (transactionType.value === "0") {
 
 			        for (let i = 0; i < expenseList.length; i++) {
 			            expenseList[i].style.display = "";
@@ -142,7 +144,7 @@
 			            incomeList[i].style.display = "none";
 			        }
 
-			} else if (this.value === "2") {
+			    } else if (transactionType.value === "1") {
 
 			        for (let i = 0; i < expenseList.length; i++) {
 			            expenseList[i].style.display = "none";
@@ -162,9 +164,18 @@
 						incomeList[i].style.display = "none";
 					}
 				}
+			}
+
+			transactionType.addEventListener("change", function () {
+
+			    toggleCategory();
 
 			    categoryId.value = "";
+
 			});
+			
+			toggleCategory();
+			
 		</script>
 
 

src/main/resources/templates/transaction_update.html

@@ -83,18 +83,33 @@
                             カテゴリ
                         </label>
 
-                        <select id="categoryId"
+<!--                        <select id="categoryId"-->
-                                class="form-select"
+<!--                                class="form-select"-->
-                                th:field="*{categoryId}"
+<!--                                th:field="*{categoryId}"-->
-								required>
+<!--								required>-->
+
+<!--                            <option value="">-->
+<!--                                選択してください-->
+<!--                            </option>-->
+
+<!--                            <option th:each="category : ${categoryFormList}"-->
+<!--                                    th:value="${category.categoryId}"-->
+<!--                                    th:text="${category.categoryName}">-->
+<!--                            </option>-->
+
+<!--                        </select>-->
+						<select id="categoryId" class="form-select" th:field="*{categoryId}" required>
 
 							<option value="">
 								選択してください
 							</option>
 
-                            <option th:each="category : ${categoryFormList}"
+							<option class="expenseListClass" th:each="category : ${expenseList}"
-                                    th:value="${category.categoryId}"
+								th:value="${category.categoryId}" th:text="${category.categoryName}">
-                                    th:text="${category.categoryName}">
+							</option>
+
+							<option class="incomeListClass" th:each="category : ${incomeList}"
+								th:value="${category.categoryId}" th:text="${category.categoryName}">
 							</option>
 
 						</select>
@@ -141,6 +156,68 @@
     <div th:replace="~{footer :: footer}">
     </div>
 
+	<script th:inline="javascript">
+		const transactionType = document.getElementById("transactionType");
+		const categoryId = document.getElementById("categoryId");
+
+		const expenseList = document.getElementsByClassName("expenseListClass");
+		const incomeList = document.getElementsByClassName("incomeListClass");
+
+		const tType = '[[${session.tType}]]';
+		
+		function toggleCategory() {
+
+		    if (transactionType.value === "0") {
+
+		        for (let i = 0; i < expenseList.length; i++) {
+		            expenseList[i].style.display = "";
+		        }
+
+		        for (let i = 0; i < incomeList.length; i++) {
+		            incomeList[i].style.display = "none";
+		        }
+
+		    } else if (transactionType.value === "1") {
+
+		        for (let i = 0; i < expenseList.length; i++) {
+		            expenseList[i].style.display = "none";
+		        }
+
+		        for (let i = 0; i < incomeList.length; i++) {
+		            incomeList[i].style.display = "";
+		        }
+
+		    } else {
+
+				for (let i = 0; i < expenseList.length; i++) {
+					expenseList[i].style.display = "none";
+				}
+
+				for (let i = 0; i < incomeList.length; i++) {
+					incomeList[i].style.display = "none";
+				}
+			}
+		}
+
+		transactionType.addEventListener("change", function () {
+
+		    toggleCategory();
+
+		    categoryId.value = "";
+
+		});
+		
+		if (tType == "0") {
+			transactionType.value = "0";
+		} else if (tType == "1") {
+			transactionType.value = "1";
+		}
+		
+		toggleCategory();
+		
+	</script>
+
+	
 </body>
 
 </html>