Skip to content
Merged
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
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.smartair.controller.homecontroller;
package com.example.smartair.controller;

import ch.qos.logback.core.model.Model;
import com.example.smartair.dto.TrackProgressDto;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package com.example.smartair.controller;

public class StudentDataController {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package com.example.smartair.controller;

public class TrackController {
}
19 changes: 19 additions & 0 deletions src/main/java/com/example/smartair/dto/CourseStatusDto.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package com.example.smartair.dto;

import lombok.Getter;
import lombok.Setter;

/**
* 과목 정보 DTO
* (title, year, semester, code, status)
*/
@Getter
@Setter
public class CourseStatusDto {

private String title; // 과목명 (기존 courseName)
private String year; // 이수 학년 (예: "전학년")
private String semester; // 이수 학기 (예: "전학기")
private String code; // 과목 코드 (기존 courseCode)
private String status; // 이수 상태 ("COMPLETED", "SCHEDULED", "NONE")
}
21 changes: 21 additions & 0 deletions src/main/java/com/example/smartair/dto/TrackDetailDto.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package com.example.smartair.dto;

import lombok.Getter;
import lombok.Setter;
import java.util.List;

/**
* 상세 UI 화면의 트랙 탭 하나의 전체 정보를 담는 DTO
* 새로 정의된 CourseStatusDto를 사용
*/
@Getter
@Setter
public class TrackDetailDto {

private String trackName; // 트랙 이름
private int completedCount; // 이수한 과목 수
private int requiredCount = 6; // 이수 필요 과목 수

// 리스트의 타입이 새로운 CourseStatusDto로 변경
private List<CourseStatusDto> courses;
}
4 changes: 3 additions & 1 deletion src/main/java/com/example/smartair/entity/TrackCourse.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@ public class TrackCourse {
private Long id;
private String courseName; // 현재 과목명
private String courseAlias; // 구(과거) 과목명
private String courseCode; // 과목 코드 (DTO의 'code'에 해당)
private String academicYear; // 이수 추천 학년 (DTO의 'year'에 해당)
private String academicSemester; // 이수 추천 학기 (DTO의 'semester'에 해당)

@ManyToOne
@JoinColumn(name = "track_id")
private Track track;
// Getters and Setters
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package com.example.smartair.repository;

public class ScheduledCourseRepository {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package com.example.smartair.repository;

public class UserRepository {
}
140 changes: 140 additions & 0 deletions src/main/resources/data.sql

Large diffs are not rendered by default.

Loading