Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 45.1 Icon
edited by Super Admin
on 2026/03/13 02:03
Change comment: There is no comment for this version
To version Icon 21.1 Icon
edited by Super Admin
on 2026/03/08 18:52
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -1,21 +1,10 @@
1 1  {{velocity}}
2 2  ## ===== 学校ページ テンプレート =====
3 -{{html clean="false"}}
4 -## メンテナンスバナー（{{include}}ではなくインラインで記述し、<p>タグ挿入を回避）
5 -#set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner'))
6 -#set($bannerObj = $bannerDoc.getObject('SeitokaiCode.MaintenanceBannerClass'))
7 -#if($bannerObj && $bannerObj.getValue('enabled') == 1)
8 -#set($bannerMsg = $bannerObj.getValue('message'))
9 -#set($bannerLevel = $bannerObj.getValue('level'))
10 -#if(!$bannerLevel || $bannerLevel == '')#set($bannerLevel = 'warning')#end
11 -<div class="maintenance-banner active maintenance-${bannerLevel}" id="maintenance-banner">
12 - <div class="maintenance-banner-inner">
13 - <span class="maintenance-icon">#if($bannerLevel == 'urgent')<svg class="ico-banner" viewBox="0 0 24 24"><path d="M10.29 3.86L1.82 18a2 2 0 001.71 3h16.94a2 2 0 001.71-3L13.71 3.86a2 2 0 00-3.42 0z"/><line x1="12" y1="9" x2="12" y2="13"/><line x1="12" y1="17" x2="12.01" y2="17"/></svg>#elseif($bannerLevel == 'info')<svg class="ico-banner" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><line x1="12" y1="16" x2="12" y2="12"/><line x1="12" y1="8" x2="12.01" y2="8"/></svg>#else<svg class="ico-banner" viewBox="0 0 24 24"><path d="M14.7 6.3a1 1 0 000 1.4l1.6 1.6a1 1 0 001.4 0l3.77-3.77a6 6 0 01-7.94 7.94l-6.91 6.91a2.12 2.12 0 01-3-3l6.91-6.91a6 6 0 017.94-7.94l-3.76 3.76z"/></svg>#end</span>
14 - <span class="maintenance-text">$!escapetool.xml($bannerMsg)</span>
15 - <button class="maintenance-close" onclick="document.getElementById('maintenance-banner').style.display='none'">&times;</button>
16 - </div>
17 -</div>
18 -#end
3 +## このテンプレートは学校ページの表示と入力フォームを制御します。
4 +
5 +## メンテナンスバナー
6 +{{include reference="SeitokaiCode.MaintenanceBannerInclude" /}}
7 +
19 19  ## --- 学校基本情報フィールド ---
20 20  #set($schoolCode = $doc.getValue('schoolCode'))
21 21  #set($schoolName = $doc.getValue('schoolName'))
... ... @@ -65,7 +65,9 @@
65 65  #set($seitokaiYoutube = $doc.getValue('seitokaiYoutube'))
66 66  #set($seitokaiOtherSns = $doc.getValue('seitokaiOtherSns'))
67 67  
68 -## --- 現在の年度を計算（4月始まり） ---
57 +## --- 年度アーカイブ ---
58 +#set($pageFiscalYear = $!doc.getValue('fiscalYear'))
59 +## 現在の年度を計算（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
68 +## fiscalYear 未設定時はデフォルトとして現在の年度を使う
69 +#if(!$pageFiscalYear || $pageFiscalYear == '')
70 + #set($pageFiscalYear = $currentFiscalYear.toString())
71 +#end
77 77  
78 78  ## --- 公開範囲フィールド ---
79 79  #set($visibilityOrgChart = $!doc.getValue('visibilityOrgChart'))
... ... @@ -102,12 +102,8 @@
102 102  
103 103  ## --- 投稿固定/解除処理 ---
104 104  #set($pinAction = $!request.action)
105 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
106 - #set($pinPostObjStr = $!request.postObj)
107 - #if(!$pinPostObjStr.matches('^\d+$'))
108 - ## 不正な値 → 無視
109 - #else
110 - #set($postObjNum = $mathtool.toInteger($pinPostObjStr))
100 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified') && $services.csrf.isTokenValid($request.form_token))
101 + #set($postObjNum = $mathtool.toInteger($!request.postObj))
111 111   #set($postObj = $doc.getObject('SeitokaiCode.ActivityPostClass', $postObjNum))
112 112   #if($postObj)
113 113   #if($pinAction == 'pin')
... ... @@ -127,15 +127,12 @@
127 127   $response.sendRedirect($doc.getURL('view'))
128 128   #stop
129 129   #end
130 - #end## /matches
131 131  #end
132 132  
133 133  ## --- 特色ある活動 選定/解除処理 ---
134 134  #set($featAction = $!request.action)
135 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
136 - #set($featActObjStr = $!request.actObj)
137 - #if($featActObjStr.matches('^\d+$'))
138 - #set($actObjNum = $mathtool.toInteger($featActObjStr))
125 +#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $services.csrf.isTokenValid($request.form_token))
126 + #set($actObjNum = $mathtool.toInteger($!request.actObj))
139 139   #set($actObj = $doc.getObject('SeitokaiCode.ActivityClass', $actObjNum))
140 140   #if($actObj)
141 141   #if($featAction == 'feature')
... ... @@ -167,13 +167,12 @@
167 167   $response.sendRedirect($doc.getURL('view'))
168 168   #stop
169 169   #end
170 - #end## /matches
171 171  #end
172 172  
173 173  ## --- ユーザー情報取得 ---
174 174  ## displayName: Wiki上の表示名（ニックネーム）。本名(firstName/lastName)は管理者のみ閲覧可能。
175 175  #set($lastAuthor = $doc.author)
176 -#set($lastAuthorDoc = $xwiki.getDocument($lastAuthor))
163 +#set($lastAuthorDoc = $xwiki.getDocument("XWiki.${lastAuthor}"))
177 177  #set($authorAccountType = '')
178 178  #set($authorUserRole = '')
179 179  #set($authorUserStatus = '')
... ... @@ -187,8 +187,7 @@
187 187   #set($authorEnrollmentYear = $!lastAuthorDoc.getValue('enrollmentYear'))
188 188   #set($authorDisplayName = $!lastAuthorDoc.getValue('displayName'))
189 189   #if(!$authorDisplayName || $authorDisplayName == '')
190 - ## false引数でプレーンテキスト（HTMLリンクなし）を取得
191 - #set($authorDisplayName = $xwiki.getUserName($doc.author, false))
177 + #set($authorDisplayName = $xwiki.getUserName($doc.author))
192 192   #end
193 193   ## --- 学年の動的計算（学校種別対応） ---
194 194   ## 日本の学校年度: 4月始まり。currentSchoolYear = (月>=4) ? 今年 : 去年
... ... @@ -226,26 +226,52 @@
226 226   #end
227 227  #end
228 228  
229 -## --- 学校名見出し（XWikiデフォルトタイトルを非表示にし、学校名を表示） ---
230 -#if($schoolName && $schoolName != '')
231 -<style>.document-header { display: none !important; }</style>
232 -<h1 class="school-page-title">$!escapetool.xml($schoolName)</h1>
233 -#end
234 -
235 -## --- 編集ボタン（権限があるユーザーのみ表示） ---
236 -#set($canEditSchool = false)
237 -#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
238 - #set($canEditSchool = true)
239 -#end
240 -#if($canEditSchool)
241 -<div style="text-align:right; margin-bottom:12px;">
242 - <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>
215 +## --- 信頼性バッジ + ユーザー情報 ---
216 +{{html clean="false"}}
217 +<div class="seitokai-badge-container">
218 + ## 承認バッジ
219 + #if($authorAccountType == 'admin')
220 + <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>
221 + #elseif($authorAccountType == 'verified')
222 + <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>
223 + #elseif($authorAccountType == 'referred')
224 + <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>
225 + #else
226 + <span class="badge badge-general">一般</span>
227 + #end
228 + ## 役割バッジ
229 + #if($authorUserRole == 'student')
230 + <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>
231 + #set($authorIsOfficer = $!lastAuthorDoc.getValue('isOfficer'))
232 + #if($authorIsOfficer == 'true')
233 + <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>
234 + #end
235 + #elseif($authorUserRole == 'teacher')
236 + <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>
237 + #elseif($authorUserRole == 'graduate')
238 + <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>
239 + #end
240 + ## 学年（生徒のみ公開）
241 + #if($authorGrade && $authorGrade != '')
242 + <span class="badge badge-grade">$authorGrade</span>
243 + #end
244 + ## 在籍状態（卒業・休学等の場合のみ表示）
245 + #if($authorUserStatus == 'graduated')
246 + <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>
247 + #elseif($authorUserStatus == 'on_leave')
248 + <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>
249 + #elseif($authorUserStatus == 'transferred')
250 + <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>
251 + #end
252 + <span class="badge-info">最終編集: $!escapetool.xml($authorDisplayName) ($xwiki.formatDate($doc.date, "yyyy/MM/dd"))</span>
243 243  </div>
244 -#end
254 +{{/html}}
245 245  
256 +{{html clean="false"}}
257 +
246 246  ## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） ---
247 247  <div class="school-info-grid">
248 - <div class="school-info-card collapsed" id="card-basic-info">
260 + <div class="school-info-card mobile-collapse" id="card-basic-info">
249 249   <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>
250 250   <table class="wiki-table school-info-table">
251 251   <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
... ... @@ -255,7 +255,7 @@
255 255   <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
256 256   <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
257 257   <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
258 - <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
270 + <tr><th>課程</th><td>$!escapetool.xml($!schoolSystem)</td></tr>
259 259   <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>
260 260   </table>
261 261   #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
... ... @@ -265,7 +265,7 @@
265 265   #end
266 266   </div>
267 267  
268 - <div class="school-info-card collapsed" id="card-contact">
280 + <div class="school-info-card mobile-collapse" id="card-contact">
269 269   <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>
270 270   <table class="wiki-table school-info-table">
271 271   <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
... ... @@ -313,7 +313,7 @@
313 313  
314 314  ## --- ③④⑤ 日常の活動・選挙・定例活動 ---
315 315  <div class="school-section-grid">
316 - #if($dailyActivities && !$dailyActivities.isEmpty())
328 + #if($dailyActivities && $dailyActivities != '')
317 317   <div class="school-section-card">
318 318   <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>
319 319   <div class="card-inner">
... ... @@ -320,7 +320,7 @@
320 320   <p class="activity-hint">活動時間の多い順に上位3つ</p>
321 321   <div class="tag-container">
322 322   #set($daIdx = 1)
323 - #foreach($da in $dailyActivities)
335 + #foreach($da in $dailyActivities.split(","))
324 324   <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
325 325   #set($daIdx = $daIdx + 1)
326 326   #end
... ... @@ -371,7 +371,7 @@
371 371   #end
372 372  
373 373   ## --- ⑦ 予算 ---
374 - #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
386 + #set($hasBudget = ($budgetProcess && $budgetProcess != '') || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
375 375   #if($hasBudget)
376 376   ## 公開範囲チェック
377 377   #set($canViewBudget = true)
... ... @@ -382,12 +382,12 @@
382 382   <div class="school-section-card">
383 383   <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>
384 384   <div class="card-inner">
385 - #if($budgetProcess && !$budgetProcess.isEmpty())
397 + #if($budgetProcess && $budgetProcess != '')
386 386   <div class="info-row">
387 387   <span class="info-label">作成過程の生徒関与</span>
388 388   <span class="info-value">
389 389   <div class="selection-display">
390 - #foreach($bp in $budgetProcess)
402 + #foreach($bp in $budgetProcess.split(","))
391 391   <span class="selection-item">$!escapetool.xml($bp.trim())</span>
392 392   #end
393 393   </div>
... ... @@ -406,12 +406,12 @@
406 406   <span class="info-value">$!escapetool.xml($!budgetScale)</span>
407 407   </div>
408 408   #end
409 - #if($budgetAllocation && !$budgetAllocation.isEmpty())
421 + #if($budgetAllocation && $budgetAllocation != '')
410 410   <div class="info-row">
411 411   <span class="info-label">主な予算配分</span>
412 412   <span class="info-value">
413 413   <div class="selection-display">
414 - #foreach($ba in $budgetAllocation)
426 + #foreach($ba in $budgetAllocation.split(","))
415 415   <span class="selection-item">$!escapetool.xml($ba.trim())</span>
416 416   #end
417 417   </div>
... ... @@ -444,12 +444,12 @@
444 444   <span class="info-label">見直しの有無（3年以内）</span>
445 445   <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
446 446   </div>
447 - #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
459 + #if($ruleReviewContent && $ruleReviewContent != '')
448 448   <div class="info-row">
449 449   <span class="info-label">見直しの内容</span>
450 450   <span class="info-value">
451 451   <div class="selection-display">
452 - #foreach($rc in $ruleReviewContent)
464 + #foreach($rc in $ruleReviewContent.split(","))
453 453   <span class="selection-item">$!escapetool.xml($rc.trim())</span>
454 454   #end
455 455   </div>
... ... @@ -456,12 +456,12 @@
456 456   </span>
457 457   </div>
458 458   #end
459 - #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
471 + #if($ruleReviewProposer && $ruleReviewProposer != '')
460 460   <div class="info-row">
461 461   <span class="info-label">見直しの提案者</span>
462 462   <span class="info-value">
463 463   <div class="selection-display">
464 - #foreach($rp in $ruleReviewProposer)
476 + #foreach($rp in $ruleReviewProposer.split(","))
465 465   <span class="selection-item">$!escapetool.xml($rp.trim())</span>
466 466   #end
467 467   </div>
... ... @@ -468,12 +468,12 @@
468 468   </span>
469 469   </div>
470 470   #end
471 - #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
483 + #if($ruleReviewImplementer && $ruleReviewImplementer != '')
472 472   <div class="info-row">
473 473   <span class="info-label">見直しの実施者</span>
474 474   <span class="info-value">
475 475   <div class="selection-display">
476 - #foreach($ri in $ruleReviewImplementer)
488 + #foreach($ri in $ruleReviewImplementer.split(","))
477 477   <span class="selection-item">$!escapetool.xml($ri.trim())</span>
478 478   #end
479 479   </div>
... ... @@ -534,12 +534,6 @@
534 534   <span class="author-legend-item"><span class="badge badge-school-external badge-sm"><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> 他校</span> 他校所属</span>
535 535   <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span>
536 536   </div>
537 - <div class="author-legend">
538 - <span class="author-legend-title">役割:</span>
539 - <span class="author-legend-item"><span class="badge badge-role-student badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10v6M2 10l10-5 10 5-10 5z"/><path d="M6 12v5c0 2 4 3 6 3s6-1 6-3v-5"/></svg> 生徒</span></span>
540 - <span class="author-legend-item"><span class="badge badge-role-officer badge-sm"><svg class="ico" viewBox="0 0 24 24"><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> 役員</span></span>
541 - <span class="author-legend-item"><span class="badge badge-role-teacher badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M20 21v-2a4 4 0 00-4-4H8a4 4 0 00-4 4v2"/><circle cx="12" cy="7" r="4"/></svg> 教員</span></span>
542 - </div>
543 543   </div>
544 544  </div>
545 545  
... ... @@ -619,17 +619,6 @@
619 619   #set($threadPosts = [])
620 620   #set($discard = $threadPosts.addAll($pinnedPosts))
621 621   #set($discard = $threadPosts.addAll($normalPosts))
622 - ## report/comment カウント
623 - #set($reportCount = 0)
624 - #set($commentCount = 0)
625 - #foreach($tp in $threadPosts)
626 - #set($tpType = $!tp.getValue('postType'))
627 - #if($tpType == 'comment')
628 - #set($commentCount = $commentCount + 1)
629 - #else
630 - #set($reportCount = $reportCount + 1)
631 - #end
632 - #end
633 633  
634 634  {{html clean="false"}}
635 635  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
... ... @@ -639,7 +639,7 @@
639 639   <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
640 640   </div>
641 641   <div class="thread-meta-row">
642 - <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
637 + <span class="thread-post-count">${threadPosts.size()}件の投稿</span>
643 643   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
644 644   #if($actFeatured == '1')
645 645   <a href="$doc.getURL('view', "action=unfeature&actObj=${actIdx}&form_token=${services.csrf.getToken()}")" class="btn-featured-toggle btn-unfeature" title="特色ある活動の選定を解除"><svg class="ico ico-fixed-14" 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> 特色解除</a>
... ... @@ -650,10 +650,7 @@
650 650   </div>
651 651   </div>
652 652  
653 - ## --- 活動報告セクション ---
654 654   #foreach($post in $threadPosts)
655 - #set($thisPostType = $!post.getValue('postType'))
656 - #if($thisPostType != 'comment')
657 657   #set($postContent = $post.getValue('content'))
658 658   #set($postAuthor = $post.getValue('author'))
659 659   #set($postAccountType = $!post.getValue('authorAccountType'))
... ... @@ -875,52 +875,14 @@
875 875   #end## /canViewPost
876 876   #end## /postHidden
877 877   #end## /postDeleted
878 - #end## /postType != comment
879 - #end## /foreach reports
880 -
881 - ## --- コメントセクション（折りたたみ） ---
882 - #if($commentCount > 0)
883 - <details class="thread-comments-section">
884 - <summary class="thread-comments-toggle">
885 - <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> ${commentCount}件のコメント
886 - </summary>
887 - #foreach($post in $threadPosts)
888 - #set($thisPostType = $!post.getValue('postType'))
889 - #if($thisPostType == 'comment')
890 - #set($postContent = $post.getValue('content'))
891 - #set($postAuthor = $post.getValue('author'))
892 - #set($postAccountType = $!post.getValue('authorAccountType'))
893 - #set($postDate = $post.getValue('createdDate'))
894 - #set($postDeleted = $!post.getValue('deleted'))
895 - #if($postDeleted == 1 || $postDeleted == '1')
896 - <div class="thread-comment thread-comment-deleted">
897 - <span class="thread-comment-meta">このコメントは削除されました</span>
898 - </div>
899 - #else
900 - #set($postHidden = $!post.getValue('hidden'))
901 - #if($postHidden == 1 || $postHidden == '1')
902 - <div class="thread-comment thread-comment-hidden">
903 - <span class="thread-comment-meta">このコメントは非表示にされました</span>
904 - </div>
905 - #else
906 - <div class="thread-comment">
907 - <span class="thread-comment-author">$!escapetool.xml($postAuthor)</span>
908 - <span class="thread-comment-date">$!postDate</span>
909 - <div class="thread-comment-body">$!escapetool.xml($postContent)</div>
910 - </div>
911 - #end
912 - #end
913 - #end
914 - #end
915 - </details>
916 916   #end
917 917  
918 918   #if($xcontext.user != "XWiki.XWikiGuest")
919 919   <div class="thread-add-post">
920 - <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
874 + <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
921 921   ＋ 活動報告を追加
922 922   </a>
923 - <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
877 + <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
924 924   <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> コメントを書く
925 925   </a>
926 926   </div>
... ... @@ -942,7 +942,7 @@
942 942  #if($xcontext.user != "XWiki.XWikiGuest")
943 943  {{html clean="false"}}
944 944  <div class="activity-add-section">
945 - <a href="/bin/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
899 + <a href="/bin/view/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
946 946   <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> 活動を追加
947 947   </a>
948 948  </div>
... ... @@ -949,6 +949,59 @@
949 949  {{/html}}
950 950  #end
951 951  
906 +## --- 年度アーカイブ セクション ---
907 +{{html clean="false"}}
908 +<div class="school-section-card school-archive-card">
909 + <h2 class="archive-section-title">
910 + <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>
911 + 年度アーカイブ
912 + </h2>
913 + <div class="archive-meta">
914 + 現在のページ: <strong>${pageFiscalYear}年度</strong>
915 + #set($lyud = $!doc.getValue('lastYearUpdateDate'))
916 + #if($lyud && $lyud != '')
917 + | 最終年度更新: $!escapetool.xml($lyud) ($!escapetool.xml($!doc.getValue('lastYearUpdateBy')))
918 + #end
919 + </div>
920 +
921 + ## 過去アーカイブの検索
922 + #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))
923 + #set($archivePages = $archiveQuery.execute())
924 +
925 + #if($archivePages && $archivePages.size() > 0)
926 + <div class="archive-card-field-lg">
927 + <div class="archive-list-label">過去の年度アーカイブ</div>
928 + <div class="archive-list">
929 + #foreach($archPage in $archivePages)
930 + #set($archPageDoc = $xwiki.getDocument($archPage))
931 + #set($archPageObj = $archPageDoc.getObject('SeitokaiCode.SchoolClass'))
932 + #if($archPageObj)
933 + #set($archPageFY = $!archPageObj.getValue('fiscalYear'))
934 + <a href="$archPageDoc.getURL('view')" class="archive-link">
935 + <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>
936 + ${archPageFY}年度
937 + </a>
938 + #end
939 + #end
940 + </div>
941 + </div>
942 + #else
943 + <div class="archive-empty">過去のアーカイブはまだありません</div>
944 + #end
945 +
946 + ## 新年度に移行ボタン（承認済み・管理者のみ）
947 + #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
948 + <div class="archive-action">
949 + <a href="/bin/view/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" class="btn-accent">
950 + <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>
951 + ${pageFiscalYear}年度をアーカイブして新年度に移行
952 + </a>
953 + <div class="archive-action-hint">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div>
954 + </div>
955 + #end
956 +</div>
957 +{{/html}}
958 +
952 952  ## --- 年度タブ切り替え JavaScript ---
953 953  {{html clean="false"}}
954 954  <script>
... ... @@ -958,19 +958,29 @@
958 958   btn.classList.add('active');
959 959   // 活動スレッドの表示切り替え
960 960   document.querySelectorAll('.activity-thread[data-fiscal-year]').forEach(function(thread) {
961 - if (fy === 'all' || thread.getAttribute('data-fiscal-year') === fy) {
962 - thread.classList.remove('fy-hidden');
968 + if (fy === 'all') {
969 + thread.style.display = '';
970 + } else if (thread.getAttribute('data-fiscal-year') === fy) {
971 + thread.style.display = '';
963 963   } else {
964 - thread.classList.add('fy-hidden');
973 + thread.style.display = 'none';
965 965   }
966 966   });
967 967  }
968 -// ページ読み込み時の初期化
977 +// ページ読み込み時にデフォルトで現在の年度を表示
969 969  document.addEventListener('DOMContentLoaded', function() {
970 - // デフォルトで現在の年度を表示
971 971   var defaultTab = document.querySelector('.activity-fy-tab.active');
972 972   if (defaultTab) { defaultTab.click(); }
981 + // モバイルでは基本情報・連絡先をデフォルト折りたたみ
982 + if (window.innerWidth <= 768) {
983 + document.querySelectorAll('.school-info-card.mobile-collapse').forEach(function(card) {
984 + card.classList.add('collapsed');
985 + });
986 + }
973 973   // 保存成功時のトースト通知
988 + if (window.location.search.indexOf('archived=1') !== -1) {
989 + showToast('年度アーカイブを作成しました', 'success');
990 + }
974 974   if (window.location.search.indexOf('saved=1') !== -1) {
975 975   showToast('学校情報を保存しました', 'success');
976 976   // URLパラメータをクリーンアップ（リロード時に再表示されないよう）
... ... @@ -1006,6 +1006,7 @@
1006 1006   var card = document.getElementById(cardId);
1007 1007   if (!card) return;
1008 1008   card.classList.toggle('collapsed');
1026 + card.classList.remove('mobile-collapse');
1009 1009  }
1010 1010  
1011 1011  // 投稿の編集（インライン編集フォームを開く）
... ... @@ -1037,9 +1037,7 @@
1037 1037   var csrfEl = document.querySelector('input[name="form_token"]');
1038 1038   var csrfToken = csrfEl ? csrfEl.value : '';
1039 1039   var xhr = new XMLHttpRequest();
1040 - xhr.open('POST', '/bin/SeitokaiCode/EditPost?outputSyntax=plain', true);
1041 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1042 - var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1058 + xhr.open('GET', '/bin/view/SeitokaiCode/EditPost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken), true);
1043 1043   xhr.onload = function() {
1044 1044   try {
1045 1045   var res = JSON.parse(xhr.responseText);
... ... @@ -1052,7 +1052,7 @@
1052 1052   } catch(e) { alert('編集に失敗しました'); }
1053 1053   };
1054 1054   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1055 - xhr.send(editPostData);
1071 + xhr.send();
1056 1056  }
1057 1057  
1058 1058  // 投稿の削除（確認ダイアログ付き）
... ... @@ -1059,9 +1059,7 @@
1059 1059  function confirmDeletePost(schoolPage, postObjNum, token) {
1060 1060   if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1061 1061   var xhr = new XMLHttpRequest();
1062 - xhr.open('POST', '/bin/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1063 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1064 - var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token);
1078 + xhr.open('GET', '/bin/view/SeitokaiCode/DeletePost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token), true);
1065 1065   xhr.onload = function() {
1066 1066   try {
1067 1067   var res = JSON.parse(xhr.responseText);
... ... @@ -1074,7 +1074,7 @@
1074 1074   } catch(e) { alert('削除に失敗しました'); }
1075 1075   };
1076 1076   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1077 - xhr.send(deletePostData);
1091 + xhr.send();
1078 1078  }
1079 1079  </script>
1080 1080  {{/html}}