Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 32.1 Icon
edited by Super Admin
on 2026/03/10 13:45
Change comment: There is no comment for this version
To version Icon 46.1 Icon
edited by Super Admin
on 2026/03/13 14:24
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -65,9 +65,7 @@
65 65  #set($seitokaiYoutube = $doc.getValue('seitokaiYoutube'))
66 66  #set($seitokaiOtherSns = $doc.getValue('seitokaiOtherSns'))
67 67  
68 -## --- 年度アーカイブ ---
69 -#set($pageFiscalYear = $!doc.getValue('fiscalYear'))
70 -## 現在の年度を計算（4月始まり）
68 +## --- 現在の年度を計算（4月始まり） ---
71 71  #set($nowFY = $datetool.date)
72 72  #set($currentFYMonth = $mathtool.toInteger($datetool.format('MM', $nowFY)))
73 73  #set($currentFYYear = $mathtool.toInteger($datetool.format('yyyy', $nowFY)))
... ... @@ -76,10 +76,6 @@
76 76  #else
77 77   #set($currentFiscalYear = $mathtool.sub($currentFYYear, 1))
78 78  #end
79 -## fiscalYear 未設定時はデフォルトとして現在の年度を使う
80 -#if(!$pageFiscalYear || $pageFiscalYear == '')
81 - #set($pageFiscalYear = $currentFiscalYear.toString())
82 -#end
83 83  
84 84  ## --- 公開範囲フィールド ---
85 85  #set($visibilityOrgChart = $!doc.getValue('visibilityOrgChart'))
... ... @@ -108,8 +108,12 @@
108 108  
109 109  ## --- 投稿固定/解除処理 ---
110 110  #set($pinAction = $!request.action)
111 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified') && $services.csrf.isTokenValid($request.form_token))
112 - #set($postObjNum = $mathtool.toInteger($!request.postObj))
105 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
106 + #set($pinPostObjStr = $!request.postObj)
107 + #if(!$pinPostObjStr.matches('^\d+$'))
108 + ## 不正な値 → 無視
109 + #else
110 + #set($postObjNum = $mathtool.toInteger($pinPostObjStr))
113 113   #set($postObj = $doc.getObject('SeitokaiCode.ActivityPostClass', $postObjNum))
114 114   #if($postObj)
115 115   #if($pinAction == 'pin')
... ... @@ -129,12 +129,15 @@
129 129   $response.sendRedirect($doc.getURL('view'))
130 130   #stop
131 131   #end
130 + #end## /matches
132 132  #end
133 133  
134 134  ## --- 特色ある活動 選定/解除処理 ---
135 135  #set($featAction = $!request.action)
136 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $services.csrf.isTokenValid($request.form_token))
137 - #set($actObjNum = $mathtool.toInteger($!request.actObj))
135 +#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
136 + #set($featActObjStr = $!request.actObj)
137 + #if($featActObjStr.matches('^\d+$'))
138 + #set($actObjNum = $mathtool.toInteger($featActObjStr))
138 138   #set($actObj = $doc.getObject('SeitokaiCode.ActivityClass', $actObjNum))
139 139   #if($actObj)
140 140   #if($featAction == 'feature')
... ... @@ -166,6 +166,7 @@
166 166   $response.sendRedirect($doc.getURL('view'))
167 167   #stop
168 168   #end
170 + #end## /matches
169 169  #end
170 170  
171 171  ## --- ユーザー情報取得 ---
... ... @@ -224,56 +224,27 @@
224 224   #end
225 225  #end
226 226  
227 -## --- 信頼性バッジ + ユーザー情報 ---
228 -<div class="seitokai-badge-container">
229 - ## 承認バッジ
230 - #if($authorAccountType == 'admin')
231 - <span class="badge badge-admin"><svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 管理者</span>
232 - #elseif($authorAccountType == 'verified')
233 - <span class="badge badge-verified"><svg class="ico" viewBox="0 0 24 24" stroke-width="2.5"><path d="M20 6L9 17l-5-5"/></svg> 承認済み</span>
234 - #elseif($authorAccountType == 'referred')
235 - <span class="badge badge-referred"><svg class="ico" viewBox="0 0 24 24"><path d="M10 13a5 5 0 007.54.54l3-3a5 5 0 00-7.07-7.07l-1.72 1.71"/><path d="M14 11a5 5 0 00-7.54-.54l-3 3a5 5 0 007.07 7.07l1.71-1.71"/></svg> 紹介</span>
236 - #else
237 - <span class="badge badge-general">一般</span>
238 - #end
239 - ## 役割バッジ
240 - #if($authorUserRole == 'student')
241 - <span class="badge badge-role-student"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 生徒</span>
242 - #set($authorIsOfficer = $!lastAuthorDoc.getValue('isOfficer'))
243 - #if($authorIsOfficer == 'true')
244 - <span class="badge badge-role-officer"><svg class="ico" viewBox="0 0 24 24"><path d="M12 2l3.09 6.26L22 9.27l-5 4.87 1.18 6.88L12 17.77l-6.18 3.25L7 14.14 2 9.27l6.91-1.01L12 2z"/></svg> 役員</span>
245 - #end
246 - #elseif($authorUserRole == 'teacher')
247 - <span class="badge badge-role-teacher"><svg class="ico" viewBox="0 0 24 24"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></svg> 教員</span>
248 - #elseif($authorUserRole == 'graduate')
249 - <span class="badge badge-role-graduate"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業生</span>
250 - #end
251 - ## 学年（生徒のみ公開）
252 - #if($authorGrade && $authorGrade != '')
253 - <span class="badge badge-grade">$authorGrade</span>
254 - #end
255 - ## 在籍状態（卒業・休学等の場合のみ表示）
256 - #if($authorUserStatus == 'graduated')
257 - <span class="badge badge-status-graduated"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業済み</span>
258 - #elseif($authorUserStatus == 'on_leave')
259 - <span class="badge badge-status-onleave"><svg class="ico" viewBox="0 0 24 24" fill="currentColor"><rect x="6" y="4" width="4" height="16" rx="1"/><rect x="14" y="4" width="4" height="16" rx="1"/></svg> 休学中</span>
260 - #elseif($authorUserStatus == 'transferred')
261 - <span class="badge badge-status-transferred"><svg class="ico" viewBox="0 0 24 24"><polyline points="23 4 23 10 17 10"/><polyline points="1 20 1 14 7 14"/><path d="M3.51 9a9 9 0 0114.85-3.36L23 10M1 14l4.64 4.36A9 9 0 0020.49 15"/></svg> 転校済み</span>
262 - #end
263 - ## 編集ボタン（権限があるユーザーのみ表示）
264 - #set($canEditSchool = false)
265 - #if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
266 - #set($canEditSchool = true)
267 - #end
268 - #if($canEditSchool)
229 +## --- 学校名見出し（XWikiデフォルトタイトルを非表示にし、学校名を表示） ---
230 +#if($schoolName && $schoolName != '')
231 +<style>.document-header { display: none !important; }</style>
232 +<h1 class="school-page-title">$!escapetool.xml($schoolName)</h1>
233 +#end
234 +
235 +## --- 編集ボタン（権限があるユーザーのみ表示） ---
236 +#set($canEditSchool = false)
237 +#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
238 + #set($canEditSchool = true)
239 +#end
240 +#if($canEditSchool)
241 +<div style="text-align:right; margin-bottom:12px;">
269 269   <a href="$doc.getURL('view', 'sheet=SeitokaiCode.SchoolEditForm')" class="btn-school-edit"><svg class="ico" viewBox="0 0 24 24"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 基本情報を編集</a>
270 - #end
271 271  </div>
244 +#end
272 272  
273 273  ## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） ---
274 274  <div class="school-info-grid">
275 275   <div class="school-info-card collapsed" id="card-basic-info">
276 - <h2 onclick="toggleInfoCard('card-basic-info')"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></svg> 学校基本情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
249 + <h2 role="button" tabindex="0" aria-expanded="false" onclick="toggleInfoCard('card-basic-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-basic-info')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></svg> 学校基本情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
277 277   <table class="wiki-table school-info-table">
278 278   <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
279 279   <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
... ... @@ -282,13 +282,18 @@
282 282   <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
283 283   <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
284 284   <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
285 - <tr><th>課程</th><td>#if($schoolSystem && $schoolSystem != '' && $schoolSystem != '[]')$!escapetool.xml($!schoolSystem)#end</td></tr>
258 + <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
286 286   <tr><th>公式サイト</th><td>#if($website && $website != '')<a href="$!escapetool.xml($website)" target="_blank" rel="noopener">$!escapetool.xml($website)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
287 287   </table>
261 + #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
262 + #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
263 + #if($infoEditDate && $infoEditDate != '')
264 + <div class="info-last-updated"><svg class="ico" viewBox="0 0 24 24"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 基本情報の最終更新: $!escapetool.xml($infoEditBy) — $!escapetool.xml($infoEditDate)</div>
265 + #end
288 288   </div>
289 289  
290 290   <div class="school-info-card collapsed" id="card-contact">
291 - <h2 onclick="toggleInfoCard('card-contact')"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M22 16.92v3a2 2 0 01-2.18 2 19.79 19.79 0 01-8.63-3.07 19.5 19.5 0 01-6-6 19.79 19.79 0 01-3.07-8.67A2 2 0 014.11 2h3a2 2 0 012 1.72c.127.96.361 1.903.7 2.81a2 2 0 01-.45 2.11L8.09 9.91a16 16 0 006 6l1.27-1.27a2 2 0 012.11-.45c.907.339 1.85.573 2.81.7A2 2 0 0122 16.92z"/></svg> 連絡先・SNS</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
269 + <h2 role="button" tabindex="0" aria-expanded="false" onclick="toggleInfoCard('card-contact')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-contact')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M22 16.92v3a2 2 0 01-2.18 2 19.79 19.79 0 01-8.63-3.07 19.5 19.5 0 01-6-6 19.79 19.79 0 01-3.07-8.67A2 2 0 014.11 2h3a2 2 0 012 1.72c.127.96.361 1.903.7 2.81a2 2 0 01-.45 2.11L8.09 9.91a16 16 0 006 6l1.27-1.27a2 2 0 012.11-.45c.907.339 1.85.573 2.81.7A2 2 0 0122 16.92z"/></svg> 連絡先・SNS</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
292 292   <table class="wiki-table school-info-table">
293 293   <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
294 294   <tr><th>生徒会Web</th><td>#if($seitokaiWebsite && $seitokaiWebsite != '')<a href="$!escapetool.xml($seitokaiWebsite)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> $!escapetool.xml($seitokaiWebsite)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
... ... @@ -335,7 +335,7 @@
335 335  
336 336  ## --- ③④⑤ 日常の活動・選挙・定例活動 ---
337 337  <div class="school-section-grid">
338 - #if($dailyActivities && $dailyActivities != '')
316 + #if($dailyActivities && !$dailyActivities.isEmpty())
339 339   <div class="school-section-card">
340 340   <h3><svg class="ico" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg> 日常の活動</h3>
341 341   <div class="card-inner">
... ... @@ -342,7 +342,7 @@
342 342   <p class="activity-hint">活動時間の多い順に上位3つ</p>
343 343   <div class="tag-container">
344 344   #set($daIdx = 1)
345 - #foreach($da in $dailyActivities.split(","))
323 + #foreach($da in $dailyActivities)
346 346   <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
347 347   #set($daIdx = $daIdx + 1)
348 348   #end
... ... @@ -393,7 +393,7 @@
393 393   #end
394 394  
395 395   ## --- ⑦ 予算 ---
396 - #set($hasBudget = ($budgetProcess && $budgetProcess != '') || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
374 + #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
397 397   #if($hasBudget)
398 398   ## 公開範囲チェック
399 399   #set($canViewBudget = true)
... ... @@ -404,12 +404,12 @@
404 404   <div class="school-section-card">
405 405   <h3><svg class="ico" viewBox="0 0 24 24"><line x1="12" y1="1" x2="12" y2="23"/><path d="M17 5H9.5a3.5 3.5 0 000 7h5a3.5 3.5 0 010 7H6"/></svg> 予算 #if($visibilityBudget != 'public')<span class="visibility-badge visibility-${visibilityBudget}">#if($visibilityBudget == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
406 406   <div class="card-inner">
407 - #if($budgetProcess && $budgetProcess != '')
385 + #if($budgetProcess && !$budgetProcess.isEmpty())
408 408   <div class="info-row">
409 409   <span class="info-label">作成過程の生徒関与</span>
410 410   <span class="info-value">
411 411   <div class="selection-display">
412 - #foreach($bp in $budgetProcess.split(","))
390 + #foreach($bp in $budgetProcess)
413 413   <span class="selection-item">$!escapetool.xml($bp.trim())</span>
414 414   #end
415 415   </div>
... ... @@ -428,12 +428,12 @@
428 428   <span class="info-value">$!escapetool.xml($!budgetScale)</span>
429 429   </div>
430 430   #end
431 - #if($budgetAllocation && $budgetAllocation != '')
409 + #if($budgetAllocation && !$budgetAllocation.isEmpty())
432 432   <div class="info-row">
433 433   <span class="info-label">主な予算配分</span>
434 434   <span class="info-value">
435 435   <div class="selection-display">
436 - #foreach($ba in $budgetAllocation.split(","))
414 + #foreach($ba in $budgetAllocation)
437 437   <span class="selection-item">$!escapetool.xml($ba.trim())</span>
438 438   #end
439 439   </div>
... ... @@ -466,12 +466,12 @@
466 466   <span class="info-label">見直しの有無（3年以内）</span>
467 467   <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
468 468   </div>
469 - #if($ruleReviewContent && $ruleReviewContent != '')
447 + #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
470 470   <div class="info-row">
471 471   <span class="info-label">見直しの内容</span>
472 472   <span class="info-value">
473 473   <div class="selection-display">
474 - #foreach($rc in $ruleReviewContent.split(","))
452 + #foreach($rc in $ruleReviewContent)
475 475   <span class="selection-item">$!escapetool.xml($rc.trim())</span>
476 476   #end
477 477   </div>
... ... @@ -478,12 +478,12 @@
478 478   </span>
479 479   </div>
480 480   #end
481 - #if($ruleReviewProposer && $ruleReviewProposer != '')
459 + #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
482 482   <div class="info-row">
483 483   <span class="info-label">見直しの提案者</span>
484 484   <span class="info-value">
485 485   <div class="selection-display">
486 - #foreach($rp in $ruleReviewProposer.split(","))
464 + #foreach($rp in $ruleReviewProposer)
487 487   <span class="selection-item">$!escapetool.xml($rp.trim())</span>
488 488   #end
489 489   </div>
... ... @@ -490,12 +490,12 @@
490 490   </span>
491 491   </div>
492 492   #end
493 - #if($ruleReviewImplementer && $ruleReviewImplementer != '')
471 + #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
494 494   <div class="info-row">
495 495   <span class="info-label">見直しの実施者</span>
496 496   <span class="info-value">
497 497   <div class="selection-display">
498 - #foreach($ri in $ruleReviewImplementer.split(","))
476 + #foreach($ri in $ruleReviewImplementer)
499 499   <span class="selection-item">$!escapetool.xml($ri.trim())</span>
500 500   #end
501 501   </div>
... ... @@ -657,7 +657,7 @@
657 657  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
658 658   <div class="activity-thread-header">
659 659   <div class="activity-thread-title">
660 - <h3 #if($actFeatured == '1')class="featured-title"#end>$!escapetool.xml($!actTitle) #if($actFeatured == '1')<svg class="ico ico-fixed-14" viewBox="0 0 24 24" fill="currentColor" stroke="none" class="ico-star-offset"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg>#end</h3>
638 + <h3 #if($actFeatured == '1')class="featured-title"#end>$!escapetool.xml($!actTitle) #if($actFeatured == '1')<svg class="ico ico-fixed-14 ico-star-offset" viewBox="0 0 24 24" fill="currentColor" stroke="none"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg>#end</h3>
661 661   <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
662 662   </div>
663 663   <div class="thread-meta-row">
... ... @@ -939,10 +939,10 @@
939 939  
940 940   #if($xcontext.user != "XWiki.XWikiGuest")
941 941   <div class="thread-add-post">
942 - <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
920 + <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
943 943   ＋ 活動報告を追加
944 944   </a>
945 - <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
923 + <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
946 946   <svg class="ico" viewBox="0 0 24 24"><path d="M21 15a2 2 0 01-2 2H7l-4 4V5a2 2 0 012-2h14a2 2 0 012 2z"/></svg> コメントを書く
947 947   </a>
948 948   </div>
... ... @@ -964,7 +964,7 @@
964 964  #if($xcontext.user != "XWiki.XWikiGuest")
965 965  {{html clean="false"}}
966 966  <div class="activity-add-section">
967 - <a href="/bin/view/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
945 + <a href="/bin/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
968 968   <svg class="ico" viewBox="0 0 24 24" stroke-width="2.5"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg> 活動を追加
969 969   </a>
970 970  </div>
... ... @@ -971,59 +971,6 @@
971 971  {{/html}}
972 972  #end
973 973  
974 -## --- 年度アーカイブ セクション ---
975 -{{html clean="false"}}
976 -<div class="school-section-card school-archive-card">
977 - <h2 class="archive-section-title">
978 - <svg class="ico ico-md" viewBox="0 0 24 24"><path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg>
979 - 年度アーカイブ
980 - </h2>
981 - <div class="archive-meta">
982 - 現在のページ: <strong>${pageFiscalYear}年度</strong>
983 - #set($lyud = $!doc.getValue('lastYearUpdateDate'))
984 - #if($lyud && $lyud != '')
985 - | 最終年度更新: $!escapetool.xml($lyud) ($!escapetool.xml($!doc.getValue('lastYearUpdateBy')))
986 - #end
987 - </div>
988 -
989 - ## 過去アーカイブの検索
990 - #set($archiveQuery = $services.query.hql("where doc.fullName like :pattern and doc.fullName like '%Archive_%' order by doc.fullName desc").bindValue("pattern", "${doc.fullName}.Archive_%").setLimit(20))
991 - #set($archivePages = $archiveQuery.execute())
992 -
993 - #if($archivePages && $archivePages.size() > 0)
994 - <div class="archive-card-field-lg">
995 - <div class="archive-list-label">過去の年度アーカイブ</div>
996 - <div class="archive-list">
997 - #foreach($archPage in $archivePages)
998 - #set($archPageDoc = $xwiki.getDocument($archPage))
999 - #set($archPageObj = $archPageDoc.getObject('SeitokaiCode.SchoolClass'))
1000 - #if($archPageObj)
1001 - #set($archPageFY = $!archPageObj.getValue('fiscalYear'))
1002 - <a href="$archPageDoc.getURL('view')" class="archive-link">
1003 - <svg class="ico" viewBox="0 0 24 24"><path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg>
1004 - ${archPageFY}年度
1005 - </a>
1006 - #end
1007 - #end
1008 - </div>
1009 - </div>
1010 - #else
1011 - <div class="archive-empty">過去のアーカイブはまだありません</div>
1012 - #end
1013 -
1014 - ## 新年度に移行ボタン（承認済み・管理者のみ）
1015 - #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
1016 - <div class="archive-action">
1017 - <a href="/bin/view/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" class="btn-accent">
1018 - <svg class="ico" viewBox="0 0 24 24" stroke-width="2.5"><path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg>
1019 - ${pageFiscalYear}年度をアーカイブして新年度に移行
1020 - </a>
1021 - <div class="archive-action-hint">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div>
1022 - </div>
1023 - #end
1024 -</div>
1025 -{{/html}}
1026 -
1027 1027  ## --- 年度タブ切り替え JavaScript ---
1028 1028  {{html clean="false"}}
1029 1029  <script>
... ... @@ -1040,14 +1040,12 @@
1040 1040   }
1041 1041   });
1042 1042  }
1043 -// ページ読み込み時にデフォルトで現在の年度を表示
968 +// ページ読み込み時の初期化
1044 1044  document.addEventListener('DOMContentLoaded', function() {
970 + // デフォルトで現在の年度を表示
1045 1045   var defaultTab = document.querySelector('.activity-fy-tab.active');
1046 1046   if (defaultTab) { defaultTab.click(); }
1047 1047   // 保存成功時のトースト通知
1048 - if (window.location.search.indexOf('archived=1') !== -1) {
1049 - showToast('年度アーカイブを作成しました', 'success');
1050 - }
1051 1051   if (window.location.search.indexOf('saved=1') !== -1) {
1052 1052   showToast('学校情報を保存しました', 'success');
1053 1053   // URLパラメータをクリーンアップ（リロード時に再表示されないよう）
... ... @@ -1083,6 +1083,9 @@
1083 1083   var card = document.getElementById(cardId);
1084 1084   if (!card) return;
1085 1085   card.classList.toggle('collapsed');
1009 + var isCollapsed = card.classList.contains('collapsed');
1010 + var h2 = card.querySelector('h2[role="button"]');
1011 + if (h2) h2.setAttribute('aria-expanded', !isCollapsed);
1086 1086  }
1087 1087  
1088 1088  // 投稿の編集（インライン編集フォームを開く）
... ... @@ -1114,7 +1114,9 @@
1114 1114   var csrfEl = document.querySelector('input[name="form_token"]');
1115 1115   var csrfToken = csrfEl ? csrfEl.value : '';
1116 1116   var xhr = new XMLHttpRequest();
1117 - xhr.open('GET', '/bin/view/SeitokaiCode/EditPost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken), true);
1043 + xhr.open('POST', '/bin/SeitokaiCode/EditPost?outputSyntax=plain', true);
1044 + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1045 + var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1118 1118   xhr.onload = function() {
1119 1119   try {
1120 1120   var res = JSON.parse(xhr.responseText);
... ... @@ -1127,7 +1127,7 @@
1127 1127   } catch(e) { alert('編集に失敗しました'); }
1128 1128   };
1129 1129   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1130 - xhr.send();
1058 + xhr.send(editPostData);
1131 1131  }
1132 1132  
1133 1133  // 投稿の削除（確認ダイアログ付き）
... ... @@ -1134,7 +1134,9 @@
1134 1134  function confirmDeletePost(schoolPage, postObjNum, token) {
1135 1135   if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1136 1136   var xhr = new XMLHttpRequest();
1137 - xhr.open('GET', '/bin/view/SeitokaiCode/DeletePost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token), true);
1065 + xhr.open('POST', '/bin/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1066 + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1067 + var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token);
1138 1138   xhr.onload = function() {
1139 1139   try {
1140 1140   var res = JSON.parse(xhr.responseText);
... ... @@ -1147,7 +1147,7 @@
1147 1147   } catch(e) { alert('削除に失敗しました'); }
1148 1148   };
1149 1149   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1150 - xhr.send();
1080 + xhr.send(deletePostData);
1151 1151  }
1152 1152  </script>
1153 1153  {{/html}}