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

Summary

Details

Icon Page properties
Content
... ... @@ -7,6 +7,19 @@
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)" />
10 10  ## メンテナンスバナー（{{include}}ではなくインラインで記述し、<p>タグ挿入を回避）
11 11  #set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner'))
12 12  #set($bannerObj = $bannerDoc.getObject('SeitokaiCode.MaintenanceBannerClass'))
... ... @@ -68,6 +68,7 @@
68 68  #set($activityPlace = $doc.getValue('activityPlace'))
69 69  #set($activityRoomEquipment = $doc.getValue('activityRoomEquipment'))
70 70  #set($activityRoomImage = $doc.getValue('activityRoomImage'))
84 +#set($ictTools = $doc.getValue('ictTools'))
71 71  #set($ictUsage = $doc.getValue('ictUsage'))
72 72  
73 73  ## --- 生徒総会 ---
... ... @@ -144,6 +144,7 @@
144 144  #set($isGuest = $viewerUser == 'XWiki.XWikiGuest')
145 145  #set($isViewerAdmin = false)
146 146  #set($viewerSchoolCode = '')
161 +#set($viewerSecondaryGraduated = false)
147 147  #if(!$isGuest)
148 148   #set($viewerDoc = $xwiki.getDocument($viewerUser))
149 149   #set($viewerAccountType = $!viewerDoc.getValue('accountType'))
... ... @@ -153,6 +153,24 @@
153 153   #if($viewerAccountType == 'admin')
154 154   #set($isViewerAdmin = true)
155 155   #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
156 156  #end
157 157  
158 158  ## --- 関連校（中高一貫校）情報 ---
... ... @@ -162,7 +162,7 @@
162 162  #if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
163 163   #if($viewerSchoolCode == $affiliatedSchoolCode)
164 164   #set($isAffiliated = true)
165 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode)
198 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode && !$viewerSecondaryGraduated)
166 166   #set($isAffiliated = true)
167 167   #end
168 168  #end
... ... @@ -172,7 +172,7 @@
172 172  #if(!$isGuest && $viewerUserRole != 'graduate')
173 173   #if($viewerSchoolCode == $schoolCode || $isAffiliated)
174 174   #set($isSchoolMember = true)
175 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode)
208 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode && !$viewerSecondaryGraduated)
176 176   #set($isSchoolMember = true)
177 177   #end
178 178  #end
... ... @@ -354,7 +354,7 @@
354 354  #end
355 355  #if($canEditSchool)
356 356  <div style="text-align:right; margin-bottom:12px;">
357 - <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>
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>
358 358  </div>
359 359  #end
360 360  
... ... @@ -386,7 +386,19 @@
386 386   <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
387 387   <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
388 388   <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
389 - <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</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>
390 390   <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
391 391   <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
392 392   <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
... ... @@ -432,6 +432,127 @@
432 432   #end
433 433   #end
434 434  
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)
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>
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>
505 + </div>
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 + </div>
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 + #end
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)
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>
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 +
435 435   ## --- 日常の活動 ---
436 436   #if($dailyActivities && !$dailyActivities.isEmpty())
437 437   #set($canViewDA = true)
... ... @@ -443,9 +443,13 @@
443 443   <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>
444 444   <div class="seitokai-subsection-content">
445 445   <p class="activity-hint">活動時間が多い3つ</p>
446 - <div class="tag-container">
447 - #foreach($da in $dailyActivities)
448 - <span class="tag tag-accent">$!escapetool.xml($da.trim())</span>
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
449 449   #end
450 450   </div>
451 451   #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
... ... @@ -458,36 +458,6 @@
458 458   #end
459 459   #end
460 460  
461 - ## --- 選挙 ---
462 - #if($electionExists && $electionExists != '')
463 - #set($canViewEL = true)
464 - #if($visibilityElection == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEL = false)
465 - #elseif($visibilityElection == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEL = false)
466 - #end
467 - #if($canViewEL)
468 - <div class="seitokai-subsection">
469 - <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>
470 - <div class="seitokai-subsection-content">
471 - <div class="info-row">
472 - <span class="info-label">役員選挙</span>
473 - <span class="info-value">$!escapetool.xml($!electionExists)</span>
474 - </div>
475 - #if($electionType && $electionType != '')
476 - <div class="info-row">
477 - <span class="info-label">直近の選挙方式</span>
478 - <span class="info-value">$!escapetool.xml($!electionType)</span>
479 - </div>
480 - #end
481 - #if($electionNote && $electionNote.trim() != '')
482 - <div class="free-note">$!escapetool.xml($electionNote)</div>
483 - #end
484 - </div>
485 - </div>
486 - #else
487 - <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>
488 - #end
489 - #end
490 -
491 491   ## --- 定例活動 ---
492 492   #if($meetingFrequency && $meetingFrequency != '')
493 493   #set($canViewMT = true)
... ... @@ -512,28 +512,27 @@
512 512   #end
513 513   #end
514 514  
515 - ## --- 予算 ---
516 - #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
517 - #if($hasBudget)
518 - #set($canViewBudget = true)
519 - #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
520 - #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
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)
521 521   #end
522 - #if($canViewBudget)
662 + #if($canViewAS)
523 523   <div class="seitokai-subsection">
524 - <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>
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>
525 525   <div class="seitokai-subsection-content">
526 - #if($budgetProcess && !$budgetProcess.isEmpty())
666 + #if($assemblyFormat && $assemblyFormat != '')
527 527   <div class="info-row">
528 - <span class="info-label">作成過程の生徒関与</span>
668 + <span class="info-label">開催方式</span>
529 529   <span class="info-value">
530 530   <div class="selection-display">
531 - #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整（折衝等）","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"])
532 - #foreach($bpOpt in $allBpOpts)
533 - #if($budgetProcess.contains($bpOpt))
534 - <span class="selection-item">$!escapetool.xml($bpOpt)</span>
671 + #foreach($afo in ["全生徒の対面開催","オンラインと併用","完全オンライン開催","開催なし","その他"])
672 + #if($assemblyFormat == $afo)
673 + <span class="selection-item">$!escapetool.xml($afo)</span>
535 535   #else
536 - <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span>
675 + <span class="selection-item selection-item-off">$!escapetool.xml($afo)</span>
537 537   #end
538 538   #end
539 539   </div>
... ... @@ -540,40 +540,87 @@
540 540   </span>
541 541   </div>
542 542   #end
543 - #if($studentFee && $studentFee != '')
682 + #if($assemblyCount && $assemblyCount > 0)
544 544   <div class="info-row">
545 - <span class="info-label">生徒会費（年額）</span>
546 - <span class="info-value">$!escapetool.xml($!studentFee)</span>
684 + <span class="info-label">開催回数（年）</span>
685 + <span class="info-value">$!escapetool.xml($assemblyCount)回</span>
547 547   </div>
548 548   #end
549 - #if($budgetScale && $budgetScale != '')
688 + #if($assemblyAgenda && !$assemblyAgenda.isEmpty())
550 550   <div class="info-row">
551 - <span class="info-label">予算規模</span>
552 - <span class="info-value">$!escapetool.xml($!budgetScale)</span>
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>
553 553   </div>
554 554   #end
555 - #if($budgetAllocation && !$budgetAllocation.isEmpty())
704 + #if($assemblyTopics && !$assemblyTopics.isEmpty())
556 556   <div class="info-row">
557 - <span class="info-label">主な予算配分</span>
706 + <span class="info-label">扱う内容</span>
558 558   <span class="info-value">
559 559   <div class="selection-display">
560 - #foreach($ba in $budgetAllocation)
561 - <span class="selection-item">$!escapetool.xml($ba.trim())</span>
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
562 562   #end
563 563   </div>
564 564   </span>
565 565   </div>
566 566   #end
567 - #if($budgetNote && $budgetNote.trim() != '')
568 - <div class="free-note">$!escapetool.xml($budgetNote)</div>
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>
569 569   #end
570 570   </div>
571 571   </div>
572 572   #else
573 - <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>
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>
574 574   #end
575 575   #end
576 576  
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 +
577 577   ## --- 校則・生徒会会則の見直し ---
578 578   #if($ruleReviewStatus && $ruleReviewStatus != '')
579 579   #set($canViewRuleReview = true)
... ... @@ -594,8 +594,12 @@
594 594   <span class="info-label">見直しの内容</span>
595 595   <span class="info-value">
596 596   <div class="selection-display">
597 - #foreach($rc in $ruleReviewContent)
598 - <span class="selection-item">$!escapetool.xml($rc.trim())</span>
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
599 599   #end
600 600   </div>
601 601   </span>
... ... @@ -606,8 +606,12 @@
606 606   <span class="info-label">見直しの提案者</span>
607 607   <span class="info-value">
608 608   <div class="selection-display">
609 - #foreach($rp in $ruleReviewProposer)
610 - <span class="selection-item">$!escapetool.xml($rp.trim())</span>
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
611 611   #end
612 612   </div>
613 613   </span>
... ... @@ -618,8 +618,12 @@
618 618   <span class="info-label">見直しの実施者</span>
619 619   <span class="info-value">
620 620   <div class="selection-display">
621 - #foreach($ri in $ruleReviewImplementer)
622 - <span class="selection-item">$!escapetool.xml($ri.trim())</span>
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
623 623   #end
624 624   </div>
625 625   </span>
... ... @@ -639,117 +639,69 @@
639 639   #end
640 640   #end
641 641  
642 - ## --- 活動環境 ---
643 - #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictUsage && !$ictUsage.isEmpty()))
644 - #if($hasActivityEnv)
645 - #set($canViewAE = true)
646 - #if($visibilityActivityEnv == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAE = false)
647 - #elseif($visibilityActivityEnv == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAE = false)
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)
648 648   #end
649 - #if($canViewAE)
847 + #if($canViewBudget)
650 650   <div class="seitokai-subsection">
651 - <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>
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>
652 652   <div class="seitokai-subsection-content">
653 - #if($activityPlace && !$activityPlace.isEmpty())
851 + #if($budgetProcess && !$budgetProcess.isEmpty())
654 654   <div class="info-row">
655 - <span class="info-label">普段の活動場所</span>
853 + <span class="info-label">作成過程の生徒関与</span>
656 656   <span class="info-value">
657 657   <div class="selection-display">
658 - #foreach($ap in $activityPlace)
659 - <span class="selection-item">$!escapetool.xml($ap.trim())</span>
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
660 660   #end
661 661   </div>
662 662   </span>
663 663   </div>
664 664   #end
665 - #if($activityRoomEquipment && $activityRoomEquipment != '')
868 + #if($studentFee && $studentFee != '')
666 666   <div class="info-row">
667 - <span class="info-label">生徒会室の設備</span>
668 - <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span>
870 + <span class="info-label">生徒会費（年額）</span>
871 + <span class="info-value">$!escapetool.xml($!studentFee)</span>
669 669   </div>
670 670   #end
671 - #if($activityRoomImage && $activityRoomImage != '')
874 + #if($budgetScale && $budgetScale != '')
672 672   <div class="info-row">
673 - <span class="info-label">活動場所の写真</span>
674 - <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span>
876 + <span class="info-label">予算規模</span>
877 + <span class="info-value">$!escapetool.xml($!budgetScale)</span>
675 675   </div>
676 676   #end
677 - #if($ictUsage && !$ictUsage.isEmpty())
880 + #if($budgetAllocation && !$budgetAllocation.isEmpty())
678 678   <div class="info-row">
679 - <span class="info-label">ICT活用している場面</span>
882 + <span class="info-label">主な予算配分</span>
680 680   <span class="info-value">
681 681   <div class="selection-display">
682 - #foreach($iu in $ictUsage)
683 - <span class="selection-item">$!escapetool.xml($iu.trim())</span>
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
684 684   #end
685 685   </div>
686 686   </span>
687 687   </div>
688 688   #end
689 - </div>
690 - </div>
691 - #else
692 - <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>
693 - #end
694 - #end
695 -
696 - ## --- 生徒総会 ---
697 - #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != ''))
698 - #if($hasAssembly)
699 - #set($canViewAS = true)
700 - #if($visibilityAssembly == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAS = false)
701 - #elseif($visibilityAssembly == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAS = false)
702 - #end
703 - #if($canViewAS)
704 - <div class="seitokai-subsection">
705 - <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>
706 - <div class="seitokai-subsection-content">
707 - #if($assemblyFormat && $assemblyFormat != '')
708 - <div class="info-row">
709 - <span class="info-label">開催方式</span>
710 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span>
711 - </div>
896 + #if($budgetNote && $budgetNote.trim() != '')
897 + <div class="free-note">$!escapetool.xml($budgetNote)</div>
712 712   #end
713 - #if($assemblyCount && $assemblyCount > 0)
714 - <div class="info-row">
715 - <span class="info-label">開催回数（年）</span>
716 - <span class="info-value">$!escapetool.xml($assemblyCount)回</span>
717 - </div>
718 - #end
719 - #if($assemblyAgenda && !$assemblyAgenda.isEmpty())
720 - <div class="info-row">
721 - <span class="info-label">議案の集め方</span>
722 - <span class="info-value">
723 - <div class="selection-display">
724 - #foreach($aa in $assemblyAgenda)
725 - <span class="selection-item">$!escapetool.xml($aa.trim())</span>
726 - #end
727 - </div>
728 - </span>
729 - </div>
730 - #end
731 - #if($assemblyTopics && !$assemblyTopics.isEmpty())
732 - <div class="info-row">
733 - <span class="info-label">扱う内容</span>
734 - <span class="info-value">
735 - <div class="selection-display">
736 - #foreach($at in $assemblyTopics)
737 - <span class="selection-item">$!escapetool.xml($at.trim())</span>
738 - #end
739 - </div>
740 - </span>
741 - </div>
742 - #end
743 - #if($assemblyNote && $assemblyNote != '')
744 - <div class="info-row">
745 - <span class="info-label">自由記述</span>
746 - <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span>
747 - </div>
748 - #end
749 749   </div>
750 750   </div>
751 751   #else
752 - <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>
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>
753 753   #end
754 754   #end
755 755  
... ... @@ -809,7 +809,17 @@
809 809   #if($externalCooperation && $externalCooperation != '')
810 810   <div class="info-row">
811 811   <span class="info-label">他校の生徒会との連携</span>
812 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($externalCooperation)</span></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>
813 813   </div>
814 814   #end
815 815   #if($externalOrgName && $externalOrgName != '')
... ... @@ -823,8 +823,12 @@
823 823   <span class="info-label">社会参加・地域連携・ボランティア</span>
824 824   <span class="info-value">
825 825   <div class="selection-display">
826 - #foreach($sp2 in $socialParticipation)
827 - <span class="selection-item">$!escapetool.xml($sp2.trim())</span>
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
828 828   #end
829 829   </div>
830 830   </span>
... ... @@ -837,35 +837,6 @@
837 837   #end
838 838   #end
839 839  
840 - ## --- 年間主要行事 ---
841 - #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]])
842 - #set($hasAnyEvent = false)
843 - #foreach($m in $months)
844 - #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end
845 - #end
846 - #if($hasAnyEvent)
847 - #set($canViewAN = true)
848 - #if($visibilityAnnualEvents == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAN = false)
849 - #elseif($visibilityAnnualEvents == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAN = false)
850 - #end
851 - #if($canViewAN)
852 - <div class="seitokai-subsection">
853 - <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>
854 - <div class="seitokai-subsection-content">
855 - <table class="wiki-table school-info-table" style="margin:0">
856 - #foreach($m in $months)
857 - #if($m.get(1) && $m.get(1) != '')
858 - <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr>
859 - #end
860 - #end
861 - </table>
862 - </div>
863 - </div>
864 - #else
865 - <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>
866 - #end
867 - #end
868 -
869 869   ## --- 生徒会の課題意識 ---
870 870   #if($challenges && $challenges != '')
871 871   #set($canViewChallenges = true)
... ... @@ -937,13 +937,13 @@
937 937  
938 938  <div class="activity-toolbar">
939 939   <div class="activity-fy-tabs">
940 - <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
1075 + <button class="activity-fy-tab" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
941 941   #foreach($fy in $fySet)
942 942   #if($fy != $currentFYStr)
943 943   <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
944 944   #end
945 945   #end
946 - <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
1081 + <button class="activity-fy-tab active" onclick="switchActivityFY('all', this)">全期間</button>
947 947   </div>
948 948   <div class="activity-toolbar-right">
949 949   <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示">
... ... @@ -982,22 +982,67 @@
982 982  
983 983  {{/html}}
984 984  
985 -## 特色ある活動を先頭に表示するため、並び替え用リストを作成
986 -#set($featuredActivities = [])
987 -#set($normalActivities = [])
988 -#if($activities && $activities.size() > 0)
989 - #foreach($act in $activities)
990 - #set($isFeatured = $!act.getValue('featured'))
991 - #if($isFeatured == '1')
992 - #set($discard = $featuredActivities.add($foreach.index))
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)
993 993   #else
994 - #set($discard = $normalActivities.add($foreach.index))
1150 + #set($discard = $fyNextRem.add($fy))
995 995   #end
996 996   #end
1153 + #set($fyRemaining = $fyNextRem)
997 997  #end
1155 +## 年度未設定の活動は末尾に表示（fySetに'unknown'は入らないため無条件追加）
1156 +#set($discard = $fyDesc.add('unknown'))
1157 +## Step2: 年度降順で featured → normal の順にインデックスを収集
998 998  #set($orderedActivityIndices = [])
999 -#set($discard = $orderedActivityIndices.addAll($featuredActivities))
1000 -#set($discard = $orderedActivityIndices.addAll($normalActivities))
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
1001 1001  
1002 1002  #if($activities && $activities.size() > 0)
1003 1003   #foreach($actIdx in $orderedActivityIndices)
... ... @@ -1262,6 +1262,25 @@
1262 1262   #if($postVis != 'public')
1263 1263   <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>
1264 1264   #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>
1265 1265   ## 固定/編集/削除/通報/非表示ボタン（横並び）
1266 1266   #set($postAuthorRef = $!post.getValue('authorRef'))
1267 1267   #set($postObjNumED = $post.number)
... ... @@ -1382,10 +1382,68 @@
1382 1382  {{/html}}
1383 1383  #end
1384 1384  
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 +
1385 1385  ## --- 年度タブ切り替え JavaScript ---
1386 1386  {{html clean="false"}}
1387 1387  <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 +})();
1388 1388  // コンパクト表示（タイトルのみ）トグル
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 +
1389 1389  function toggleCompactView() {
1390 1390   var container = document.querySelector('.xwiki-content') || document.body;
1391 1391   var isCompact = container.classList.toggle('activity-compact-view');
... ... @@ -1429,7 +1429,7 @@
1429 1429  }
1430 1430  // ページ読み込み時の初期化
1431 1431  document.addEventListener('DOMContentLoaded', function() {
1432 - // 年度タブを降順にソート（「全期間」タブは末尾に固定）
1689 + // 年度タブを降順にソート（「全期間」タブは先頭に固定）
1433 1433   var tabContainer = document.querySelector('.activity-fy-tabs');
1434 1434   if (tabContainer) {
1435 1435   var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
... ... @@ -1446,11 +1446,11 @@
1446 1446   var bYear = parseInt(b.textContent) || 0;
1447 1447   return bYear - aYear;
1448 1448   });
1449 - // DOM再配置
1450 - fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1706 + // DOM再配置（全期間を先頭、年度タブを降順で続ける）
1451 1451   if (allTab) { tabContainer.appendChild(allTab); }
1708 + fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1452 1452   }
1453 - // デフォルトで現在の年度を表示
1710 + // デフォルトで全期間を表示
1454 1454   var defaultTab = document.querySelector('.activity-fy-tab.active');
1455 1455   if (defaultTab) { defaultTab.click(); }
1456 1456   // 保存成功時のトースト通知
... ... @@ -1503,7 +1503,15 @@
1503 1503   };
1504 1504   var toast = document.createElement('div');
1505 1505   toast.className = 'toast toast-' + type;
1506 - toast.innerHTML = (icons[type] || '') + '<span>' + message + '</span>';
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);
1507 1507   container.appendChild(toast);
1508 1508   setTimeout(function() { toast.remove(); }, 3200);
1509 1509  }
... ... @@ -1542,6 +1542,7 @@
1542 1542   var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
1543 1543  
1544 1544   // コメント以外は添付ファイル編集を表示
1810 + function escAttr(s) { return s.replace(/&/g,'&amp;').replace(/"/g,'&quot;').replace(/'/g,'&#39;').replace(/</g,'&lt;').replace(/>/g,'&gt;'); }
1545 1545   if (postType !== 'comment') {
1546 1546   // 既存画像
1547 1547   html += '<div class="edit-attachments">';
... ... @@ -1551,10 +1551,10 @@
1551 1551   for (var i = 0; i < imgs.length; i++) {
1552 1552   var img = imgs[i].trim();
1553 1553   if (!img) continue;
1554 - html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'&quot;') + '">' +
1820 + html += '<div class="edit-attach-item" data-name="' + escAttr(img) + '">' +
1555 1555   '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
1556 1556   '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1557 - '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'&quot;') + '" />' +
1823 + '<input type="hidden" name="keepImages" value="' + escAttr(img) + '" />' +
1558 1558   '</div>';
1559 1559   }
1560 1560   html += '</div>';
... ... @@ -1568,10 +1568,10 @@
1568 1568   if (!f) continue;
1569 1569   var displayName = f;
1570 1570   if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
1571 - html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'&quot;') + '">' +
1572 - '<span class="edit-attach-fname">' + displayName.replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</span>' +
1837 + html += '<div class="edit-attach-item" data-name="' + escAttr(f) + '">' +
1838 + '<span class="edit-attach-fname">' + escAttr(displayName) + '</span>' +
1573 1573   '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1574 - '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'&quot;') + '" />' +
1840 + '<input type="hidden" name="keepFiles" value="' + escAttr(f) + '" />' +
1575 1575   '</div>';
1576 1576   }
1577 1577   html += '</div>';