今回の変更
C-2: 共済マスタ unique 制約修正 models.py: k_num 単独unique → (k_num, s_num) ペアunique に変更 s_num を null=True → default='' に変更(unique_together で null は扱いにくいため) views.py: インポート時のルックアップを k_num 単独 → (k_num, s_num) ペアに修正 C-4: 面積フィールド m2 統一 models.py: 共済・中山間両方の area を DecimalField(ha) → IntegerField(m2) に変更 payment_amount も DecimalField → IntegerField に統一 views.py: インポート時の area 値を int() で変換 types/index.ts: TypeScript型を string → number に更新 A-8: 圃場詳細に共済/中山間情報表示 fields/[id]/page.tsx: 編集フォームの下に共済情報テーブル・中山間情報テーブルを追加 壊れていたJSX(重複フラグメント)も修正 追加修正 FieldViewSet の AllowAny → IsAuthenticated に変更(D-4 の漏れ) マイグレーション 0005 を作成 注意事項 Docker起動後に python manage.py migrate が必要です 既存の共済/中山間データがある場合、area の値は DecimalField → IntegerField に変換されます(既にm2で保存されているはずなので小数点以下が切り捨てられるだけ)
This commit is contained in:
@@ -2,7 +2,9 @@
|
|||||||
"permissions": {
|
"permissions": {
|
||||||
"allow": [
|
"allow": [
|
||||||
"Bash(docker-compose exec:*)",
|
"Bash(docker-compose exec:*)",
|
||||||
"Bash(python -c:*)"
|
"Bash(python -c:*)",
|
||||||
|
"Bash(python manage.py makemigrations:*)",
|
||||||
|
"Bash(npx tsc:*)"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,43 @@
|
|||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('fields', '0004_field_display_order_field_group_name'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
# C-2: k_num 単独 unique → (k_num, s_num) ペアで unique
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='officialkyosaifield',
|
||||||
|
name='k_num',
|
||||||
|
field=models.CharField(max_length=20, verbose_name='共済番号'),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='officialkyosaifield',
|
||||||
|
name='s_num',
|
||||||
|
field=models.CharField(blank=True, default='', max_length=20, verbose_name='枝番'),
|
||||||
|
),
|
||||||
|
migrations.AlterUniqueTogether(
|
||||||
|
name='officialkyosaifield',
|
||||||
|
unique_together={('k_num', 's_num')},
|
||||||
|
),
|
||||||
|
# C-4: 面積を DecimalField(ha) → IntegerField(m2) に変更
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='officialkyosaifield',
|
||||||
|
name='area',
|
||||||
|
field=models.IntegerField(default=0, verbose_name='面積(m2)'),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='officialchusankanfield',
|
||||||
|
name='area',
|
||||||
|
field=models.IntegerField(default=0, verbose_name='面積(m2)'),
|
||||||
|
),
|
||||||
|
# payment_amount も DecimalField → IntegerField に統一
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='officialchusankanfield',
|
||||||
|
name='payment_amount',
|
||||||
|
field=models.IntegerField(blank=True, null=True, verbose_name='支払金額'),
|
||||||
|
),
|
||||||
|
]
|
||||||
@@ -3,15 +3,16 @@ from django.db import models
|
|||||||
|
|
||||||
|
|
||||||
class OfficialKyosaiField(models.Model):
|
class OfficialKyosaiField(models.Model):
|
||||||
k_num = models.CharField(max_length=20, unique=True, verbose_name="共済番号")
|
k_num = models.CharField(max_length=20, verbose_name="共済番号")
|
||||||
s_num = models.CharField(max_length=20, blank=True, null=True, verbose_name="枝番")
|
s_num = models.CharField(max_length=20, blank=True, default='', verbose_name="枝番")
|
||||||
address = models.CharField(max_length=255, verbose_name="住所")
|
address = models.CharField(max_length=255, verbose_name="住所")
|
||||||
kanji_name = models.CharField(max_length=100, verbose_name="漢字名")
|
kanji_name = models.CharField(max_length=100, verbose_name="漢字名")
|
||||||
area = models.DecimalField(max_digits=10, decimal_places=2, verbose_name="面積(ha)")
|
area = models.IntegerField(default=0, verbose_name="面積(m2)")
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
verbose_name = "共済マスタ"
|
verbose_name = "共済マスタ"
|
||||||
verbose_name_plural = "共済マスタ"
|
verbose_name_plural = "共済マスタ"
|
||||||
|
unique_together = [['k_num', 's_num']]
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return f"{self.k_num} ({self.kanji_name})"
|
return f"{self.k_num} ({self.kanji_name})"
|
||||||
@@ -22,8 +23,8 @@ class OfficialChusankanField(models.Model):
|
|||||||
oaza = models.CharField(max_length=100, verbose_name="大字")
|
oaza = models.CharField(max_length=100, verbose_name="大字")
|
||||||
aza = models.CharField(max_length=100, verbose_name="字")
|
aza = models.CharField(max_length=100, verbose_name="字")
|
||||||
chiban = models.CharField(max_length=50, verbose_name="地番")
|
chiban = models.CharField(max_length=50, verbose_name="地番")
|
||||||
area = models.DecimalField(max_digits=10, decimal_places=2, verbose_name="面積(ha)")
|
area = models.IntegerField(default=0, verbose_name="面積(m2)")
|
||||||
payment_amount = models.DecimalField(max_digits=12, decimal_places=0, blank=True, null=True, verbose_name="支払金額")
|
payment_amount = models.IntegerField(blank=True, null=True, verbose_name="支払金額")
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
verbose_name = "中山間マスタ"
|
verbose_name = "中山間マスタ"
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ class FieldViewSet(viewsets.ModelViewSet):
|
|||||||
'id'
|
'id'
|
||||||
)
|
)
|
||||||
serializer_class = FieldSerializer
|
serializer_class = FieldSerializer
|
||||||
permission_classes = [permissions.AllowAny]
|
permission_classes = [permissions.IsAuthenticated]
|
||||||
filter_backends = [filters.OrderingFilter]
|
filter_backends = [filters.OrderingFilter]
|
||||||
ordering_fields = ['group_name', 'display_order', 'id', 'area_tan']
|
ordering_fields = ['group_name', 'display_order', 'id', 'area_tan']
|
||||||
|
|
||||||
@@ -44,14 +44,14 @@ def import_kyosai_master(request):
|
|||||||
continue
|
continue
|
||||||
|
|
||||||
defaults = {
|
defaults = {
|
||||||
's_num': s_num,
|
|
||||||
'address': str(row.get('地名 地番', '')).strip() if pd.notna(row.get('地名 地番')) else '',
|
'address': str(row.get('地名 地番', '')).strip() if pd.notna(row.get('地名 地番')) else '',
|
||||||
'kanji_name': str(row.get('漢字地名', '')).strip() if pd.notna(row.get('漢字地名')) else '',
|
'kanji_name': str(row.get('漢字地名', '')).strip() if pd.notna(row.get('漢字地名')) else '',
|
||||||
'area': float(row.get('本地面積(m2)', 0)) if pd.notna(row.get('本地面積(m2)')) else 0,
|
'area': int(float(row.get('本地面積(m2)', 0))) if pd.notna(row.get('本地面積(m2)')) else 0,
|
||||||
}
|
}
|
||||||
|
|
||||||
obj, created = OfficialKyosaiField.objects.update_or_create(
|
obj, created = OfficialKyosaiField.objects.update_or_create(
|
||||||
k_num=k_num,
|
k_num=k_num,
|
||||||
|
s_num=s_num,
|
||||||
defaults=defaults
|
defaults=defaults
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -198,7 +198,7 @@ def import_chusankan_master(request):
|
|||||||
'oaza': str(row.get('大字', '')).strip() if pd.notna(row.get('大字')) else '',
|
'oaza': str(row.get('大字', '')).strip() if pd.notna(row.get('大字')) else '',
|
||||||
'aza': str(row.get('字', '')).strip() if pd.notna(row.get('字')) else '',
|
'aza': str(row.get('字', '')).strip() if pd.notna(row.get('字')) else '',
|
||||||
'chiban': str(row.get('地番', '')).strip() if pd.notna(row.get('地番')) else '',
|
'chiban': str(row.get('地番', '')).strip() if pd.notna(row.get('地番')) else '',
|
||||||
'area': float(row.get('農地面積', 0)) if pd.notna(row.get('農地面積')) else 0,
|
'area': int(float(row.get('農地面積', 0))) if pd.notna(row.get('農地面積')) else 0,
|
||||||
'payment_amount': payment_amount,
|
'payment_amount': payment_amount,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
import { useState, useEffect } from 'react';
|
import { useState, useEffect } from 'react';
|
||||||
import { useRouter, useParams } from 'next/navigation';
|
import { useRouter, useParams } from 'next/navigation';
|
||||||
import { api } from '@/lib/api';
|
import { api } from '@/lib/api';
|
||||||
import { Field } from '@/types';
|
import { Field, OfficialKyosaiField, OfficialChusankanField } from '@/types';
|
||||||
import Navbar from '@/components/Navbar';
|
import Navbar from '@/components/Navbar';
|
||||||
import { ArrowLeft, Save } from 'lucide-react';
|
import { ArrowLeft, Save } from 'lucide-react';
|
||||||
|
|
||||||
@@ -25,6 +25,8 @@ export default function EditFieldPage() {
|
|||||||
owner_name: '',
|
owner_name: '',
|
||||||
group_name: '',
|
group_name: '',
|
||||||
});
|
});
|
||||||
|
const [kyosaiFields, setKyosaiFields] = useState<OfficialKyosaiField[]>([]);
|
||||||
|
const [chusankanFields, setChusankanFields] = useState<OfficialChusankanField[]>([]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
fetchField();
|
fetchField();
|
||||||
@@ -42,6 +44,8 @@ export default function EditFieldPage() {
|
|||||||
owner_name: field.owner_name || '',
|
owner_name: field.owner_name || '',
|
||||||
group_name: field.group_name || '',
|
group_name: field.group_name || '',
|
||||||
});
|
});
|
||||||
|
setKyosaiFields(field.kyosai_fields || []);
|
||||||
|
setChusankanFields(field.chusankan_fields || []);
|
||||||
} catch (err: unknown) {
|
} catch (err: unknown) {
|
||||||
console.error('Failed to fetch field:', err);
|
console.error('Failed to fetch field:', err);
|
||||||
const axiosError = err as { response?: { status?: number } };
|
const axiosError = err as { response?: { status?: number } };
|
||||||
@@ -231,11 +235,6 @@ export default function EditFieldPage() {
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="pt-4">
|
|
||||||
placeholder="例:山田太郎"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="pt-4">
|
<div className="pt-4">
|
||||||
<button
|
<button
|
||||||
type="submit"
|
type="submit"
|
||||||
@@ -257,6 +256,68 @@ export default function EditFieldPage() {
|
|||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* 共済情報 */}
|
||||||
|
<div className="bg-white rounded-lg shadow p-6 mt-6">
|
||||||
|
<h2 className="text-lg font-bold text-gray-900 mb-4">共済情報</h2>
|
||||||
|
{kyosaiFields.length === 0 ? (
|
||||||
|
<p className="text-gray-500 text-sm">紐づけられた共済区画はありません</p>
|
||||||
|
) : (
|
||||||
|
<div className="overflow-x-auto">
|
||||||
|
<table className="min-w-full text-sm">
|
||||||
|
<thead>
|
||||||
|
<tr className="border-b border-gray-200">
|
||||||
|
<th className="text-left py-2 px-3 font-medium text-gray-600">耕地-分筆</th>
|
||||||
|
<th className="text-left py-2 px-3 font-medium text-gray-600">漢字地名</th>
|
||||||
|
<th className="text-left py-2 px-3 font-medium text-gray-600">住所</th>
|
||||||
|
<th className="text-right py-2 px-3 font-medium text-gray-600">面積(m2)</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{kyosaiFields.map((k) => (
|
||||||
|
<tr key={k.id} className="border-b border-gray-100">
|
||||||
|
<td className="py-2 px-3">{k.k_num}{k.s_num ? `-${k.s_num}` : ''}</td>
|
||||||
|
<td className="py-2 px-3">{k.kanji_name}</td>
|
||||||
|
<td className="py-2 px-3">{k.address}</td>
|
||||||
|
<td className="py-2 px-3 text-right">{k.area.toLocaleString()}</td>
|
||||||
|
</tr>
|
||||||
|
))}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* 中山間情報 */}
|
||||||
|
<div className="bg-white rounded-lg shadow p-6 mt-6">
|
||||||
|
<h2 className="text-lg font-bold text-gray-900 mb-4">中山間情報</h2>
|
||||||
|
{chusankanFields.length === 0 ? (
|
||||||
|
<p className="text-gray-500 text-sm">紐づけられた中山間区画はありません</p>
|
||||||
|
) : (
|
||||||
|
<div className="overflow-x-auto">
|
||||||
|
<table className="min-w-full text-sm">
|
||||||
|
<thead>
|
||||||
|
<tr className="border-b border-gray-200">
|
||||||
|
<th className="text-left py-2 px-3 font-medium text-gray-600">ID</th>
|
||||||
|
<th className="text-left py-2 px-3 font-medium text-gray-600">所在地</th>
|
||||||
|
<th className="text-right py-2 px-3 font-medium text-gray-600">面積(m2)</th>
|
||||||
|
<th className="text-right py-2 px-3 font-medium text-gray-600">支払金額</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{chusankanFields.map((c) => (
|
||||||
|
<tr key={c.id} className="border-b border-gray-100">
|
||||||
|
<td className="py-2 px-3">{c.c_id}</td>
|
||||||
|
<td className="py-2 px-3">{c.oaza} {c.aza} {c.chiban}</td>
|
||||||
|
<td className="py-2 px-3 text-right">{c.area.toLocaleString()}</td>
|
||||||
|
<td className="py-2 px-3 text-right">{c.payment_amount != null ? `¥${c.payment_amount.toLocaleString()}` : '-'}</td>
|
||||||
|
</tr>
|
||||||
|
))}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
export interface OfficialKyosaiField {
|
export interface OfficialKyosaiField {
|
||||||
id: number;
|
id: number;
|
||||||
k_num: string;
|
k_num: string;
|
||||||
s_num: string | null;
|
s_num: string;
|
||||||
address: string;
|
address: string;
|
||||||
kanji_name: string;
|
kanji_name: string;
|
||||||
area: string;
|
area: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface OfficialChusankanField {
|
export interface OfficialChusankanField {
|
||||||
@@ -13,8 +13,8 @@ export interface OfficialChusankanField {
|
|||||||
oaza: string;
|
oaza: string;
|
||||||
aza: string;
|
aza: string;
|
||||||
chiban: string;
|
chiban: string;
|
||||||
area: string;
|
area: number;
|
||||||
payment_amount: string | null;
|
payment_amount: number | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface Field {
|
export interface Field {
|
||||||
|
|||||||
1
frontend/tsconfig.tsbuildinfo
Normal file
1
frontend/tsconfig.tsbuildinfo
Normal file
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user