Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 119.1
edited by Super Admin
on 2026/04/05 18:59
Change comment: There is no comment for this version
To version Icon 94.1 Icon
edited by Super Admin
on 2026/03/20 17:50
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -7,19 +7,6 @@
7 7   #stop
8 8  #end
9 9  {{html clean="false"}}
10 -## --- OGP メタタグ（SNSシェア対応） ---
11 -#set($ogTitle = "$!{schoolName} — 生徒会Wiki")
12 -#set($ogDesc = "$!{schoolName}の生徒会活動情報。全国の高校の生徒会活動事例を集積・共有するプラットフォーム。")
13 -#set($ogUrl = "https://${request.serverName}${doc.getURL('view')}")
14 -<meta property="og:type" content="article" />
15 -<meta property="og:title" content="$escapetool.xml($ogTitle)" />
16 -<meta property="og:description" content="$escapetool.xml($ogDesc)" />
17 -<meta property="og:url" content="$escapetool.xml($ogUrl)" />
18 -<meta property="og:site_name" content="生徒会Wiki" />
19 -<meta property="og:locale" content="ja_JP" />
20 -<meta name="twitter:card" content="summary" />
21 -<meta name="twitter:title" content="$escapetool.xml($ogTitle)" />
22 -<meta name="twitter:description" content="$escapetool.xml($ogDesc)" />
23 23  ## メンテナンスバナー（{{include}}ではなくインラインで記述し、<p>タグ挿入を回避）
24 24  #set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner'))
25 25  #set($bannerObj = $bannerDoc.getObject('SeitokaiCode.MaintenanceBannerClass'))
... ... @@ -81,7 +81,6 @@
81 81  #set($activityPlace = $doc.getValue('activityPlace'))
82 82  #set($activityRoomEquipment = $doc.getValue('activityRoomEquipment'))
83 83  #set($activityRoomImage = $doc.getValue('activityRoomImage'))
84 -#set($ictTools = $doc.getValue('ictTools'))
85 85  #set($ictUsage = $doc.getValue('ictUsage'))
86 86  
87 87  ## --- 生徒総会 ---
... ... @@ -139,14 +139,6 @@
139 139  #set($visibilityBudget = $!doc.getValue('visibilityBudget'))
140 140  #set($visibilityRuleReview = $!doc.getValue('visibilityRuleReview'))
141 141  #set($visibilityChallenges = $!doc.getValue('visibilityChallenges'))
142 -#set($visibilityDailyActivities = $!doc.getValue('visibilityDailyActivities'))
143 -#set($visibilityElection = $!doc.getValue('visibilityElection'))
144 -#set($visibilityMeeting = $!doc.getValue('visibilityMeeting'))
145 -#set($visibilityActivityEnv = $!doc.getValue('visibilityActivityEnv'))
146 -#set($visibilityAssembly = $!doc.getValue('visibilityAssembly'))
147 -#set($visibilityPublicity = $!doc.getValue('visibilityPublicity'))
148 -#set($visibilityExternal = $!doc.getValue('visibilityExternal'))
149 -#set($visibilityAnnualEvents = $!doc.getValue('visibilityAnnualEvents'))
150 150  ## デフォルト値（未設定なら全体公開）
151 151  #if(!$visibilityOrgChart || $visibilityOrgChart == '') #set($visibilityOrgChart = 'public') #end
152 152  #if(!$visibilityBudget || $visibilityBudget == '') #set($visibilityBudget = 'public') #end
... ... @@ -158,7 +158,6 @@
158 158  #set($isGuest = $viewerUser == 'XWiki.XWikiGuest')
159 159  #set($isViewerAdmin = false)
160 160  #set($viewerSchoolCode = '')
161 -#set($viewerSecondaryGraduated = false)
162 162  #if(!$isGuest)
163 163   #set($viewerDoc = $xwiki.getDocument($viewerUser))
164 164   #set($viewerAccountType = $!viewerDoc.getValue('accountType'))
... ... @@ -168,24 +168,6 @@
168 168   #if($viewerAccountType == 'admin')
169 169   #set($isViewerAdmin = true)
170 170   #end
171 - ## 第2所属校の在学年数超過チェック
172 - #set($viewerSecEnrollYear = $!viewerDoc.getValue('secondaryEnrollmentYear'))
173 - #if($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecEnrollYear && $viewerSecEnrollYear != '')
174 - #set($vNow = $datetool.date)
175 - #set($vCurYear = $mathtool.toInteger($datetool.format('yyyy', $vNow)))
176 - #set($vCurMonth = $mathtool.toInteger($datetool.format('MM', $vNow)))
177 - #if($vCurMonth >= 4)#set($vSchoolYear = $vCurYear)#else#set($vSchoolYear = $mathtool.sub($vCurYear, 1))#end
178 - #set($vSecEnroll = $mathtool.toInteger($viewerSecEnrollYear))
179 - #set($vSecMax = 3)
180 - #if($viewerSecondarySchoolCode.length() >= 2)
181 - #set($vSecType = $viewerSecondarySchoolCode.substring(0, 2))
182 - #if($vSecType == 'C2')#set($vSecMax = 9)#elseif($vSecType == 'D2')#set($vSecMax = 6)#end
183 - #end
184 - #set($vSecGrade = $mathtool.add($mathtool.sub($vSchoolYear, $vSecEnroll), 1))
185 - #if($vSecGrade > $vSecMax)
186 - #set($viewerSecondaryGraduated = true)
187 - #end
188 - #end
189 189  #end
190 190  
191 191  ## --- 関連校（中高一貫校）情報 ---
... ... @@ -195,7 +195,7 @@
195 195  #if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
196 196   #if($viewerSchoolCode == $affiliatedSchoolCode)
197 197   #set($isAffiliated = true)
198 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode && !$viewerSecondaryGraduated)
157 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode)
199 199   #set($isAffiliated = true)
200 200   #end
201 201  #end
... ... @@ -205,7 +205,7 @@
205 205  #if(!$isGuest && $viewerUserRole != 'graduate')
206 206   #if($viewerSchoolCode == $schoolCode || $isAffiliated)
207 207   #set($isSchoolMember = true)
208 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode && !$viewerSecondaryGraduated)
167 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode)
209 209   #set($isSchoolMember = true)
210 210   #end
211 211  #end
... ... @@ -387,7 +387,7 @@
387 387  #end
388 388  #if($canEditSchool)
389 389  <div style="text-align:right; margin-bottom:12px;">
390 - <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>
349 + <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>
391 391  </div>
392 392  #end
393 393  
... ... @@ -419,19 +419,7 @@
419 419   <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
420 420   <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
421 421   <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
422 - <tr><th>共学・別学</th><td>
423 - #if($coeducation && $coeducation != '')
424 - <div class="selection-display">
425 - #foreach($ceo in ["共学","男子校","女子校","その他"])
426 - #if($coeducation == $ceo)
427 - <span class="selection-item">$!escapetool.xml($ceo)</span>
428 - #else
429 - <span class="selection-item selection-item-off">$!escapetool.xml($ceo)</span>
430 - #end
431 - #end
432 - </div>
433 - #end
434 - </td></tr>
381 + <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
435 435   <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
436 436   <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
437 437   <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
... ... @@ -477,166 +477,50 @@
477 477   #end
478 478   #end
479 479  
480 - ## --- 活動環境 ---
481 - #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictTools && !$ictTools.isEmpty()) || ($ictUsage && !$ictUsage.isEmpty()))
482 - #if($hasActivityEnv)
483 - #set($canViewAE = true)
484 - #if($visibilityActivityEnv == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAE = false)
485 - #elseif($visibilityActivityEnv == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAE = false)
486 - #end
487 - #if($canViewAE)
427 + ## --- 日常の活動 ---
428 + #if($dailyActivities && !$dailyActivities.isEmpty())
488 488   <div class="seitokai-subsection">
489 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 9l9-7 9 7v11a2 2 0 01-2 2H5a2 2 0 01-2-2z"/><polyline points="9 22 9 12 15 12 15 22"/></svg> 生徒会の活動環境 #if($visibilityActivityEnv != '' && $visibilityActivityEnv != 'public')<span class="visibility-badge visibility-${visibilityActivityEnv}">#if($visibilityActivityEnv == 'school_trusted')<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> 校内承認・紹介限定#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>
430 + <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>
490 490   <div class="seitokai-subsection-content">
491 - #if($activityPlace && !$activityPlace.isEmpty())
492 - <div class="info-row">
493 - <span class="info-label">普段の活動場所</span>
494 - <span class="info-value">
495 - <div class="selection-display">
496 - #foreach($apo in ["専用の生徒会室","他の部活・委員会と併用した教室","空き教室を活用","インターネット中心","その他"])
497 - #if($activityPlace.contains($apo))
498 - <span class="selection-item">$!escapetool.xml($apo)</span>
499 - #else
500 - <span class="selection-item selection-item-off">$!escapetool.xml($apo)</span>
501 - #end
502 - #end
503 - </div>
504 - </span>
432 + <p class="activity-hint">活動時間が多い3つ</p>
433 + <div class="tag-container">
434 + #foreach($da in $dailyActivities)
435 + <span class="tag tag-accent">$!escapetool.xml($da.trim())</span>
436 + #end
505 505   </div>
438 + #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
439 + <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
506 506   #end
507 - #if($activityRoomEquipment && $activityRoomEquipment != '')
508 - <div class="info-row">
509 - <span class="info-label">生徒会室の設備</span>
510 - <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span>
511 - </div>
512 - #end
513 - #if($activityRoomImage && $activityRoomImage != '')
514 - <div class="info-row">
515 - <span class="info-label">活動場所の写真</span>
516 - <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span>
517 - </div>
518 - #end
519 - #if($ictTools && !$ictTools.isEmpty())
520 - <div class="info-row">
521 - <span class="info-label">利用しているICTツール</span>
522 - <span class="info-value">
523 - #set($ictCatDisplay = [
524 - ["連絡ツール", ["メール","LINE","LINE WORKS","Discord","Slack","Microsoft Teams","Google Chat","InstagramのDM","XのDM","その他（連絡）"]],
525 - ["ドキュメント作成・共有", ["Googleドキュメント","Googleスプレッドシート","Googleスライド","Googleドライブ","Word","Excel","PowerPoint","OneDrive","SharePoint","Notion","Pages","Numbers","Keynote","Dropbox","Box","その他（ドキュメント）"]],
526 - ["タスク管理", ["Googleカレンダー","Google ToDoリスト","Trello","Asana","Excel等スプレッドシート","その他（タスク管理）"]],
527 - ["ビデオ会議ツール", ["Zoom","Google Meet","その他（ビデオ会議）"]],
528 - ["アンケート", ["Googleフォーム","Microsoft Forms","その他（アンケート）"]],
529 - ["デザイン・クリエイティブ", ["Canva","各種Adobe","CapCut","LumaFusion","AviUtl","ibisPaint","その他（デザイン）"]],
530 - ["その他", ["独自のWebシステム・自作アプリ"]]
531 - ])
532 - #foreach($catD in $ictCatDisplay)
533 - #set($catHasItems = false)
534 - #foreach($t in $catD.get(1))
535 - #if($ictTools.contains($t)) #set($catHasItems = true) #end
536 - #end
537 - #if($catHasItems)
538 - <div style="margin-bottom:6px">
539 - <span style="font-size:0.8em;font-weight:600;color:var(--text-mid)">$catD.get(0):</span>
540 - <div class="selection-display" style="margin-top:2px">
541 - #foreach($t in $catD.get(1))
542 - #if($ictTools.contains($t))
543 - <span class="selection-item">$!escapetool.xml($t)</span>
544 - #end
545 - #end
546 - </div>
547 - </div>
548 - #end
549 - #end
550 - </span>
551 - </div>
552 - #end
553 - #if($ictUsage && !$ictUsage.isEmpty())
554 - <div class="info-row">
555 - <span class="info-label">ICT活用している場面</span>
556 - <span class="info-value">
557 - <div class="selection-display">
558 - #foreach($iu in $ictUsage)
559 - <span class="selection-item">$!escapetool.xml($iu.trim())</span>
560 - #end
561 - </div>
562 - </span>
563 - </div>
564 - #end
565 565   </div>
566 566   </div>
567 - #else
568 - <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($visibilityActivityEnv == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
569 - #end
570 570   #end
571 571  
572 - ## --- 年間主要行事 ---
573 - #set($months = [["4月", $eventApril], ["5月", $eventMay], ["6月", $eventJune], ["7月", $eventJuly], ["8月", $eventAugust], ["9月", $eventSeptember], ["10月", $eventOctober], ["11月", $eventNovember], ["12月", $eventDecember], ["1月", $eventJanuary], ["2月", $eventFebruary], ["3月", $eventMarch]])
574 - #set($hasAnyEvent = false)
575 - #foreach($m in $months)
576 - #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end
577 - #end
578 - #if($hasAnyEvent)
579 - #set($canViewAN = true)
580 - #if($visibilityAnnualEvents == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAN = false)
581 - #elseif($visibilityAnnualEvents == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAN = false)
582 - #end
583 - #if($canViewAN)
445 + ## --- 選挙 ---
446 + #if($electionExists && $electionExists != '')
584 584   <div class="seitokai-subsection">
585 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2" ry="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> 年間主要行事 #if($visibilityAnnualEvents != '' && $visibilityAnnualEvents != 'public')<span class="visibility-badge visibility-${visibilityAnnualEvents}">#if($visibilityAnnualEvents == 'school_trusted')<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> 校内承認・紹介限定#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>
448 + <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>
586 586   <div class="seitokai-subsection-content">
587 - <table class="wiki-table school-info-table" style="margin:0">
588 - #foreach($m in $months)
589 - #if($m.get(1) && $m.get(1) != '')
590 - <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr>
591 - #end
592 - #end
593 - </table>
594 - </div>
595 - </div>
596 - #else
597 - <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($visibilityAnnualEvents == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
598 - #end
599 - #end
600 -
601 - ## --- 日常の活動 ---
602 - #if($dailyActivities && !$dailyActivities.isEmpty())
603 - #set($canViewDA = true)
604 - #if($visibilityDailyActivities == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewDA = false)
605 - #elseif($visibilityDailyActivities == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewDA = false)
606 - #end
607 - #if($canViewDA)
608 - <div class="seitokai-subsection">
609 - <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> 日常の活動 #if($visibilityDailyActivities != '' && $visibilityDailyActivities != 'public')<span class="visibility-badge visibility-${visibilityDailyActivities}">#if($visibilityDailyActivities == 'school_trusted')<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> 校内承認・紹介限定#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>
610 - <div class="seitokai-subsection-content">
611 - <p class="activity-hint">活動時間が多い3つ</p>
612 - <div class="selection-display">
613 - #foreach($dao in ["文化祭","体育祭","生徒会企画","歓送迎会","その他学校行事","校則改正","選挙","総会","予算編成・会計活動","教員との連携","他校との連携","地域との連携","ボランティア","広報","引き継ぎ","DX","目安箱","委員会","学級・HRとの連携","アンケート","三者協議会等","企業との連携","保護者との連携","その他"])
614 - #if($dailyActivities.contains($dao))
615 - <span class="selection-item">$!escapetool.xml($dao)</span>
616 - #else
617 - <span class="selection-item selection-item-off">$!escapetool.xml($dao)</span>
618 - #end
619 - #end
450 + <div class="info-row">
451 + <span class="info-label">役員選挙</span>
452 + <span class="info-value">$!escapetool.xml($!electionExists)</span>
620 620   </div>
621 - #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
622 - <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
454 + #if($electionType && $electionType != '')
455 + <div class="info-row">
456 + <span class="info-label">直近の選挙方式</span>
457 + <span class="info-value">$!escapetool.xml($!electionType)</span>
458 + </div>
623 623   #end
460 + #if($electionNote && $electionNote.trim() != '')
461 + <div class="free-note">$!escapetool.xml($electionNote)</div>
462 + #end
624 624   </div>
625 625   </div>
626 - #else
627 - <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($visibilityDailyActivities == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
628 - #end
629 629   #end
630 630  
631 631   ## --- 定例活動 ---
632 632   #if($meetingFrequency && $meetingFrequency != '')
633 - #set($canViewMT = true)
634 - #if($visibilityMeeting == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewMT = false)
635 - #elseif($visibilityMeeting == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewMT = false)
636 - #end
637 - #if($canViewMT)
638 638   <div class="seitokai-subsection">
639 - <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> 定例活動 #if($visibilityMeeting != '' && $visibilityMeeting != 'public')<span class="visibility-badge visibility-${visibilityMeeting}">#if($visibilityMeeting == 'school_trusted')<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> 校内承認・紹介限定#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>
470 + <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>
640 640   <div class="seitokai-subsection-content">
641 641   <div class="info-row">
642 642   <span class="info-label">役員定例会の頻度</span>
... ... @@ -647,32 +647,30 @@
647 647   #end
648 648   </div>
649 649   </div>
650 - #else
651 - <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($visibilityMeeting == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
652 - #end
653 653   #end
654 654  
655 - ## --- 生徒総会 ---
656 - #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != ''))
657 - #if($hasAssembly)
658 - #set($canViewAS = true)
659 - #if($visibilityAssembly == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAS = false)
660 - #elseif($visibilityAssembly == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAS = false)
483 + ## --- 予算 ---
484 + #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
485 + #if($hasBudget)
486 + #set($canViewBudget = true)
487 + #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
488 + #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
661 661   #end
662 - #if($canViewAS)
490 + #if($canViewBudget)
663 663   <div class="seitokai-subsection">
664 - <h3 class="seitokai-subsection-title"><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> 生徒総会 #if($visibilityAssembly != '' && $visibilityAssembly != 'public')<span class="visibility-badge visibility-${visibilityAssembly}">#if($visibilityAssembly == 'school_trusted')<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> 校内承認・紹介限定#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>
492 + <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 == 'school_trusted')<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> 校内承認・紹介限定#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>
665 665   <div class="seitokai-subsection-content">
666 - #if($assemblyFormat && $assemblyFormat != '')
494 + #if($budgetProcess && !$budgetProcess.isEmpty())
667 667   <div class="info-row">
668 - <span class="info-label">開催方式</span>
496 + <span class="info-label">作成過程の生徒関与</span>
669 669   <span class="info-value">
670 670   <div class="selection-display">
671 - #foreach($afo in ["全生徒の対面開催","オンラインと併用","完全オンライン開催","開催なし","その他"])
672 - #if($assemblyFormat == $afo)
673 - <span class="selection-item">$!escapetool.xml($afo)</span>
499 + #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整（折衝等）","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"])
500 + #foreach($bpOpt in $allBpOpts)
501 + #if($budgetProcess.contains($bpOpt))
502 + <span class="selection-item">$!escapetool.xml($bpOpt)</span>
674 674   #else
675 - <span class="selection-item selection-item-off">$!escapetool.xml($afo)</span>
504 + <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span>
676 676   #end
677 677   #end
678 678   </div>
... ... @@ -679,87 +679,40 @@
679 679   </span>
680 680   </div>
681 681   #end
682 - #if($assemblyCount && $assemblyCount > 0)
511 + #if($studentFee && $studentFee != '')
683 683   <div class="info-row">
684 - <span class="info-label">開催回数（年）</span>
685 - <span class="info-value">$!escapetool.xml($assemblyCount)回</span>
513 + <span class="info-label">生徒会費（年額）</span>
514 + <span class="info-value">$!escapetool.xml($!studentFee)</span>
686 686   </div>
687 687   #end
688 - #if($assemblyAgenda && !$assemblyAgenda.isEmpty())
517 + #if($budgetScale && $budgetScale != '')
689 689   <div class="info-row">
690 - <span class="info-label">議案の集め方</span>
691 - <span class="info-value">
692 - <div class="selection-display">
693 - #foreach($aao in ["教員からの提案","執行部からの提案","クラスごとの討議","目安箱","アンケート","総会時の発議","その他"])
694 - #if($assemblyAgenda.contains($aao))
695 - <span class="selection-item">$!escapetool.xml($aao)</span>
696 - #else
697 - <span class="selection-item selection-item-off">$!escapetool.xml($aao)</span>
698 - #end
699 - #end
700 - </div>
701 - </span>
519 + <span class="info-label">予算規模</span>
520 + <span class="info-value">$!escapetool.xml($!budgetScale)</span>
702 702   </div>
703 703   #end
704 - #if($assemblyTopics && !$assemblyTopics.isEmpty())
523 + #if($budgetAllocation && !$budgetAllocation.isEmpty())
705 705   <div class="info-row">
706 - <span class="info-label">扱う内容</span>
525 + <span class="info-label">主な予算配分</span>
707 707   <span class="info-value">
708 708   <div class="selection-display">
709 - #foreach($ato in ["生徒会決算案","生徒会予算案","会則/校則の改正","生徒会の活動方針","学校への要望事項","外部へのアピール（宣言の採択など）","その他"])
710 - #if($assemblyTopics.contains($ato))
711 - <span class="selection-item">$!escapetool.xml($ato)</span>
712 - #else
713 - <span class="selection-item selection-item-off">$!escapetool.xml($ato)</span>
714 - #end
528 + #foreach($ba in $budgetAllocation)
529 + <span class="selection-item">$!escapetool.xml($ba.trim())</span>
715 715   #end
716 716   </div>
717 717   </span>
718 718   </div>
719 719   #end
720 - #if($assemblyNote && $assemblyNote != '')
721 - <div class="info-row">
722 - <span class="info-label">自由記述</span>
723 - <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span>
724 - </div>
535 + #if($budgetNote && $budgetNote.trim() != '')
536 + <div class="free-note">$!escapetool.xml($budgetNote)</div>
725 725   #end
726 726   </div>
727 727   </div>
728 728   #else
729 - <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($visibilityAssembly == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
541 + <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 == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
730 730   #end
731 731   #end
732 732  
733 - ## --- 選挙 ---
734 - #if($electionExists && $electionExists != '')
735 - #set($canViewEL = true)
736 - #if($visibilityElection == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEL = false)
737 - #elseif($visibilityElection == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEL = false)
738 - #end
739 - #if($canViewEL)
740 - <div class="seitokai-subsection">
741 - <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> 選挙 #if($visibilityElection != '' && $visibilityElection != 'public')<span class="visibility-badge visibility-${visibilityElection}">#if($visibilityElection == 'school_trusted')<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> 校内承認・紹介限定#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>
742 - <div class="seitokai-subsection-content">
743 - <div class="info-row">
744 - <span class="info-label">役員選挙</span>
745 - <span class="info-value">$!escapetool.xml($!electionExists)</span>
746 - </div>
747 - #if($electionType && $electionType != '')
748 - <div class="info-row">
749 - <span class="info-label">直近の選挙方式</span>
750 - <span class="info-value">$!escapetool.xml($!electionType)</span>
751 - </div>
752 - #end
753 - #if($electionNote && $electionNote.trim() != '')
754 - <div class="free-note">$!escapetool.xml($electionNote)</div>
755 - #end
756 - </div>
757 - </div>
758 - #else
759 - <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($visibilityElection == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
760 - #end
761 - #end
762 -
763 763   ## --- 校則・生徒会会則の見直し ---
764 764   #if($ruleReviewStatus && $ruleReviewStatus != '')
765 765   #set($canViewRuleReview = true)
... ... @@ -780,12 +780,8 @@
780 780   <span class="info-label">見直しの内容</span>
781 781   <span class="info-value">
782 782   <div class="selection-display">
783 - #foreach($rco in ["服飾規定（制服など）","持ち物規定","校則改正の仕組み","生徒会の仕組み","その他"])
784 - #if($ruleReviewContent.contains($rco))
785 - <span class="selection-item">$!escapetool.xml($rco)</span>
786 - #else
787 - <span class="selection-item selection-item-off">$!escapetool.xml($rco)</span>
788 - #end
565 + #foreach($rc in $ruleReviewContent)
566 + <span class="selection-item">$!escapetool.xml($rc.trim())</span>
789 789   #end
790 790   </div>
791 791   </span>
... ... @@ -796,12 +796,8 @@
796 796   <span class="info-label">見直しの提案者</span>
797 797   <span class="info-value">
798 798   <div class="selection-display">
799 - #foreach($rpo in ["教員","生徒会役員","専門委員会","その他の生徒","その他"])
800 - #if($ruleReviewProposer.contains($rpo))
801 - <span class="selection-item">$!escapetool.xml($rpo)</span>
802 - #else
803 - <span class="selection-item selection-item-off">$!escapetool.xml($rpo)</span>
804 - #end
577 + #foreach($rp in $ruleReviewProposer)
578 + <span class="selection-item">$!escapetool.xml($rp.trim())</span>
805 805   #end
806 806   </div>
807 807   </span>
... ... @@ -812,12 +812,8 @@
812 812   <span class="info-label">見直しの実施者</span>
813 813   <span class="info-value">
814 814   <div class="selection-display">
815 - #foreach($rio in ["教員","生徒会役員","専門委員会","その他の生徒","その他"])
816 - #if($ruleReviewImplementer.contains($rio))
817 - <span class="selection-item">$!escapetool.xml($rio)</span>
818 - #else
819 - <span class="selection-item selection-item-off">$!escapetool.xml($rio)</span>
820 - #end
589 + #foreach($ri in $ruleReviewImplementer)
590 + <span class="selection-item">$!escapetool.xml($ri.trim())</span>
821 821   #end
822 822   </div>
823 823   </span>
... ... @@ -837,82 +837,103 @@
837 837   #end
838 838   #end
839 839  
840 - ## --- 予算 ---
841 - #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
842 - #if($hasBudget)
843 - #set($canViewBudget = true)
844 - #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
845 - #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
846 - #end
847 - #if($canViewBudget)
610 + ## --- 活動環境 ---
611 + #set($hasActivityEnv = ($activityPlace && $activityPlace != '') || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictUsage && !$ictUsage.isEmpty()))
612 + #if($hasActivityEnv)
848 848   <div class="seitokai-subsection">
849 - <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 == 'school_trusted')<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> 校内承認・紹介限定#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>
614 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 9l9-7 9 7v11a2 2 0 01-2 2H5a2 2 0 01-2-2z"/><polyline points="9 22 9 12 15 12 15 22"/></svg> 生徒会の活動環境</h3>
850 850   <div class="seitokai-subsection-content">
851 - #if($budgetProcess && !$budgetProcess.isEmpty())
616 + #if($activityPlace && $activityPlace != '')
852 852   <div class="info-row">
853 - <span class="info-label">作成過程の生徒関与</span>
618 + <span class="info-label">普段の活動場所</span>
619 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($activityPlace)</span></span>
620 + </div>
621 + #end
622 + #if($activityRoomEquipment && $activityRoomEquipment != '')
623 + <div class="info-row">
624 + <span class="info-label">生徒会室の設備</span>
625 + <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span>
626 + </div>
627 + #end
628 + #if($activityRoomImage && $activityRoomImage != '')
629 + <div class="info-row">
630 + <span class="info-label">活動場所の写真</span>
631 + <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span>
632 + </div>
633 + #end
634 + #if($ictUsage && !$ictUsage.isEmpty())
635 + <div class="info-row">
636 + <span class="info-label">ICT活用している場面</span>
854 854   <span class="info-value">
855 855   <div class="selection-display">
856 - #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整（折衝等）","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"])
857 - #foreach($bpOpt in $allBpOpts)
858 - #if($budgetProcess.contains($bpOpt))
859 - <span class="selection-item">$!escapetool.xml($bpOpt)</span>
860 - #else
861 - <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span>
862 - #end
639 + #foreach($iu in $ictUsage)
640 + <span class="selection-item">$!escapetool.xml($iu.trim())</span>
863 863   #end
864 864   </div>
865 865   </span>
866 866   </div>
867 867   #end
868 - #if($studentFee && $studentFee != '')
646 + </div>
647 + </div>
648 + #end
649 +
650 + ## --- 生徒総会 ---
651 + #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != ''))
652 + #if($hasAssembly)
653 + <div class="seitokai-subsection">
654 + <h3 class="seitokai-subsection-title"><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> 生徒総会</h3>
655 + <div class="seitokai-subsection-content">
656 + #if($assemblyFormat && $assemblyFormat != '')
869 869   <div class="info-row">
870 - <span class="info-label">生徒会費（年額）</span>
871 - <span class="info-value">$!escapetool.xml($!studentFee)</span>
658 + <span class="info-label">開催方式</span>
659 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span>
872 872   </div>
873 873   #end
874 - #if($budgetScale && $budgetScale != '')
662 + #if($assemblyCount && $assemblyCount > 0)
875 875   <div class="info-row">
876 - <span class="info-label">予算規模</span>
877 - <span class="info-value">$!escapetool.xml($!budgetScale)</span>
664 + <span class="info-label">開催回数（年）</span>
665 + <span class="info-value">$!escapetool.xml($assemblyCount)回</span>
878 878   </div>
879 879   #end
880 - #if($budgetAllocation && !$budgetAllocation.isEmpty())
668 + #if($assemblyAgenda && !$assemblyAgenda.isEmpty())
881 881   <div class="info-row">
882 - <span class="info-label">主な予算配分</span>
670 + <span class="info-label">議案の集め方</span>
883 883   <span class="info-value">
884 884   <div class="selection-display">
885 - #foreach($bao in ["行事費用","部活動","寄付","HR活動","執行部等","委員会活動","その他"])
886 - #if($budgetAllocation.contains($bao))
887 - <span class="selection-item">$!escapetool.xml($bao)</span>
888 - #else
889 - <span class="selection-item selection-item-off">$!escapetool.xml($bao)</span>
890 - #end
673 + #foreach($aa in $assemblyAgenda)
674 + <span class="selection-item">$!escapetool.xml($aa.trim())</span>
891 891   #end
892 892   </div>
893 893   </span>
894 894   </div>
895 895   #end
896 - #if($budgetNote && $budgetNote.trim() != '')
897 - <div class="free-note">$!escapetool.xml($budgetNote)</div>
680 + #if($assemblyTopics && !$assemblyTopics.isEmpty())
681 + <div class="info-row">
682 + <span class="info-label">扱う内容</span>
683 + <span class="info-value">
684 + <div class="selection-display">
685 + #foreach($at in $assemblyTopics)
686 + <span class="selection-item">$!escapetool.xml($at.trim())</span>
687 + #end
688 + </div>
689 + </span>
690 + </div>
898 898   #end
692 + #if($assemblyNote && $assemblyNote != '')
693 + <div class="info-row">
694 + <span class="info-label">自由記述</span>
695 + <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span>
696 + </div>
697 + #end
899 899   </div>
900 900   </div>
901 - #else
902 - <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 == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
903 - #end
904 904   #end
905 905  
906 906   ## --- 広報 ---
907 907   #set($hasPublicity = ($publicityMethod && !$publicityMethod.isEmpty()) || ($publicityFrequency && $publicityFrequency != '') || ($publicityNote && $publicityNote != ''))
908 908   #if($hasPublicity)
909 - #set($canViewPB = true)
910 - #if($visibilityPublicity == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPB = false)
911 - #elseif($visibilityPublicity == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPB = false)
912 - #end
913 - #if($canViewPB)
914 914   <div class="seitokai-subsection">
915 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z"/><circle cx="12" cy="12" r="3"/></svg> 広報 #if($visibilityPublicity != '' && $visibilityPublicity != 'public')<span class="visibility-badge visibility-${visibilityPublicity}">#if($visibilityPublicity == 'school_trusted')<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> 校内承認・紹介限定#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>
706 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z"/><circle cx="12" cy="12" r="3"/></svg> 広報</h3>
916 916   <div class="seitokai-subsection-content">
917 917   #if($publicityMethod && !$publicityMethod.isEmpty())
918 918   <div class="info-row">
... ... @@ -940,36 +940,18 @@
940 940   #end
941 941   </div>
942 942   </div>
943 - #else
944 - <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($visibilityPublicity == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
945 - #end
946 946   #end
947 947  
948 948   ## --- 外部連携 ---
949 949   #set($hasExternal = ($externalCooperation && $externalCooperation != '') || ($externalOrgName && $externalOrgName != '') || ($socialParticipation && !$socialParticipation.isEmpty()))
950 950   #if($hasExternal)
951 - #set($canViewEX = true)
952 - #if($visibilityExternal == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEX = false)
953 - #elseif($visibilityExternal == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEX = false)
954 - #end
955 - #if($canViewEX)
956 956   <div class="seitokai-subsection">
957 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><circle cx="18" cy="5" r="3"/><circle cx="6" cy="12" r="3"/><circle cx="18" cy="19" r="3"/><line x1="8.59" y1="13.51" x2="15.42" y2="17.49"/><line x1="15.41" y1="6.51" x2="8.59" y2="10.49"/></svg> 外部連携 #if($visibilityExternal != '' && $visibilityExternal != 'public')<span class="visibility-badge visibility-${visibilityExternal}">#if($visibilityExternal == 'school_trusted')<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> 校内承認・紹介限定#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>
740 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><circle cx="18" cy="5" r="3"/><circle cx="6" cy="12" r="3"/><circle cx="18" cy="19" r="3"/><line x1="8.59" y1="13.51" x2="15.42" y2="17.49"/><line x1="15.41" y1="6.51" x2="8.59" y2="10.49"/></svg> 外部連携</h3>
958 958   <div class="seitokai-subsection-content">
959 959   #if($externalCooperation && $externalCooperation != '')
960 960   <div class="info-row">
961 961   <span class="info-label">他校の生徒会との連携</span>
962 - <span class="info-value">
963 - <div class="selection-display">
964 - #foreach($eco in ["定期的な連盟等の会合への参加","自治体等が主催するイベントへの参加","個別学校との交流","なし","その他"])
965 - #if($externalCooperation == $eco)
966 - <span class="selection-item">$!escapetool.xml($eco)</span>
967 - #else
968 - <span class="selection-item selection-item-off">$!escapetool.xml($eco)</span>
969 - #end
970 - #end
971 - </div>
972 - </span>
745 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($externalCooperation)</span></span>
973 973   </div>
974 974   #end
975 975   #if($externalOrgName && $externalOrgName != '')
... ... @@ -983,12 +983,8 @@
983 983   <span class="info-label">社会参加・地域連携・ボランティア</span>
984 984   <span class="info-value">
985 985   <div class="selection-display">
986 - #foreach($spo in ["三者協議会等","学校運営協議会等","町内会や商工会等との意見交換","企業や地域との商品開発","ゴミ拾い・地域清掃","募金","あいさつ運動","地域のお祭り・イベント等への協力・出展","その他"])
987 - #if($socialParticipation.contains($spo))
988 - <span class="selection-item">$!escapetool.xml($spo)</span>
989 - #else
990 - <span class="selection-item selection-item-off">$!escapetool.xml($spo)</span>
991 - #end
759 + #foreach($sp2 in $socialParticipation)
760 + <span class="selection-item">$!escapetool.xml($sp2.trim())</span>
992 992   #end
993 993   </div>
994 994   </span>
... ... @@ -996,11 +996,29 @@
996 996   #end
997 997   </div>
998 998   </div>
999 - #else
1000 - <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($visibilityExternal == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
1001 - #end
1002 1002   #end
1003 1003  
770 + ## --- 年間主要行事 ---
771 + #set($months = [["4月", $eventApril], ["5月", $eventMay], ["6月", $eventJune], ["7月", $eventJuly], ["8月", $eventAugust], ["9月", $eventSeptember], ["10月", $eventOctober], ["11月", $eventNovember], ["12月", $eventDecember], ["1月", $eventJanuary], ["2月", $eventFebruary], ["3月", $eventMarch]])
772 + #set($hasAnyEvent = false)
773 + #foreach($m in $months)
774 + #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end
775 + #end
776 + #if($hasAnyEvent)
777 + <div class="seitokai-subsection">
778 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2" ry="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>
779 + <div class="seitokai-subsection-content">
780 + <table class="wiki-table school-info-table" style="margin:0">
781 + #foreach($m in $months)
782 + #if($m.get(1) && $m.get(1) != '')
783 + <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr>
784 + #end
785 + #end
786 + </table>
787 + </div>
788 + </div>
789 + #end
790 +
1004 1004   ## --- 生徒会の課題意識 ---
1005 1005   #if($challenges && $challenges != '')
1006 1006   #set($canViewChallenges = true)
... ... @@ -1072,13 +1072,13 @@
1072 1072  
1073 1073  <div class="activity-toolbar">
1074 1074   <div class="activity-fy-tabs">
1075 - <button class="activity-fy-tab" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
862 + <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
1076 1076   #foreach($fy in $fySet)
1077 1077   #if($fy != $currentFYStr)
1078 1078   <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
1079 1079   #end
1080 1080   #end
1081 - <button class="activity-fy-tab active" onclick="switchActivityFY('all', this)">全期間</button>
868 + <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
1082 1082   </div>
1083 1083   <div class="activity-toolbar-right">
1084 1084   <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示">
... ... @@ -1117,67 +1117,22 @@
1117 1117  
1118 1118  {{/html}}
1119 1119  
1120 -## 活動を「年度降順 + 特色あり先頭」で並び替え
1121 -## Step1: fySet から年度を降順ソート（Velocity ネイティブ実装）
1122 -#set($fyNums = [])
1123 -#foreach($fy in $fySet)
1124 - #if($fy && $fy != '' && $fy != 'unknown')
1125 - #set($fyInt = $mathtool.toInteger($fy))
1126 - #if($fyInt)
1127 - #set($discard = $fyNums.add($fyInt))
1128 - #end
1129 - #end
1130 -#end
1131 -## 最大値を順番に取り出して降順リストを構築（最大20年度まで対応）
1132 -#set($fyDesc = [])
1133 -#set($fyRemaining = [])
1134 -#foreach($fy in $fyNums)
1135 - #set($discard = $fyRemaining.add($fy))
1136 -#end
1137 -#foreach($dummy in [1..20])
1138 - #if($fyRemaining.isEmpty())#break#end
1139 - #set($fyMax = $fyRemaining.get(0))
1140 - #foreach($fy in $fyRemaining)
1141 - #if($fy > $fyMax)#set($fyMax = $fy)#end
1142 - #end
1143 - #set($discard = $fyDesc.add($fyMax))
1144 - #set($fyNextRem = [])
1145 - #set($fyMaxRemoved = false)
1146 - #foreach($fy in $fyRemaining)
1147 - #if(!$fyMaxRemoved && $fy == $fyMax)
1148 - #set($fyMaxRemoved = true)
907 +## 特色ある活動を先頭に表示するため、並び替え用リストを作成
908 +#set($featuredActivities = [])
909 +#set($normalActivities = [])
910 +#if($activities && $activities.size() > 0)
911 + #foreach($act in $activities)
912 + #set($isFeatured = $!act.getValue('featured'))
913 + #if($isFeatured == '1')
914 + #set($discard = $featuredActivities.add($foreach.index))
1149 1149   #else
1150 - #set($discard = $fyNextRem.add($fy))
916 + #set($discard = $normalActivities.add($foreach.index))
1151 1151   #end
1152 1152   #end
1153 - #set($fyRemaining = $fyNextRem)
1154 1154  #end
1155 -## 年度未設定の活動は末尾に表示（fySetに'unknown'は入らないため無条件追加）
1156 -#set($discard = $fyDesc.add('unknown'))
1157 -## Step2: 年度降順で featured → normal の順にインデックスを収集
1158 1158  #set($orderedActivityIndices = [])
1159 -#foreach($curFY in $fyDesc)
1160 - ## 同年度の特色あり活動を先頭に
1161 - #set($actIdx2 = 0)
1162 - #foreach($act in $activities)
1163 - #set($aFY2 = $!act.getValue('fiscalYear'))
1164 - #if(!$aFY2 || $aFY2 == '') #set($aFY2 = 'unknown') #end
1165 - #if($aFY2 == $curFY && $act.getValue('featured') == '1')
1166 - #set($discard = $orderedActivityIndices.add($actIdx2))
1167 - #end
1168 - #set($actIdx2 = $actIdx2 + 1)
1169 - #end
1170 - ## 同年度の通常活動
1171 - #set($actIdx2 = 0)
1172 - #foreach($act in $activities)
1173 - #set($aFY2 = $!act.getValue('fiscalYear'))
1174 - #if(!$aFY2 || $aFY2 == '') #set($aFY2 = 'unknown') #end
1175 - #if($aFY2 == $curFY && $act.getValue('featured') != '1')
1176 - #set($discard = $orderedActivityIndices.add($actIdx2))
1177 - #end
1178 - #set($actIdx2 = $actIdx2 + 1)
1179 - #end
1180 -#end
921 +#set($discard = $orderedActivityIndices.addAll($featuredActivities))
922 +#set($discard = $orderedActivityIndices.addAll($normalActivities))
1181 1181  
1182 1182  #if($activities && $activities.size() > 0)
1183 1183   #foreach($actIdx in $orderedActivityIndices)
... ... @@ -1442,25 +1442,6 @@
1442 1442   #if($postVis != 'public')
1443 1443   <div class="visibility-badge visibility-${postVis} post-action-mt">#if($postVis == 'school_trusted')<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> 校内承認・紹介限定#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</div>
1444 1444   #end
1445 - ## いいねボタン
1446 - #set($postLikeCount = $!post.getValue('likeCount'))
1447 - #if(!$postLikeCount || $postLikeCount == '') #set($postLikeCount = 0) #end
1448 - #set($postLikedBy = $!post.getValue('likedBy'))
1449 - #set($isLikedByMe = false)
1450 - #if($postLikedBy && $postLikedBy.contains($xcontext.user)) #set($isLikedByMe = true) #end
1451 - <div class="post-like-row post-action-mt">
1452 - #if($xcontext.user != 'XWiki.XWikiGuest')
1453 - <button type="button" class="btn-like #if($isLikedByMe)liked#end" data-page="$escapetool.xml($doc.fullName)" data-obj="$post.number" data-csrf="$services.csrf.getToken()" onclick="toggleLike(this)">
1454 - <svg class="ico ico-fixed-14" viewBox="0 0 24 24" #if($isLikedByMe)fill="currentColor" stroke="none"#end><path d="M20.84 4.61a5.5 5.5 0 00-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 00-7.78 7.78l1.06 1.06L12 21.23l7.78-7.78 1.06-1.06a5.5 5.5 0 000-7.78z"/></svg>
1455 - <span class="like-count">$postLikeCount</span>
1456 - </button>
1457 - #else
1458 - <span class="btn-like disabled">
1459 - <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M20.84 4.61a5.5 5.5 0 00-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 00-7.78 7.78l1.06 1.06L12 21.23l7.78-7.78 1.06-1.06a5.5 5.5 0 000-7.78z"/></svg>
1460 - <span class="like-count">$postLikeCount</span>
1461 - </span>
1462 - #end
1463 - </div>
1464 1464   ## 固定/編集/削除/通報/非表示ボタン（横並び）
1465 1465   #set($postAuthorRef = $!post.getValue('authorRef'))
1466 1466   #set($postObjNumED = $post.number)
... ... @@ -1581,68 +1581,10 @@
1581 1581  {{/html}}
1582 1582  #end
1583 1583  
1584 -## --- OGP / SNSシェア対応 ---
1585 -#set($ogpTitle = "${schoolName} — 生徒会Wiki")
1586 -#set($ogpDesc = "${schoolName}の生徒会活動情報。")
1587 -#if($prefecture && $prefecture != '') #set($ogpDesc = "${ogpDesc}${prefecture}") #end
1588 -#if($city && $city != '') #set($ogpDesc = "${ogpDesc}${city}。") #end
1589 -#if($dailyActivities && $dailyActivities != '') #set($ogpDesc = "${ogpDesc} 主な活動: ${dailyActivities}") #end
1590 -#set($ogpUrl = "https://${request.serverName}${doc.getURL()}")
1591 -
1592 1592  ## --- 年度タブ切り替え JavaScript ---
1593 1593  {{html clean="false"}}
1594 1594  <script>
1595 -// OGPメタタグ挿入
1596 -(function() {
1597 - var ogp = {
1598 - 'og:title': '$escapetool.javascript($ogpTitle)',
1599 - 'og:description': '$escapetool.javascript($ogpDesc)',
1600 - 'og:type': 'article',
1601 - 'og:url': '$escapetool.javascript($ogpUrl)',
1602 - 'og:site_name': '生徒会Wiki',
1603 - 'twitter:card': 'summary'
1604 - };
1605 - for (var p in ogp) {
1606 - var meta = document.createElement('meta');
1607 - meta.setAttribute('property', p);
1608 - meta.setAttribute('content', ogp[p]);
1609 - document.head.appendChild(meta);
1610 - }
1611 - // twitter用
1612 - var tw = document.createElement('meta');
1613 - tw.setAttribute('name', 'twitter:card');
1614 - tw.setAttribute('content', 'summary');
1615 - document.head.appendChild(tw);
1616 -})();
1617 1617  // コンパクト表示（タイトルのみ）トグル
1618 -// いいねトグル
1619 -function toggleLike(btn) {
1620 - var page = btn.getAttribute('data-page');
1621 - var obj = btn.getAttribute('data-obj');
1622 - var csrf = btn.getAttribute('data-csrf');
1623 - btn.disabled = true;
1624 - var fd = new FormData();
1625 - fd.append('page', page);
1626 - fd.append('obj', obj);
1627 - fd.append('form_token', csrf);
1628 - fetch('/bin/SeitokaiCode/LikePost', { method: 'POST', body: fd })
1629 - .then(function(r) { return r.json(); })
1630 - .then(function(data) {
1631 - btn.querySelector('.like-count').textContent = data.count;
1632 - if (data.action === 'liked') {
1633 - btn.classList.add('liked');
1634 - btn.querySelector('svg').setAttribute('fill', 'currentColor');
1635 - btn.querySelector('svg').setAttribute('stroke', 'none');
1636 - } else {
1637 - btn.classList.remove('liked');
1638 - btn.querySelector('svg').removeAttribute('fill');
1639 - btn.querySelector('svg').setAttribute('stroke', 'currentColor');
1640 - }
1641 - })
1642 - .catch(function() { alert('エラーが発生しました'); })
1643 - .finally(function() { btn.disabled = false; });
1644 -}
1645 -
1646 1646  function toggleCompactView() {
1647 1647   var container = document.querySelector('.xwiki-content') || document.body;
1648 1648   var isCompact = container.classList.toggle('activity-compact-view');
... ... @@ -1686,7 +1686,7 @@
1686 1686  }
1687 1687  // ページ読み込み時の初期化
1688 1688  document.addEventListener('DOMContentLoaded', function() {
1689 - // 年度タブを降順にソート（「全期間」タブは先頭に固定）
1354 + // 年度タブを降順にソート（「全期間」タブは末尾に固定）
1690 1690   var tabContainer = document.querySelector('.activity-fy-tabs');
1691 1691   if (tabContainer) {
1692 1692   var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
... ... @@ -1703,11 +1703,11 @@
1703 1703   var bYear = parseInt(b.textContent) || 0;
1704 1704   return bYear - aYear;
1705 1705   });
1706 - // DOM再配置（全期間を先頭、年度タブを降順で続ける）
1707 - if (allTab) { tabContainer.appendChild(allTab); }
1371 + // DOM再配置
1708 1708   fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1373 + if (allTab) { tabContainer.appendChild(allTab); }
1709 1709   }
1710 - // デフォルトで全期間を表示
1375 + // デフォルトで現在の年度を表示
1711 1711   var defaultTab = document.querySelector('.activity-fy-tab.active');
1712 1712   if (defaultTab) { defaultTab.click(); }
1713 1713   // 保存成功時のトースト通知
... ... @@ -1760,15 +1760,7 @@
1760 1760   };
1761 1761   var toast = document.createElement('div');
1762 1762   toast.className = 'toast toast-' + type;
1763 - var iconSvg = icons[type] || '';
1764 - if (iconSvg) {
1765 - var iconSpan = document.createElement('span');
1766 - iconSpan.innerHTML = iconSvg;
1767 - toast.appendChild(iconSpan);
1768 - }
1769 - var msgSpan = document.createElement('span');
1770 - msgSpan.textContent = message;
1771 - toast.appendChild(msgSpan);
1428 + toast.innerHTML = (icons[type] || '') + '<span>' + message + '</span>';
1772 1772   container.appendChild(toast);
1773 1773   setTimeout(function() { toast.remove(); }, 3200);
1774 1774  }
... ... @@ -1807,7 +1807,6 @@
1807 1807   var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
1808 1808  
1809 1809   // コメント以外は添付ファイル編集を表示
1810 - function escAttr(s) { return s.replace(/&/g,'&amp;').replace(/"/g,'&quot;').replace(/'/g,'&#39;').replace(/</g,'&lt;').replace(/>/g,'&gt;'); }
1811 1811   if (postType !== 'comment') {
1812 1812   // 既存画像
1813 1813   html += '<div class="edit-attachments">';
... ... @@ -1817,10 +1817,10 @@
1817 1817   for (var i = 0; i < imgs.length; i++) {
1818 1818   var img = imgs[i].trim();
1819 1819   if (!img) continue;
1820 - html += '<div class="edit-attach-item" data-name="' + escAttr(img) + '">' +
1476 + html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'&quot;') + '">' +
1821 1821   '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
1822 1822   '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1823 - '<input type="hidden" name="keepImages" value="' + escAttr(img) + '" />' +
1479 + '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'&quot;') + '" />' +
1824 1824   '</div>';
1825 1825   }
1826 1826   html += '</div>';
... ... @@ -1834,10 +1834,10 @@
1834 1834   if (!f) continue;
1835 1835   var displayName = f;
1836 1836   if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
1837 - html += '<div class="edit-attach-item" data-name="' + escAttr(f) + '">' +
1838 - '<span class="edit-attach-fname">' + escAttr(displayName) + '</span>' +
1493 + html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'&quot;') + '">' +
1494 + '<span class="edit-attach-fname">' + displayName.replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</span>' +
1839 1839   '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1840 - '<input type="hidden" name="keepFiles" value="' + escAttr(f) + '" />' +
1496 + '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'&quot;') + '" />' +
1841 1841   '</div>';
1842 1842   }
1843 1843   html += '</div>';