From d22e8b5a2371ea763b70daacf53fdea48b36bd3b Mon Sep 17 00:00:00 2001
From: Akira <akira.miyata@sumasen.net>
Date: Fri, 8 Nov 2024 14:33:46 +0900
Subject: [PATCH] final stage update bugs

---
 .DS_Store                                     | Bin 10244 -> 0 bytes
 SumasenLibs/excel_lib/sumaexcel/sumaexcel.py  |   6 +-
 .../testdata/certificate_template.xlsx        | Bin 11217 -> 11221 bytes
 docbase/certificate.ini                       |   1 +
 rog/postgres_views.sql                        |   6 +-
 rog/views.py                                  |   4 +-
 supervisor/html/index.html                    | 175 ++++++++++--------
 7 files changed, 108 insertions(+), 84 deletions(-)
 delete mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index cf4dc94a120fcb52bfec8d0b78ac27a416bab8b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10244
zcmeHMzmF3~6n=AezOyj_OF0k-MOp-kD2|KI%8^(!<}d{XQiKT<0gm;L_*SfUjqSrA
z>yQfylt9BDKtZ|`L205;AR&<yQOZaWH6;ZoQY1tL-<uuoX4dO#A_Y#Gk#^ti%zJO%
zeBaC)&zgwD(rSHy$RVOME|$6NxFr;B=WC=)sG2;afIa!mg-R`KwMR5<g+;(3U=gqg
zSOhEr9|{84v$>?Rk+gS<fJML}u#N!d2L~6+l9Izn%G80IJOV&Yp;{I^=lB8AQL?1u
zFp_9N5s@imWGd7VLqz7Nca&a9$zdcTa}w(CAym&oolu1A9sV7uPNEb^d$$N!1V$0y
zv-=dyQ<FUE8Rz#MH~-YzT4A|d^}{Oa(m#E@>-b+k|9;GDuW#DkUeUe{6d%Ksrm03D
z1@tZYZl3hRn)1&}n0?Q`k%d)FT_aA~cPHMi$9mw^{NSXJu^Rog!i{*x=@>E7R~*M~
z#Joyf>LKzL9i}!Uzcr~t4Ln^TA84v^nPZx0!d@TK9;(B-MwemPfiJddDUS{5yMvlK
z{9Pv(Eq;Q(dm2U`Z|ZN17kUtjYA2PosF)ic@$n3)BZ^oI;**&5b|VJx3VuVz#*AHj
zAG1r-DR^fjRF5(J*D?JJ@NnVVMGqWZo35J{at7(>q+roNbRM}eO-5jhraseBKRzlz
zQ}d(Gvr9kBUVL$0&ND+}W0oar=yNRfw2cmE8^*=!F`#Rk%_Xrz<31<n-xbVFPd@Qj
z1I)`VJoMnFXO3C&rjL0NR$+V<N|q9|s{L+Tt<_(vZQtwm^7+5T#N<?JdIlvsbD^>l
z_A5QNx7uBDJKylznK1OL@1EW2S+CJw&dnYVgP!XJjgB<%>J6xzKj#JYu)h?p2KBDA
ztwaqOl;zx>!JzPEan30$7T4ySL9vjZb3QK?*48rVT?alpdV2Y?-wML-7)bmKP(K&w
zqv(D8&ht-=S?8E0{`hC3Md$bBr%!G@U;B;olCsk?$Y`t1E2V}oduMmG(h2-9;B3Ir
zP0Re@f+de?CQCer#SM*RLsw(r;s4IUUa)Wk$QQm?WEK_{@<-;J#r$H728J1BEDg8O
zXbj3AL)x0{IwkuD+3K^MDz$SGRv_xcjMFjbN$4j=QU=}|GCBLQ7o>WVDsdm9+^12M
zV4)GVm6uJz$V}D>{{qkiEuFi<!MmBgzsTj3sJW3gH`g?IEHRS_{zlm3Eu1%9PLDO*
zug2Kq?M6?0v(yLg9%jK|Y*4(Rjc)z(@Uvq2kqcN))7cR}309n(jpRPFZk4prVf!+)
z83S7^0u}*_fJML}FcyKysKv=bo*4iC|5$t5U=gqgY<&d8RJl@K!Z`RinpF5(yMyZz
zE-tJ$jHEQdja9f_evZcre~v$->i8R@ENCzB1LQE0ctUv(e+Jm|fB(#X`3hst|K>?=
I%bow<0#1ESIsgCw

diff --git a/SumasenLibs/excel_lib/sumaexcel/sumaexcel.py b/SumasenLibs/excel_lib/sumaexcel/sumaexcel.py
index 600f74e..8de400f 100644
--- a/SumasenLibs/excel_lib/sumaexcel/sumaexcel.py
+++ b/SumasenLibs/excel_lib/sumaexcel/sumaexcel.py
@@ -113,6 +113,10 @@ class SumasenExcel:
 
             self.basic = basic
 
+            self.output_path = basic.get("output_path")
+            if not os.path.exists(self.output_path):
+                os.makedirs(self.output_path, exist_ok=True)
+
             logging.info("step-2")
 
             # basicセクションから必要なパラメータを取得
@@ -143,7 +147,7 @@ class SumasenExcel:
                 logging.error("sections not found in basic section")    
 
             # 出力ファイルパスを設定
-            self.output_filepath = f"{self.docpath}/{doc_file}"
+            self.output_filepath = f"{self.output_path}/{doc_file}"
             # 新規のExcelワークブックを作成
             self.workbook = openpyxl.Workbook()
             # デフォルトで作成されるシートを削除
diff --git a/SumasenLibs/excel_lib/testdata/certificate_template.xlsx b/SumasenLibs/excel_lib/testdata/certificate_template.xlsx
index 5c966953d07f76b7bd7c474385477de36669a541..d023f4c8d55371832829a9abbf1649b8e08f8a0a 100644
GIT binary patch
delta 4311
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

delta 4307
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

diff --git a/docbase/certificate.ini b/docbase/certificate.ini
index e59f05a..f7dc825 100644
--- a/docbase/certificate.ini
+++ b/docbase/certificate.ini
@@ -4,6 +4,7 @@ doc_file=certificate_[zekken_number].xlsx
 sections=section1
 maxcol=10
 column_width=3,5,16,16,16,16,16,8,8,12,3
+output_path=media/reports/[event_code]
 
 [section1]
 template_sheet=certificate
diff --git a/rog/postgres_views.sql b/rog/postgres_views.sql
index 089e538..7ad9099 100644
--- a/rog/postgres_views.sql
+++ b/rog/postgres_views.sql
@@ -134,8 +134,7 @@ FROM
         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
+    LEFT JOIN rog_goalimages gi ON e.owner_id = gi.user_id 
 
 GROUP BY 
     e.id, e.zekken_number, e.is_active, e."hasParticipated", e."hasGoaled", e.date,
@@ -176,7 +175,8 @@ SELECT
     g.points
 FROM 
     gps_checkins g
-    LEFT JOIN rog_location l ON g.cp_number = l.cp
+    LEFT JOIN rog_location l ON g.cp_number = l.cp 
+        AND l."group" LIKE '%' || g.event_code || '%'
 ORDER BY 
     g.event_code,
     g.zekken_number,
diff --git a/rog/views.py b/rog/views.py
index 9804674..9284ade 100644
--- a/rog/views.py
+++ b/rog/views.py
@@ -2561,7 +2561,7 @@ def update_checkins(request):
                         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_at = timezone.now() チェックイン時刻は更新しない
                         checkin.update_user = request.user.email if request.user.is_authenticated else None
                         checkin.save()
                         logger.info(f"Updated existing checkin result: {checkin}")
@@ -2583,7 +2583,7 @@ def update_checkins(request):
                             validate_location=update.get('validation', False),
                             buy_flag=update.get('buy_flag', False),
                             points=update.get('points', 0),
-                            create_at=timezone.now(),
+                            # 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
diff --git a/supervisor/html/index.html b/supervisor/html/index.html
index ef95905..ed46026 100755
--- a/supervisor/html/index.html
+++ b/supervisor/html/index.html
@@ -46,7 +46,7 @@
                 </div>
                 <div class="bg-gray-50 p-4 rounded-lg">
                     <div class="text-sm text-gray-500">ゴール時刻</div>
-		    <div class="goal-time-container">
+		        <div class="goal-time-container">
                         <span id="goalTimeDisplay" class="goal-time-display cursor-pointer"></span>
                         <input type="datetime-local" id="goalTimeInput" class="goal-time-input hidden border rounded px-2 py-1"
                                onchange="updateGoalTime(this)">
@@ -123,7 +123,7 @@
 	// APIのベースURLを環境に応じて設定
         const API_BASE_URL = 'http://rogaining.sumasen.net/api';
         let original_goal_time = '';
-	let selected_event_code = '';
+	    let selected_event_code = '';
 
 	// イベントリスナーの設定
         document.addEventListener('DOMContentLoaded', function() {
@@ -147,7 +147,7 @@
                     alert('イベントコードを選択してください');
                     return;
                 }
-		selected_event_code = eventCode;
+		        selected_event_code = eventCode;
                 loadTeamData(e.target.value, eventCode);
             });
 
@@ -253,6 +253,16 @@
 
             try {
                 const newTime = new Date(input.value);
+                    // inputがnullの場合は棄権処理
+                if (!input) {
+                    const validateElement = document.getElementById('validate');
+                    display.textContent = '棄権';
+                    if (validateElement) {
+                        validateElement.textContent = '棄権';
+                    }
+                    return;
+                }
+
                 display.textContent = newTime.toLocaleString();
 
                 const eventCodeSelect = document.getElementById('eventCode');
@@ -279,23 +289,23 @@
                                .then(checkins => {
                                    const startCheckin = checkins.find(c => c.cp_number === -1);
                                    if (startCheckin) {
-                                       const startTime = new Date(startCheckin.create_at);
-                                       const timeDiff = (newTime - startTime) / 1000; // 秒単位の差
-                                       const maxTime = team.duration + 15*60; // 制限時間+15分
-                                       updateValidation(timeDiff, maxTime );
-				       const overtime = ((newTime - startTime) / 1000 - team.duration/1000 + 60 ) // 60;
-                		       if( overtime>0 ){
-                			       late_point = overtime*(-50);
-                			       lateElement = document.getElementById('latePoints');
-                 			       lateElement.textContent = late_point;
-                			       lateElement.classList.add('text-red-600');
-                		       }else{
-                			       lateElement = document.getElementById('latePoints');
-                 			       lateElement.textContent = 0;
-                			       lateElement.classList.remove('text-red-600');
-                		       }
-                                   }
-                               })
+                                        const startTime = new Date(startCheckin.create_at);
+                                        const timeDiff = (newTime - startTime) / 1000; // 秒単位の差
+                                        const maxTime = team.duration + 15*60; // 制限時間+15分
+                                        updateValidation(timeDiff, maxTime );
+				                        const overtime = ((newTime - startTime) / 1000 - team.duration/1000 + 60 ) // 60;
+                		                if( overtime>0 ){
+                			                late_point = overtime*(-50);
+                			                lateElement = document.getElementById('latePoints');
+                 			                lateElement.textContent = late_point;
+                			                lateElement.classList.add('text-red-600');
+                		                }else{
+                			                lateElement = document.getElementById('latePoints');
+                 			                lateElement.textContent = 0;
+                			                lateElement.classList.remove('text-red-600');
+                		                }
+                                    }
+                               })   
                                .catch(error => handleApiError(error));
 
                        } else {
@@ -304,24 +314,25 @@
                            const timeDiff = (newTime - startTime) / 1000; // 分単位の差
                            const maxTime = team.duration + 15*60; // 制限時間+15分
 
-			   //console.info('startTime=',startTime,',goalTime=',newTime,',timeDiff=',timeDiff,'duration=',team.duration,',maxTime=',maxTime);
+			                //console.info('startTime=',startTime,',goalTime=',newTime,',timeDiff=',timeDiff,'duration=',team.duration,',maxTime=',maxTime);
                            updateValidation(timeDiff, maxTime );
 
-			   // １秒でも遅刻すると、１分につき-50点
-			   const overtime = ((newTime - startTime) / 1000 - team.duration );
-			   if( overtime>0 ){
-			       //console.info('overtime=',overtime);
-			       late_point = Math.ceil(overtime/60)*(-50);
-			       lateElement = document.getElementById('latePoints');
- 			       lateElement.textContent = late_point;
-			       lateElement.classList.add('text-red-600');
-		           }else{
-			       lateElement = document.getElementById('latePoints');
- 			       lateElement.textContent = 0;
-			       lateElement.classList.remove('text-red-600');
-			   }
-                       }
+			                // １秒でも遅刻すると、１分につき-50点
+			                const overtime = ((newTime - startTime) / 1000 - team.duration );
+			                if( overtime>0 ){
+			                    //console.info('overtime=',overtime);
+			                    late_point = Math.ceil(overtime/60)*(-50);
+			                    lateElement = document.getElementById('latePoints');
+ 			                    lateElement.textContent = late_point;
+			                    lateElement.classList.add('text-red-600');
+		                    }else{
+			                    lateElement = document.getElementById('latePoints');
+ 			                    lateElement.textContent = 0;
+			                    lateElement.classList.remove('text-red-600');
+			                }
+                        }
                    });
