Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 29.1 Icon
edited by Super Admin
on 2026/03/10 13:11
Change comment: There is no comment for this version
To version Icon 48.1 Icon
edited by Super Admin
on 2026/03/13 21:13
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'))
... ... @@ -106,10 +106,47 @@
106 106   #end
107 107  #end
108 108  
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 +
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))
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))
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
163 + #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))
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))
138 138   #set($actObj = $doc.getObject('SeitokaiCode.ActivityClass', $actObjNum))
139 139   #if($actObj)
140 140   #if($featAction == 'feature')
... ... @@ -166,12 +166,13 @@
166 166   $response.sendRedirect($doc.getURL('view'))
167 167   #stop
168 168   #end
203 + #end## /matches
169 169  #end
170 170  
171 171  ## --- ユーザー情報取得 ---
172 172  ## displayName: Wiki上の表示名（ニックネーム）。本名(firstName/lastName)は管理者のみ閲覧可能。
173 173  #set($lastAuthor = $doc.author)
174 -#set($lastAuthorDoc = $xwiki.getDocument("XWiki.${lastAuthor}"))
209 +#set($lastAuthorDoc = $xwiki.getDocument($lastAuthor))
175 175  #set($authorAccountType = '')
176 176  #set($authorUserRole = '')
177 177  #set($authorUserStatus = '')
... ... @@ -224,57 +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 - <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
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;">
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>
272 272  </div>
277 +#end
273 273  
274 274  ## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） ---
275 275  <div class="school-info-grid">
276 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>
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>
278 278   <table class="wiki-table school-info-table">
279 279   <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
280 280   <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
... ... @@ -283,7 +283,7 @@
283 283   <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
284 284   <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
285 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>
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>
287 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 288   </table>
289 289   #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
... ... @@ -294,7 +294,7 @@
294 294   </div>
295 295  
296 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>
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>
298 298   <table class="wiki-table school-info-table">
299 299   <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
300 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>
... ... @@ -341,7 +341,7 @@
341 341  
342 342  ## --- ③④⑤ 日常の活動・選挙・定例活動 ---
343 343  <div class="school-section-grid">
344 - #if($dailyActivities && $dailyActivities != '')
349 + #if($dailyActivities && !$dailyActivities.isEmpty())
345 345   <div class="school-section-card">
346 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 347   <div class="card-inner">
... ... @@ -348,7 +348,7 @@
348 348   <p class="activity-hint">活動時間の多い順に上位3つ</p>
349 349   <div class="tag-container">
350 350   #set($daIdx = 1)
351 - #foreach($da in $dailyActivities.split(","))
356 + #foreach($da in $dailyActivities)
352 352   <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
353 353   #set($daIdx = $daIdx + 1)
354 354   #end
... ... @@ -399,7 +399,7 @@
399 399   #end
400 400  
401 401   ## --- ⑦ 予算 ---
402 - #set($hasBudget = ($budgetProcess && $budgetProcess != '') || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
407 + #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
403 403   #if($hasBudget)
404 404   ## 公開範囲チェック
405 405   #set($canViewBudget = true)
... ... @@ -410,12 +410,12 @@
410 410   <div class="school-section-card">
411 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 412   <div class="card-inner">
413 - #if($budgetProcess && $budgetProcess != '')
418 + #if($budgetProcess && !$budgetProcess.isEmpty())
414 414   <div class="info-row">
415 415   <span class="info-label">作成過程の生徒関与</span>
416 416   <span class="info-value">
417 417   <div class="selection-display">
418 - #foreach($bp in $budgetProcess.split(","))
423 + #foreach($bp in $budgetProcess)
419 419   <span class="selection-item">$!escapetool.xml($bp.trim())</span>
420 420   #end
421 421   </div>
... ... @@ -434,12 +434,12 @@
434 434   <span class="info-value">$!escapetool.xml($!budgetScale)</span>
435 435   </div>
436 436   #end
437 - #if($budgetAllocation && $budgetAllocation != '')
442 + #if($budgetAllocation && !$budgetAllocation.isEmpty())
438 438   <div class="info-row">
439 439   <span class="info-label">主な予算配分</span>
440 440   <span class="info-value">
441 441   <div class="selection-display">
442 - #foreach($ba in $budgetAllocation.split(","))
447 + #foreach($ba in $budgetAllocation)
443 443   <span class="selection-item">$!escapetool.xml($ba.trim())</span>
444 444   #end
445 445   </div>
... ... @@ -472,12 +472,12 @@
472 472   <span class="info-label">見直しの有無（3年以内）</span>
473 473   <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
474 474   </div>
475 - #if($ruleReviewContent && $ruleReviewContent != '')
480 + #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
476 476   <div class="info-row">
477 477   <span class="info-label">見直しの内容</span>
478 478   <span class="info-value">
479 479   <div class="selection-display">
480 - #foreach($rc in $ruleReviewContent.split(","))
485 + #foreach($rc in $ruleReviewContent)
481 481   <span class="selection-item">$!escapetool.xml($rc.trim())</span>
482 482   #end
483 483   </div>
... ... @@ -484,12 +484,12 @@
484 484   </span>
485 485   </div>
486 486   #end
487 - #if($ruleReviewProposer && $ruleReviewProposer != '')
492 + #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
488 488   <div class="info-row">
489 489   <span class="info-label">見直しの提案者</span>
490 490   <span class="info-value">
491 491   <div class="selection-display">
492 - #foreach($rp in $ruleReviewProposer.split(","))
497 + #foreach($rp in $ruleReviewProposer)
493 493   <span class="selection-item">$!escapetool.xml($rp.trim())</span>
494 494   #end
495 495   </div>
... ... @@ -496,12 +496,12 @@
496 496   </span>
497 497   </div>
498 498   #end
499 - #if($ruleReviewImplementer && $ruleReviewImplementer != '')
504 + #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
500 500   <div class="info-row">
501 501   <span class="info-label">見直しの実施者</span>
502 502   <span class="info-value">
503 503   <div class="selection-display">
504 - #foreach($ri in $ruleReviewImplementer.split(","))
509 + #foreach($ri in $ruleReviewImplementer)
505 505   <span class="selection-item">$!escapetool.xml($ri.trim())</span>
506 506   #end
507 507   </div>
... ... @@ -663,7 +663,7 @@
663 663  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
664 664   <div class="activity-thread-header">
665 665   <div class="activity-thread-title">
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>
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>
667 667   <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
668 668   </div>
669 669   <div class="thread-meta-row">
... ... @@ -793,9 +793,6 @@
793 793   #elseif($postUserRole == 'graduate')
794 794   <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>
795 795   #end
796 - #if($postGrade && $postGrade != '')
797 - <span class="badge badge-grade badge-sm">$postGrade</span>
798 - #end
799 799   </span>
800 800   <span class="thread-post-date">$!postDate</span>
801 801   #set($postEdited = $!post.getValue('edited'))
... ... @@ -945,10 +945,10 @@
945 945  
946 946   #if($xcontext.user != "XWiki.XWikiGuest")
947 947   <div class="thread-add-post">
948 - <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
950 + <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
949 949   ＋ 活動報告を追加
950 950   </a>
951 - <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
953 + <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
952 952   <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> コメントを書く
953 953   </a>
954 954   </div>
... ... @@ -970,7 +970,7 @@
970 970  #if($xcontext.user != "XWiki.XWikiGuest")
971 971  {{html clean="false"}}
972 972  <div class="activity-add-section">
973 - <a href="/bin/view/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
975 + <a href="/bin/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
974 974   <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> 活動を追加
975 975   </a>
976 976  </div>
... ... @@ -977,59 +977,6 @@
977 977  {{/html}}
978 978  #end
979 979  
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 -
1033 1033  ## --- 年度タブ切り替え JavaScript ---
1034 1034  {{html clean="false"}}
1035 1035  <script>
... ... @@ -1046,14 +1046,12 @@
1046 1046   }
1047 1047   });
1048 1048  }
1049 -// ページ読み込み時にデフォルトで現在の年度を表示
998 +// ページ読み込み時の初期化
1050 1050  document.addEventListener('DOMContentLoaded', function() {
1000 + // デフォルトで現在の年度を表示
1051 1051   var defaultTab = document.querySelector('.activity-fy-tab.active');
1052 1052   if (defaultTab) { defaultTab.click(); }
1053 1053   // 保存成功時のトースト通知
1054 - if (window.location.search.indexOf('archived=1') !== -1) {
1055 - showToast('年度アーカイブを作成しました', 'success');
1056 - }
1057 1057   if (window.location.search.indexOf('saved=1') !== -1) {
1058 1058   showToast('学校情報を保存しました', 'success');
1059 1059   // URLパラメータをクリーンアップ（リロード時に再表示されないよう）
... ... @@ -1089,6 +1089,9 @@
1089 1089   var card = document.getElementById(cardId);
1090 1090   if (!card) return;
1091 1091   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);
1092 1092  }
1093 1093  
1094 1094  // 投稿の編集（インライン編集フォームを開く）
... ... @@ -1120,7 +1120,9 @@
1120 1120   var csrfEl = document.querySelector('input[name="form_token"]');
1121 1121   var csrfToken = csrfEl ? csrfEl.value : '';
1122 1122   var xhr = new XMLHttpRequest();
1123 - xhr.open('GET', '/bin/view/SeitokaiCode/EditPost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken), true);
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);
1124 1124   xhr.onload = function() {
1125 1125   try {
1126 1126   var res = JSON.parse(xhr.responseText);
... ... @@ -1133,7 +1133,7 @@
1133 1133   } catch(e) { alert('編集に失敗しました'); }
1134 1134   };
1135 1135   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1136 - xhr.send();
1088 + xhr.send(editPostData);
1137 1137  }
1138 1138  
1139 1139  // 投稿の削除（確認ダイアログ付き）
... ... @@ -1140,7 +1140,9 @@
1140 1140  function confirmDeletePost(schoolPage, postObjNum, token) {
1141 1141   if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1142 1142   var xhr = new XMLHttpRequest();
1143 - xhr.open('GET', '/bin/view/SeitokaiCode/DeletePost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token), true);
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);
1144 1144   xhr.onload = function() {
1145 1145   try {
1146 1146   var res = JSON.parse(xhr.responseText);
... ... @@ -1153,7 +1153,7 @@
1153 1153   } catch(e) { alert('削除に失敗しました'); }
1154 1154   };
1155 1155   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1156 - xhr.send();
1110 + xhr.send(deletePostData);
1157 1157  }
1158 1158  </script>
1159 1159  {{/html}}