Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 48.1 Icon
edited by Super Admin
on 2026/03/13 21:13
Change comment: There is no comment for this version
To version Icon 31.1 Icon
edited by Super Admin
on 2026/03/10 13:42
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -65,7 +65,9 @@
65 65  #set($seitokaiYoutube = $doc.getValue('seitokaiYoutube'))
66 66  #set($seitokaiOtherSns = $doc.getValue('seitokaiOtherSns'))
67 67  
68 -## --- 現在の年度を計算（4月始まり） ---
68 +## --- 年度アーカイブ ---
69 +#set($pageFiscalYear = $!doc.getValue('fiscalYear'))
70 +## 現在の年度を計算（4月始まり）
69 69  #set($nowFY = $datetool.date)
70 70  #set($currentFYMonth = $mathtool.toInteger($datetool.format('MM', $nowFY)))
71 71  #set($currentFYYear = $mathtool.toInteger($datetool.format('yyyy', $nowFY)))
... ... @@ -74,6 +74,10 @@
74 74  #else
75 75   #set($currentFiscalYear = $mathtool.sub($currentFYYear, 1))
76 76  #end
79 +## fiscalYear 未設定時はデフォルトとして現在の年度を使う
80 +#if(!$pageFiscalYear || $pageFiscalYear == '')
81 + #set($pageFiscalYear = $currentFiscalYear.toString())
82 +#end
77 77  
78 78  ## --- 公開範囲フィールド ---
79 79  #set($visibilityOrgChart = $!doc.getValue('visibilityOrgChart'))
... ... @@ -100,47 +100,10 @@
100 100   #end
101 101  #end
102 102  
103 -## --- 学校ページ非表示チェック ---
104 -#set($schoolHidden = $doc.getValue('hidden'))
105 -#if($schoolHidden == 1)
106 - #if($isViewerAdmin)
107 - ## 管理者: 黄色バナー + ページ内容は通常表示（プレビュー）
108 -<div class="school-hidden-banner admin">
109 - <svg class="ico" viewBox="0 0 24 24"><path d="M17.94 17.94A10.07 10.07 0 0112 20c-7 0-11-8-11-8a18.45 18.45 0 015.06-5.94M9.9 4.24A9.12 9.12 0 0112 4c7 0 11 8 11 8a18.5 18.5 0 01-2.16 3.19m-6.72-1.07a3 3 0 01-4.24-4.24"/><line x1="1" y1="1" x2="23" y2="23"/></svg>
110 - <div>
111 - <strong>このページは非表示になっています</strong>（管理者のみ閲覧可能）
112 - #set($hBy = $!doc.getValue('hiddenBy'))
113 - #set($hAt = $!doc.getValue('hiddenAt'))
114 - #set($hReason = $!doc.getValue('hiddenReason'))
115 - <div class="school-hidden-detail">
116 - 非表示: $!escapetool.xml($hAt) / $!escapetool.xml($hBy)
117 - #if($hReason && $hReason != '') ・ 理由: $!escapetool.xml($hReason)#end
118 - </div>
119 - <a href="$xwiki.getURL('SeitokaiAdmin.SchoolManagement', 'view')" style="color:#92400e;text-decoration:underline">学校ページ管理へ</a>
120 - </div>
121 -</div>
122 - #else
123 - ## 一般ユーザー・ゲスト: 非公開メッセージを表示して停止
124 -<div class="school-hidden-public">
125 - <svg class="ico" viewBox="0 0 24 24" style="width:2.5em;height:2.5em"><path d="M17.94 17.94A10.07 10.07 0 0112 20c-7 0-11-8-11-8a18.45 18.45 0 015.06-5.94M9.9 4.24A9.12 9.12 0 0112 4c7 0 11 8 11 8a18.5 18.5 0 01-2.16 3.19m-6.72-1.07a3 3 0 01-4.24-4.24"/><line x1="1" y1="1" x2="23" y2="23"/></svg>
126 - <h2>このページは現在公開されていません</h2>
127 - <p>このページは管理者により非公開に設定されています。</p>
128 - <a href="$xwiki.getURL('Schools.WebHome', 'view')" class="btn-back-list">学校一覧に戻る</a>
129 -</div>
130 -{{/html}}
131 -{{/velocity}}
132 -#stop
133 - #end
134 -#end
135 -
136 136  ## --- 投稿固定/解除処理 ---
137 137  #set($pinAction = $!request.action)
138 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
139 - #set($pinPostObjStr = $!request.postObj)
140 - #if(!$pinPostObjStr.matches('^\d+$'))
141 - ## 不正な値 → 無視
142 - #else
143 - #set($postObjNum = $mathtool.toInteger($pinPostObjStr))
111 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified') && $services.csrf.isTokenValid($request.form_token))
112 + #set($postObjNum = $mathtool.toInteger($!request.postObj))
144 144   #set($postObj = $doc.getObject('SeitokaiCode.ActivityPostClass', $postObjNum))
145 145   #if($postObj)
146 146   #if($pinAction == 'pin')
... ... @@ -160,15 +160,12 @@
160 160   $response.sendRedirect($doc.getURL('view'))
161 161   #stop
162 162   #end
163 - #end## /matches
164 164  #end
165 165  
166 166  ## --- 特色ある活動 選定/解除処理 ---
167 167  #set($featAction = $!request.action)
168 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
169 - #set($featActObjStr = $!request.actObj)
170 - #if($featActObjStr.matches('^\d+$'))
171 - #set($actObjNum = $mathtool.toInteger($featActObjStr))
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))
172 172   #set($actObj = $doc.getObject('SeitokaiCode.ActivityClass', $actObjNum))
173 173   #if($actObj)
174 174   #if($featAction == 'feature')
... ... @@ -200,7 +200,6 @@
200 200   $response.sendRedirect($doc.getURL('view'))
201 201   #stop
202 202   #end
203 - #end## /matches
204 204  #end
205 205  
206 206  ## --- ユーザー情報取得 ---
... ... @@ -259,27 +259,56 @@
259 259   #end
260 260  #end
261 261  
262 -## --- 学校名見出し（XWikiデフォルトタイトルを非表示にし、学校名を表示） ---
263 -#if($schoolName && $schoolName != '')
264 -<style>.document-header { display: none !important; }</style>
265 -<h1 class="school-page-title">$!escapetool.xml($schoolName)</h1>
266 -#end
267 -
268 -## --- 編集ボタン（権限があるユーザーのみ表示） ---
269 -#set($canEditSchool = false)
270 -#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
271 - #set($canEditSchool = true)
272 -#end
273 -#if($canEditSchool)
274 -<div style="text-align:right; margin-bottom:12px;">
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)
275 275   <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
276 276  </div>
277 -#end
278 278  
279 279  ## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） ---
280 280  <div class="school-info-grid">
281 281   <div class="school-info-card collapsed" id="card-basic-info">
282 - <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>
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>
283 283   <table class="wiki-table school-info-table">
284 284   <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
285 285   <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
... ... @@ -288,7 +288,7 @@
288 288   <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
289 289   <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
290 290   <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
291 - <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
285 + <tr><th>課程</th><td>#if($schoolSystem && $schoolSystem != '' && $schoolSystem != '[]')$!escapetool.xml($!schoolSystem)#end</td></tr>
292 292   <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>
293 293   </table>
294 294   #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
... ... @@ -299,7 +299,7 @@
299 299   </div>
300 300  
301 301   <div class="school-info-card collapsed" id="card-contact">
302 - <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>
296 + <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>
303 303   <table class="wiki-table school-info-table">
304 304   <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
305 305   <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>
... ... @@ -346,7 +346,7 @@
346 346  
347 347  ## --- ③④⑤ 日常の活動・選挙・定例活動 ---
348 348  <div class="school-section-grid">
349 - #if($dailyActivities && !$dailyActivities.isEmpty())
343 + #if($dailyActivities && $dailyActivities != '')
350 350   <div class="school-section-card">
351 351   <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>
352 352   <div class="card-inner">
... ... @@ -353,7 +353,7 @@
353 353   <p class="activity-hint">活動時間の多い順に上位3つ</p>
354 354   <div class="tag-container">
355 355   #set($daIdx = 1)
356 - #foreach($da in $dailyActivities)
350 + #foreach($da in $dailyActivities.split(","))
357 357   <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
358 358   #set($daIdx = $daIdx + 1)
359 359   #end
... ... @@ -404,7 +404,7 @@
404 404   #end
405 405  
406 406   ## --- ⑦ 予算 ---
407 - #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
401 + #set($hasBudget = ($budgetProcess && $budgetProcess != '') || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
408 408   #if($hasBudget)
409 409   ## 公開範囲チェック
410 410   #set($canViewBudget = true)
... ... @@ -415,12 +415,12 @@
415 415   <div class="school-section-card">
416 416   <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>
417 417   <div class="card-inner">
418 - #if($budgetProcess && !$budgetProcess.isEmpty())
412 + #if($budgetProcess && $budgetProcess != '')
419 419   <div class="info-row">
420 420   <span class="info-label">作成過程の生徒関与</span>
421 421   <span class="info-value">
422 422   <div class="selection-display">
423 - #foreach($bp in $budgetProcess)
417 + #foreach($bp in $budgetProcess.split(","))
424 424   <span class="selection-item">$!escapetool.xml($bp.trim())</span>
425 425   #end
426 426   </div>
... ... @@ -439,12 +439,12 @@
439 439   <span class="info-value">$!escapetool.xml($!budgetScale)</span>
440 440   </div>
441 441   #end
442 - #if($budgetAllocation && !$budgetAllocation.isEmpty())
436 + #if($budgetAllocation && $budgetAllocation != '')
443 443   <div class="info-row">
444 444   <span class="info-label">主な予算配分</span>
445 445   <span class="info-value">
446 446   <div class="selection-display">
447 - #foreach($ba in $budgetAllocation)
441 + #foreach($ba in $budgetAllocation.split(","))
448 448   <span class="selection-item">$!escapetool.xml($ba.trim())</span>
449 449   #end
450 450   </div>
... ... @@ -477,12 +477,12 @@
477 477   <span class="info-label">見直しの有無（3年以内）</span>
478 478   <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
479 479   </div>
480 - #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
474 + #if($ruleReviewContent && $ruleReviewContent != '')
481 481   <div class="info-row">
482 482   <span class="info-label">見直しの内容</span>
483 483   <span class="info-value">
484 484   <div class="selection-display">
485 - #foreach($rc in $ruleReviewContent)
479 + #foreach($rc in $ruleReviewContent.split(","))
486 486   <span class="selection-item">$!escapetool.xml($rc.trim())</span>
487 487   #end
488 488   </div>
... ... @@ -489,12 +489,12 @@
489 489   </span>
490 490   </div>
491 491   #end
492 - #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
486 + #if($ruleReviewProposer && $ruleReviewProposer != '')
493 493   <div class="info-row">
494 494   <span class="info-label">見直しの提案者</span>
495 495   <span class="info-value">
496 496   <div class="selection-display">
497 - #foreach($rp in $ruleReviewProposer)
491 + #foreach($rp in $ruleReviewProposer.split(","))
498 498   <span class="selection-item">$!escapetool.xml($rp.trim())</span>
499 499   #end
500 500   </div>
... ... @@ -501,12 +501,12 @@
501 501   </span>
502 502   </div>
503 503   #end
504 - #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
498 + #if($ruleReviewImplementer && $ruleReviewImplementer != '')
505 505   <div class="info-row">
506 506   <span class="info-label">見直しの実施者</span>
507 507   <span class="info-value">
508 508   <div class="selection-display">
509 - #foreach($ri in $ruleReviewImplementer)
503 + #foreach($ri in $ruleReviewImplementer.split(","))
510 510   <span class="selection-item">$!escapetool.xml($ri.trim())</span>
511 511   #end
512 512   </div>
... ... @@ -668,7 +668,7 @@
668 668  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
669 669   <div class="activity-thread-header">
670 670   <div class="activity-thread-title">
671 - <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>
665 + <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>
672 672   <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
673 673   </div>
674 674   <div class="thread-meta-row">
... ... @@ -798,6 +798,9 @@
798 798   #elseif($postUserRole == 'graduate')
799 799   <span class="badge badge-role-graduate badge-sm"><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>
800 800   #end
795 + #if($postGrade && $postGrade != '')
796 + <span class="badge badge-grade badge-sm">$postGrade</span>
797 + #end
801 801   </span>
802 802   <span class="thread-post-date">$!postDate</span>
803 803   #set($postEdited = $!post.getValue('edited'))
... ... @@ -947,10 +947,10 @@
947 947  
948 948   #if($xcontext.user != "XWiki.XWikiGuest")
949 949   <div class="thread-add-post">
950 - <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
947 + <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
951 951   ＋ 活動報告を追加
952 952   </a>
953 - <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
950 + <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
954 954   <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> コメントを書く
955 955   </a>
956 956   </div>
... ... @@ -972,7 +972,7 @@
972 972  #if($xcontext.user != "XWiki.XWikiGuest")
973 973  {{html clean="false"}}
974 974  <div class="activity-add-section">
975 - <a href="/bin/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
972 + <a href="/bin/view/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
976 976   <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> 活動を追加
977 977   </a>
978 978  </div>
... ... @@ -979,6 +979,59 @@
979 979  {{/html}}
980 980  #end
981 981  
979 +## --- 年度アーカイブ セクション ---
980 +{{html clean="false"}}
981 +<div class="school-section-card school-archive-card">
982 + <h2 class="archive-section-title">
983 + <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>
984 + 年度アーカイブ
985 + </h2>
986 + <div class="archive-meta">
987 + 現在のページ: <strong>${pageFiscalYear}年度</strong>
988 + #set($lyud = $!doc.getValue('lastYearUpdateDate'))
989 + #if($lyud && $lyud != '')
990 + | 最終年度更新: $!escapetool.xml($lyud) ($!escapetool.xml($!doc.getValue('lastYearUpdateBy')))
991 + #end
992 + </div>
993 +
994 + ## 過去アーカイブの検索
995 + #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))
996 + #set($archivePages = $archiveQuery.execute())
997 +
998 + #if($archivePages && $archivePages.size() > 0)
999 + <div class="archive-card-field-lg">
1000 + <div class="archive-list-label">過去の年度アーカイブ</div>
1001 + <div class="archive-list">
1002 + #foreach($archPage in $archivePages)
1003 + #set($archPageDoc = $xwiki.getDocument($archPage))
1004 + #set($archPageObj = $archPageDoc.getObject('SeitokaiCode.SchoolClass'))
1005 + #if($archPageObj)
1006 + #set($archPageFY = $!archPageObj.getValue('fiscalYear'))
1007 + <a href="$archPageDoc.getURL('view')" class="archive-link">
1008 + <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>
1009 + ${archPageFY}年度
1010 + </a>
1011 + #end
1012 + #end
1013 + </div>
1014 + </div>
1015 + #else
1016 + <div class="archive-empty">過去のアーカイブはまだありません</div>
1017 + #end
1018 +
1019 + ## 新年度に移行ボタン（承認済み・管理者のみ）
1020 + #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
1021 + <div class="archive-action">
1022 + <a href="/bin/view/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" class="btn-accent">
1023 + <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>
1024 + ${pageFiscalYear}年度をアーカイブして新年度に移行
1025 + </a>
1026 + <div class="archive-action-hint">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div>
1027 + </div>
1028 + #end
1029 +</div>
1030 +{{/html}}
1031 +
982 982  ## --- 年度タブ切り替え JavaScript ---
983 983  {{html clean="false"}}
984 984  <script>
... ... @@ -995,12 +995,14 @@
995 995   }
996 996   });
997 997  }
998 -// ページ読み込み時の初期化
1048 +// ページ読み込み時にデフォルトで現在の年度を表示
999 999  document.addEventListener('DOMContentLoaded', function() {
1000 - // デフォルトで現在の年度を表示
1001 1001   var defaultTab = document.querySelector('.activity-fy-tab.active');
1002 1002   if (defaultTab) { defaultTab.click(); }
1003 1003   // 保存成功時のトースト通知
1053 + if (window.location.search.indexOf('archived=1') !== -1) {
1054 + showToast('年度アーカイブを作成しました', 'success');
1055 + }
1004 1004   if (window.location.search.indexOf('saved=1') !== -1) {
1005 1005   showToast('学校情報を保存しました', 'success');
1006 1006   // URLパラメータをクリーンアップ（リロード時に再表示されないよう）
... ... @@ -1036,9 +1036,6 @@
1036 1036   var card = document.getElementById(cardId);
1037 1037   if (!card) return;
1038 1038   card.classList.toggle('collapsed');
1039 - var isCollapsed = card.classList.contains('collapsed');
1040 - var h2 = card.querySelector('h2[role="button"]');
1041 - if (h2) h2.setAttribute('aria-expanded', !isCollapsed);
1042 1042  }
1043 1043  
1044 1044  // 投稿の編集（インライン編集フォームを開く）
... ... @@ -1070,9 +1070,7 @@
1070 1070   var csrfEl = document.querySelector('input[name="form_token"]');
1071 1071   var csrfToken = csrfEl ? csrfEl.value : '';
1072 1072   var xhr = new XMLHttpRequest();
1073 - xhr.open('POST', '/bin/SeitokaiCode/EditPost?outputSyntax=plain', true);
1074 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1075 - var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1122 + xhr.open('GET', '/bin/view/SeitokaiCode/EditPost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken), true);
1076 1076   xhr.onload = function() {
1077 1077   try {
1078 1078   var res = JSON.parse(xhr.responseText);
... ... @@ -1085,7 +1085,7 @@
1085 1085   } catch(e) { alert('編集に失敗しました'); }
1086 1086   };
1087 1087   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1088 - xhr.send(editPostData);
1135 + xhr.send();
1089 1089  }
1090 1090  
1091 1091  // 投稿の削除（確認ダイアログ付き）
... ... @@ -1092,9 +1092,7 @@
1092 1092  function confirmDeletePost(schoolPage, postObjNum, token) {
1093 1093   if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1094 1094   var xhr = new XMLHttpRequest();
1095 - xhr.open('POST', '/bin/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1096 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1097 - var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token);
1142 + xhr.open('GET', '/bin/view/SeitokaiCode/DeletePost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token), true);
1098 1098   xhr.onload = function() {
1099 1099   try {
1100 1100   var res = JSON.parse(xhr.responseText);
... ... @@ -1107,7 +1107,7 @@
1107 1107   } catch(e) { alert('削除に失敗しました'); }
1108 1108   };
1109 1109   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1110 - xhr.send(deletePostData);
1155 + xhr.send();
1111 1111  }
1112 1112  </script>
1113 1113  {{/html}}