final stage -- still some bugs

This reverts commit 586f341897.

Dockerfile.gdal

@@ -3,6 +3,7 @@ FROM osgeo/gdal:ubuntu-small-3.4.0
 
 WORKDIR /app
 
+
 LABEL maintainer="nouffer@gmail.com"
 LABEL description="Development image for the Rogaining JP"
 
@@ -38,8 +39,29 @@ RUN apt-get install -y python3
 RUN apt-get update && apt-get install -y \
     python3-pip
 
+# ベースイメージの更新とパッケージのインストール
+RUN apt-get update && \
+    apt-get install -y \
+    libreoffice \
+    libreoffice-calc \
+    libreoffice-writer \
+    python3-uno   # LibreOffice Python バインディング
+
+# 作業ディレクトリとパーミッションの設定
+RUN mkdir -p /app/docbase /tmp/libreoffice && \
+    chmod -R 777 /app/docbase /tmp/libreoffice
+
+
 RUN pip install --upgrade pip
 
+# Copy the package directory first
+COPY SumasenLibs/excel_lib /app/SumasenLibs/excel_lib
+COPY ./docbase /app/docbase
+
+# Install the package in editable mode
+RUN pip install -e /app/SumasenLibs/excel_lib
+
+
 RUN apt-get update
 
 COPY ./requirements.txt /app/requirements.txt

SumasenLibs/excel_lib/README.md

