@@ -5403,6 +5609,120 @@
)}
+ {managementYearDetailModalOpen && (
+
+ )}
+
{managementAccountModal && (
setManagementAccountModal(null)}>
e.stopPropagation()}>
@@ -5674,10 +5994,10 @@
{[0.25, 0.5, 0.75, 1].map((ratio) => {
- const y = 320 - ratio * 250;
+ const y = companyGraphLayout.baseY - ratio * companyGraphLayout.chartHeight;
return (
-
+
{fmtEokManagement(companyGraphMaxValue * ratio)}
@@ -5685,10 +6005,10 @@
);
})}
{companyGraphRows.map((row, index) => {
- const centerX = 150 + index * (companyGraphRows.length > 1 ? 260 : 0);
- const barWidth = 94;
- const stackBaseY = 320;
- const chartHeight = 250;
+ const centerX = companyGraphLayout.centerStartX + index * companyGraphLayout.stepX;
+ const barWidth = companyGraphLayout.barWidth;
+ const stackBaseY = companyGraphLayout.baseY;
+ const chartHeight = companyGraphLayout.chartHeight;
const stackItems = [...row.typeItems].sort((a, b) => {
const stackOrder = { "관리": 0, "시공": 999 };
const aFixed = Object.prototype.hasOwnProperty.call(stackOrder, a.project_type || "") ? stackOrder[a.project_type] : 100;
@@ -5720,11 +6040,14 @@
);
})}
-
+
{row.year}
-
- 지출 {fmtEokManagement(row.expense_supply || 0)}
+
+ 지출
+
+
+ {fmtEokManagement(row.expense_supply || 0)}
);
@@ -5739,13 +6062,26 @@
filter="url(#companyLineShadow)"
/>
{companyGraphRows.map((row, index) => {
- const x = 150 + index * (companyGraphRows.length > 1 ? 260 : 0);
- const y = 320 - (Number(row.income_supply || 0) / companyGraphMaxValue) * 250;
+ const x = companyGraphLayout.centerStartX + index * companyGraphLayout.stepX;
+ const y = companyGraphLayout.baseY - (Number(row.income_supply || 0) / companyGraphMaxValue) * companyGraphLayout.chartHeight;
return (
-
+
{fmtEokManagement(row.income_supply || 0)}
diff --git a/server/ptc_api_server.py b/server/ptc_api_server.py
index afdbad1..6e4feef 100644
--- a/server/ptc_api_server.py
+++ b/server/ptc_api_server.py
@@ -14,7 +14,7 @@ from zipfile import ZipFile
BASE_DIR = Path("/home/hyein/project")
-DEFAULT_XLSX_PATH = BASE_DIR / "PTC(2023-2026.02).xlsx"
+DEFAULT_XLSX_PATH = BASE_DIR / "PTC 입출금내역(2015~).xlsx"
XLSX_SOURCE_CONFIG_PATH = BASE_DIR / "server" / "ptc_source_path.txt"
METHOD_XLSX_PATH = BASE_DIR / "PTC공법.xlsx"
DB_PATH = BASE_DIR / "db" / "ptc_local.sqlite3"
@@ -375,6 +375,24 @@ def normalize_transaction_type(in_out: str, account_name: str) -> str:
return "unknown"
+def correct_transaction_date(
+ transaction_date: str,
+ raw_value: str,
+ project_code: str,
+ account_code: str,
+ description: str,
+) -> str:
+ if (
+ transaction_date == "2106-10-31"
+ and raw_value == "75545"
+ and project_code == "15-시공-25"
+ and account_code == "711"
+ and (description or "").strip() == "강관말뚝"
+ ):
+ return "2016-10-31"
+ return transaction_date
+
+
def read_xlsx_rows(path: Path) -> list[dict]:
with ZipFile(path) as book:
shared_strings = []
@@ -405,36 +423,72 @@ def read_xlsx_rows(path: Path) -> list[dict]:
if not rows:
return []
- headers = rows[0]
- data_rows = rows[1:]
+ header_row_index = 0
+ headers = rows[0] if rows else []
+ for idx, candidate in enumerate(rows):
+ normalized = [str(cell).strip() for cell in candidate if str(cell).strip()]
+ if "거래일" in normalized and "입/출금" in normalized and "계정코드" in normalized:
+ header_row_index = idx
+ headers = candidate
+ break
+
+ data_rows = rows[header_row_index + 1 :]
width = len(headers)
items = []
- for source_row_no, row in enumerate(data_rows, start=2):
+
+ def payload_get(payload: dict, *keys: str) -> str:
+ for key in keys:
+ if key in payload and payload.get(key) not in (None, ""):
+ return payload.get(key, "")
+ return ""
+
+ for source_row_no, row in enumerate(data_rows, start=header_row_index + 2):
current = row + [""] * (width - len(row)) if len(row) < width else row[:width]
payload = dict(zip(headers, current))
+ transaction_date_raw = payload_get(payload, "거래일")
+ in_out = payload_get(payload, "입/출금")
+ account_code = payload_get(payload, "계정코드")
+ account_name = payload_get(payload, "구분", "계정과목")
+ department_name = payload_get(payload, "부서")
+ vendor_name = payload_get(payload, "거래처")
+ project_code = payload_get(payload, "프로젝트코드")
+ raw_project_type = payload_get(payload, "프로젝트 구분(안)")
+ project_name = payload_get(payload, "프로젝트명")
+ description = payload_get(payload, "적요")
+ supply_amount_raw = payload_get(payload, "공급가액")
+ vat_amount_raw = payload_get(payload, "부가세")
+ total_amount_raw = payload_get(payload, "합계금액")
+ remarks = payload_get(payload, "비고")
+ transaction_date = correct_transaction_date(
+ excel_serial_to_date(transaction_date_raw),
+ transaction_date_raw,
+ project_code,
+ account_code,
+ description,
+ )
items.append(
{
"source_row_no": source_row_no,
- "transaction_date_raw": payload.get("거래일", ""),
- "transaction_date": excel_serial_to_date(payload.get("거래일", "")),
- "in_out": payload.get("입/출금", ""),
- "account_code": payload.get("계정코드", ""),
- "account_name": payload.get("구분", ""),
- "department_name": payload.get("부서", ""),
- "vendor_name": payload.get("거래처", ""),
- "project_code": payload.get("프로젝트코드", ""),
- "project_type": payload.get("프로젝트 구분(안)", ""),
- "project_name": payload.get("프로젝트명", ""),
- "description": payload.get("적요", ""),
- "supply_amount_raw": payload.get("공급가액", ""),
- "vat_amount_raw": payload.get("부가세", ""),
- "total_amount_raw": payload.get("합계금액", ""),
- "remarks": payload.get("비고", ""),
- "supply_amount": parse_amount(payload.get("공급가액", "")),
- "vat_amount": parse_amount(payload.get("부가세", "")),
- "total_amount": parse_amount(payload.get("합계금액", "")),
+ "transaction_date_raw": transaction_date_raw,
+ "transaction_date": transaction_date,
+ "in_out": in_out,
+ "account_code": account_code,
+ "account_name": account_name,
+ "department_name": department_name,
+ "vendor_name": vendor_name,
+ "project_code": project_code,
+ "project_type": raw_project_type or infer_project_type_from_code(project_code),
+ "project_name": project_name,
+ "description": description,
+ "supply_amount_raw": supply_amount_raw,
+ "vat_amount_raw": vat_amount_raw,
+ "total_amount_raw": total_amount_raw,
+ "remarks": remarks,
+ "supply_amount": parse_amount(supply_amount_raw),
+ "vat_amount": parse_amount(vat_amount_raw),
+ "total_amount": parse_amount(total_amount_raw),
"normalized_type": normalize_transaction_type(
- payload.get("입/출금", ""), payload.get("구분", "")
+ in_out, account_name
),
}
)
diff --git a/server/ptc_source_path.txt b/server/ptc_source_path.txt
index 0a4bce4..95a288d 100644
--- a/server/ptc_source_path.txt
+++ b/server/ptc_source_path.txt
@@ -1 +1 @@
-/home/hyein/project/PTC(2023-2026.02).xlsx
+/home/hyein/project/PTC 입출금내역(2015~).xlsx
diff --git a/windows/README.txt b/windows/README.txt
index 2c77872..0e76a92 100644
--- a/windows/README.txt
+++ b/windows/README.txt
@@ -1,5 +1,7 @@
사용 파일
- start_ptc_share.bat : 공유용 실행 파일. 관리자 권한으로 다시 실행되어 WSL 서버 시작, IP 공유 설정, 방화벽 허용, 공유 주소 복사까지 처리합니다.
+- install_ptc_share_autostart.bat : Windows 로그인 시 자동으로 공유가 시작되도록 작업 스케줄러에 등록합니다.
+- remove_ptc_share_autostart.bat : 자동 실행 등록을 해제합니다.
- set_ptc_source.bat : 사용할 PTC 원본 `.xlsx` 파일을 선택하고 저장한 뒤 서버를 다시 시작합니다.
- stop_ptc_share.bat : 공유 중지
- check_ptc_share.bat : 현재 공유 상태 확인
diff --git a/windows/check_ptc_share.bat b/windows/check_ptc_share.bat
index ad796c8..8d57502 100644
--- a/windows/check_ptc_share.bat
+++ b/windows/check_ptc_share.bat
@@ -1,12 +1,6 @@
@echo off
setlocal EnableExtensions
-set "HOST_IP="
-
-for /f "usebackq delims=" %%i in (`powershell -NoProfile -Command "$ip = Get-NetIPAddress -AddressFamily IPv4 ^| Where-Object { $_.IPAddress -notlike '127.*' -and $_.IPAddress -notlike '169.254.*' -and $_.PrefixOrigin -ne 'WellKnown' } ^| Sort-Object InterfaceMetric, SkipAsSource ^| Select-Object -ExpandProperty IPAddress -First 1; if ($ip) { $ip }"`) do (
- set "HOST_IP=%%i"
-)
-
-if "%HOST_IP%"=="" set "HOST_IP=localhost"
+set "HOST_IP=172.16.40.36"
echo [Windows portproxy]
netsh interface portproxy show v4tov4
@@ -15,10 +9,13 @@ echo [WSL api]
wsl.exe bash -lc "curl -s http://127.0.0.1:4000/api/health"
echo.
echo [WSL web]
-wsl.exe bash -lc "curl -I -s http://127.0.0.1:4000/PTC/ | head -n 1"
+wsl.exe bash -lc "curl -I -s http://127.0.0.1:4000/PTC-lab/ | head -n 1"
+echo.
+echo [WSL manage web]
+wsl.exe bash -lc "curl -I -s http://127.0.0.1:4000/PTC-lab-manage/ | head -n 1"
echo.
echo [Office LAN web]
-powershell -NoProfile -Command "try { (Invoke-WebRequest -Uri 'http://%HOST_IP%:4000/PTC/' -UseBasicParsing -TimeoutSec 5).StatusCode } catch { $_.Exception.Message }"
+powershell -NoProfile -Command "try { (Invoke-WebRequest -Uri 'http://%HOST_IP%:4000/PTC-lab-manage/' -UseBasicParsing -TimeoutSec 5).StatusCode } catch { $_.Exception.Message }"
echo.
echo [Office LAN api]
powershell -NoProfile -Command "try { (Invoke-WebRequest -Uri 'http://%HOST_IP%:4000/api/health' -UseBasicParsing -TimeoutSec 5).Content } catch { $_.Exception.Message }"
diff --git a/windows/start_ptc_share.ps1 b/windows/start_ptc_share.ps1
index 408d24e..c92d382 100644
--- a/windows/start_ptc_share.ps1
+++ b/windows/start_ptc_share.ps1
@@ -1,3 +1,8 @@
+param(
+ [switch]$NoBrowser,
+ [switch]$NoPause
+)
+
$ErrorActionPreference = "Stop"
function Test-IsAdmin {
@@ -7,17 +12,22 @@ function Test-IsAdmin {
}
if (-not (Test-IsAdmin)) {
- Start-Process -FilePath "powershell.exe" -Verb RunAs -ArgumentList @(
+ $childArgs = @(
"-NoProfile",
"-ExecutionPolicy", "Bypass",
"-File", "`"$PSCommandPath`""
)
+ if ($NoBrowser) { $childArgs += "-NoBrowser" }
+ if ($NoPause) { $childArgs += "-NoPause" }
+ Start-Process -FilePath "powershell.exe" -Verb RunAs -ArgumentList @(
+ $childArgs
+ )
exit 0
}
$projectDir = "/home/hyein/project"
$apiPort = 4000
-$localUrl = "http://localhost:$apiPort/PTC/"
+$localUrl = "http://localhost:$apiPort/PTC-lab-manage/"
$preferredLanIp = "172.16.40.36"
$defaultSource = "/home/hyein/project/PTC(2023-2026.02).xlsx"
$sourceConfigPath = "/home/hyein/project/server/ptc_source_path.txt"
@@ -43,30 +53,39 @@ Write-Host "Source file: $currentSource"
$startResult = Invoke-WslBash "pkill -f '/home/hyein/project/server/ptc_api_server.py' >/dev/null 2>&1 || true; nohup python3 /home/hyein/project/server/ptc_api_server.py >/tmp/ptc_api.log 2>&1 & sleep 3"
if ($startResult.ExitCode -ne 0) {
Write-Host "Failed to start the server in WSL." -ForegroundColor Red
- Read-Host "Press Enter to exit"
+ if (-not $NoPause) {
+ Read-Host "Press Enter to exit"
+ }
exit 1
}
-$healthResult = Invoke-WslBash "curl -fsS http://127.0.0.1:$apiPort/api/health >/tmp/ptc_api_health.json && curl -fsSI http://127.0.0.1:$apiPort/PTC/ >/tmp/ptc_web_health.txt"
+$healthResult = Invoke-WslBash "curl -fsS http://127.0.0.1:$apiPort/api/health >/tmp/ptc_api_health.json && curl -fsSI http://127.0.0.1:$apiPort/PTC-lab/ >/tmp/ptc_web_health.txt && curl -fsSI http://127.0.0.1:$apiPort/PTC-lab-manage/ >/tmp/ptc_manage_web_health.txt"
if ($healthResult.ExitCode -ne 0) {
Write-Host "Local server check failed. Recent server log:" -ForegroundColor Red
$logResult = Invoke-WslBash "tail -n 80 /tmp/ptc_api.log"
$logResult.Output | ForEach-Object { Write-Host $_ }
- Read-Host "Press Enter to exit"
+ if (-not $NoPause) {
+ Read-Host "Press Enter to exit"
+ }
exit 1
}
-Start-Process $localUrl
+if (-not $NoBrowser) {
+ Start-Process $localUrl
+}
Write-Host ""
Write-Host "Local URL: $localUrl"
-$lanIp = Get-NetIPAddress -AddressFamily IPv4 |
+$lanIps = @(Get-NetIPAddress -AddressFamily IPv4 |
Where-Object {
$_.IPAddress -notlike '127.*' -and
$_.IPAddress -notlike '169.254.*' -and
$_.PrefixOrigin -ne 'WellKnown'
} |
- Select-Object -ExpandProperty IPAddress -First 1
+ Sort-Object InterfaceMetric, SkipAsSource |
+ Select-Object -ExpandProperty IPAddress)
+
+$lanIp = $lanIps | Select-Object -First 1
$wslIpResult = Invoke-WslBash "hostname -I | awk '{print \$1}'"
$wslIp = ($wslIpResult.Output | Select-Object -First 1).Trim()
@@ -78,14 +97,39 @@ if (-not [string]::IsNullOrWhiteSpace($lanIp) -and -not [string]::IsNullOrWhiteS
& netsh advfirewall firewall delete rule name="PTC 4000" | Out-Null
& netsh advfirewall firewall add rule name="PTC 4000" dir=in action=allow protocol=TCP localport=$apiPort | Out-Null
- $shareIp = if ([string]::IsNullOrWhiteSpace($preferredLanIp)) { $lanIp } else { $preferredLanIp }
- $shareUrl = "http://$shareIp:$apiPort/PTC/"
+ if (-not ($lanIps -contains $preferredLanIp)) {
+ Write-Host "Preferred share IP $preferredLanIp is not assigned on this PC." -ForegroundColor Red
+ Write-Host "Detected Windows IPs: $($lanIps -join ', ')" -ForegroundColor Yellow
+ if (-not $NoPause) {
+ Read-Host "Press Enter to exit"
+ }
+ exit 1
+ }
+
+ $shareIp = $preferredLanIp
+ $shareUrl = "http://$shareIp:$apiPort/PTC-lab-manage/"
+ Write-Host "Windows IP: $lanIp"
+ Write-Host "Preferred share IP in use: $shareIp"
+ Write-Host "WSL IP: $wslIp"
Write-Host "LAN URL: $shareUrl"
Set-Clipboard -Value $shareUrl
Write-Host "The share URL has been copied to the clipboard."
+
+ try {
+ $lanWebStatus = (Invoke-WebRequest -Uri $shareUrl -UseBasicParsing -TimeoutSec 5).StatusCode
+ $lanApiStatus = (Invoke-WebRequest -Uri "http://$shareIp:$apiPort/api/health" -UseBasicParsing -TimeoutSec 5).StatusCode
+ Write-Host "LAN web check: $lanWebStatus"
+ Write-Host "LAN api check: $lanApiStatus"
+ }
+ catch {
+ Write-Host "LAN check failed for $shareIp:$apiPort" -ForegroundColor Red
+ Write-Host $_.Exception.Message -ForegroundColor Yellow
+ }
}
else {
Write-Host "LAN sharing was skipped because Windows IP or WSL IP could not be detected."
}
-Read-Host "Press Enter to close"
+if (-not $NoPause) {
+ Read-Host "Press Enter to close"
+}