+                   calculatePoints();  // 総合ポイントの計算
 
             } catch (e) {
                 console.error('Error updating goal time:', e);
@@ -419,7 +430,7 @@
             try {
                 const [teamResponse, checkinsResponse] = await Promise.all([
                     fetch(`${API_BASE_URL}/team_info/${zekkenNumber}/`),
-		    fetch(`${API_BASE_URL}/checkins/${zekkenNumber}/${event_code}/`),
+		            fetch(`${API_BASE_URL}/checkins/${zekkenNumber}/${event_code}/`),
                 ]);
        
                 // 各レスポンスのステータスを個別にチェック
@@ -434,7 +445,7 @@
         
                 // ゴール時刻の表示を更新
                 updateGoalTimeDisplay(teamData.end_datetime);
-		original_goal_time = teamData.end_datetime;
+		        original_goal_time = teamData.end_datetime;
 
                 // イベントコードに対応するイベントを検索
                 //const event = eventData.find(e => e.code === document.getElementById('eventCode').value);
@@ -453,34 +464,36 @@
                     '未ゴール';
                 goalTimeDisplay.textContent = goalTime;
 
-		console.info('teamData.goal_photo = ',teamData.goal_photo );
+                updateGoalTime(goalTime)    // ゴール時刻の表示を更新
+
+		        console.info('teamData.goal_photo = ',teamData.goal_photo );
 
                 if (goalTime === '-') {
                     goalTimeDisplay.classList.add('cursor-pointer');
                     goalTimeDisplay.onclick = () => editGoalTime(goalTimeDisplay);
                 }
 
-		//console.info("step 0");
-        // ゴール時計の表示を更新
-        const goalTimeElement = document.getElementById('goalTime');
-        if (teamData.goal_photo) {
-            // 画像要素を作成
-		//console.info("step 1");
-            const img = document.createElement('img');
-            img.src = teamData.goal_photo;
-            img.classList.add('h-32', 'w-auto', 'object-contain', 'cursor-pointer');
-            img.onclick = () => showLargeImage(teamData.goal_photo);
+		        //console.info("step 0");
+                // ゴール時計の表示を更新
+                const goalTimeElement = document.getElementById('goalTime');
+                if (teamData.goal_photo) {
+                    // 画像要素を作成
+		            //console.info("step 1");
+                    const img = document.createElement('img');
+                    img.src = teamData.goal_photo;
+                    img.classList.add('h-32', 'w-auto', 'object-contain', 'cursor-pointer');
+                    img.onclick = () => showLargeImage(teamData.goal_photo);
             
-		//console.info("step 2");
-            // 既存の内容をクリアして画像を追加
-            goalTimeElement.innerHTML = '';
-            goalTimeElement.appendChild(img);
+		            //console.info("step 2");
+                    // 既存の内容をクリアして画像を追加
+                    goalTimeElement.innerHTML = '';
+                    goalTimeElement.appendChild(img);
             
-            //console.info("Goal photo displayed: ",teamData.goal_photo);
-        } else {
-            goalTimeElement.textContent = '画像なし';
-            console.info("No goal photo available");
-        }
+                    //console.info("Goal photo displayed: ",teamData.goal_photo);
+                } else {
+                    goalTimeElement.textContent = '画像なし';
+                    console.info("No goal photo available");
+                }
 
 
                 // チェックインリストの更新
@@ -493,11 +506,11 @@
                 checkinsData.forEach((checkin, index) => {
                     const tr = document.createElement('tr');
                     tr.dataset.id = checkin.id;
-		    tr.dataset.local_id = index+1;
+		            tr.dataset.local_id = index+1;
                     tr.dataset.cpNumber = checkin.cp_number;
                     tr.dataset.buyPoint = checkin.buy_point;
-		    tr.dataset.checkinPoint = checkin.checkin_point;
-		    tr.dataset.path_order = index+1;
+		            tr.dataset.checkinPoint = checkin.checkin_point;
+		            tr.dataset.path_order = index+1;
                     const bgColor = checkin.buy_point > 0 ? 'bg-blue-100' : '';
                     
                     tr.innerHTML = `
@@ -510,7 +523,11 @@
                                 `<img src="/media/compressed/${checkin.photos}" class="h-20 w-20 object-cover rounded" onclick="showLargeImage(this.src)">` : ''}
                         </td>
                         <td class="px-2 py-3">
-	   		    ${checkin.cp_number===-1 || checkin.image_address===null ? "" : `<img src="${checkin.image_address}" class="h-20 w-20 object-cover rounded" onclick="showLargeImage(this.src)">`}
+                            ${checkin.cp_number===-1 || checkin.image_address===null ? "" : 
+                                `<img src="${checkin.image_address}" 
+                                    class="h-20 w-20 object-cover rounded" 
+                                    onclick="showLargeImage(this.src)"
+                                    onerror="this.parentElement.innerHTML=''">`}
                         </td>
                         <td class="px-2 py-3 ${bgColor}">
                             <div class="font-bold">${checkin.sub_loc_id}</div>
@@ -546,7 +563,7 @@
                     //    }
                     //}
                 });
-		updatePathOrders();
+		        updatePathOrders();
         
                 // 合計ポイントの更新
                 //document.getElementById('totalPoints').textContent = totalPoints;
@@ -991,37 +1008,39 @@ function applyImageOrientation(imgElement) {
 
 	// 総合ポイントの計算
         function calculatePoints() {
-	    //console.info('calculatePoints');
+	        //console.info('calculatePoints');
             const rows = Array.from(document.getElementById('checkinList').children);
             let totalPoints = 0;	// チェックインポイントの合計をクリア
             let cpPoints = 0;		// チェックインポイントの合計をクリア
             let buyPoints = 0;		// 買い物ポイントの合計をクリア
+            let latePoints = 0;		// 遅刻ポイントの合計をクリア
 
-	    // 各行のチェックインポイント及び買い物ポイントを合算
+	        // 各行のチェックインポイント及び買い物ポイントを合算
             rows.forEach(row => {
-		const buybox = row.children[6].querySelector('input[type="checkbox"]');
-		const checkbox = row.children[7].querySelector('input[type="checkbox"]');
-		const point = parseInt(row.children[8].textContent);
+		        const buybox = row.children[6].querySelector('input[type="checkbox"]');
+		        const checkbox = row.children[7].querySelector('input[type="checkbox"]');
+		        const point = parseInt(row.children[8].textContent);
                 if (checkbox) {
                     totalPoints += point;
                     if (buybox && buybox.checked) {
                         buyPoints += point;
-		    }else{
-			cpPoints += point;
-		    }			  
+		            }else{
+			            cpPoints += point;
+		            }			  
                 }
             });
 
             // 遅刻ポイントの計算=ゴール時刻がEventのゴール時刻を超えていたら１分につき-50点を加算する。
-            const latePoints = parseInt(document.getElementById('latePoints').textContent) || 0;
-	    // 総合得点を計算
+            latePoints = parseInt(document.getElementById('latePoints').textContent) || 0;
+	        // 総合得点を計算
             const finalPoints = totalPoints + latePoints;
 
-	    // 判定を更新。順位を表示、ゴール時刻を１５分経過したら失格
-	    //console.info('calculatePoints:totalPoints=',cpPoints,',buyPoints=',buyPoints,',finalPoints=',finalPoints);
+	        // 判定を更新。順位を表示、ゴール時刻を１５分経過したら失格
+	        //console.info('calculatePoints:totalPoints=',cpPoints,',buyPoints=',buyPoints,',finalPoints=',finalPoints);
 
             document.getElementById('totalPoints').textContent = cpPoints;
             document.getElementById('buyPoints').textContent = buyPoints;
+            document.getElementById('latePoints').textContent = latePoints;
             document.getElementById('finalPoints').textContent = finalPoints;
         }
 
@@ -1034,17 +1053,17 @@ function applyImageOrientation(imgElement) {
             const zekkenNumber = document.querySelector('#zekkenNumber').value;
             const eventCode = document.querySelector('#eventCode').value;
       
-	    const display = document.getElementById('goalTimeDisplay');
+	        const display = document.getElementById('goalTimeDisplay');
 
             if (!display) {
                 console.error('Goal time elements not found');
                 return;
             }
 
-	    let goalTime = display.textContent;
- 	    console.info('Goal time = ',goalTime);
+	        let goalTime = display.textContent;
+ 	        console.info('Goal time = ',goalTime);
 
-	    try { 
+	        try { 
                 const checkins = getCurrentCheckins(); // 現在の表示データを取得
                 
                 const response = await fetch(`${API_BASE_URL}/update_checkins/`, {