@@ -0,0 +1,19 @@
+# SumasenExcel Library
+
+Excel操作のためのシンプルなPythonライブラリです。
+
+## インストール方法
+
+```bash
+pip install -e .
+
+## 使用方法
+from sumaexcel import SumasenExcel
+
+excel = SumasenExcel("path/to/file.xlsx")
+data = excel.read_excel()
+
+## ライセンス
+
+MIT License
+

SumasenLibs/excel_lib/docker/docker-compose.yml

@@ -0,0 +1,20 @@
+version: '3.8'
+
+services:
+  python:
+    build:
+      context: ..
+      dockerfile: docker/python/Dockerfile
+    volumes:
+      - ..:/app
+    environment:
+      - PYTHONPATH=/app
+      - POSTGRES_DB=rogdb
+      - POSTGRES_USER=admin
+      - POSTGRES_PASSWORD=admin123456
+      - POSTGRES_HOST=localhost
+      - POSTGRES_PORT=5432
+    network_mode: "host"
+    tty: true
+    container_name: python_container  # コンテナ名を明示的に指定
+

SumasenLibs/excel_lib/docker/python/Dockerfile

@@ -0,0 +1,26 @@
+FROM python:3.9-slim
+
+WORKDIR /app
+
+# GPGキーの更新とパッケージのインストール
+RUN apt-get update --allow-insecure-repositories && \
+    apt-get install -y --allow-unauthenticated python3-dev libpq-dev postgresql-client && \
+    rm -rf /var/lib/apt/lists/*
+
+# Pythonパッケージのインストール
+COPY requirements.txt .
+COPY setup.py .
+COPY README.md .
+COPY . .
+
+RUN pip install --no-cache-dir -r requirements.txt
+
+# 開発用パッケージのインストール
+RUN pip install --no-cache-dir --upgrade pip \
+    pytest \
+    pytest-cov \
+    flake8
+
+# パッケージのインストール
+RUN pip install -e .
+

SumasenLibs/excel_lib/requirements.txt

@@ -0,0 +1,6 @@
+openpyxl>=3.0.0
+pandas>=1.0.0
+pillow>=8.0.0
+configparser>=5.0.0
+psycopg2-binary==2.9.9
+requests

SumasenLibs/excel_lib/setup.py

@@ -0,0 +1,25 @@
+# setup.py
+from setuptools import setup, find_packages
+
+setup(
+    name="sumaexcel",
+    version="0.1.0",
+    packages=find_packages(),
+    install_requires=[
+        "openpyxl>=3.0.0",
+        "pandas>=1.0.0" 
+    ],
+    author="Akira Miyata",
+    author_email="akira.miyata@sumasen.net",
+    description="Excel handling library",
+    long_description=open("README.md").read(),
+    long_description_content_type="text/markdown",
+    url="https://github.com/akiramiyata/sumaexcel",
+    classifiers=[
+        "Programming Language :: Python :: 3",
+        "License :: OSI Approved :: MIT License",
+        "Operating System :: OS Independent",
+    ],
+    python_requires=">=3.6",
+)
+

SumasenLibs/excel_lib/sumaexcel/__init__.py

@@ -0,0 +1,4 @@
+from .sumaexcel import SumasenExcel
+
+__version__ = "0.1.0" 
+__all__ = ["SumasenExcel"]

SumasenLibs/excel_lib/sumaexcel/conditional.py

@@ -0,0 +1,102 @@
+# sumaexcel/conditional.py
+from typing import Dict, Any, List, Union
+from openpyxl.formatting.rule import Rule, ColorScaleRule, DataBarRule, IconSetRule
+from openpyxl.styles import PatternFill, Font, Border, Side
+from openpyxl.worksheet.worksheet import Worksheet
+
+class ConditionalFormatManager:
+    """Handle conditional formatting in Excel""" 
+
+    def __init__(self, worksheet: Worksheet):
+        self.worksheet = worksheet
+
+    def add_color_scale(
+        self,
+        cell_range: str,
+        min_color: str = "00FF0000",  # Red
+        mid_color: str = "00FFFF00",  # Yellow
+        max_color: str = "0000FF00"   # Green
+    ) -> None:
+        """Add color scale conditional formatting""" 
+        rule = ColorScaleRule(
+            start_type='min',
+            start_color=min_color,
+            mid_type='percentile',
+            mid_value=50,
+            mid_color=mid_color,
+            end_type='max',
+            end_color=max_color
+        )
+        self.worksheet.conditional_formatting.add(cell_range, rule)
+
+    def add_data_bar(
+        self,
+        cell_range: str,
+        color: str = "000000FF",  # Blue
+        show_value: bool = True
+    ) -> None:
+        """Add data bar conditional formatting""" 
+        rule = DataBarRule(
+            start_type='min',
+            end_type='max',
+            color=color,
+            showValue=show_value
+        )
+        self.worksheet.conditional_formatting.add(cell_range, rule)
+
+    def add_icon_set(
+        self,
+        cell_range: str,
+        icon_style: str = '3Arrows',  # '3Arrows', '3TrafficLights', '3Signs'
+        reverse_icons: bool = False
+    ) -> None:
+        """Add icon set conditional formatting""" 
+        rule = IconSetRule(
+            icon_style=icon_style,
+            type='percent',
+            values=[0, 33, 67],
+            reverse_icons=reverse_icons
+        )
+        self.worksheet.conditional_formatting.add(cell_range, rule)
+
+    def add_custom_rule(
+        self,
+        cell_range: str,
+        rule_type: str,
+        formula: str,
+        fill_color: str = None,
+        font_color: str = None,
+        bold: bool = None,
+        border_style: str = None,
+        border_color: str = None
+    ) -> None:
+        """Add custom conditional formatting rule""" 
+        dxf = {}
+        if fill_color:
+            dxf['fill'] = PatternFill(start_color=fill_color, end_color=fill_color)
+        if font_color or bold is not None:
+            dxf['font'] = Font(color=font_color, bold=bold)
+        if border_style and border_color:
+            side = Side(style=border_style, color=border_color)
+            dxf['border'] = Border(left=side, right=side, top=side, bottom=side)
+
+        rule = Rule(type=rule_type, formula=[formula], dxf=dxf)
+        self.worksheet.conditional_formatting.add(cell_range, rule)
+
+    def copy_conditional_format(
+        self,
+        source_range: str,
+        target_range: str
+    ) -> None:
+        """Copy conditional formatting from one range to another""" 
+        source_rules = self.worksheet.conditional_formatting.get(source_range)
+        if source_rules:
+            for rule in source_rules:
+                self.worksheet.conditional_formatting.add(target_range, rule)
+
+    def clear_conditional_format(
+        self,
+        cell_range: str
+    ) -> None:
+        """Clear conditional formatting from specified range""" 
+        self.worksheet.conditional_formatting.delete(cell_range)

SumasenLibs/excel_lib/sumaexcel/config_handler.py

@@ -0,0 +1,166 @@
+# config_handler.py
+#
+import configparser
+import os
+from typing import Any, Dict, Optional
+
+import configparser
+import os
+import re
+from typing import Any, Dict, Optional
+
+class ConfigHandler:
+    """変数置換機能付きの設定ファイル管理クラス"""
+    
+    def __init__(self, ini_file_path: str, variables: Dict[str, str] = None):
+        """
+        Args:
+            ini_file_path (str): INIファイルのパス
+            variables (Dict[str, str], optional): 置換用の変数辞書
+        """
+        self.ini_file_path = ini_file_path
+        self.variables = variables or {}
+        self.config = configparser.ConfigParser()
+        self.load_config()
+    
+    def _substitute_variables(self, text: str) -> str:
+        """
+        テキスト内の変数を置換する
+
+        Args:
+            text (str): 置換対象のテキスト
+
+        Returns:
+            str: 置換後のテキスト
+        """
+        # ${var}形式の変数を置換
+        pattern1 = r'\${([^}]+)}'
+        # [var]形式の変数を置換
+        pattern2 = r'\[([^\]]+)\]'
+        
+        def replace_var(match):
+            var_name = match.group(1)
+            return self.variables.get(var_name, match.group(0))
+        
+        # 両方のパターンで置換を実行
+        text = re.sub(pattern1, replace_var, text)
+        text = re.sub(pattern2, replace_var, text)
+        
+        return text
+    
+    def load_config(self) -> None:
+        """設定ファイルを読み込み、変数を置換する"""
+        if not os.path.exists(self.ini_file_path):
+            raise FileNotFoundError(f"設定ファイルが見つかりません: {self.ini_file_path}")
+        
+        # まず生のテキストとして読み込む
+        with open(self.ini_file_path, 'r', encoding='utf-8') as f:
+            content = f.read()
+        
+        # 変数を置換
+        substituted_content = self._substitute_variables(content)
+        
+        # 置換済みの内容を StringIO 経由で configparser に読み込ませる
+        from io import StringIO
+        self.config.read_file(StringIO(substituted_content))
+    
+    def get_value(self, section: str, key: str, default: Any = None) -> Optional[str]:
+        """
+        指定されたセクションのキーの値を取得する
+        
+        Args:
+            section (str): セクション名
+            key (str): キー名
+            default (Any): デフォルト値（オプション）
+            
+        Returns:
+            Optional[str]: 設定値。存在しない場合はデフォルト値
+        """
+        try:
+            return self.config[section][key]
+        except KeyError:
+            return default
+    
+    def get_section(self, section: str) -> Dict[str, str]:
+        """
+        指定されたセクションの全ての設定を取得する
+        
+        Args:
+            section (str): セクション名
+            
+        Returns:
+            Dict[str, str]: セクションの設定をディクショナリで返す
+        """
+        try:
+            return dict(self.config[section])
+        except KeyError:
+            return {}
+    
+    def get_all_sections(self) -> Dict[str, Dict[str, str]]:
+        """
+        全てのセクションの設定を取得する
+        
+        Returns:
+            Dict[str, Dict[str, str]]: 全セクションの設定をネストされたディクショナリで返す
+        """
+        return {section: dict(self.config[section]) for section in self.config.sections()}
+
+
+
+
+
+# 使用例
+if __name__ == "__main__":
+    # サンプルのINIファイル作成
+    sample_ini = """
+[Database]
+host = localhost
+port = 5432
+database = mydb
+user = admin
+password = secret
+
+[Application]
+debug = true
+log_level = INFO
+max_connections = 100
+
+[Paths]
+data_dir = /var/data
+log_file = /var/log/app.log
+"""
+    
+    # サンプルINIファイルを作成
+    with open('config.ini', 'w', encoding='utf-8') as f:
+        f.write(sample_ini)
+    
+    # 設定を読み込んで使用
+    config = ConfigHandler('config.ini')
+    
+    # 特定の値を取得
+    db_host = config.get_value('Database', 'host')
+    db_port = config.get_value('Database', 'port')
+    print(f"Database connection: {db_host}:{db_port}")
+    
+    # セクション全体を取得
+    db_config = config.get_section('Database')
+    print("Database configuration:", db_config)
+    
+    # 全ての設定を取得
+    all_config = config.get_all_sections()
+    print("All configurations:", all_config)
+
+
+# サンプル：
+# # 設定ファイルから値を取得
+# config = ConfigHandler('config.ini')
+# 
+# # データベース設定を取得
+# db_host = config.get_value('Database', 'host')
+# db_port = config.get_value('Database', 'port')
+# db_name = config.get_value('Database', 'database')
+# 
+# # アプリケーション設定を取得
+# debug_mode = config.get_value('Application', 'debug')
+# log_level = config.get_value('Application', 'log_level')
+# 

SumasenLibs/excel_lib/sumaexcel/image.py

@@ -0,0 +1,77 @@
+# sumaexcel/image.py
+from typing import Optional, Tuple, Union
+from pathlib import Path
+import os
+from PIL import Image
+from openpyxl.drawing.image import Image as XLImage
+from openpyxl.worksheet.worksheet import Worksheet
+
+class ImageManager:
+    """Handle image operations in Excel""" 
+
+    def __init__(self, worksheet: Worksheet):
+        self.worksheet = worksheet
+        self.temp_dir = Path("/tmp/sumaexcel_images")
+        self.temp_dir.mkdir(parents=True, exist_ok=True)
+
+    def add_image(
+        self,
+        image_path: Union[str, Path],
+        cell_coordinates: Tuple[int, int],
+        size: Optional[Tuple[int, int]] = None,
+        keep_aspect_ratio: bool = True,
+        anchor_type: str = 'absolute'
+    ) -> None:
+        """Add image to worksheet at specified position""" 
+        # Convert path to Path object
+        image_path = Path(image_path)
+
+        # Open and process image
+        with Image.open(image_path) as img:
+            # Get original size
+            orig_width, orig_height = img.size
+
+            # Calculate new size if specified
+            if size:
+                target_width, target_height = size
+                if keep_aspect_ratio:
+                    ratio = min(target_width/orig_width, target_height/orig_height)
+                    target_width = int(orig_width * ratio)
+                    target_height = int(orig_height * ratio)
+
+                # Resize image
+                img = img.resize((target_width, target_height), Image.LANCZOS)
+
+                # Save temporary resized image
+                temp_path = self.temp_dir / f"temp_{image_path.name}" 
+                img.save(temp_path)
+                image_path = temp_path
+
+        # Create Excel image object
+        excel_image = XLImage(str(image_path))
+
+        # Add to worksheet
+        self.worksheet.add_image(excel_image, anchor=f'{cell_coordinates[0]}{cell_coordinates[1]}')
+
+    def add_image_absolute(
+        self,
+        image_path: Union[str, Path],
+        position: Tuple[int, int],
+        size: Optional[Tuple[int, int]] = None
+    ) -> None:
+        """Add image with absolute positioning""" 
+        excel_image = XLImage(str(image_path))
+        if size:
+            excel_image.width, excel_image.height = size
+        excel_image.anchor = 'absolute'
+        excel_image.top, excel_image.left = position
+        self.worksheet.add_image(excel_image)
+
+    def cleanup(self) -> None:
+        """Clean up temporary files""" 
+        for file in self.temp_dir.glob("temp_*"):
+            file.unlink()
+
+    def __del__(self):
+        """Cleanup on object destruction""" 
+        self.cleanup()

SumasenLibs/excel_lib/sumaexcel/merge.py

@@ -0,0 +1,96 @@
+# sumaexcel/merge.py
+from typing import List, Tuple, Dict
+from openpyxl.worksheet.worksheet import Worksheet
+from openpyxl.worksheet.merge import MergedCellRange
+
+class MergeManager:
+    """Handle merge cell operations""" 
+
+    def __init__(self, worksheet: Worksheet):
+        self.worksheet = worksheet
+        self._merged_ranges: List[MergedCellRange] = []
+        self._load_merged_ranges()
+
+    def _load_merged_ranges(self) -> None:
+        """Load existing merged ranges from worksheet""" 
+        self._merged_ranges = list(self.worksheet.merged_cells.ranges)
+
+    def merge_cells(
+        self,
+        start_row: int,
+        start_col: int,
+        end_row: int,
+        end_col: int
+    ) -> None:
+        """Merge cells in specified range""" 
+        self.worksheet.merge_cells(
+            start_row=start_row,
+            start_column=start_col,
+            end_row=end_row,
+            end_column=end_col
+        )
+        self._load_merged_ranges()
+
+    def unmerge_cells(
+        self,
+        start_row: int,
+        start_col: int,
+        end_row: int,
+        end_col: int
+    ) -> None:
+        """Unmerge cells in specified range""" 
+        self.worksheet.unmerge_cells(
+            start_row=start_row,
+            start_column=start_col,
+            end_row=end_row,
+            end_column=end_col
+        )
+        self._load_merged_ranges()
+
+    def copy_merged_cells(
+        self,
+        source_range: Tuple[int, int, int, int],
+        target_start_row: int,
+        target_start_col: int
+    ) -> None:
+        """Copy merged cells from source range to target position""" 
+        src_row1, src_col1, src_row2, src_col2 = source_range
+        row_offset = target_start_row - src_row1
+        col_offset = target_start_col - src_col1
+
+        for merged_range in self._merged_ranges:
+            if (src_row1 <= merged_range.min_row <= src_row2 and
+                src_col1 <= merged_range.min_col <= src_col2):
+                new_row1 = merged_range.min_row + row_offset
+                new_col1 = merged_range.min_col + col_offset
+                new_row2 = merged_range.max_row + row_offset
+                new_col2 = merged_range.max_col + col_offset
+
+                self.merge_cells(new_row1, new_col1, new_row2, new_col2)
+
+    def shift_merged_cells(
+        self,
+        start_row: int,
+        rows: int = 0,
+        cols: int = 0
+    ) -> None:
+        """Shift merged cells by specified number of rows and columns""" 
+        new_ranges = []
+        for merged_range in self._merged_ranges:
+            if merged_range.min_row >= start_row:
+                new_row1 = merged_range.min_row + rows
+                new_col1 = merged_range.min_col + cols
+                new_row2 = merged_range.max_row + rows
+                new_col2 = merged_range.max_col + cols
+
+                self.worksheet.unmerge_cells(
+                    start_row=merged_range.min_row,
+                    start_column=merged_range.min_col,
+                    end_row=merged_range.max_row,
+                    end_column=merged_range.max_col
+                )
+
+                new_ranges.append((new_row1, new_col1, new_row2, new_col2))
+
+        for new_range in new_ranges:
+            self.merge_cells(*new_range)

SumasenLibs/excel_lib/sumaexcel/page.py

@@ -0,0 +1,148 @@
+# sumaexcel/page.py
+from typing import Optional, Dict, Any, Union
+from openpyxl.worksheet.worksheet import Worksheet
+from openpyxl.worksheet.page import PageMargins, PrintPageSetup
+
+# sumaexcel/page.py (continued)
+
+class PageManager:
+    """Handle page setup and header/footer settings""" 
+
+    def __init__(self, worksheet: Worksheet):
+        self.worksheet = worksheet
+
+    def set_page_setup(
+        self,
+        orientation: str = 'portrait',
+        paper_size: int = 9,  # A4
+        fit_to_height: Optional[int] = None,
+        fit_to_width: Optional[int] = None,
+        scale: Optional[int] = None
+    ) -> None:
+        """Configure page setup
+
+        Args:
+            orientation: 'portrait' or 'landscape'
+            paper_size: paper size (e.g., 9 for A4)
+            fit_to_height: number of pages tall
+            fit_to_width: number of pages wide
+            scale: zoom scale (1-400)
+        """ 
+        setup = PrintPageSetup(
+            orientation=orientation,
+            paperSize=paper_size,
+            scale=scale,
+            fitToHeight=fit_to_height,
+            fitToWidth=fit_to_width
+        )
+        self.worksheet.page_setup = setup
+
+    def set_margins(
+        self,
+        left: float = 0.7,
+        right: float = 0.7,
+        top: float = 0.75,
+        bottom: float = 0.75,
+        header: float = 0.3,
+        footer: float = 0.3
+    ) -> None:
+        """Set page margins in inches""" 
+        margins = PageMargins(
+            left=left,
+            right=right,
+            top=top,
+            bottom=bottom,
+            header=header,
+            footer=footer
+        )
+        self.worksheet.page_margins = margins
+
+    def set_header_footer(
+        self,
+        odd_header: Optional[str] = None,
+        odd_footer: Optional[str] = None,
+        even_header: Optional[str] = None,
+        even_footer: Optional[str] = None,
+        first_header: Optional[str] = None,
+        first_footer: Optional[str] = None,
+        different_first: bool = False,
+        different_odd_even: bool = False
+    ) -> None:
+        """Set headers and footers
+
+        Format codes:
+        - &P: Page number
+        - &N: Total pages
+        - &D: Date
+        - &T: Time
+        - &[Tab]: Sheet name
+        - &[Path]: File path
+        - &[File]: File name
+        - &[Tab]: Worksheet name
+        """ 
+        self.worksheet.oddHeader.left = odd_header or "" 
+        self.worksheet.oddFooter.left = odd_footer or "" 
+
+        if different_odd_even:
+            self.worksheet.evenHeader.left = even_header or "" 
+            self.worksheet.evenFooter.left = even_footer or "" 
+
+        if different_first:
+            self.worksheet.firstHeader.left = first_header or "" 
+            self.worksheet.firstFooter.left = first_footer or "" 
+
+        self.worksheet.differentFirst = different_first
+        self.worksheet.differentOddEven = different_odd_even
+
+    def set_print_area(self, range_string: str) -> None:
+        """Set print area
+
+        Args:
+            range_string: Cell range in A1 notation (e.g., 'A1:H42')
+        """ 
+        self.worksheet.print_area = range_string
+
+    def set_print_title_rows(self, rows: str) -> None:
+        """Set rows to repeat at top of each page
+
+        Args:
+            rows: Row range (e.g., '1:3')
+        """ 
+        self.worksheet.print_title_rows = rows
+
+    def set_print_title_columns(self, cols: str) -> None:
+        """Set columns to repeat at left of each page
+
+        Args:
+            cols: Column range (e.g., 'A:B')
+        """ 
+        self.worksheet.print_title_cols = cols
+
+    def set_print_options(
+        self,
+        grid_lines: bool = False,
+        horizontal_centered: bool = False,
+        vertical_centered: bool = False,
+        headers: bool = False
+    ) -> None:
+        """Set print options""" 
+        self.worksheet.print_gridlines = grid_lines
+        self.worksheet.print_options.horizontalCentered = horizontal_centered
+        self.worksheet.print_options.verticalCentered = vertical_centered
+        self.worksheet.print_options.headers = headers
+
+class PaperSizes:
+    """Standard paper size constants""" 
+    LETTER = 1
+    LETTER_SMALL = 2
+    TABLOID = 3
+    LEDGER = 4
+    LEGAL = 5
+    STATEMENT = 6
+    EXECUTIVE = 7
+    A3 = 8
+    A4 = 9
+    A4_SMALL = 10
+    A5 = 11
+    B4 = 12
+    B5 = 13

SumasenLibs/excel_lib/sumaexcel/styles.py

@@ -0,0 +1,115 @@
+# sumaexcel/styles.py
+from typing import Dict, Any, Optional, Union
+from openpyxl.styles import (
+    Font, PatternFill, Alignment, Border, Side,
+    NamedStyle, Protection, Color
+)
+from openpyxl.styles.differential import DifferentialStyle
+from openpyxl.formatting.rule import Rule
+from openpyxl.worksheet.worksheet import Worksheet
+
+class StyleManager:
+    """Excel style management class""" 
+
+    @staticmethod
+    def create_font(
+        name: str = "Arial",
+        size: int = 11,
+        bold: bool = False,
+        italic: bool = False,
+        color: str = "000000",
+        underline: str = None,
+        strike: bool = False
+    ) -> Font:
+        """Create a Font object with specified parameters""" 
+        return Font(
+            name=name,
+            size=size,
+            bold=bold,
+            italic=italic,
+            color=color,
+            underline=underline,
+            strike=strike
+        )
+
+    @staticmethod
+    def create_fill(
+        fill_type: str = "solid",
+        start_color: str = "FFFFFF",
+        end_color: str = None
+    ) -> PatternFill:
+        """Create a PatternFill object""" 
+        return PatternFill(
+            fill_type=fill_type,
+            start_color=start_color,
+            end_color=end_color or start_color
+        )
+
+    @staticmethod
+    def create_border(
+        style: str = "thin",
+        color: str = "000000" 
+    ) -> Border:
+        """Create a Border object""" 
+        side = Side(style=style, color=color)
+        return Border(
+            left=side,
+            right=side,
+            top=side,
+            bottom=side
+        )
+
+    @staticmethod
+    def create_alignment(
+        horizontal: str = "general",
+        vertical: str = "bottom",
+        wrap_text: bool = False,
+        shrink_to_fit: bool = False,
+        indent: int = 0
+    ) -> Alignment:
+        """Create an Alignment object""" 
+        return Alignment(
+            horizontal=horizontal,
+            vertical=vertical,
+            wrap_text=wrap_text,
+            shrink_to_fit=shrink_to_fit,
+            indent=indent
+        )
+
+    @staticmethod
+    def copy_style(source_cell: Any, target_cell: Any) -> None:
+        """Copy all style properties from source cell to target cell""" 
+        target_cell.font = Font(
+            name=source_cell.font.name,
+            size=source_cell.font.size,
+            bold=source_cell.font.bold,
+            italic=source_cell.font.italic,
+            color=source_cell.font.color,
+            underline=source_cell.font.underline,
+            strike=source_cell.font.strike
+        )
+
+        if source_cell.fill.patternType != None:
+            target_cell.fill = PatternFill(
+                fill_type=source_cell.fill.patternType,
+                start_color=source_cell.fill.start_color.rgb,
+                end_color=source_cell.fill.end_color.rgb
+            )
+
+        target_cell.border = Border(
+            left=source_cell.border.left,
+            right=source_cell.border.right,
+            top=source_cell.border.top,
+            bottom=source_cell.border.bottom
+        )
+
+        target_cell.alignment = Alignment(
+            horizontal=source_cell.alignment.horizontal,
+            vertical=source_cell.alignment.vertical,
+            wrap_text=source_cell.alignment.wrap_text,
+            shrink_to_fit=source_cell.alignment.shrink_to_fit,
+            indent=source_cell.alignment.indent
+        )
+
+        if source_cell.number_format:
+            target_cell.number_format = source_cell.number_format

SumasenLibs/excel_lib/testdata/sample.py

@@ -0,0 +1,28 @@
+from sumaexcel import SumasenExcel
+import logging
+
+# 初期化
+# 初期化
+variables = {
+    "zekken_number":"5033",
+    "event_code":"FC岐阜",
+    "db":"rogdb",
+    "username":"admin",
+    "password":"admin123456",
+    "host":"localhost",
+    "port":"5432"
+}
+excel = SumasenExcel(document="test", variables=variables, docbase="./testdata")
+
+logging.info("Excelファイル作成 step-1")
+
+# シート初期化
+ret = excel.make_report(variables=variables)
+logging.info(f"Excelファイル作成 step-2 : ret={ret}")
+if ret["status"]==True:
+    filepath=ret["filepath"]
+    logging.info(f"Excelファイル作成 : ret.filepath={filepath}")
+else:
+    message = ret.get("message", "No message provided")
+    logging.error(f"Excelファイル作成失敗 : ret.message={message}")
+

SumasenLibs/excel_lib/testdata/test.ini

@@ -0,0 +1,26 @@
+[basic]
+template_file=certificate_template.xlsx
+doc_file=certificate_[zekken_number].xlsx
+sections=section1
+maxcol=10
+column_width=3,5,16,16,16,16,16,8,8,12,3
+
+[section1]
+template_sheet=certificate
+sheet_name=certificate
+groups=group1,group2
+fit_to_width=1
+orientation=portrait
+
+[section1.group1]
+table_name=mv_entry_details
+where=zekken_number='[zekken_number]' and event_name='[event_code]'
+group_range=A1:J12
+
+
+[section1.group2]
+table_name=v_checkins_locations
+where=zekken_number='[zekken_number]' and event_code='[event_code]'
+sort=path_order
+group_range=A13:J13
+

docbase/certificate.ini

@@ -0,0 +1,26 @@
+[basic]
+template_file=certificate_template.xlsx
+doc_file=certificate_[zekken_number].xlsx
+sections=section1
+maxcol=10
+column_width=3,5,16,16,16,16,16,8,8,12,3
+
+[section1]
+template_sheet=certificate
+sheet_name=certificate
+groups=group1,group2
+fit_to_width=1
+orientation=portrait
+
+[section1.group1]
+table_name=mv_entry_details
+where=zekken_number='[zekken_number]' and event_name='[event_code]'
+group_range=A1:J12
+
+
+[section1.group2]
+table_name=v_checkins_locations
+where=zekken_number='[zekken_number]' and event_code='[event_code]'
+sort=path_order
+group_range=A13:J13
+

docker-compose.yaml

@@ -53,7 +53,9 @@ services:
         - type: volume
           source: nginx_logs
           target: /var/log/nginx
-        - media_data:/app/media:ro
+        - type: bind
+          source: ./media
+          target: /usr/share/nginx/html/media
       ports:
         - "80:80"
       depends_on:
@@ -73,4 +75,3 @@ volumes:
   geoserver-data:
   static_volume:
   nginx_logs:
-  media_data:

rog/models.py

@@ -323,6 +323,8 @@ class NewEvent2(models.Model):
     class_solo_male = models.BooleanField(default=True)
     class_solo_female = models.BooleanField(default=True)
 
+    self_rogaining = models.BooleanField(default=False)
+
     def __str__(self):
         return f"{self.event_name} - From:{self.start_datetime} To:{self.end_datetime}"
 
@@ -520,6 +522,11 @@ class GoalImages(models.Model):
     team_name = models.CharField(_("Team name"), max_length=255)
     event_code = models.CharField(_("event code"), max_length=255)
     cp_number = models.IntegerField(_("CP numner"))
+    zekken_number = models.TextField(
+        null=True,  # False にする
+        blank=True, # False にする
+        help_text="ゼッケン番号"
+    )
 
 class CheckinImages(models.Model):
     user=models.ForeignKey(CustomUser, on_delete=models.DO_NOTHING)
@@ -530,6 +537,7 @@ class CheckinImages(models.Model):
     cp_number = models.IntegerField(_("CP numner"))
 
 class GpsCheckin(models.Model):
+    id = models.AutoField(primary_key=True)  # 明示的にidフィールドを追加
     path_order = models.IntegerField(
         null=False,
         help_text="チェックポイントの順序番号"
@@ -623,19 +631,14 @@ class GpsCheckin(models.Model):
 
     class Meta:
         db_table = 'gps_checkins'
-        constraints = [
-            models.UniqueConstraint(
-                fields=['zekken_number', 'event_code', 'path_order'],
-                name='unique_gps_checkin'
-            )
-        ]
         indexes = [
-            models.Index(fields=['zekken_number', 'event_code','path_order'], name='idx_zekken_event'),
+            models.Index(fields=['zekken_number', 'event_code', 'path_order'], name='idx_zekken_event'),
             models.Index(fields=['create_at'], name='idx_create_at'),
         ]
 
+
     def __str__(self):
-        return f"{self.event_code}-{self.zekken_number}-{self.path_order}"
+        return f"{self.event_code}-{self.zekken_number}-{self.path_order}-buy:{self.buy_flag}-valid:{self.validate_location}-point:{self.points}"
 
     def save(self, *args, **kwargs):
         # 作成時・更新時のタイムスタンプを自動設定

rog/postgres_views.sql

@@ -0,0 +1,189 @@
+-- まず既存のビューをすべて削除
+DROP MATERIALIZED VIEW IF EXISTS mv_entry_details CASCADE;
+DROP VIEW IF EXISTS v_category_rankings CASCADE;
+DROP VIEW IF EXISTS v_checkin_summary CASCADE;
+
+-- チェックポイントの集計用ビュー
+CREATE VIEW v_checkin_summary AS
+SELECT 
+    event_code,
+    zekken_number,          -- 文字列として保持
+    COUNT(*) as total_checkins,
+    COUNT(CASE WHEN buy_flag THEN 1 END) as purchase_count,
+    SUM(points) as total_points,
+    SUM(CASE WHEN buy_flag THEN points ELSE 0 END) as bonus_points,
+    SUM(CASE WHEN NOT buy_flag THEN points ELSE 0 END) as normal_points,
+    SUM(COALESCE(late_point, 0)) as penalty_points,
+    MAX(create_at) as last_checkin
+FROM 
+    gps_checkins
+GROUP BY 
+    event_code, zekken_number;
+
+-- カテゴリー内ランキング計算用ビュー
+CREATE VIEW v_category_rankings AS
+SELECT 
+    e.id,
+    e.event_id,
+    ev.event_name,
+    e.category_id,
+    CAST(e.zekken_number AS TEXT) as zekken_number,  -- 数値を文字列に変換
+    COALESCE(cs.total_points, 0) as total_score,
+    RANK() OVER (PARTITION BY e.event_id, e.category_id 
+                ORDER BY COALESCE(cs.total_points, 0) DESC) as ranking,
+    COUNT(*) OVER (PARTITION BY e.event_id, e.category_id) as total_participants
+FROM 
+    rog_entry e
+    JOIN rog_newevent2 ev ON e.event_id = ev.id
+    LEFT JOIN v_checkin_summary cs ON ev.event_name = cs.event_code 
+        AND CAST(e.zekken_number AS TEXT) = cs.zekken_number
+WHERE 
+    e.is_active = true;
+
+-- マテリアライズドビューの作成
+-- マテリアライズドビューの再作成
+CREATE MATERIALIZED VIEW mv_entry_details AS
+SELECT 
+    -- 既存のフィールド
+    e.id,
+    CAST(e.zekken_number AS TEXT) as zekken_number,
+    e.is_active,
+    e."hasParticipated",
+    e."hasGoaled",
+    e.date as entry_date,
+    
+    -- イベント情報
+    ev.event_name,
+    ev.start_datetime,
+    ev.end_datetime,
+    ev."deadlineDateTime",
+    
+    -- カテゴリー情報
+    nc.category_name,
+    nc.category_number,
+    nc.duration,
+    nc.num_of_member,
+    nc.family as is_family_category,
+    nc.female as is_female_category,
+    
+    -- チーム情報
+    t.team_name,
+    
+    -- オーナー情報
+    cu.email as owner_email,
+    cu.firstname as owner_firstname,
+    cu.lastname as owner_lastname,
+    cu.date_of_birth as owner_birth_date,
+    cu.female as owner_is_female,
+    
+    -- スコア情報
+    COALESCE(cs.total_points, 0) as total_points,
+    COALESCE(cs.normal_points, 0) as normal_points,
+    COALESCE(cs.bonus_points, 0) as bonus_points,
+    COALESCE(cs.penalty_points, 0) as penalty_points,
+    COALESCE(cs.total_checkins, 0) as checkin_count,
+    COALESCE(cs.purchase_count, 0) as purchase_count,
+    
+    -- ゴール情報
+    gi.goalimage as goal_image,
+    gi.goaltime as goal_time,
+    
+    -- 完走状態の判定を追加
+    CASE 
+        WHEN gi.goaltime IS NULL THEN '棄権'
+        WHEN gi.goaltime <= ev.end_datetime THEN '完走'
+        WHEN gi.goaltime > ev.end_datetime AND 
+             gi.goaltime <= ev.end_datetime + INTERVAL '15 minutes' THEN '完走(遅刻)'
+        ELSE '失格'
+    END as validation,
+    
+    -- ランキング情報
+    cr.ranking as category_rank,
+    cr.total_participants,
+    
+    -- チームメンバー情報（JSON形式で格納）
+    jsonb_agg(
+        jsonb_build_object(
+            'email', m.user_id,
+            'firstname', m.firstname,
+            'lastname', m.lastname,
+            'birth_date', m.date_of_birth,
+            'is_female', m.female,
+            'is_temporary', m.is_temporary,
+            'status', CASE 
+                WHEN m.is_temporary THEN 'TEMPORARY'
+                WHEN m.date_of_birth IS NULL THEN 'PENDING'
+                ELSE 'ACTIVE'
+            END,
+            'member_type', CASE 
+                WHEN m.user_id = e.owner_id THEN 'OWNER'
+                ELSE 'MEMBER'
+            END
+        ) ORDER BY 
+            CASE WHEN m.user_id = e.owner_id THEN 0 ELSE 1 END,  -- オーナーを最初に
+            m.id
+    ) FILTER (WHERE m.id IS NOT NULL) as team_members
+
+FROM 
+    rog_entry e
+    INNER JOIN rog_newevent2 ev ON e.event_id = ev.id
+    INNER JOIN rog_newcategory nc ON e.category_id = nc.id
+    INNER JOIN rog_team t ON e.team_id = t.id
+    LEFT JOIN rog_customuser cu ON e.owner_id = cu.id
+    LEFT JOIN v_checkin_summary cs ON ev.event_name = cs.event_code 
+        AND CAST(e.zekken_number AS TEXT) = cs.zekken_number
+    LEFT JOIN v_category_rankings cr ON e.id = cr.id
+    LEFT JOIN rog_member m ON t.id = m.team_id
+    LEFT JOIN rog_goalimages gi ON ev.event_name = gi.event_code 
+        AND CAST(e.zekken_number AS TEXT) = gi.zekken_number
+
+GROUP BY 
+    e.id, e.zekken_number, e.is_active, e."hasParticipated", e."hasGoaled", e.date,
+    ev.event_name, ev.start_datetime, ev.end_datetime, ev."deadlineDateTime",
+    nc.category_name, nc.category_number, nc.duration, nc.num_of_member, 
+    nc.family, nc.female,
+    t.team_name,
+    cu.email, cu.firstname, cu.lastname, cu.date_of_birth, cu.female,
+    cs.total_points, cs.normal_points, cs.bonus_points, cs.penalty_points,
+    cs.total_checkins, cs.purchase_count, cs.last_checkin,
+    cr.ranking, cr.total_participants,
+    gi.goalimage, gi.goaltime,
+    e.owner_id;
+
+-- インデックスの再作成
+CREATE UNIQUE INDEX idx_mv_entry_details_event_zekken 
+ON mv_entry_details(event_name, zekken_number);
+
+-- ビューの更新
+REFRESH MATERIALIZED VIEW mv_entry_details;
+
+
+-- チェックインと位置情報を結合したビューを作成
+DROP VIEW IF EXISTS v_checkins_locations CASCADE;
+CREATE OR REPLACE VIEW v_checkins_locations AS
+SELECT 
+    g.event_code,
+    g.zekken_number,
+    g.path_order,
+    g.cp_number,
+    l.sub_loc_id,
+    l.location_name,
+    l.photos,
+    g.image_address,
+    g.create_at,
+    g.buy_flag,
+    g.validate_location,
+    g.points
+FROM 
+    gps_checkins g
+    LEFT JOIN rog_location l ON g.cp_number = l.cp
+ORDER BY 
+    g.event_code,
+    g.zekken_number,
+    g.path_order;
+
+-- インデックスのサジェスチョン（実際のテーブルに適用する必要があります）
+/*
+CREATE INDEX idx_gps_checkins_cp_number ON gps_checkins(cp_number);
+CREATE INDEX idx_rog_location_cp ON rog_location(cp);
+*/

rog/urls.py

@@ -124,6 +124,9 @@ urlpatterns += [
     path('export_excel/<int:zekken_number>/<str:event_code>/', views.export_excel, name='export_excel'),
     # for Supervisor Web app
     path('test/', views.test_api, name='test_api'),
+    path('update-goal-time/', views.update_goal_time, name='update-goal-time'),
+    path('get-goalimage/', views.get_goalimage, name='get-goalimage'),
+
 ]
 
 if settings.DEBUG:

rog/views.py

@@ -5,6 +5,10 @@ User = get_user_model()
 import traceback
 from django.contrib.auth.hashers import make_password
 
+import subprocess  # subprocessモジュールを追加
+import tempfile  # tempfileモジュールを追加
+import shutil    # shutilモジュールを追加
+
 from django.contrib.auth.tokens import default_token_generator
 from django.utils.http import urlsafe_base64_encode, urlsafe_base64_decode
 from django.utils.encoding import force_bytes, force_str
@@ -89,6 +93,9 @@ from io import BytesIO
 
 from django.urls import get_resolver
 import os
+import json
+from django.http import HttpResponse
+from sumaexcel import SumasenExcel
 
 logger = logging.getLogger(__name__)
 
@@ -227,6 +234,43 @@ class LocationViewSet(viewsets.ModelViewSet):
     serializer_class=LocationSerializer
     filter_fields=["prefecture", "location_name"]
 
+    def get_queryset(self):
+        queryset = Location.objects.all()
+        logger.info("=== Location API Called ===")
+
+        # リクエストパラメータの確認
+        group_filter = self.request.query_params.get('group__contains')
+        logger.info(f"Request params: {dict(self.request.query_params)}")
+        logger.info(f"Group filter: {group_filter}")
+
+        if group_filter:
+            # フィルタ適用前のデータ数
+            total_count = queryset.count()
+            logger.info(f"Total locations before filter: {total_count}")
+
+            # フィルタの適用
+            queryset = queryset.filter(group__contains=group_filter)
+
+            # フィルタ適用後のデータ数
+            filtered_count = queryset.count()
+            logger.info(f"Filtered locations count: {filtered_count}")
+
+            # フィルタされたデータのサンプル（最初の5件）
+            sample_data = queryset[:5]
+            logger.info("Sample of filtered data:")
+            for loc in sample_data:
+                logger.info(f"ID: {loc.id}, Name: {loc.location_name}, Group: {loc.group}")
+
+        return queryset
+
+    def list(self, request, *args, **kwargs):
+        try:
+            response = super().list(request, *args, **kwargs)
+            logger.info(f"Response data count: {len(response.data['features'])}")
+            return response
+        except Exception as e:
+            logger.error(f"Error in list method: {str(e)}", exc_info=True)
+            raise
 
 class Location_lineViewSet(viewsets.ModelViewSet):
     queryset=Location_line.objects.all()
@@ -2362,18 +2406,45 @@ def get_team_info(request, zekken_number):
     entry = Entry.objects.select_related('team','event').get(zekken_number=zekken_number)
     members = Member.objects.filter(team=entry.team)
 
-    # チームのゴール時間を取得
+    start_datetime = entry.event.start_datetime #イベントの規定スタート時刻
+    if entry.event.self_rogaining:
+        #get_checkinsの中で、
+        #  start_datetime = -1(ロゲ開始)のcreate_at
+        logger.debug(f"self.rogaining={entry.event.self_rogaining} => start_datetime = -1(ロゲ開始)のcreate_at")   
+
+    # チームの最初のゴール時間を取得
     goal_record = GoalImages.objects.filter(
         team_name=entry.team.team_name,
         event_code=entry.event.event_name
-    ).order_by('-goaltime').first()
+    ).order_by('goaltime').first()
+
+    # Nullチェックを追加してからログ出力
+    goalimage_url = None
+    goaltime = None
+
+    if goal_record:
+        try:
+            goaltime = goal_record.goaltime
+            if goal_record.goalimage and hasattr(goal_record.goalimage, 'url'):
+                goalimage_url = request.build_absolute_uri(goal_record.goalimage.url)
+                logger.info(f"get_team_info record.goalimage_url={goalimage_url}")
+            else:
+                logger.info("Goal record exists but no image found")
+                
+        except ValueError as e:
+            logger.warning(f"Error accessing goal image: {str(e)}")
+    else:
+        logger.info("No goal record found for team")
+
 
     return Response({
         'team_name': entry.team.team_name,
         'members': ', '.join([f"{m.lastname} {m.firstname}" for m in members]),
         'event_code': entry.event.event_name,
         'start_datetime': entry.event.start_datetime,
-        'end_datetime': goal_record.goaltime if goal_record else None
+        'end_datetime': goaltime, #goal_record.goaltime if goal_record else None,
+        'goal_photo': goalimage_url, #goal_record.goalimage if goal_record else None,
+        'duration': entry.category.duration.total_seconds()   
     })
 
     def create(self, request, *args, **kwargs):
@@ -2468,63 +2539,547 @@ def get_checkins(request, *args, **kwargs):
             status=status.HTTP_500_INTERNAL_SERVER_ERROR
         )
 
+
 @api_view(['POST'])
 def update_checkins(request):
+    try:
         with transaction.atomic():
-        for update in request.data:
+            update_base = request.data
+            logger.info(f"Processing update data: {update_base}")
+            zekken_number = update_base['zekken_number']
+            event_code = update_base['event_code']
+
+            # 既存レコードの更新
+            for update in update_base['checkins']:
+                if 'id' in update and int(update['id']) > 0:
+                    try:
                         checkin = GpsCheckin.objects.get(id=update['id'])
-            checkin.path_order = update['path_order']
-            checkin.validate_location = update['validate_location']
+                        logger.info(f"Updating existing checkin: {checkin}")
+
+                        # 既存レコードの更新
+                        checkin.path_order = update['order']
+                        checkin.buy_flag = update.get('buy_flag', False)
+                        checkin.validate_location = update.get('validation', False)
+                        checkin.points = update.get('points', 0)
+                        checkin.update_at = timezone.now()
+                        checkin.update_user = request.user.email if request.user.is_authenticated else None
                         checkin.save()
-    return Response({'status': 'success'})
+                        logger.info(f"Updated existing checkin result: {checkin}")
 
-@api_view(['GET'])
-def export_excel(request, zekken_number):
-    # エントリー情報の取得
-    entry = Entry.objects.select_related('team').get(zekken_number=zekken_number)
-    checkins = GpsCheckin.objects.filter(zekken_number=zekken_number).order_by('path_order')
+                    except GpsCheckin.DoesNotExist:
+                        logger.error(f"Checkin with id {update['id']} not found")
+                        continue  # エラーを無視して次のレコードの処理を継続
 
-    # Excelファイルの生成
-    output = BytesIO()
-    workbook = xlsxwriter.Workbook(output)
-    worksheet = workbook.add_worksheet('通過証明書')
+            # 新規レコードの作成
+            for update in update_base['checkins']:
+                if 'id' in update and int(update['id']) == 0:
+                    logger.info(f"Creating new checkin: {update}")
+                    try:
+                        checkin = GpsCheckin.objects.create(
+                            zekken_number=zekken_number,
+                            event_code=event_code,
+                            path_order=update['order'],
+                            cp_number=update['cp_number'],
+                            validate_location=update.get('validation', False),
+                            buy_flag=update.get('buy_flag', False),
+                            points=update.get('points', 0),
+                            create_at=timezone.now(),
+                            update_at=timezone.now(),
+                            create_user=request.user.email if request.user.is_authenticated else None,
+                            update_user=request.user.email if request.user.is_authenticated else None
+                        )
+                        logger.info(f"Created new checkin: {checkin}")
 
-    # スタイルの定義
-    header_format = workbook.add_format({
-        'bold': True,
-        'bg_color': '#CCCCCC',
-        'border': 1
+                    except Exception as e:
+                        logger.error(f"Error creating new checkin: {str(e)}")
+                        continue  # エラーを無視して次のレコードの処理を継続
+
+            # 更新後のデータを順序付けて取得
+            updated_checkins = GpsCheckin.objects.filter(
+                zekken_number=zekken_number,
+                event_code=event_code
+            ).order_by('path_order')
+
+            return Response({
+                'status': 'success',
+                'message': 'Checkins updated successfully',
+                'data': [{'id': c.id, 'path_order': c.path_order} for c in updated_checkins]
             })
 
-    # ヘッダー情報の書き込み
-    worksheet.write('A1', 'チーム名', header_format)
-    worksheet.write('B1', entry.team.team_name)
-    worksheet.write('A2', 'ゼッケン番号', header_format)
-    worksheet.write('B2', zekken_number)
+    except Exception as e:
+        logger.error(f"Error in update_checkins: {str(e)}", exc_info=True)
+        return Response(
+            {"error": "Failed to update checkins", "detail": str(e)},
+            status=status.HTTP_500_INTERNAL_SERVER_ERROR
+        )
 
-    # チェックインデータの書き込み
-    headers = ['順序', 'CP番号', 'チェックイン時刻', '検証', 'ポイント']
-    for col, header in enumerate(headers):
-        worksheet.write(3, col, header, header_format)
 
-    for row, checkin in enumerate(checkins, start=4):
-        worksheet.write(row, 0, checkin.path_order)
-        worksheet.write(row, 1, checkin.cp_number)
-        worksheet.write(row, 2, checkin.create_at.strftime('%Y-%m-%d %H:%M:%S'))
-        worksheet.write(row, 3, '✓' if checkin.validate_location else '')
-        worksheet.write(row, 4, checkin.points)
+@api_view(['POST'])
+def update_checkins_old(request):
+    try:
+        with transaction.atomic():
+            update_base = request.data
+            logger.info(f"Processing update data: {update_base}")
+            zekken_number = update_base['zekken_number']
+            event_code = update_base['event_code']
 
-    workbook.close()
+            for update in update_base['checkins']:
+                if 'id' in update and int(update['id'])>0:
+                    # 既存レコードの更新
+                    logger.info(f"Updating existing checkin : {update}")
+                    try:
+                        checkin = GpsCheckin.objects.get(id=update['id'])
+                        logger.info(f"Updating existing checkin: {checkin}")
                         
-    # レスポンスの生成
-    output.seek(0)
+                        # 既存レコードの更新
+                        checkin.path_order = update['order']
+                        checkin.buy_flag = update.get('buy_flag', False)
+                        checkin.validate_location = update.get('validation', False)
+                        checkin.points = update.get('points', 0)
+                        checkin.save()
+                        logger.info(f"Updated existing checkin result: {checkin}")
+                        
+                    except GpsCheckin.DoesNotExist:
+                        logger.error(f"Checkin with id {update['id']} not found")
+                        return Response(
+                            {"error": f"Checkin with id {update['id']} not found"}, 
+                            status=status.HTTP_404_NOT_FOUND
+                        )
+            for update in update_base['checkins']:
+                if 'id' in update and int(update['id'])==0:
+                    # 新規レコードの作成
+                    logger.info("Creating new checkin:{update}")
+                    try:
+                        checkin = GpsCheckin.objects.create(
+                            zekken_number=update_base['zekken_number'],
+                            event_code=update_base['event_code'],
+
+                            path_order=update['order'],
+                            cp_number=update['cp_number'],
+                            validate_location=update.get('validation', False),
+                            buy_flag=update.get('buy_flag', False),
+                            points=update.get('points', 0),
+                            create_at=timezone.now(),
+                            update_at=timezone.now(),
+                            create_user=request.user.email if request.user.is_authenticated else None,
+                            update_user=request.user.email if request.user.is_authenticated else None
+                        )
+                        logger.info(f"Updated existing checkin result: {checkin}")
+                    
+                    except KeyError as e:
+                        logger.error(f"Missing required field: {str(e)}")
+                        return Response(
+                            {"error": f"Missing required field: {str(e)}"}, 
+                            status=status.HTTP_400_BAD_REQUEST
+                        )
+
+        return Response({'status': 'success', 'message': 'Checkins updated successfully'})
+    
+    except Exception as e:
+        logger.error(f"Error in update_checkins: {str(e)}", exc_info=True)
+        return Response(
+            {"error": "Failed to update checkins", "detail": str(e)}, 
+            status=status.HTTP_500_INTERNAL_SERVER_ERROR
+        )
+
+
+
+@api_view(['GET'])
+def export_excel(request, zekken_number, event_code):
+    temp_dir = None
+    try:
+        # パラメータを文字列型に変換
+        zekken_number = str(zekken_number)
+        event_code = str(event_code)
+
+        logger.info(f"Exporting Excel/PDF for zekken_number: {zekken_number}, event_code: {event_code}")
+
+        # 入力値の検証
+        if not zekken_number or not event_code:
+            logger.error("Missing required parameters")
+            return Response(
+                {"error": "Both zekken_number and event_code are required"},
+                status=status.HTTP_400_BAD_REQUEST
+            )
+
+        # docbaseディレクトリのパスを絶対パスで設定
+        base_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+        docbase_path = os.path.join(base_dir, 'docbase')
+
+        # ディレクトリ存在確認と作成
+        os.makedirs(docbase_path, exist_ok=True)
+
+        # 設定ファイルのパス
+        template_path = os.path.join(docbase_path, 'certificate_template.xlsx')
+        ini_path = os.path.join(docbase_path, 'certificate.ini')
+
+        # テンプレートと設定ファイルの存在確認
+        if not os.path.exists(template_path):
+            logger.error(f"Template file not found: {template_path}")
+            return Response(
+                {"error": "Excel template file missing"},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )
+
+        if not os.path.exists(ini_path):
+            logger.error(f"INI file not found: {ini_path}")
+            return Response(
+                {"error": "Configuration file missing"},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )
+
+        # Docker環境用のデータベース設定を使用
+        db_settings = settings.DATABASES['default']
+
+        # 初期化
+        variables = {
+            "zekken_number": str(zekken_number),
+            "event_code": str(event_code),
+            "db": str(db_settings['NAME']),
+            "username": str(db_settings['USER']),
+            "password": str(db_settings['PASSWORD']),
+            "host": str(db_settings['HOST']),
+            "port": str(db_settings['PORT']),
+            "template_path": template_path
+        }
+
+        try:
+            excel = SumasenExcel(document="certificate", variables=variables, docbase=docbase_path)
+            ret = excel.make_report(variables=variables)
+
+            if ret["status"] != True:
+                message = ret.get("message", "No message provided")
+                logger.error(f"Excelファイル作成失敗 : ret.message={message}")
+                return Response(
+                    {"error": f"Excel generation failed: {message}"},
+                    status=status.HTTP_500_INTERNAL_SERVER_ERROR
+                )
+
+            excel_path = ret.get("filepath")
+            if not excel_path or not os.path.exists(excel_path):
+                logger.error(f"Output file not found: {excel_path}")
+                return Response(
+                    {"error": "Generated file not found"},
+                    status=status.HTTP_500_INTERNAL_SERVER_ERROR
+                )
+
+            # フォーマット指定（excel or pdf）
+            format_type = request.query_params.get('format', 'pdf')
+
+            if format_type.lower() == 'pdf':
+                try:
+                    # 一時ディレクトリを作成
+                    temp_dir = tempfile.mkdtemp()
+                    temp_excel = os.path.join(temp_dir, f'certificate_{zekken_number}.xlsx')
+                    temp_pdf = os.path.join(temp_dir, f'certificate_{zekken_number}.pdf')
+
+                    # Excelファイルを一時ディレクトリにコピー
+                    shutil.copy2(excel_path, temp_excel)
+
+                    # 一時ディレクトリのパーミッションを設定
+                    os.chmod(temp_dir, 0o777)
+                    os.chmod(temp_excel, 0o666)
+
+                    logger.info(f"Converting Excel to PDF in temp directory: {temp_dir}")
+
+                    # LibreOfficeを使用してExcelをPDFに変換
+                    conversion_command = [
+                        'soffice',  # LibreOfficeの代替コマンド
+                        '--headless',
+                        '--convert-to',
+                        'pdf',
+                        '--outdir',
+                        temp_dir,
+                        temp_excel
+                    ]
+
+                    logger.debug(f"Running conversion command: {' '.join(conversion_command)}")
+
+                    # 環境変数を設定
+                    env = os.environ.copy()
+                    env['HOME'] = temp_dir  # LibreOfficeの設定ディレクトリを一時ディレクトリに設定
+
+                    # 変換プロセスを実行
+                    process = subprocess.run(
+                        conversion_command,
+                        env=env,
+                        capture_output=True,
+                        text=True,
+                        check=True
+                    )
+
+                    logger.debug(f"Conversion output: {process.stdout}")
+
+                    # PDFファイルの存在確認
+                    if not os.path.exists(temp_pdf):
+                        logger.error("PDF conversion failed - output file not found")
+                        return Response(
+                            {"error": "PDF conversion failed - output file not found"},
+                            status=status.HTTP_500_INTERNAL_SERVER_ERROR
+                        )
+
+                    # PDFファイルを読み込んでレスポンスを返す
+                    with open(temp_pdf, 'rb') as pdf_file:
+                        pdf_content = pdf_file.read()
+
+                    response = HttpResponse(pdf_content, content_type='application/pdf')
+                    response['Content-Disposition'] = f'attachment; filename="certificate_{zekken_number}_{event_code}.pdf"'
+                    return response
+
+                except subprocess.CalledProcessError as e:
+                    logger.error(f"Error converting to PDF: {str(e)}\nSTDOUT: {e.stdout}\nSTDERR: {e.stderr}")
+                    return Response(
+                        {"error": f"PDF conversion failed: {str(e)}"},
+                        status=status.HTTP_500_INTERNAL_SERVER_ERROR
+                    )
+                finally:
+                    # 一時ディレクトリの削除
+                    if temp_dir and os.path.exists(temp_dir):
+                        try:
+                            shutil.rmtree(temp_dir)
+                            logger.debug(f"Temporary directory removed: {temp_dir}")
+                        except Exception as e:
+                            logger.warning(f"Failed to remove temporary directory: {str(e)}")
+
+            else:  # Excel形式の場合
+                with open(excel_path, 'rb') as excel_file:
                     response = HttpResponse(
-        output.read(),
+                        excel_file.read(),
                         content_type='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
                     )
-    response['Content-Disposition'] = f'attachment; filename=通過証明書_{zekken_number}.xlsx'
+                    response['Content-Disposition'] = f'attachment; filename="certificate_{zekken_number}_{event_code}.xlsx"'
                     return response
 
+        except Exception as e:
+            logger.error(f"Error in Excel/PDF generation: {str(e)}", exc_info=True)
+            return Response(
+                {"error": f"File generation failed: {str(e)}"},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )
+
+    except Exception as e:
+        logger.error(f"Error in export_excel: {str(e)}", exc_info=True)
+        return Response(
+            {"error": "Failed to export file", "detail": str(e)},
+            status=status.HTTP_500_INTERNAL_SERVER_ERROR
+        )
+    finally:
+        # 確実に一時ディレクトリを削除
+        if temp_dir and os.path.exists(temp_dir):
+            try:
+                shutil.rmtree(temp_dir)
+            except Exception as e:
+                logger.warning(f"Failed to remove temporary directory in finally block: {str(e)}")
+
+@api_view(['GET'])
+def export_exceli_old2(request,zekken_number, event_code):
+
+    try:
+        # パラメータを文字列型に変換
+        zekken_number = str(zekken_number)
+        event_code = str(event_code)
+
+        logger.info(f"Exporting Excel for zekken_number: {zekken_number}, event_code: {event_code}")
+
+        # 入力値の検証
+        if not zekken_number or not event_code:
+            logger.error("Missing required parameters")
+            return Response(
+                {"error": "Both zekken_number and event_code are required"},
+                status=status.HTTP_400_BAD_REQUEST
+            )
+
+        # docbaseディレクトリのパスを絶対パスで設定
+        base_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+        docbase_path = os.path.join(base_dir, 'docbase')
+        
+        # ディレクトリ存在確認と作成
+        os.makedirs(docbase_path, exist_ok=True)
+        
+        # 設定ファイルのパス
+        template_path = os.path.join(docbase_path, 'certificate_template.xlsx')
+        ini_path = os.path.join(docbase_path, 'certificate.ini')
+ 
+         # テンプレートと設定ファイルの存在確認
+        if not os.path.exists(template_path):
+            logger.error(f"Template file not found: {template_path}")
+            return Response(
+                {"error": "Excel template file missing"},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )
+
+        if not os.path.exists(ini_path):
+            logger.error(f"INI file not found: {ini_path}")
+            return Response(
+                {"error": "Configuration file missing"},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )
+
+        # Docker環境用のデータベース設定を使用
+        db_settings = settings.DATABASES['default']
+
+
+
+        # 初期化
+        variables = {
+            "zekken_number":str(zekken_number),
+            "event_code":str(event_code),
+            "db":str(db_settings['NAME']),  #"rogdb",
+            "username":str(db_settings['USER']), #"admin",
+            "password":str(db_settings['PASSWORD']), #"admin123456",
+            "host":str(db_settings['HOST']),  # Docker Composeのサービス名を使用 # "localhost",
+            "port":str(db_settings['PORT']),  #"5432",
+            "template_path": template_path
+        }
+
+        # データベース接続情報のログ出力（パスワードは除く）
+        logger.info(f"Attempting database connection to {variables['host']}:{variables['port']} "
+                   f"with user {variables['username']} and database {variables['db']}")
+
+        try:
+            excel = SumasenExcel(document="certificate", variables=variables, docbase=docbase_path)
+            # ./docbase/certificate.ini の定義をベースに、
+            # ./docbase/certificate_template.xlsxを読み込み
+            # ./docbase/certificate_(zekken_number).xlsxを作成する
+        
+            # シート初期化
+            logger.info("Generating report with variables: %s",
+                 {k: v for k, v in variables.items() if k != 'password'})  # パスワードを除外
+    
+            ret = excel.make_report(variables=variables)
+            if ret["status"]==True:
+                filepath=ret["filepath"]
+                logging.info(f"Excelファイル作成 : ret.filepath={filepath}")
+            else:
+                message = ret.get("message", "No message provided")
+                logging.error(f"Excelファイル作成失敗 : ret.message={message}")
+        
+            output_path = ret.get("filepath")   
+            if not output_path or not os.path.exists(output_path):
+                logger.error(f"Output file not found: {output_path}")
+                return Response(
+                    {"error": "Generated file not found"},
+                    status=status.HTTP_500_INTERNAL_SERVER_ERROR
+                )
+            excel_path = output_path
+
+            # PDFのファイル名を生成
+            pdf_filename = f'certificate_{zekken_number}_{event_code}.pdf'
+            pdf_path = os.path.join(docbase_path, pdf_filename)
+
+            # フォーマット指定（excel or pdf）
+            format_type = request.query_params.get('format', 'pdf') # 'excel'
+
+            if format_type.lower() == 'pdf':
+                try:
+                    # 一時ディレクトリを作成
+                    temp_dir = tempfile.mkdtemp()
+                    temp_excel = os.path.join(temp_dir, f'certificate_{zekken_number}.xlsx')
+                    temp_pdf = os.path.join(temp_dir, f'certificate_{zekken_number}.pdf')
+
+                    # Excelファイルを一時ディレクトリにコピー
+                    shutil.copy2(excel_path, temp_excel)
+
+                    # 一時ディレクトリのパーミッションを設定
+                    os.chmod(temp_dir, 0o777)
+                    os.chmod(temp_excel, 0o666)
+
+                    logger.info(f"Converting Excel to PDF in temp directory: {temp_dir}")
+  
+
+                    # LibreOfficeを使用してExcelをPDFに変換
+                    conversion_command = [
+                        'soffice',
+                        '--headless',
+                        '--convert-to',
+                        'pdf',
+                        '--outdir',
+                        temp_dir,
+                        temp_excel
+                    ]
+
+                    logger.debug(f"Running conversion command: {' '.join(conversion_command)}")
+
+                    # 環境変数を設定
+                    env = os.environ.copy()
+                    env['HOME'] = temp_dir  # LibreOfficeの設定ディレクトリを一時ディレクトリに設定
+
+                    # 変換プロセスを実行
+                    process = subprocess.run(
+                        conversion_command,
+                        env=env,
+                        capture_output=True,
+                        text=True,
+                        check=True
+                    )
+                    
+                    logger.debug(f"Conversion output: {process.stdout}")
+
+                    # PDFファイルの存在確認
+                    if not os.path.exists(temp_pdf):
+                        logger.error("PDF conversion failed - output file not found")
+                        return Response(
+                            {"error": "PDF conversion failed - output file not found"},
+                            status=status.HTTP_500_INTERNAL_SERVER_ERROR
+                        )
+
+                    # PDFファイルを読み込んでレスポンスを返す
+                    with open(temp_pdf, 'rb') as pdf_file:
+                        pdf_content = pdf_file.read()
+                        
+                    response = HttpResponse(pdf_content, content_type='application/pdf')
+                    response['Content-Disposition'] = f'attachment; filename="certificate_{zekken_number}_{event_code}.pdf"'
+                    return response
+
+
+                except subprocess.CalledProcessError as e:
+                    logger.error(f"Error converting to PDF: {str(e)}\nSTDOUT: {e.stdout}\nSTDERR: {e.stderr}")
+                    return Response(
+                        {"error": "PDF conversion failed"},
+                        status=status.HTTP_500_INTERNAL_SERVER_ERROR
+                    )
+                finally:
+                    # 一時ディレクトリの削除
+                    if temp_dir and os.path.exists(temp_dir):
+                        try:
+                            shutil.rmtree(temp_dir)
+                            logger.debug(f"Temporary directory removed: {temp_dir}")
+                        except Exception as e:
+                            logger.warning(f"Failed to remove temporary directory: {str(e)}")
+
+
+            else:  # Excel形式の場合
+                with open(excel_path, 'rb') as excel_file:
+                    response = HttpResponse(
+                        excel_file.read(),
+                        content_type='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+                    )
+                    excel_filename = f'certificate_{zekken_number}_{event_code}.xlsx'
+                    response['Content-Disposition'] = f'attachment; filename="{excel_filename}"'
+                    return response
+
+        except Exception as e:
+            logger.error(f"Error in Excel/PDF generation: {str(e)}", exc_info=True)
+            return Response(
+                {"error": f"File generation failed: {str(e)}"},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )
+
+    except Exception as e:
+        logger.error(f"Error in export_excel: {str(e)}", exc_info=True)
+        return Response(
+            {"error": "Failed to export file", "detail": str(e)},
+            status=status.HTTP_500_INTERNAL_SERVER_ERROR
+        )
+    finally:
+        # 確実に一時ディレクトリを削除
+        if temp_dir and os.path.exists(temp_dir):
+            try:
+                shutil.rmtree(temp_dir)
+            except Exception as e:
+                logger.warning(f"Failed to remove temporary directory in finally block: {str(e)}")
+
+
 # ----- for Supervisor -----
 
 @api_view(['GET'])
@@ -2532,3 +3087,145 @@ def test_api(request):
     logger.debug("Test API endpoint called")
     return JsonResponse({"status": "API is working"})
 
+@api_view(['GET'])
+#@authentication_classes([TokenAuthentication])
+#@permission_classes([IsAuthenticated])
+def get_goalimage(request):
+    """
+    ゼッケン番号とイベントコードに基づいてゴール画像情報を取得するエンドポイント
+    
+    Parameters:
+        zekken_number (str): ゼッケン番号
+        event_code (str): イベントコード
+    
+    Returns:
+        Response: ゴール画像情報を含むJSONレスポンス
+    """
+    try:
+        logger.debug(f"get_goalimage called with params: {request.GET}")
+
+        # リクエストパラメータを取得
+        zekken_number = request.GET.get('zekken_number')
+        event_code = request.GET.get('event_code')
+
+        logger.debug(f"Searching for goal records with zekken_number={zekken_number}, event_code={event_code}")
+
+        # パラメータの検証
+        if not zekken_number or not event_code:
+            return Response(
+                {"error": "zekken_number and event_code are required"},
+                status=status.HTTP_400_BAD_REQUEST
+            )
+
+        # ゴール画像レコードを検索（最も早いゴール時間のレコードを取得）
+        goal_records = GoalImages.objects.filter(
+            zekken_number=zekken_number,
+            event_code=event_code
+        ).order_by('goaltime')
+
+        logger.debug(f"Found {goal_records.count()} goal records")
+
+        if not goal_records.exists():
+            return Response(
+                {"message": "No goal records found"},
+                status=status.HTTP_404_NOT_FOUND
+            )
+
+        # 最も早いゴール時間のレコード（cp_number = 0）を探す
+        valid_goal = goal_records.filter(cp_number=0).first()
+        
+        if not valid_goal:
+            return Response(
+                {"message": "No valid goal record found"},
+                status=status.HTTP_404_NOT_FOUND
+            )
+
+        # シリアライザでデータを整形
+        serializer = GolaImageSerializer(valid_goal)
+        
+        # レスポンスデータの構築
+        response_data = {
+            "goal_record": serializer.data,
+            "total_records": goal_records.count(),
+            "has_multiple_records": goal_records.count() > 1
+        }
+
+        logger.info(f"Retrieved goal record for zekken_number {zekken_number} in event {event_code}")
+        return Response(response_data)
+
+    except Exception as e:
+        logger.error(f"Error retrieving goal record: {str(e)}", exc_info=True)
+        return Response(
+            {"error": f"Failed to retrieve goal record: {str(e)}"},
+            status=status.HTTP_500_INTERNAL_SERVER_ERROR
+        )
+
+
+@api_view(['POST'])
+#@authentication_classes([TokenAuthentication])
+#@permission_classes([IsAuthenticated])
+def update_goal_time(request):
+    try:
+        logger.info(f"update_goal_time:{request}")
+        # リクエストからデータを取得
+        zekken_number = request.data.get('zekken_number')
+        event_code = request.data.get('event_code')
+        team_name = request.data.get('team_name')
+        goal_time_str = request.data.get('goaltime')
+
+        logger.info(f"zekken_number={zekken_number},event_code={event_code},team_name={team_name},goal_time={goal_time_str}")
+
+        # 入力バリデーション
+        #if not all([zekken_number, event_code, team_name, goal_time_str]):
+        #    return Response(
+        #        {"error": "Missing required fields"},
+        #        status=status.HTTP_400_BAD_REQUEST
+        #    )
+
+        try:
+            # 文字列からdatetimeオブジェクトに変換
+            goal_time = datetime.strptime(goal_time_str, '%Y-%m-%dT%H:%M:%S')
+        except ValueError:
+            return Response(
+                {"error": "Invalid goal time format"},
+                status=status.HTTP_400_BAD_REQUEST
+            )
+
+        # 既存のゴール記録を探す
+        goal_record = GoalImages.objects.filter(
+            team_name=team_name,
+            event_code=event_code
+        ).first()
+
+        if goal_record:
+            # 既存の記録を更新
+            goal_record.goaltime = goal_time
+            goal_record.save()
+            logger.info(f"Updated goal time as {goal_time} for team {team_name} in event {event_code}")
+        else:
+            # 新しい記録を作成
+            entry = Entry.objects.get(zekken_number=zekken_number, event__event_name=event_code)
+            GoalImages.objects.create(
+                user=entry.owner,
+                goaltime=goal_time,
+                team_name=team_name,
+                event_code=event_code,
+                cp_number=0  # ゴール地点を表すCP番号
+            )
+            logger.info(f"Created new goal time record for team {team_name} in event {event_code}")
+
+        return Response({"message": "Goal time updated successfully"})
+
+    except Entry.DoesNotExist:
+        logger.error(f"Entry not found for zekken_number {zekken_number} in event {event_code}")
+        return Response(
+            {"error": "Entry not found"},
+            status=status.HTTP_404_NOT_FOUND
+        )
+    except Exception as e:
+        logger.error(f"Error updating goal time: {str(e)}")
+        return Response(
+            {"error": f"Failed to update goal time: {str(e)}"},
+            status=status.HTTP_500_INTERNAL_SERVER_ERROR
+        )
+

templates/activation-template.html

@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="ja">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>アクティベーション成功</title>
+    <style>
+        body {
+            font-family: Arial, sans-serif;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            height: 100vh;
+            margin: 0;
+            background-color: #f0f0f0;
+        }
+        .message {
+            background-color: white;
+            padding: 20px;
+            border-radius: 5px;
+            box-shadow: 0 2px 10px rgba(0,0,0,0.1);
+            text-align: center;
+        }
+    </style>
+</head>
+<body>
+    <div class="message">
+        <h1>アクティベーション成功</h1>
+        <p>{{ message }}</p>
+    </div>
+</body>
+</html>

templates/verification-template.html

@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="ja">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>メール確認成功</title>
+    <style>
+        body {
+            font-family: Arial, sans-serif;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            height: 100vh;
+            margin: 0;
+            background-color: #f0f0f0;
+        }
+        .message {
+            background-color: white;
+            padding: 20px;
+            border-radius: 5px;
+            box-shadow: 0 2px 10px rgba(0,0,0,0.1);
+            text-align: center;
+        }
+    </style>
+</head>
+<body>
+    <div class="message">
+        <h1>メール確認成功</h1>
+        <p>{{ message }}</p>
+    </div>
+</body>
+</html>