feat: 작업보고서 시스템 완성

- 일일 공수 입력 기능
- 부적합 사항 등록 (이미지 선택사항)
- 날짜별 부적합 조회 (시간순 나열)
- 목록 관리 (인라인 편집, 작업시간 확인 버튼)
- 보고서 생성 (총 공수/부적합 시간 분리)
- JWT 인증 및 권한 관리
- Docker 기반 배포 환경 구성
This commit is contained in:
hyungi
2025-09-17 10:41:25 +09:00
commit 1339e5dded
36 changed files with 5233 additions and 0 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -0,0 +1,19 @@
from sqlalchemy import create_engine
from sqlalchemy.orm import sessionmaker, Session
from sqlalchemy.ext.declarative import declarative_base
import os
from typing import Generator
DATABASE_URL = os.getenv("DATABASE_URL", "postgresql://mproject:mproject2024@localhost:5432/mproject")
engine = create_engine(DATABASE_URL)
SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
Base = declarative_base()
def get_db() -> Generator[Session, None, None]:
db = SessionLocal()
try:
yield db
finally:
db.close()

View File

@@ -0,0 +1,69 @@
from sqlalchemy import Column, Integer, String, DateTime, Float, Boolean, Text, ForeignKey, Enum
from sqlalchemy.ext.declarative import declarative_base
from sqlalchemy.orm import relationship
from datetime import datetime
import enum
Base = declarative_base()
class UserRole(str, enum.Enum):
ADMIN = "admin"
USER = "user"
class IssueStatus(str, enum.Enum):
NEW = "new"
PROGRESS = "progress"
COMPLETE = "complete"
class IssueCategory(str, enum.Enum):
MATERIAL_MISSING = "material_missing"
DIMENSION_DEFECT = "dimension_defect"
INCOMING_DEFECT = "incoming_defect"
class User(Base):
__tablename__ = "users"
id = Column(Integer, primary_key=True, index=True)
username = Column(String, unique=True, index=True, nullable=False)
hashed_password = Column(String, nullable=False)
full_name = Column(String)
role = Column(Enum(UserRole), default=UserRole.USER)
is_active = Column(Boolean, default=True)
created_at = Column(DateTime, default=datetime.utcnow)
# Relationships
issues = relationship("Issue", back_populates="reporter")
daily_works = relationship("DailyWork", back_populates="created_by")
class Issue(Base):
__tablename__ = "issues"
id = Column(Integer, primary_key=True, index=True)
photo_path = Column(String)
category = Column(Enum(IssueCategory), nullable=False)
description = Column(Text, nullable=False)
status = Column(Enum(IssueStatus), default=IssueStatus.NEW)
reporter_id = Column(Integer, ForeignKey("users.id"))
report_date = Column(DateTime, default=datetime.utcnow)
work_hours = Column(Float, default=0)
detail_notes = Column(Text)
# Relationships
reporter = relationship("User", back_populates="issues")
class DailyWork(Base):
__tablename__ = "daily_works"
id = Column(Integer, primary_key=True, index=True)
date = Column(DateTime, nullable=False, index=True)
worker_count = Column(Integer, nullable=False)
regular_hours = Column(Float, nullable=False)
overtime_workers = Column(Integer, default=0)
overtime_hours = Column(Float, default=0)
overtime_total = Column(Float, default=0)
total_hours = Column(Float, nullable=False)
created_by_id = Column(Integer, ForeignKey("users.id"))
created_at = Column(DateTime, default=datetime.utcnow)
# Relationships
created_by = relationship("User", back_populates="daily_works")

129
backend/database/schemas.py Normal file
View File

@@ -0,0 +1,129 @@
from pydantic import BaseModel, Field
from datetime import datetime
from typing import Optional, List
from enum import Enum
class UserRole(str, Enum):
admin = "admin"
user = "user"
class IssueStatus(str, Enum):
new = "new"
progress = "progress"
complete = "complete"
class IssueCategory(str, Enum):
material_missing = "material_missing"
dimension_defect = "dimension_defect"
incoming_defect = "incoming_defect"
# User schemas
class UserBase(BaseModel):
username: str
full_name: Optional[str] = None
role: UserRole = UserRole.user
class UserCreate(UserBase):
password: str
class UserUpdate(BaseModel):
full_name: Optional[str] = None
password: Optional[str] = None
role: Optional[UserRole] = None
is_active: Optional[bool] = None
class User(UserBase):
id: int
is_active: bool
created_at: datetime
class Config:
from_attributes = True
# Auth schemas
class Token(BaseModel):
access_token: str
token_type: str
user: User
class TokenData(BaseModel):
username: Optional[str] = None
class LoginRequest(BaseModel):
username: str
password: str
# Issue schemas
class IssueBase(BaseModel):
category: IssueCategory
description: str
class IssueCreate(IssueBase):
photo: Optional[str] = None # Base64 encoded image
class IssueUpdate(BaseModel):
category: Optional[IssueCategory] = None
description: Optional[str] = None
work_hours: Optional[float] = None
detail_notes: Optional[str] = None
status: Optional[IssueStatus] = None
photo: Optional[str] = None # Base64 encoded image for update
class Issue(IssueBase):
id: int
photo_path: Optional[str] = None
status: IssueStatus
reporter_id: int
reporter: User
report_date: datetime
work_hours: float
detail_notes: Optional[str] = None
class Config:
from_attributes = True
# Daily Work schemas
class DailyWorkBase(BaseModel):
date: datetime
worker_count: int = Field(gt=0)
overtime_workers: Optional[int] = 0
overtime_hours: Optional[float] = 0
class DailyWorkCreate(DailyWorkBase):
pass
class DailyWorkUpdate(BaseModel):
worker_count: Optional[int] = Field(None, gt=0)
overtime_workers: Optional[int] = None
overtime_hours: Optional[float] = None
class DailyWork(DailyWorkBase):
id: int
regular_hours: float
overtime_total: float
total_hours: float
created_by_id: int
created_by: User
created_at: datetime
class Config:
from_attributes = True
# Report schemas
class ReportRequest(BaseModel):
start_date: datetime
end_date: datetime
class CategoryStats(BaseModel):
material_missing: int = 0
dimension_defect: int = 0
incoming_defect: int = 0
class ReportSummary(BaseModel):
start_date: datetime
end_date: datetime
total_hours: float
total_issues: int
category_stats: CategoryStats
completed_issues: int
average_resolution_time: float