diff --git a/system3-nonconformance/api/database/database.py b/system3-nonconformance/api/database/database.py
index a647323..5a3a77f 100644
--- a/system3-nonconformance/api/database/database.py
+++ b/system3-nonconformance/api/database/database.py
@@ -14,7 +14,7 @@ DB_NAME = os.getenv("DB_NAME", "hyungi")
DATABASE_URL = f"mysql+pymysql://{DB_USER}:{quote_plus(DB_PASSWORD)}@{DB_HOST}:{DB_PORT}/{DB_NAME}?charset=utf8mb4"
-engine = create_engine(DATABASE_URL, pool_recycle=3600)
+engine = create_engine(DATABASE_URL, pool_recycle=3600, pool_pre_ping=True)
SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
Base = declarative_base()
diff --git a/system3-nonconformance/api/routers/issues.py b/system3-nonconformance/api/routers/issues.py
index 791d031..a8d1b75 100644
--- a/system3-nonconformance/api/routers/issues.py
+++ b/system3-nonconformance/api/routers/issues.py
@@ -140,23 +140,26 @@ async def update_issue(
# 업데이트
update_data = issue_update.dict(exclude_unset=True)
- # 사진 업데이트 처리 (최대 5장)
+ # 사진 업데이트 처리 (최대 5장) - 새 사진 저장 후 기존 사진 삭제 (안전)
+ old_photos_to_delete = []
for i in range(1, 6):
photo_field = f"photo{i if i > 1 else ''}"
path_field = f"photo_path{i if i > 1 else ''}"
if photo_field in update_data:
- # 기존 사진 삭제
existing_path = getattr(issue, path_field, None)
- if existing_path:
- delete_file(existing_path)
# 새 사진 저장
if update_data[photo_field]:
new_path = save_base64_image(update_data[photo_field])
update_data[path_field] = new_path
+ # 새 사진 저장 성공 시에만 기존 사진 삭제 예약
+ if new_path and existing_path:
+ old_photos_to_delete.append(existing_path)
else:
update_data[path_field] = None
+ if existing_path:
+ old_photos_to_delete.append(existing_path)
# photo 필드는 제거 (DB에는 photo_path만 저장)
del update_data[photo_field]
@@ -171,6 +174,14 @@ async def update_issue(
db.commit()
db.refresh(issue)
+
+ # DB 커밋 성공 후 기존 사진 파일 삭제
+ for old_path in old_photos_to_delete:
+ try:
+ delete_file(old_path)
+ except Exception:
+ pass
+
return issue
@router.delete("/{issue_id}")
@@ -456,15 +467,8 @@ async def reject_completion_request(
raise HTTPException(status_code=403, detail="완료 반려 권한이 없습니다.")
try:
- # 완료 사진 파일 삭제 (최대 5장)
- for i in range(1, 6):
- path_field = f"completion_photo_path{i if i > 1 else ''}"
- photo_path = getattr(issue, path_field, None)
- if photo_path:
- try:
- delete_file(photo_path)
- except Exception:
- pass
+ # 완료 사진은 파일 삭제하지 않음 (재신청 시 참고용으로 보존)
+ # DB 참조만 초기화
# 완료 신청 정보 초기화
issue.completion_requested_at = None
diff --git a/system3-nonconformance/web/issues-dashboard.html b/system3-nonconformance/web/issues-dashboard.html
index 263dce3..1348070 100644
--- a/system3-nonconformance/web/issues-dashboard.html
+++ b/system3-nonconformance/web/issues-dashboard.html
@@ -4,6 +4,7 @@
부적합 현황판
+
diff --git a/system3-nonconformance/web/issues-inbox.html b/system3-nonconformance/web/issues-inbox.html
index 8d11dda..dd02ecc 100644
--- a/system3-nonconformance/web/issues-inbox.html
+++ b/system3-nonconformance/web/issues-inbox.html
@@ -4,6 +4,7 @@
수신함 - 작업보고서
+
diff --git a/system3-nonconformance/web/issues-management.html b/system3-nonconformance/web/issues-management.html
index 3bf93de..8ffcfe7 100644
--- a/system3-nonconformance/web/issues-management.html
+++ b/system3-nonconformance/web/issues-management.html
@@ -4,6 +4,7 @@
관리함 - 작업보고서
+
diff --git a/system3-nonconformance/web/m/dashboard.html b/system3-nonconformance/web/m/dashboard.html
new file mode 100644
index 0000000..3775e42
--- /dev/null
+++ b/system3-nonconformance/web/m/dashboard.html
@@ -0,0 +1,195 @@
+
+
+
+
+
+ 부적합 현황판
+
+
+
+
+
+
+
+
+
+
+
+
+
전체0
+
오늘 신규0
+
완료 대기0
+
지연0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/system3-nonconformance/web/m/inbox.html b/system3-nonconformance/web/m/inbox.html
new file mode 100644
index 0000000..5623584
--- /dev/null
+++ b/system3-nonconformance/web/m/inbox.html
@@ -0,0 +1,203 @@
+
+
+
+
+
+ 수신함
+
+
+
+
+
+
+
+
+
+
+
+
+
금일 신규0
+
금일 처리0
+
미해결0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
전체0
+
진행 중0
+
완료 대기0
+
완료됨0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
![]()
';
+ modal.addEventListener('click', function (e) { if (e.target === modal) closePhotoModal(); });
+ document.body.appendChild(modal);
+ }
+ modal.querySelector('img').src = src;
+ modal.classList.add('open');
+ document.body.style.overflow = 'hidden';
+}
+
+function closePhotoModal() {
+ var modal = document.getElementById('photoModal');
+ if (modal) {
+ modal.classList.remove('open');
+ if (!_activeSheets.length) document.body.style.overflow = '';
+ }
+}
+
+/* ===== Auth Helper ===== */
+async function mCheckAuth() {
+ var token = TokenManager.getToken();
+ if (!token) {
+ window.location.href = _getLoginUrl();
+ return null;
+ }
+ try {
+ var user = await AuthAPI.getCurrentUser();
+ return user;
+ } catch (e) {
+ TokenManager.removeToken();
+ TokenManager.removeUser();
+ window.location.href = _getLoginUrl();
+ return null;
+ }
+}
+
+/* ===== Loading Overlay ===== */
+function hideLoading() {
+ var el = document.getElementById('loadingOverlay');
+ if (el) { el.classList.add('hide'); setTimeout(function () { el.remove(); }, 300); }
+}
+
+/* ===== Helpers ===== */
+function escapeHtml(text) {
+ if (!text) return '';
+ var div = document.createElement('div');
+ div.textContent = text;
+ return div.innerHTML;
+}
+
+function getPhotoPaths(issue) {
+ return [issue.photo_path, issue.photo_path2, issue.photo_path3, issue.photo_path4, issue.photo_path5].filter(Boolean);
+}
+
+function getCompletionPhotoPaths(issue) {
+ return [issue.completion_photo_path, issue.completion_photo_path2, issue.completion_photo_path3, issue.completion_photo_path4, issue.completion_photo_path5].filter(Boolean);
+}
+
+function renderPhotoThumbs(photos) {
+ if (!photos || !photos.length) return '';
+ return '' + photos.map(function (p, i) {
+ return '
';
+ }).join('') + '
' +
+ issues.map(function (issue) { return renderIssueCard(issue); }).join('') +
+ '
';
+ }).join('');
+
+ container.innerHTML = html;
+}
+
+function renderIssueCard(issue) {
+ var project = projects.find(function (p) { return p.id === issue.project_id; });
+ var projectName = project ? project.project_name : '미지정';
+ var status = getIssueStatus(issue);
+ var photos = getPhotoPaths(issue);
+ var isPending = status === 'pending_completion';
+
+ // 의견/댓글 파싱
+ var opinionsHtml = renderOpinions(issue);
+
+ // 완료 반려 내용
+ var rejectionHtml = '';
+ if (issue.completion_rejection_reason) {
+ var rejAt = issue.completion_rejected_at ? formatKSTDateTime(issue.completion_rejected_at) : '';
+ rejectionHtml = '' +
+ '
완료 반려
' +
+ '
' + (rejAt ? '[' + rejAt + '] ' : '') + escapeHtml(issue.completion_rejection_reason) + '
' +
+ '
완료 신청 정보
' +
+ (cPhotos.length ? renderPhotoThumbs(cPhotos) : '
완료 사진 없음
') +
+ '
' + (issue.completion_comment || '코멘트 없음') + '
' +
+ '
신청: ' + formatKSTDateTime(issue.completion_requested_at) + '
' +
+ '
' +
+ '' +
+ '' +
+ '
';
+ } else {
+ actionHtml = '' +
+ '' +
+ '' +
+ '
';
+ }
+
+ return '' +
+ '' +
+ '
' + escapeHtml(getIssueTitle(issue)) + '
' +
+ '
' +
+ // 상세 내용
+ '
' + escapeHtml(getIssueDetail(issue)) + '
' +
+ // 정보행
+ '
' +
+ '' + escapeHtml(issue.reporter?.full_name || issue.reporter?.username || '-') + '' +
+ '' + getCategoryText(issue.category || issue.final_category) + '' +
+ (issue.expected_completion_date ? '' + formatKSTDate(issue.expected_completion_date) + '' : '') +
+ '
' +
+ // 사진
+ (photos.length ? renderPhotoThumbs(photos) : '') +
+ // 해결방안 / 의견 섹션
+ '
' +
+ renderManagementComment(issue) +
+ opinionsHtml +
+ '
' +
+ rejectionHtml +
+ completionInfoHtml +
+ '
' +
+ actionHtml +
+ '' +
+ '
' +
+ '
' +
+ (content ? escapeHtml(content) : '확정된 해결 방안 없음') +
+ '
';
+
+ validOpinions.forEach(function (opinion, opinionIndex) {
+ var trimmed = opinion.trim();
+ var headerMatch = trimmed.match(/^\[([^\]]+)\]\s*\(([^)]+)\)/);
+
+ if (headerMatch) {
+ var author = headerMatch[1];
+ var datetime = headerMatch[2];
+ var rest = trimmed.substring(headerMatch[0].length).trim().split('\n');
+ var mainContent = '';
+ var comments = [];
+ var currentCommentIdx = -1;
+
+ rest.forEach(function (line) {
+ if (line.match(/^\s*└/)) {
+ var cm = line.match(/└\s*\[([^\]]+)\]\s*\(([^)]+)\):\s*(.+)/);
+ if (cm) { comments.push({ author: cm[1], datetime: cm[2], content: cm[3], replies: [] }); currentCommentIdx = comments.length - 1; }
+ } else if (line.match(/^\s*↳/)) {
+ var rm = line.match(/↳\s*\[([^\]]+)\]\s*\(([^)]+)\):\s*(.+)/);
+ if (rm && currentCommentIdx >= 0) { comments[currentCommentIdx].replies.push({ author: rm[1], datetime: rm[2], content: rm[3] }); }
+ } else {
+ mainContent += (mainContent ? '\n' : '') + line;
+ }
+ });
+
+ var isOwn = currentUser && (author === currentUser.full_name || author === currentUser.username);
+
+ html += '
' +
+ '' +
+ '
' + escapeHtml(mainContent) + '
' +
+ '
' +
+ '' +
+ (isOwn ? '' +
+ '' : '') +
+ '
';
+
+ // 댓글
+ comments.forEach(function (comment, commentIndex) {
+ var isOwnComment = currentUser && (comment.author === currentUser.full_name || comment.author === currentUser.username);
+ html += ''; // m-comment
+ });
+
+ html += '
'; // m-opinion-card
+ }
+ });
+
+ html += '
' +
+ '' +
+ '
' + escapeHtml(issue.final_description || issue.description) + '
' +
+ '
' +
+ '
' +
+ '' + escapeHtml(issue.reporter?.username || '알 수 없음') + '' +
+ '' + getCategoryText(issue.category || issue.final_category) + '' +
+ '' + (photoCount > 0 ? photoCount + '장' : '없음') + '' +
+ '' + getTimeAgo(issue.report_date) + '' +
+ '
' +
+ (photos.length ? renderPhotoThumbs(photos) : '') +
+ (issue.detail_notes ? '
"' + escapeHtml(issue.detail_notes) + '"
' : '') +
+ '
' +
+ '
' +
+ '' +
+ '' +
+ '' +
+ '
' +
+ '
동일 프로젝트의 관리함 이슈가 없습니다.
';
+ return;
+ }
+
+ container.innerHTML = list.map(function (mi) {
+ return '' +
+ '
' + escapeHtml(mi.description || mi.final_description) + '
' +
+ '
' +
+ '' + getCategoryText(mi.category || mi.final_category) + '' +
+ '신고자: ' + escapeHtml(mi.reporter_name) + '' +
+ 'ID: ' + mi.id + '' +
+ '
목록 로드 실패
';
+ }
+}
+
+function selectDuplicate(id, el) {
+ var items = document.getElementById('managementIssuesList').children;
+ for (var i = 0; i < items.length; i++) items[i].style.background = '';
+ el.style.background = '#eff6ff';
+ document.getElementById('selectedDuplicateId').value = id;
+}
+
+async function confirmDispose() {
+ if (!currentIssueId) return;
+ var reason = document.getElementById('disposalReason').value;
+ var customReason = document.getElementById('customReason').value;
+ var duplicateId = document.getElementById('selectedDuplicateId').value;
+
+ if (reason === 'custom' && !customReason.trim()) { showToast('폐기 사유를 입력해주세요.', 'warning'); return; }
+ if (reason === 'duplicate' && !duplicateId) { showToast('중복 대상을 선택해주세요.', 'warning'); return; }
+
+ try {
+ var body = { disposal_reason: reason, custom_disposal_reason: reason === 'custom' ? customReason : null };
+ if (reason === 'duplicate' && duplicateId) body.duplicate_of_issue_id = parseInt(duplicateId);
+
+ var resp = await fetch(API_BASE_URL + '/inbox/' + currentIssueId + '/dispose', {
+ method: 'POST',
+ headers: { 'Authorization': 'Bearer ' + TokenManager.getToken(), 'Content-Type': 'application/json' },
+ body: JSON.stringify(body)
+ });
+
+ if (resp.ok) {
+ showToast('폐기 처리되었습니다.', 'success');
+ closeSheet('dispose');
+ await loadIssues();
+ } else {
+ var err = await resp.json();
+ throw new Error(err.detail || '폐기 실패');
+ }
+ } catch (e) { showToast('오류: ' + e.message, 'error'); }
+}
+
+// ===== 검토 =====
+function openReviewSheet(issueId) {
+ currentIssueId = issueId;
+ var issue = issues.find(function (i) { return i.id === issueId; });
+ if (!issue) return;
+
+ var project = projects.find(function (p) { return p.id === issue.project_id; });
+
+ // 원본 정보
+ document.getElementById('originalInfo').innerHTML =
+ '프로젝트: ' + (project ? escapeHtml(project.project_name) : '미지정') + '
' +
+ '신고자: ' + escapeHtml(issue.reporter?.username || '알 수 없음') + '
' +
+ '등록일: ' + formatKSTDate(issue.report_date) + '
';
+
+ // 프로젝트 select
+ var sel = document.getElementById('reviewProjectId');
+ sel.innerHTML = '';
+ projects.forEach(function (p) {
+ sel.innerHTML += '';
+ });
+
+ document.getElementById('reviewCategory').value = issue.category || issue.final_category || 'etc';
+ var desc = issue.description || issue.final_description || '';
+ var lines = desc.split('\n');
+ document.getElementById('reviewTitle').value = lines[0] || '';
+ document.getElementById('reviewDescription').value = lines.slice(1).join('\n') || desc;
+
+ openSheet('review');
+}
+
+async function saveReview() {
+ if (!currentIssueId) return;
+ var projectId = document.getElementById('reviewProjectId').value;
+ var category = document.getElementById('reviewCategory').value;
+ var title = document.getElementById('reviewTitle').value.trim();
+ var description = document.getElementById('reviewDescription').value.trim();
+
+ if (!title) { showToast('부적합명을 입력해주세요.', 'warning'); return; }
+
+ var combined = title + (description ? '\n' + description : '');
+
+ try {
+ var resp = await fetch(API_BASE_URL + '/inbox/' + currentIssueId + '/review', {
+ method: 'POST',
+ headers: { 'Authorization': 'Bearer ' + TokenManager.getToken(), 'Content-Type': 'application/json' },
+ body: JSON.stringify({
+ project_id: projectId ? parseInt(projectId) : null,
+ category: category,
+ description: combined
+ })
+ });
+
+ if (resp.ok) {
+ showToast('검토가 완료되었습니다.', 'success');
+ closeSheet('review');
+ await loadIssues();
+ } else {
+ var err = await resp.json();
+ throw new Error(err.detail || '검토 실패');
+ }
+ } catch (e) { showToast('오류: ' + e.message, 'error'); }
+}
+
+// ===== 확인 (상태 결정) =====
+function openStatusSheet(issueId) {
+ currentIssueId = issueId;
+ document.querySelectorAll('input[name="finalStatus"]').forEach(function (r) { r.checked = false; });
+ document.querySelectorAll('.m-radio-item').forEach(function (el) { el.classList.remove('selected'); });
+ document.getElementById('completionSection').classList.add('hidden');
+ statusPhotoBase64 = null;
+ document.getElementById('statusPhotoInput').value = '';
+ document.getElementById('statusPhotoPreview').classList.add('hidden');
+ document.getElementById('solutionInput').value = '';
+ document.getElementById('responsibleDepartmentInput').value = '';
+ document.getElementById('responsiblePersonInput').value = '';
+ openSheet('status');
+}
+
+function selectStatus(value) {
+ document.querySelectorAll('.m-radio-item').forEach(function (el) { el.classList.remove('selected'); });
+ var radio = document.querySelector('input[name="finalStatus"][value="' + value + '"]');
+ if (radio) { radio.checked = true; radio.closest('.m-radio-item').classList.add('selected'); }
+ document.getElementById('completionSection').classList.toggle('hidden', value !== 'completed');
+}
+
+function handleStatusPhoto(event) {
+ var file = event.target.files[0];
+ if (!file) return;
+ if (file.size > 5 * 1024 * 1024) { showToast('5MB 이하 파일만 가능합니다.', 'warning'); event.target.value = ''; return; }
+ var reader = new FileReader();
+ reader.onload = function (e) {
+ statusPhotoBase64 = e.target.result.split(',')[1];
+ var preview = document.getElementById('statusPhotoPreview');
+ preview.src = e.target.result;
+ preview.classList.remove('hidden');
+ };
+ reader.readAsDataURL(file);
+}
+
+async function confirmStatus() {
+ if (!currentIssueId) return;
+ var selected = document.querySelector('input[name="finalStatus"]:checked');
+ if (!selected) { showToast('상태를 선택해주세요.', 'warning'); return; }
+
+ var reviewStatus = selected.value;
+ var body = { review_status: reviewStatus };
+
+ if (reviewStatus === 'completed') {
+ var solution = document.getElementById('solutionInput').value.trim();
+ var dept = document.getElementById('responsibleDepartmentInput').value;
+ var person = document.getElementById('responsiblePersonInput').value.trim();
+ if (solution) body.solution = solution;
+ if (dept) body.responsible_department = dept;
+ if (person) body.responsible_person = person;
+ if (statusPhotoBase64) body.completion_photo = statusPhotoBase64;
+ }
+
+ try {
+ var resp = await fetch(API_BASE_URL + '/inbox/' + currentIssueId + '/status', {
+ method: 'POST',
+ headers: { 'Authorization': 'Bearer ' + TokenManager.getToken(), 'Content-Type': 'application/json' },
+ body: JSON.stringify(body)
+ });
+
+ if (resp.ok) {
+ showToast('상태가 변경되었습니다.', 'success');
+ closeSheet('status');
+ await loadIssues();
+ } else {
+ var err = await resp.json();
+ throw new Error(err.detail || '상태 변경 실패');
+ }
+ } catch (e) { showToast('오류: ' + e.message, 'error'); }
+}
+
+// ===== 시작 =====
+document.addEventListener('DOMContentLoaded', initialize);
diff --git a/system3-nonconformance/web/static/js/m/m-management.js b/system3-nonconformance/web/static/js/m/m-management.js
new file mode 100644
index 0000000..245376d
--- /dev/null
+++ b/system3-nonconformance/web/static/js/m/m-management.js
@@ -0,0 +1,436 @@
+/**
+ * m-management.js — 관리함 모바일 페이지 로직
+ */
+
+var currentUser = null;
+var issues = [];
+var projects = [];
+var filteredIssues = [];
+var currentTab = 'in_progress';
+var currentIssueId = null;
+var rejectIssueId = null;
+
+function cleanManagementComment(text) {
+ if (!text) return '';
+ return text.replace(/\[완료 반려[^\]]*\][^\n]*\n*/g, '').trim();
+}
+
+// ===== 초기화 =====
+async function initialize() {
+ currentUser = await mCheckAuth();
+ if (!currentUser) return;
+
+ await loadProjects();
+ await loadIssues();
+ renderBottomNav('management');
+ hideLoading();
+}
+
+async function loadProjects() {
+ try {
+ var resp = await fetch(API_BASE_URL + '/projects/', {
+ headers: { 'Authorization': 'Bearer ' + TokenManager.getToken() }
+ });
+ if (resp.ok) {
+ projects = await resp.json();
+ var sel = document.getElementById('projectFilter');
+ sel.innerHTML = '';
+ projects.forEach(function (p) {
+ sel.innerHTML += '';
+ });
+ }
+ } catch (e) { console.error('프로젝트 로드 실패:', e); }
+}
+
+async function loadIssues() {
+ try {
+ var resp = await fetch(API_BASE_URL + '/issues/admin/all', {
+ headers: { 'Authorization': 'Bearer ' + TokenManager.getToken() }
+ });
+ if (resp.ok) {
+ var all = await resp.json();
+ var filtered = all.filter(function (i) { return i.review_status === 'in_progress' || i.review_status === 'completed'; });
+
+ // 프로젝트별 순번
+ filtered.sort(function (a, b) { return new Date(a.reviewed_at) - new Date(b.reviewed_at); });
+ var groups = {};
+ filtered.forEach(function (issue) {
+ if (!groups[issue.project_id]) groups[issue.project_id] = [];
+ groups[issue.project_id].push(issue);
+ });
+ Object.keys(groups).forEach(function (pid) {
+ groups[pid].forEach(function (issue, idx) { issue.project_sequence_no = idx + 1; });
+ });
+
+ issues = filtered;
+ filterIssues();
+ }
+ } catch (e) { console.error('이슈 로드 실패:', e); }
+}
+
+// ===== 탭 전환 =====
+function switchTab(tab) {
+ currentTab = tab;
+ document.getElementById('tabInProgress').classList.toggle('active', tab === 'in_progress');
+ document.getElementById('tabCompleted').classList.toggle('active', tab === 'completed');
+ document.getElementById('additionalInfoBtn').style.display = tab === 'in_progress' ? 'flex' : 'none';
+ filterIssues();
+}
+
+// ===== 통계 =====
+function updateStatistics() {
+ var pid = document.getElementById('projectFilter').value;
+ var pi = pid ? issues.filter(function (i) { return i.project_id == pid; }) : issues;
+
+ document.getElementById('totalCount').textContent = pi.length;
+ document.getElementById('inProgressCount').textContent = pi.filter(function (i) { return i.review_status === 'in_progress' && !i.completion_requested_at; }).length;
+ document.getElementById('pendingCompletionCount').textContent = pi.filter(function (i) { return i.review_status === 'in_progress' && i.completion_requested_at; }).length;
+ document.getElementById('completedCount').textContent = pi.filter(function (i) { return i.review_status === 'completed'; }).length;
+}
+
+// ===== 필터 =====
+function filterIssues() {
+ var pid = document.getElementById('projectFilter').value;
+ filteredIssues = issues.filter(function (i) {
+ if (i.review_status !== currentTab) return false;
+ if (pid && i.project_id != pid) return false;
+ return true;
+ });
+ filteredIssues.sort(function (a, b) { return new Date(b.report_date) - new Date(a.report_date); });
+ renderIssues();
+ updateStatistics();
+}
+
+// ===== 이슈 상태 =====
+function getIssueStatus(issue) {
+ if (issue.review_status === 'completed') return 'completed';
+ if (issue.completion_requested_at) return 'pending_completion';
+ if (issue.expected_completion_date) {
+ var diff = (new Date(issue.expected_completion_date) - new Date()) / 86400000;
+ if (diff < 0) return 'overdue';
+ if (diff <= 3) return 'urgent';
+ }
+ return 'in_progress';
+}
+
+function getStatusBadgeHtml(status) {
+ var map = {
+ 'in_progress': ' 진행 중',
+ 'urgent': ' 긴급',
+ 'overdue': ' 지연됨',
+ 'pending_completion': ' 완료 대기',
+ 'completed': ' 완료됨'
+ };
+ return map[status] || map['in_progress'];
+}
+
+// ===== 렌더링 =====
+function renderIssues() {
+ var container = document.getElementById('issuesList');
+ var empty = document.getElementById('emptyState');
+
+ if (!filteredIssues.length) { container.innerHTML = ''; empty.classList.remove('hidden'); return; }
+ empty.classList.add('hidden');
+
+ // 날짜별 그룹
+ var grouped = {};
+ var dateObjs = {};
+ filteredIssues.forEach(function (issue) {
+ var dateToUse = currentTab === 'completed' ? (issue.actual_completion_date || issue.report_date) : issue.report_date;
+ var d = new Date(dateToUse);
+ var key = d.toLocaleDateString('ko-KR');
+ if (!grouped[key]) { grouped[key] = []; dateObjs[key] = d; }
+ grouped[key].push(issue);
+ });
+
+ var html = Object.keys(grouped)
+ .sort(function (a, b) { return dateObjs[b] - dateObjs[a]; })
+ .map(function (dateKey) {
+ var issues = grouped[dateKey];
+ return '' +
+ issues.map(function (issue) {
+ return currentTab === 'in_progress' ? renderInProgressCard(issue) : renderCompletedCard(issue);
+ }).join('') +
+ '
';
+ }).join('');
+
+ container.innerHTML = html;
+}
+
+function renderInProgressCard(issue) {
+ var project = projects.find(function (p) { return p.id === issue.project_id; });
+ var status = getIssueStatus(issue);
+ var isPending = status === 'pending_completion';
+ var photos = getPhotoPaths(issue);
+
+ // 관리 필드 표시
+ var mgmtHtml = '' +
+ '
해결방안: ' + escapeHtml(cleanManagementComment(issue.management_comment) || '-') + '
' +
+ '
담당부서: ' + getDepartmentText(issue.responsible_department) + '
' +
+ '
담당자: ' + escapeHtml(issue.responsible_person || '-') + '
' +
+ '
조치예상일: ' + (issue.expected_completion_date ? formatKSTDate(issue.expected_completion_date) : '-') + '
' +
+ '
' +
+ '
완료 신청 정보
' +
+ (cPhotos.length ? renderPhotoThumbs(cPhotos) : '') +
+ '
' + escapeHtml(issue.completion_comment || '코멘트 없음') + '
' +
+ '
신청: ' + formatKSTDateTime(issue.completion_requested_at) + '
' +
+ '
' +
+ '' +
+ '' +
+ '
';
+ } else {
+ actionHtml = '' +
+ '' +
+ '' +
+ '
';
+ }
+
+ return '' +
+ '' +
+ '
' + escapeHtml(getIssueTitle(issue)) + '
' +
+ '
' +
+ '
' + escapeHtml(getIssueDetail(issue)) + '
' +
+ '
' +
+ '' + getCategoryText(issue.category || issue.final_category) + '' +
+ '' + escapeHtml(issue.reporter?.full_name || issue.reporter?.username || '-') + '' +
+ '
' +
+ (photos.length ? renderPhotoThumbs(photos) : '') +
+ mgmtHtml +
+ completionInfoHtml +
+ '
' +
+ actionHtml +
+ '' +
+ '
' +
+ '' +
+ '
' + escapeHtml(getIssueTitle(issue)) + '
' +
+ '' +
+ '
' +
+ '
기본 정보
' +
+ '
프로젝트: ' + escapeHtml(project ? project.project_name : '-') + '
' +
+ '
부적합명: ' + escapeHtml(getIssueTitle(issue)) + '
' +
+ '
' + escapeHtml(getIssueDetail(issue)) + '
' +
+ '
분류: ' + getCategoryText(issue.final_category || issue.category) + '
' +
+ '
확인자: ' + escapeHtml(getReporterNames(issue)) + '
' +
+ (photos.length ? '
업로드 사진
' + renderPhotoThumbs(photos) + '
' : '') +
+ '
' +
+ '
관리 정보
' +
+ '
해결방안: ' + escapeHtml(cleanManagementComment(issue.management_comment) || '-') + '
' +
+ '
담당부서: ' + getDepartmentText(issue.responsible_department) + '
' +
+ '
담당자: ' + escapeHtml(issue.responsible_person || '-') + '
' +
+ '
원인부서: ' + getDepartmentText(issue.cause_department) + '
' +
+ '
' +
+ '
완료 정보
' +
+ (cPhotos.length ? '
완료 사진
' + renderPhotoThumbs(cPhotos) + '
' : '
완료 사진 없음
') +
+ '
완료 코멘트: ' + escapeHtml(issue.completion_comment || '-') + '
' +
+ (issue.completion_requested_at ? '
완료 신청일: ' + formatKSTDateTime(issue.completion_requested_at) + '
' : '') +
+ (issue.completed_at ? '
최종 완료일: ' + formatKSTDateTime(issue.completed_at) + '
' : '') +
+ '
-
-
-
-
-
No.${issue.project_sequence_no || '-'}
-
+