Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 52.1 Icon
edited by Super Admin
on 2026/03/14 16:51
Change comment: There is no comment for this version
To version Icon 29.1 Icon
edited by Super Admin
on 2026/03/10 13:11
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,45 +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 -#stop
131 - #end
132 -#end
133 -
134 134  ## --- 投稿固定/解除処理 ---
135 135  #set($pinAction = $!request.action)
136 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
137 - #set($pinPostObjStr = $!request.postObj)
138 - #if(!$pinPostObjStr.matches('^\d+$'))
139 - ## 不正な値 → 無視
140 - #else
141 - #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))
142 142   #set($postObj = $doc.getObject('SeitokaiCode.ActivityPostClass', $postObjNum))
143 143   #if($postObj)
144 144   #if($pinAction == 'pin')
... ... @@ -158,15 +158,12 @@
158 158   $response.sendRedirect($doc.getURL('view'))
159 159   #stop
160 160   #end
161 - #end## /matches
162 162  #end
163 163  
164 164  ## --- 特色ある活動 選定/解除処理 ---
165 165  #set($featAction = $!request.action)
166 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
167 - #set($featActObjStr = $!request.actObj)
168 - #if($featActObjStr.matches('^\d+$'))
169 - #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))
170 170   #set($actObj = $doc.getObject('SeitokaiCode.ActivityClass', $actObjNum))
171 171   #if($actObj)
172 172   #if($featAction == 'feature')
... ... @@ -198,13 +198,12 @@
198 198   $response.sendRedirect($doc.getURL('view'))
199 199   #stop
200 200   #end
201 - #end## /matches
202 202  #end
203 203  
204 204  ## --- ユーザー情報取得 ---
205 205  ## displayName: Wiki上の表示名（ニックネーム）。本名(firstName/lastName)は管理者のみ閲覧可能。
206 206  #set($lastAuthor = $doc.author)
207 -#set($lastAuthorDoc = $xwiki.getDocument($lastAuthor))
174 +#set($lastAuthorDoc = $xwiki.getDocument("XWiki.${lastAuthor}"))
208 208  #set($authorAccountType = '')
209 209  #set($authorUserRole = '')
210 210  #set($authorUserStatus = '')
... ... @@ -257,282 +257,319 @@
257 257   #end
258 258  #end
259 259  
260 -## --- 学校名見出し（XWikiデフォルトタイトルを非表示にし、学校名を表示） ---
261 -#if($schoolName && $schoolName != '')
262 -<style>.document-header { display: none !important; }</style>
263 -<h1 class="school-page-title">$!escapetool.xml($schoolName)</h1>
264 -#end
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 + <span class="badge-info">最終編集: $!escapetool.xml($authorDisplayName) ($xwiki.formatDate($doc.date, "yyyy/MM/dd"))</span>
264 + ## 編集ボタン（権限があるユーザーのみ表示）
265 + #set($canEditSchool = false)
266 + #if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
267 + #set($canEditSchool = true)
268 + #end
269 + #if($canEditSchool)
270 + <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>
271 + #end
272 +</div>
265 265  
266 -## --- 編集ボタン（権限があるユーザーのみ表示） ---
267 -#set($canEditSchool = false)
268 -#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
269 - #set($canEditSchool = true)
270 -#end
271 -#if($canEditSchool)
272 -<div style="text-align:right; margin-bottom:12px;">
273 - <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>
274 +## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） ---
275 +<div class="school-info-grid">
276 + <div class="school-info-card collapsed" id="card-basic-info">
277 + <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>
278 + <table class="wiki-table school-info-table">
279 + <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
280 + <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
281 + <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
282 + <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
283 + <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
284 + <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
285 + <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
286 + <tr><th>課程</th><td>#if($schoolSystem && $schoolSystem != '' && $schoolSystem != '[]')$!escapetool.xml($!schoolSystem)#end</td></tr>
287 + <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>
288 + </table>
289 + #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
290 + #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
291 + #if($infoEditDate && $infoEditDate != '')
292 + <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>
293 + #end
294 + </div>
295 +
296 + <div class="school-info-card collapsed" id="card-contact">
297 + <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>
298 + <table class="wiki-table school-info-table">
299 + <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
300 + <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>
301 + <tr><th>X (Twitter)</th><td>#if($seitokaiTwitter && $seitokaiTwitter != '')<a href="https://x.com/$!escapetool.url($seitokaiTwitter)" target="_blank" rel="noopener">𝕏 @$!escapetool.xml($seitokaiTwitter)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
302 + <tr><th>Instagram</th><td>#if($seitokaiInstagram && $seitokaiInstagram != '')<a href="https://instagram.com/$!escapetool.url($seitokaiInstagram)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><path d="M23 19a2 2 0 01-2 2H3a2 2 0 01-2-2V8a2 2 0 012-2h4l2-3h6l2 3h4a2 2 0 012 2z"/><circle cx="12" cy="13" r="4"/></svg> @$!escapetool.xml($seitokaiInstagram)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
303 + <tr><th>YouTube</th><td>#if($seitokaiYoutube && $seitokaiYoutube != '')<a href="$!escapetool.xml($seitokaiYoutube)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><polygon points="5 3 19 12 5 21 5 3"/></svg> YouTubeチャンネル</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
304 + <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
305 + </table>
306 + </div>
274 274  </div>
275 -#end
276 276  
277 -## --- ① 学校基本情報 ---
278 -<div class="school-info-card collapsed" id="card-basic-info">
279 - <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>
280 - <table class="wiki-table school-info-table">
281 - <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
282 - <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
283 - <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
284 - <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
285 - <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
286 - <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
287 - <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
288 - <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
289 - <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>
290 - </table>
291 - #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
292 - #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
293 - #if($infoEditDate && $infoEditDate != '')
294 - <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>
295 - #end
309 +## --- 生徒会情報アコーディオン ---
310 +<div class="school-section-divider">
311 + <button class="shortcut-btn shortcut-btn-secondary" onclick="var sec=document.getElementById('seitokai-info-section');sec.classList.toggle('open');this.querySelector('.shortcut-arrow').textContent=sec.classList.contains('open')?'▲':'▼';">
312 + <svg class="ico ico-md" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/></svg>
313 + 生徒会情報を見る <span class="shortcut-arrow">▼</span>
314 + </button>
296 296  </div>
297 297  
298 -## --- ② 生徒会基本情報（折りたたみカード） ---
299 -<div class="school-info-card" id="card-seitokai-info">
300 - <h2 role="button" tabindex="0" aria-expanded="true" onclick="toggleInfoCard('card-seitokai-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-seitokai-info')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/></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>
301 - <div class="seitokai-info-body">
317 +<div id="seitokai-info-section" class="seitokai-info-accordion">
302 302  
303 - ## --- 組織図 ---
304 - #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
305 - #if($hasOrgContent)
306 - #set($canViewOrgChart = true)
307 - #if($visibilityOrgChart == 'members' && $isGuest) #set($canViewOrgChart = false)
308 - #elseif($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false)
309 - #end
310 - #if($canViewOrgChart)
311 - <div class="seitokai-subsection">
312 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/><line x1="9" y1="10" x2="9" y2="10.01"/><line x1="15" y1="10" x2="15" y2="10.01"/><line x1="9" y1="14" x2="9" y2="14.01"/><line x1="15" y1="14" x2="15" y2="14.01"/></svg> 組織図 #if($visibilityOrgChart != 'public')<span class="visibility-badge visibility-${visibilityOrgChart}">#if($visibilityOrgChart == '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>
313 - <div class="seitokai-subsection-content">
314 - #if($orgChartImage && $orgChartImage != '')
315 - <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
316 - #end
317 - #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
318 - </div>
319 - </div>
320 - #else
321 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 組織図は #if($visibilityOrgChart == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
322 - #end
319 +## --- ② 組織図 ---
320 +#set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
321 +#if($hasOrgContent)
322 + ## 公開範囲チェック
323 + #set($canViewOrgChart = true)
324 + #if($visibilityOrgChart == 'members' && $isGuest) #set($canViewOrgChart = false)
325 + #elseif($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false)
326 + #end
327 + #if($canViewOrgChart)
328 +<h2 class="section-title"><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/><line x1="9" y1="10" x2="9" y2="10.01"/><line x1="15" y1="10" x2="15" y2="10.01"/><line x1="9" y1="14" x2="9" y2="14.01"/><line x1="15" y1="14" x2="15" y2="14.01"/></svg> 組織図 #if($visibilityOrgChart != 'public')<span class="visibility-badge visibility-${visibilityOrgChart}">#if($visibilityOrgChart == '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</h2>
329 +<div class="school-section-card">
330 + <div class="card-inner">
331 + #if($orgChartImage && $orgChartImage != '')
332 + <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
323 323   #end
334 + #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
335 + </div>
336 +</div>
337 + #else
338 +<div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 組織図は #if($visibilityOrgChart == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
339 + #end
340 +#end
324 324  
325 - ## --- 日常の活動 ---
326 - #if($dailyActivities && !$dailyActivities.isEmpty())
327 - <div class="seitokai-subsection">
328 - <h3 class="seitokai-subsection-title"><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>
329 - <div class="seitokai-subsection-content">
330 - <p class="activity-hint">活動時間の多い順に上位3つ</p>
331 - <div class="tag-container">
332 - #set($daIdx = 1)
333 - #foreach($da in $dailyActivities)
334 - <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
335 - #set($daIdx = $daIdx + 1)
336 - #end
337 - </div>
338 - #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
339 - <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
342 +## --- ③④⑤ 日常の活動・選挙・定例活動 ---
343 +<div class="school-section-grid">
344 + #if($dailyActivities && $dailyActivities != '')
345 + <div class="school-section-card">
346 + <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>
347 + <div class="card-inner">
348 + <p class="activity-hint">活動時間の多い順に上位3つ</p>
349 + <div class="tag-container">
350 + #set($daIdx = 1)
351 + #foreach($da in $dailyActivities.split(","))
352 + <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
353 + #set($daIdx = $daIdx + 1)
340 340   #end
341 341   </div>
356 + #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
357 + <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
358 + #end
342 342   </div>
343 - #end
360 + </div>
361 + #end
344 344  
345 - ## --- 選挙 ---
346 - #if($electionExists && $electionExists != '')
347 - <div class="seitokai-subsection">
348 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M7 13l3 3 7-7"/></svg> 選挙</h3>
349 - <div class="seitokai-subsection-content">
350 - <div class="info-row">
351 - <span class="info-label">役員選挙</span>
352 - <span class="info-value">$!escapetool.xml($!electionExists)</span>
353 - </div>
354 - #if($electionType && $electionType != '')
355 - <div class="info-row">
356 - <span class="info-label">直近の選挙方式</span>
357 - <span class="info-value">$!escapetool.xml($!electionType)</span>
358 - </div>
359 - #end
360 - #if($electionNote && $electionNote.trim() != '')
361 - <div class="free-note">$!escapetool.xml($electionNote)</div>
362 - #end
363 + #if($electionExists && $electionExists != '')
364 + <div class="school-section-card">
365 + <h3><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M7 13l3 3 7-7"/></svg> 選挙</h3>
366 + <div class="card-inner">
367 + <div class="info-row">
368 + <span class="info-label">役員選挙</span>
369 + <span class="info-value">$!escapetool.xml($!electionExists)</span>
363 363   </div>
371 + #if($electionType && $electionType != '')
372 + <div class="info-row">
373 + <span class="info-label">直近の選挙方式</span>
374 + <span class="info-value">$!escapetool.xml($!electionType)</span>
375 + </div>
376 + #end
377 + #if($electionNote && $electionNote.trim() != '')
378 + <div class="free-note">$!escapetool.xml($electionNote)</div>
379 + #end
364 364   </div>
365 - #end
381 + </div>
382 + #end
383 +</div>
366 366  
367 - ## --- 定例活動 ---
368 - #if($meetingFrequency && $meetingFrequency != '')
369 - <div class="seitokai-subsection">
370 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 定例活動</h3>
371 - <div class="seitokai-subsection-content">
372 - <div class="info-row">
373 - <span class="info-label">役員定例会の頻度</span>
374 - <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
375 - </div>
376 - #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
377 - <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
378 - #end
385 +<div class="school-section-grid">
386 + #if($meetingFrequency && $meetingFrequency != '')
387 + <div class="school-section-card">
388 + <h3><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 定例活動</h3>
389 + <div class="card-inner">
390 + <div class="info-row">
391 + <span class="info-label">役員定例会の頻度</span>
392 + <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
379 379   </div>
394 + #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
395 + <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
396 + #end
380 380   </div>
381 - #end
398 + </div>
399 + #end
382 382  
383 - ## --- 予算 ---
384 - #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
385 - #if($hasBudget)
386 - #set($canViewBudget = true)
387 - #if($visibilityBudget == 'members' && $isGuest) #set($canViewBudget = false)
388 - #elseif($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewBudget = false)
401 + ## --- ⑦ 予算 ---
402 + #set($hasBudget = ($budgetProcess && $budgetProcess != '') || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
403 + #if($hasBudget)
404 + ## 公開範囲チェック
405 + #set($canViewBudget = true)
406 + #if($visibilityBudget == 'members' && $isGuest) #set($canViewBudget = false)
407 + #elseif($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewBudget = false)
408 + #end
409 + #if($canViewBudget)
410 + <div class="school-section-card">
411 + <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>
412 + <div class="card-inner">
413 + #if($budgetProcess && $budgetProcess != '')
414 + <div class="info-row">
415 + <span class="info-label">作成過程の生徒関与</span>
416 + <span class="info-value">
417 + <div class="selection-display">
418 + #foreach($bp in $budgetProcess.split(","))
419 + <span class="selection-item">$!escapetool.xml($bp.trim())</span>
420 + #end
421 + </div>
422 + </span>
423 + </div>
389 389   #end
390 - #if($canViewBudget)
391 - <div class="seitokai-subsection">
392 - <h3 class="seitokai-subsection-title"><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>
393 - <div class="seitokai-subsection-content">
394 - #if($budgetProcess && !$budgetProcess.isEmpty())
395 - <div class="info-row">
396 - <span class="info-label">作成過程の生徒関与</span>
397 - <span class="info-value">
398 - <div class="selection-display">
399 - #foreach($bp in $budgetProcess)
400 - <span class="selection-item">$!escapetool.xml($bp.trim())</span>
401 - #end
402 - </div>
403 - </span>
404 - </div>
405 - #end
406 - #if($studentFee && $studentFee != '')
407 - <div class="info-row">
408 - <span class="info-label">生徒会費（年額）</span>
409 - <span class="info-value">$!escapetool.xml($!studentFee)</span>
410 - </div>
411 - #end
412 - #if($budgetScale && $budgetScale != '')
413 - <div class="info-row">
414 - <span class="info-label">予算規模</span>
415 - <span class="info-value">$!escapetool.xml($!budgetScale)</span>
416 - </div>
417 - #end
418 - #if($budgetAllocation && !$budgetAllocation.isEmpty())
419 - <div class="info-row">
420 - <span class="info-label">主な予算配分</span>
421 - <span class="info-value">
422 - <div class="selection-display">
423 - #foreach($ba in $budgetAllocation)
424 - <span class="selection-item">$!escapetool.xml($ba.trim())</span>
425 - #end
426 - </div>
427 - </span>
428 - </div>
429 - #end
430 - #if($budgetNote && $budgetNote.trim() != '')
431 - <div class="free-note">$!escapetool.xml($budgetNote)</div>
432 - #end
425 + #if($studentFee && $studentFee != '')
426 + <div class="info-row">
427 + <span class="info-label">生徒会費（年額）</span>
428 + <span class="info-value">$!escapetool.xml($!studentFee)</span>
433 433   </div>
434 - </div>
435 - #else
436 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 予算情報は #if($visibilityBudget == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
437 437   #end
431 + #if($budgetScale && $budgetScale != '')
432 + <div class="info-row">
433 + <span class="info-label">予算規模</span>
434 + <span class="info-value">$!escapetool.xml($!budgetScale)</span>
435 + </div>
436 + #end
437 + #if($budgetAllocation && $budgetAllocation != '')
438 + <div class="info-row">
439 + <span class="info-label">主な予算配分</span>
440 + <span class="info-value">
441 + <div class="selection-display">
442 + #foreach($ba in $budgetAllocation.split(","))
443 + <span class="selection-item">$!escapetool.xml($ba.trim())</span>
444 + #end
445 + </div>
446 + </span>
447 + </div>
448 + #end
449 + #if($budgetNote && $budgetNote.trim() != '')
450 + <div class="free-note">$!escapetool.xml($budgetNote)</div>
451 + #end
452 + </div>
453 + </div>
454 + #else
455 + <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 予算情報は #if($visibilityBudget == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
438 438   #end
457 + #end
458 +</div>
439 439  
440 - ## --- 校則の見直し ---
441 - #if($ruleReviewStatus && $ruleReviewStatus != '')
442 - #set($canViewRuleReview = true)
443 - #if($visibilityRuleReview == 'members' && $isGuest) #set($canViewRuleReview = false)
444 - #elseif($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false)
445 - #end
446 - #if($canViewRuleReview)
447 - <div class="seitokai-subsection">
448 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M16 4h2a2 2 0 012 2v12a2 2 0 01-2 2h-2"/><path d="M8 4H6a2 2 0 00-2 2v12a2 2 0 002 2h2"/><line x1="12" y1="4" x2="12" y2="8"/><line x1="12" y1="16" x2="12" y2="20"/><line x1="8" y1="8" x2="16" y2="8"/><line x1="8" y1="16" x2="16" y2="16"/></svg> 校則の見直し #if($visibilityRuleReview != 'public')<span class="visibility-badge visibility-${visibilityRuleReview}">#if($visibilityRuleReview == '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>
449 - <div class="seitokai-subsection-content">
450 - <div class="info-row">
451 - <span class="info-label">見直しの有無（3年以内）</span>
452 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
460 +## --- ⑧ 校則の見直し ---
461 +#if($ruleReviewStatus && $ruleReviewStatus != '')
462 + ## 公開範囲チェック
463 + #set($canViewRuleReview = true)
464 + #if($visibilityRuleReview == 'members' && $isGuest) #set($canViewRuleReview = false)
465 + #elseif($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false)
466 + #end
467 + #if($canViewRuleReview)
468 +<h2 class="section-title"><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M16 4h2a2 2 0 012 2v12a2 2 0 01-2 2h-2"/><path d="M8 4H6a2 2 0 00-2 2v12a2 2 0 002 2h2"/><line x1="12" y1="4" x2="12" y2="8"/><line x1="12" y1="16" x2="12" y2="20"/><line x1="8" y1="8" x2="16" y2="8"/><line x1="8" y1="16" x2="16" y2="16"/></svg> 校則の見直し #if($visibilityRuleReview != 'public')<span class="visibility-badge visibility-${visibilityRuleReview}">#if($visibilityRuleReview == '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</h2>
469 +<div class="school-section-card">
470 + <div class="card-inner">
471 + <div class="info-row">
472 + <span class="info-label">見直しの有無（3年以内）</span>
473 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
474 + </div>
475 + #if($ruleReviewContent && $ruleReviewContent != '')
476 + <div class="info-row">
477 + <span class="info-label">見直しの内容</span>
478 + <span class="info-value">
479 + <div class="selection-display">
480 + #foreach($rc in $ruleReviewContent.split(","))
481 + <span class="selection-item">$!escapetool.xml($rc.trim())</span>
482 + #end
453 453   </div>
454 - #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
455 - <div class="info-row">
456 - <span class="info-label">見直しの内容</span>
457 - <span class="info-value">
458 - <div class="selection-display">
459 - #foreach($rc in $ruleReviewContent)
460 - <span class="selection-item">$!escapetool.xml($rc.trim())</span>
461 - #end
462 - </div>
463 - </span>
484 + </span>
485 + </div>
486 + #end
487 + #if($ruleReviewProposer && $ruleReviewProposer != '')
488 + <div class="info-row">
489 + <span class="info-label">見直しの提案者</span>
490 + <span class="info-value">
491 + <div class="selection-display">
492 + #foreach($rp in $ruleReviewProposer.split(","))
493 + <span class="selection-item">$!escapetool.xml($rp.trim())</span>
494 + #end
464 464   </div>
465 - #end
466 - #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
467 - <div class="info-row">
468 - <span class="info-label">見直しの提案者</span>
469 - <span class="info-value">
470 - <div class="selection-display">
471 - #foreach($rp in $ruleReviewProposer)
472 - <span class="selection-item">$!escapetool.xml($rp.trim())</span>
473 - #end
474 - </div>
475 - </span>
496 + </span>
497 + </div>
498 + #end
499 + #if($ruleReviewImplementer && $ruleReviewImplementer != '')
500 + <div class="info-row">
501 + <span class="info-label">見直しの実施者</span>
502 + <span class="info-value">
503 + <div class="selection-display">
504 + #foreach($ri in $ruleReviewImplementer.split(","))
505 + <span class="selection-item">$!escapetool.xml($ri.trim())</span>
506 + #end
476 476   </div>
477 - #end
478 - #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
479 - <div class="info-row">
480 - <span class="info-label">見直しの実施者</span>
481 - <span class="info-value">
482 - <div class="selection-display">
483 - #foreach($ri in $ruleReviewImplementer)
484 - <span class="selection-item">$!escapetool.xml($ri.trim())</span>
485 - #end
486 - </div>
487 - </span>
488 - </div>
489 - #end
490 - #if($ruleReviewSystem && $ruleReviewSystem != '')
491 - <div class="info-row">
492 - <span class="info-label">見直しの仕組み</span>
493 - <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
494 - </div>
495 - #end
496 - </div>
508 + </span>
497 497   </div>
498 - #else
499 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 校則の見直し情報は #if($visibilityRuleReview == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
500 - #end
501 501   #end
502 -
503 - ## --- 生徒会の課題意識 ---
504 - #if($challenges && $challenges != '')
505 - #set($canViewChallenges = true)
506 - #if($visibilityChallenges == 'members' && $isGuest) #set($canViewChallenges = false)
507 - #elseif($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false)
508 - #end
509 - #if($canViewChallenges)
510 - <div class="seitokai-subsection">
511 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> 生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == '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>
512 - <div class="seitokai-subsection-content">
513 - <div class="challenge-text">$!escapetool.xml($challenges)</div>
514 - </div>
511 + #if($ruleReviewSystem && $ruleReviewSystem != '')
512 + <div class="info-row">
513 + <span class="info-label">見直しの仕組み</span>
514 + <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
515 515   </div>
516 - #else
517 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 課題情報は #if($visibilityChallenges == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
518 - #end
519 519   #end
517 + </div>
518 +</div>
519 + #else
520 +<div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 校則の見直し情報は #if($visibilityRuleReview == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
521 + #end
522 +#end
520 520  
521 - </div>## seitokai-info-body 終了
522 -</div>## card-seitokai-info 終了
524 +## --- ⑨ 課題 ---
525 +#if($challenges && $challenges != '')
526 + ## 公開範囲チェック
527 + #set($canViewChallenges = true)
528 + #if($visibilityChallenges == 'members' && $isGuest) #set($canViewChallenges = false)
529 + #elseif($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false)
530 + #end
531 + #if($canViewChallenges)
532 +<h2 class="section-title">生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == '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</h2>
533 +<div class="challenge-text">$!escapetool.xml($challenges)</div>
534 + #else
535 +<div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 課題情報は #if($visibilityChallenges == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
536 + #end
537 +#end
523 523  
524 -## --- ③ 連絡先 ---
525 -<div class="school-info-card collapsed" id="card-contact">
526 - <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> 連絡先</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
527 - <table class="wiki-table school-info-table">
528 - <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
529 - <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>
530 - <tr><th>X (Twitter)</th><td>#if($seitokaiTwitter && $seitokaiTwitter != '')<a href="https://x.com/$!escapetool.url($seitokaiTwitter)" target="_blank" rel="noopener">𝕏 @$!escapetool.xml($seitokaiTwitter)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
531 - <tr><th>Instagram</th><td>#if($seitokaiInstagram && $seitokaiInstagram != '')<a href="https://instagram.com/$!escapetool.url($seitokaiInstagram)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><path d="M23 19a2 2 0 01-2 2H3a2 2 0 01-2-2V8a2 2 0 012-2h4l2-3h6l2 3h4a2 2 0 012 2z"/><circle cx="12" cy="13" r="4"/></svg> @$!escapetool.xml($seitokaiInstagram)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
532 - <tr><th>YouTube</th><td>#if($seitokaiYoutube && $seitokaiYoutube != '')<a href="$!escapetool.xml($seitokaiYoutube)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><polygon points="5 3 19 12 5 21 5 3"/></svg> YouTubeチャンネル</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
533 - <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
534 - </table>
535 -</div>
539 +</div>## seitokai-info-accordion 終了
536 536  
537 537  {{/html}}
538 538  
... ... @@ -659,7 +659,7 @@
659 659  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
660 660   <div class="activity-thread-header">
661 661   <div class="activity-thread-title">
662 - <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>
666 + <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>
663 663   <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
664 664   </div>
665 665   <div class="thread-meta-row">
... ... @@ -789,6 +789,9 @@
789 789   #elseif($postUserRole == 'graduate')
790 790   <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>
791 791   #end
796 + #if($postGrade && $postGrade != '')
797 + <span class="badge badge-grade badge-sm">$postGrade</span>
798 + #end
792 792   </span>
793 793   <span class="thread-post-date">$!postDate</span>
794 794   #set($postEdited = $!post.getValue('edited'))
... ... @@ -938,10 +938,10 @@
938 938  
939 939   #if($xcontext.user != "XWiki.XWikiGuest")
940 940   <div class="thread-add-post">
941 - <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
948 + <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
942 942   ＋ 活動報告を追加
943 943   </a>
944 - <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
951 + <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
945 945   <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> コメントを書く
946 946   </a>
947 947   </div>
... ... @@ -963,7 +963,7 @@
963 963  #if($xcontext.user != "XWiki.XWikiGuest")
964 964  {{html clean="false"}}
965 965  <div class="activity-add-section">
966 - <a href="/bin/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
973 + <a href="/bin/view/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
967 967   <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> 活動を追加
968 968   </a>
969 969  </div>
... ... @@ -970,6 +970,59 @@
970 970  {{/html}}
971 971  #end
972 972  
980 +## --- 年度アーカイブ セクション ---
981 +{{html clean="false"}}
982 +<div class="school-section-card school-archive-card">
983 + <h2 class="archive-section-title">
984 + <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>
985 + 年度アーカイブ
986 + </h2>
987 + <div class="archive-meta">
988 + 現在のページ: <strong>${pageFiscalYear}年度</strong>
989 + #set($lyud = $!doc.getValue('lastYearUpdateDate'))
990 + #if($lyud && $lyud != '')
991 + | 最終年度更新: $!escapetool.xml($lyud) ($!escapetool.xml($!doc.getValue('lastYearUpdateBy')))
992 + #end
993 + </div>
994 +
995 + ## 過去アーカイブの検索
996 + #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))
997 + #set($archivePages = $archiveQuery.execute())
998 +
999 + #if($archivePages && $archivePages.size() > 0)
1000 + <div class="archive-card-field-lg">
1001 + <div class="archive-list-label">過去の年度アーカイブ</div>
1002 + <div class="archive-list">
1003 + #foreach($archPage in $archivePages)
1004 + #set($archPageDoc = $xwiki.getDocument($archPage))
1005 + #set($archPageObj = $archPageDoc.getObject('SeitokaiCode.SchoolClass'))
1006 + #if($archPageObj)
1007 + #set($archPageFY = $!archPageObj.getValue('fiscalYear'))
1008 + <a href="$archPageDoc.getURL('view')" class="archive-link">
1009 + <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>
1010 + ${archPageFY}年度
1011 + </a>
1012 + #end
1013 + #end
1014 + </div>
1015 + </div>
1016 + #else
1017 + <div class="archive-empty">過去のアーカイブはまだありません</div>
1018 + #end
1019 +
1020 + ## 新年度に移行ボタン（承認済み・管理者のみ）
1021 + #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
1022 + <div class="archive-action">
1023 + <a href="/bin/view/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" class="btn-accent">
1024 + <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>
1025 + ${pageFiscalYear}年度をアーカイブして新年度に移行
1026 + </a>
1027 + <div class="archive-action-hint">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div>
1028 + </div>
1029 + #end
1030 +</div>
1031 +{{/html}}
1032 +
973 973  ## --- 年度タブ切り替え JavaScript ---
974 974  {{html clean="false"}}
975 975  <script>
... ... @@ -986,12 +986,14 @@
986 986   }
987 987   });
988 988  }
989 -// ページ読み込み時の初期化
1049 +// ページ読み込み時にデフォルトで現在の年度を表示
990 990  document.addEventListener('DOMContentLoaded', function() {
991 - // デフォルトで現在の年度を表示
992 992   var defaultTab = document.querySelector('.activity-fy-tab.active');
993 993   if (defaultTab) { defaultTab.click(); }
994 994   // 保存成功時のトースト通知
1054 + if (window.location.search.indexOf('archived=1') !== -1) {
1055 + showToast('年度アーカイブを作成しました', 'success');
1056 + }
995 995   if (window.location.search.indexOf('saved=1') !== -1) {
996 996   showToast('学校情報を保存しました', 'success');
997 997   // URLパラメータをクリーンアップ（リロード時に再表示されないよう）
... ... @@ -1027,9 +1027,6 @@
1027 1027   var card = document.getElementById(cardId);
1028 1028   if (!card) return;
1029 1029   card.classList.toggle('collapsed');
1030 - var isCollapsed = card.classList.contains('collapsed');
1031 - var h2 = card.querySelector('h2[role="button"]');
1032 - if (h2) h2.setAttribute('aria-expanded', !isCollapsed);
1033 1033  }
1034 1034  
1035 1035  // 投稿の編集（インライン編集フォームを開く）
... ... @@ -1061,9 +1061,7 @@
1061 1061   var csrfEl = document.querySelector('input[name="form_token"]');
1062 1062   var csrfToken = csrfEl ? csrfEl.value : '';
1063 1063   var xhr = new XMLHttpRequest();
1064 - xhr.open('POST', '/bin/SeitokaiCode/EditPost?outputSyntax=plain', true);
1065 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1066 - var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1123 + xhr.open('GET', '/bin/view/SeitokaiCode/EditPost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken), true);
1067 1067   xhr.onload = function() {
1068 1068   try {
1069 1069   var res = JSON.parse(xhr.responseText);
... ... @@ -1076,7 +1076,7 @@
1076 1076   } catch(e) { alert('編集に失敗しました'); }
1077 1077   };
1078 1078   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1079 - xhr.send(editPostData);
1136 + xhr.send();
1080 1080  }
1081 1081  
1082 1082  // 投稿の削除（確認ダイアログ付き）
... ... @@ -1083,9 +1083,7 @@
1083 1083  function confirmDeletePost(schoolPage, postObjNum, token) {
1084 1084   if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1085 1085   var xhr = new XMLHttpRequest();
1086 - xhr.open('POST', '/bin/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1087 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1088 - var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token);
1143 + xhr.open('GET', '/bin/view/SeitokaiCode/DeletePost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token), true);
1089 1089   xhr.onload = function() {
1090 1090   try {
1091 1091   var res = JSON.parse(xhr.responseText);
... ... @@ -1098,7 +1098,7 @@
1098 1098   } catch(e) { alert('削除に失敗しました'); }
1099 1099   };
1100 1100   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1101 - xhr.send(deletePostData);
1156 + xhr.send();
1102 1102  }
1103 1103  </script>
1104 1104  {{/html}}