Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 95.1 Icon
edited by Super Admin
on 2026/03/20 18:03
Change comment: There is no comment for this version
To version Icon 118.1 Icon
edited by Super Admin
on 2026/04/01 17:36
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  ## --- 生徒総会 ---
... ... @@ -125,6 +125,14 @@
125 125  #set($visibilityBudget = $!doc.getValue('visibilityBudget'))
126 126  #set($visibilityRuleReview = $!doc.getValue('visibilityRuleReview'))
127 127  #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'))
128 128  ## デフォルト値（未設定なら全体公開）
129 129  #if(!$visibilityOrgChart || $visibilityOrgChart == '') #set($visibilityOrgChart = 'public') #end
130 130  #if(!$visibilityBudget || $visibilityBudget == '') #set($visibilityBudget = 'public') #end
... ... @@ -136,6 +136,7 @@
136 136  #set($isGuest = $viewerUser == 'XWiki.XWikiGuest')
137 137  #set($isViewerAdmin = false)
138 138  #set($viewerSchoolCode = '')
161 +#set($viewerSecondaryGraduated = false)
139 139  #if(!$isGuest)
140 140   #set($viewerDoc = $xwiki.getDocument($viewerUser))
141 141   #set($viewerAccountType = $!viewerDoc.getValue('accountType'))
... ... @@ -145,6 +145,24 @@
145 145   #if($viewerAccountType == 'admin')
146 146   #set($isViewerAdmin = true)
147 147   #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
148 148  #end
149 149  
150 150  ## --- 関連校（中高一貫校）情報 ---
... ... @@ -154,7 +154,7 @@
154 154  #if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
155 155   #if($viewerSchoolCode == $affiliatedSchoolCode)
156 156   #set($isAffiliated = true)
157 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode)
198 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode && !$viewerSecondaryGraduated)
158 158   #set($isAffiliated = true)
159 159   #end
160 160  #end
... ... @@ -164,7 +164,7 @@
164 164  #if(!$isGuest && $viewerUserRole != 'graduate')
165 165   #if($viewerSchoolCode == $schoolCode || $isAffiliated)
166 166   #set($isSchoolMember = true)
167 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode)
208 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode && !$viewerSecondaryGraduated)
168 168   #set($isSchoolMember = true)
169 169   #end
170 170  #end
... ... @@ -346,7 +346,7 @@
346 346  #end
347 347  #if($canEditSchool)
348 348  <div style="text-align:right; margin-bottom:12px;">
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>
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>
350 350  </div>
351 351  #end
352 352  
... ... @@ -424,10 +424,132 @@
424 424   #end
425 425   #end
426 426  
468 + ## --- 活動環境 ---
469 + #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictTools && !$ictTools.isEmpty()) || ($ictUsage && !$ictUsage.isEmpty()))
470 + #if($hasActivityEnv)
471 + #set($canViewAE = true)
472 + #if($visibilityActivityEnv == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAE = false)
473 + #elseif($visibilityActivityEnv == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAE = false)
474 + #end
475 + #if($canViewAE)
476 + <div class="seitokai-subsection">
477 + <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>
478 + <div class="seitokai-subsection-content">
479 + #if($activityPlace && !$activityPlace.isEmpty())
480 + <div class="info-row">
481 + <span class="info-label">普段の活動場所</span>
482 + <span class="info-value">
483 + <div class="selection-display">
484 + #foreach($ap in $activityPlace)
485 + <span class="selection-item">$!escapetool.xml($ap.trim())</span>
486 + #end
487 + </div>
488 + </span>
489 + </div>
490 + #end
491 + #if($activityRoomEquipment && $activityRoomEquipment != '')
492 + <div class="info-row">
493 + <span class="info-label">生徒会室の設備</span>
494 + <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span>
495 + </div>
496 + #end
497 + #if($activityRoomImage && $activityRoomImage != '')
498 + <div class="info-row">
499 + <span class="info-label">活動場所の写真</span>
500 + <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span>
501 + </div>
502 + #end
503 + #if($ictTools && !$ictTools.isEmpty())
504 + <div class="info-row">
505 + <span class="info-label">利用しているICTツール</span>
506 + <span class="info-value">
507 + #set($ictCatDisplay = [
508 + ["連絡ツール", ["メール","LINE","LINE WORKS","Discord","Slack","Microsoft Teams","Google Chat","InstagramのDM","XのDM","その他（連絡）"]],
509 + ["ドキュメント作成・共有", ["Googleドキュメント","Googleスプレッドシート","Googleスライド","Googleドライブ","Word","Excel","PowerPoint","OneDrive","SharePoint","Notion","Pages","Numbers","Keynote","Dropbox","Box","その他（ドキュメント）"]],
510 + ["タスク管理", ["Googleカレンダー","Google ToDoリスト","Trello","Asana","Excel等スプレッドシート","その他（タスク管理）"]],
511 + ["ビデオ会議ツール", ["Zoom","Google Meet","その他（ビデオ会議）"]],
512 + ["アンケート", ["Googleフォーム","Microsoft Forms","その他（アンケート）"]],
513 + ["デザイン・クリエイティブ", ["Canva","各種Adobe","CapCut","LumaFusion","AviUtl","ibisPaint","その他（デザイン）"]],
514 + ["その他", ["独自のWebシステム・自作アプリ"]]
515 + ])
516 + #foreach($catD in $ictCatDisplay)
517 + #set($catHasItems = false)
518 + #foreach($t in $catD.get(1))
519 + #if($ictTools.contains($t)) #set($catHasItems = true) #end
520 + #end
521 + #if($catHasItems)
522 + <div style="margin-bottom:6px">
523 + <span style="font-size:0.8em;font-weight:600;color:var(--text-mid)">$catD.get(0):</span>
524 + <div class="selection-display" style="margin-top:2px">
525 + #foreach($t in $catD.get(1))
526 + #if($ictTools.contains($t))
527 + <span class="selection-item">$!escapetool.xml($t)</span>
528 + #end
529 + #end
530 + </div>
531 + </div>
532 + #end
533 + #end
534 + </span>
535 + </div>
536 + #end
537 + #if($ictUsage && !$ictUsage.isEmpty())
538 + <div class="info-row">
539 + <span class="info-label">ICT活用している場面</span>
540 + <span class="info-value">
541 + <div class="selection-display">
542 + #foreach($iu in $ictUsage)
543 + <span class="selection-item">$!escapetool.xml($iu.trim())</span>
544 + #end
545 + </div>
546 + </span>
547 + </div>
548 + #end
549 + </div>
550 + </div>
551 + #else
552 + <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>
553 + #end
554 + #end
555 +
556 + ## --- 年間主要行事 ---
557 + #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]])
558 + #set($hasAnyEvent = false)
559 + #foreach($m in $months)
560 + #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end
561 + #end
562 + #if($hasAnyEvent)
563 + #set($canViewAN = true)
564 + #if($visibilityAnnualEvents == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAN = false)
565 + #elseif($visibilityAnnualEvents == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAN = false)
566 + #end
567 + #if($canViewAN)
568 + <div class="seitokai-subsection">
569 + <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>
570 + <div class="seitokai-subsection-content">
571 + <table class="wiki-table school-info-table" style="margin:0">
572 + #foreach($m in $months)
573 + #if($m.get(1) && $m.get(1) != '')
574 + <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr>
575 + #end
576 + #end
577 + </table>
578 + </div>
579 + </div>
580 + #else
581 + <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>
582 + #end
583 + #end
584 +
427 427   ## --- 日常の活動 ---
428 428   #if($dailyActivities && !$dailyActivities.isEmpty())
587 + #set($canViewDA = true)
588 + #if($visibilityDailyActivities == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewDA = false)
589 + #elseif($visibilityDailyActivities == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewDA = false)
590 + #end
591 + #if($canViewDA)
429 429   <div class="seitokai-subsection">
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>
593 + <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>
431 431   <div class="seitokai-subsection-content">
432 432   <p class="activity-hint">活動時間が多い3つ</p>
433 433   <div class="tag-container">
... ... @@ -440,34 +440,20 @@
440 440   #end
441 441   </div>
442 442   </div>
606 + #else
607 + <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>
608 + #end
443 443   #end
444 444  
445 - ## --- 選挙 ---
446 - #if($electionExists && $electionExists != '')
447 - <div class="seitokai-subsection">
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>
449 - <div class="seitokai-subsection-content">
450 - <div class="info-row">
451 - <span class="info-label">役員選挙</span>
452 - <span class="info-value">$!escapetool.xml($!electionExists)</span>
453 - </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>
459 - #end
460 - #if($electionNote && $electionNote.trim() != '')
461 - <div class="free-note">$!escapetool.xml($electionNote)</div>
462 - #end
463 - </div>
464 - </div>
465 - #end
466 -
467 467   ## --- 定例活動 ---
468 468   #if($meetingFrequency && $meetingFrequency != '')
613 + #set($canViewMT = true)
614 + #if($visibilityMeeting == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewMT = false)
615 + #elseif($visibilityMeeting == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewMT = false)
616 + #end
617 + #if($canViewMT)
469 469   <div class="seitokai-subsection">
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>
619 + <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>
471 471   <div class="seitokai-subsection-content">
472 472   <div class="info-row">
473 473   <span class="info-label">役員定例会の頻度</span>
... ... @@ -478,70 +478,101 @@
478 478   #end
479 479   </div>
480 480   </div>
630 + #else
631 + <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>
632 + #end
481 481   #end
482 482  
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)
635 + ## --- 生徒総会 ---
636 + #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != ''))
637 + #if($hasAssembly)
638 + #set($canViewAS = true)
639 + #if($visibilityAssembly == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAS = false)
640 + #elseif($visibilityAssembly == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAS = false)
489 489   #end
490 - #if($canViewBudget)
642 + #if($canViewAS)
491 491   <div class="seitokai-subsection">
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>
644 + <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>
493 493   <div class="seitokai-subsection-content">
494 - #if($budgetProcess && !$budgetProcess.isEmpty())
646 + #if($assemblyFormat && $assemblyFormat != '')
495 495   <div class="info-row">
496 - <span class="info-label">作成過程の生徒関与</span>
497 - <span class="info-value">
498 - <div class="selection-display">
499 - #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整（折衝等）","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"])
500 - #foreach($bpOpt in $allBpOpts)
501 - #if($budgetProcess.contains($bpOpt))
502 - <span class="selection-item">$!escapetool.xml($bpOpt)</span>
503 - #else
504 - <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span>
505 - #end
506 - #end
507 - </div>
508 - </span>
648 + <span class="info-label">開催方式</span>
649 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span>
509 509   </div>
510 510   #end
511 - #if($studentFee && $studentFee != '')
652 + #if($assemblyCount && $assemblyCount > 0)
512 512   <div class="info-row">
513 - <span class="info-label">生徒会費（年額）</span>
514 - <span class="info-value">$!escapetool.xml($!studentFee)</span>
654 + <span class="info-label">開催回数（年）</span>
655 + <span class="info-value">$!escapetool.xml($assemblyCount)回</span>
515 515   </div>
516 516   #end
517 - #if($budgetScale && $budgetScale != '')
658 + #if($assemblyAgenda && !$assemblyAgenda.isEmpty())
518 518   <div class="info-row">
519 - <span class="info-label">予算規模</span>
520 - <span class="info-value">$!escapetool.xml($!budgetScale)</span>
660 + <span class="info-label">議案の集め方</span>
661 + <span class="info-value">
662 + <div class="selection-display">
663 + #foreach($aa in $assemblyAgenda)
664 + <span class="selection-item">$!escapetool.xml($aa.trim())</span>
665 + #end
666 + </div>
667 + </span>
521 521   </div>
522 522   #end
523 - #if($budgetAllocation && !$budgetAllocation.isEmpty())
670 + #if($assemblyTopics && !$assemblyTopics.isEmpty())
524 524   <div class="info-row">
525 - <span class="info-label">主な予算配分</span>
672 + <span class="info-label">扱う内容</span>
526 526   <span class="info-value">
527 527   <div class="selection-display">
528 - #foreach($ba in $budgetAllocation)
529 - <span class="selection-item">$!escapetool.xml($ba.trim())</span>
675 + #foreach($at in $assemblyTopics)
676 + <span class="selection-item">$!escapetool.xml($at.trim())</span>
530 530   #end
531 531   </div>
532 532   </span>
533 533   </div>
534 534   #end
535 - #if($budgetNote && $budgetNote.trim() != '')
536 - <div class="free-note">$!escapetool.xml($budgetNote)</div>
682 + #if($assemblyNote && $assemblyNote != '')
683 + <div class="info-row">
684 + <span class="info-label">自由記述</span>
685 + <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span>
686 + </div>
537 537   #end
538 538   </div>
539 539   </div>
540 540   #else
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>
691 + <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>
542 542   #end
543 543   #end
544 544  
695 + ## --- 選挙 ---
696 + #if($electionExists && $electionExists != '')
697 + #set($canViewEL = true)
698 + #if($visibilityElection == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEL = false)
699 + #elseif($visibilityElection == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEL = false)
700 + #end
701 + #if($canViewEL)
702 + <div class="seitokai-subsection">
703 + <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>
704 + <div class="seitokai-subsection-content">
705 + <div class="info-row">
706 + <span class="info-label">役員選挙</span>
707 + <span class="info-value">$!escapetool.xml($!electionExists)</span>
708 + </div>
709 + #if($electionType && $electionType != '')
710 + <div class="info-row">
711 + <span class="info-label">直近の選挙方式</span>
712 + <span class="info-value">$!escapetool.xml($!electionType)</span>
713 + </div>
714 + #end
715 + #if($electionNote && $electionNote.trim() != '')
716 + <div class="free-note">$!escapetool.xml($electionNote)</div>
717 + #end
718 + </div>
719 + </div>
720 + #else
721 + <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>
722 + #end
723 + #end
724 +
545 545   ## --- 校則・生徒会会則の見直し ---
546 546   #if($ruleReviewStatus && $ruleReviewStatus != '')
547 547   #set($canViewRuleReview = true)
... ... @@ -607,109 +607,78 @@
607 607   #end
608 608   #end
609 609  
610 - ## --- 活動環境 ---
611 - #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictUsage && !$ictUsage.isEmpty()))
612 - #if($hasActivityEnv)
790 + ## --- 予算 ---
791 + #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
792 + #if($hasBudget)
793 + #set($canViewBudget = true)
794 + #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
795 + #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
796 + #end
797 + #if($canViewBudget)
613 613   <div class="seitokai-subsection">
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>
799 + <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>
615 615   <div class="seitokai-subsection-content">
616 - #if($activityPlace && !$activityPlace.isEmpty())
801 + #if($budgetProcess && !$budgetProcess.isEmpty())
617 617   <div class="info-row">
618 - <span class="info-label">普段の活動場所</span>
803 + <span class="info-label">作成過程の生徒関与</span>
619 619   <span class="info-value">
620 620   <div class="selection-display">
621 - #foreach($ap in $activityPlace)
622 - <span class="selection-item">$!escapetool.xml($ap.trim())</span>
806 + #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整（折衝等）","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"])
807 + #foreach($bpOpt in $allBpOpts)
808 + #if($budgetProcess.contains($bpOpt))
809 + <span class="selection-item">$!escapetool.xml($bpOpt)</span>
810 + #else
811 + <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span>
812 + #end
623 623   #end
624 624   </div>
625 625   </span>
626 626   </div>
627 627   #end
628 - #if($activityRoomEquipment && $activityRoomEquipment != '')
818 + #if($studentFee && $studentFee != '')
629 629   <div class="info-row">
630 - <span class="info-label">生徒会室の設備</span>
631 - <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span>
820 + <span class="info-label">生徒会費（年額）</span>
821 + <span class="info-value">$!escapetool.xml($!studentFee)</span>
632 632   </div>
633 633   #end
634 - #if($activityRoomImage && $activityRoomImage != '')
824 + #if($budgetScale && $budgetScale != '')
635 635   <div class="info-row">
636 - <span class="info-label">活動場所の写真</span>
637 - <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span>
826 + <span class="info-label">予算規模</span>
827 + <span class="info-value">$!escapetool.xml($!budgetScale)</span>
638 638   </div>
639 639   #end
640 - #if($ictUsage && !$ictUsage.isEmpty())
830 + #if($budgetAllocation && !$budgetAllocation.isEmpty())
641 641   <div class="info-row">
642 - <span class="info-label">ICT活用している場面</span>
832 + <span class="info-label">主な予算配分</span>
643 643   <span class="info-value">
644 644   <div class="selection-display">
645 - #foreach($iu in $ictUsage)
646 - <span class="selection-item">$!escapetool.xml($iu.trim())</span>
835 + #foreach($ba in $budgetAllocation)
836 + <span class="selection-item">$!escapetool.xml($ba.trim())</span>
647 647   #end
648 648   </div>
649 649   </span>
650 650   </div>
651 651   #end
652 - </div>
653 - </div>
654 - #end
655 -
656 - ## --- 生徒総会 ---
657 - #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != ''))
658 - #if($hasAssembly)
659 - <div class="seitokai-subsection">
660 - <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>
661 - <div class="seitokai-subsection-content">
662 - #if($assemblyFormat && $assemblyFormat != '')
663 - <div class="info-row">
664 - <span class="info-label">開催方式</span>
665 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span>
666 - </div>
842 + #if($budgetNote && $budgetNote.trim() != '')
843 + <div class="free-note">$!escapetool.xml($budgetNote)</div>
667 667   #end
668 - #if($assemblyCount && $assemblyCount > 0)
669 - <div class="info-row">
670 - <span class="info-label">開催回数（年）</span>
671 - <span class="info-value">$!escapetool.xml($assemblyCount)回</span>
672 - </div>
673 - #end
674 - #if($assemblyAgenda && !$assemblyAgenda.isEmpty())
675 - <div class="info-row">
676 - <span class="info-label">議案の集め方</span>
677 - <span class="info-value">
678 - <div class="selection-display">
679 - #foreach($aa in $assemblyAgenda)
680 - <span class="selection-item">$!escapetool.xml($aa.trim())</span>
681 - #end
682 - </div>
683 - </span>
684 - </div>
685 - #end
686 - #if($assemblyTopics && !$assemblyTopics.isEmpty())
687 - <div class="info-row">
688 - <span class="info-label">扱う内容</span>
689 - <span class="info-value">
690 - <div class="selection-display">
691 - #foreach($at in $assemblyTopics)
692 - <span class="selection-item">$!escapetool.xml($at.trim())</span>
693 - #end
694 - </div>
695 - </span>
696 - </div>
697 - #end
698 - #if($assemblyNote && $assemblyNote != '')
699 - <div class="info-row">
700 - <span class="info-label">自由記述</span>
701 - <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span>
702 - </div>
703 - #end
704 704   </div>
705 705   </div>
847 + #else
848 + <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>
849 + #end
706 706   #end
707 707  
708 708   ## --- 広報 ---
709 709   #set($hasPublicity = ($publicityMethod && !$publicityMethod.isEmpty()) || ($publicityFrequency && $publicityFrequency != '') || ($publicityNote && $publicityNote != ''))
710 710   #if($hasPublicity)
855 + #set($canViewPB = true)
856 + #if($visibilityPublicity == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPB = false)
857 + #elseif($visibilityPublicity == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPB = false)
858 + #end
859 + #if($canViewPB)
711 711   <div class="seitokai-subsection">
712 - <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>
861 + <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>
713 713   <div class="seitokai-subsection-content">
714 714   #if($publicityMethod && !$publicityMethod.isEmpty())
715 715   <div class="info-row">
... ... @@ -737,13 +737,21 @@
737 737   #end
738 738   </div>
739 739   </div>
889 + #else
890 + <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>
891 + #end
740 740   #end
741 741  
742 742   ## --- 外部連携 ---
743 743   #set($hasExternal = ($externalCooperation && $externalCooperation != '') || ($externalOrgName && $externalOrgName != '') || ($socialParticipation && !$socialParticipation.isEmpty()))
744 744   #if($hasExternal)
897 + #set($canViewEX = true)
898 + #if($visibilityExternal == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEX = false)
899 + #elseif($visibilityExternal == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEX = false)
900 + #end
901 + #if($canViewEX)
745 745   <div class="seitokai-subsection">
746 - <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>
903 + <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>
747 747   <div class="seitokai-subsection-content">
748 748   #if($externalCooperation && $externalCooperation != '')
749 749   <div class="info-row">
... ... @@ -771,29 +771,11 @@
771 771   #end
772 772   </div>
773 773   </div>
931 + #else
932 + <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>
933 + #end
774 774   #end
775 775  
776 - ## --- 年間主要行事 ---
777 - #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]])
778 - #set($hasAnyEvent = false)
779 - #foreach($m in $months)
780 - #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end
781 - #end
782 - #if($hasAnyEvent)
783 - <div class="seitokai-subsection">
784 - <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>
785 - <div class="seitokai-subsection-content">
786 - <table class="wiki-table school-info-table" style="margin:0">
787 - #foreach($m in $months)
788 - #if($m.get(1) && $m.get(1) != '')
789 - <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr>
790 - #end
791 - #end
792 - </table>
793 - </div>
794 - </div>
795 - #end
796 -
797 797   ## --- 生徒会の課題意識 ---
798 798   #if($challenges && $challenges != '')
799 799   #set($canViewChallenges = true)
... ... @@ -865,13 +865,13 @@
865 865  
866 866  <div class="activity-toolbar">
867 867   <div class="activity-fy-tabs">
868 - <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
1007 + <button class="activity-fy-tab" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
869 869   #foreach($fy in $fySet)
870 870   #if($fy != $currentFYStr)
871 871   <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
872 872   #end
873 873   #end
874 - <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
1013 + <button class="activity-fy-tab active" onclick="switchActivityFY('all', this)">全期間</button>
875 875   </div>
876 876   <div class="activity-toolbar-right">
877 877   <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示">
... ... @@ -910,22 +910,67 @@
910 910  
911 911  {{/html}}
912 912  
913 -## 特色ある活動を先頭に表示するため、並び替え用リストを作成
914 -#set($featuredActivities = [])
915 -#set($normalActivities = [])
916 -#if($activities && $activities.size() > 0)
917 - #foreach($act in $activities)
918 - #set($isFeatured = $!act.getValue('featured'))
919 - #if($isFeatured == '1')
920 - #set($discard = $featuredActivities.add($foreach.index))
1052 +## 活動を「年度降順 + 特色あり先頭」で並び替え
1053 +## Step1: fySet から年度を降順ソート（Velocity ネイティブ実装）
1054 +#set($fyNums = [])
1055 +#foreach($fy in $fySet)
1056 + #if($fy && $fy != '' && $fy != 'unknown')
1057 + #set($fyInt = $mathtool.toInteger($fy))
1058 + #if($fyInt)
1059 + #set($discard = $fyNums.add($fyInt))
1060 + #end
1061 + #end
1062 +#end
1063 +## 最大値を順番に取り出して降順リストを構築（最大20年度まで対応）
1064 +#set($fyDesc = [])
1065 +#set($fyRemaining = [])
1066 +#foreach($fy in $fyNums)
1067 + #set($discard = $fyRemaining.add($fy))
1068 +#end
1069 +#foreach($dummy in [1..20])
1070 + #if($fyRemaining.isEmpty())#break#end
1071 + #set($fyMax = $fyRemaining.get(0))
1072 + #foreach($fy in $fyRemaining)
1073 + #if($fy > $fyMax)#set($fyMax = $fy)#end
1074 + #end
1075 + #set($discard = $fyDesc.add($fyMax))
1076 + #set($fyNextRem = [])
1077 + #set($fyMaxRemoved = false)
1078 + #foreach($fy in $fyRemaining)
1079 + #if(!$fyMaxRemoved && $fy == $fyMax)
1080 + #set($fyMaxRemoved = true)
921 921   #else
922 - #set($discard = $normalActivities.add($foreach.index))
1082 + #set($discard = $fyNextRem.add($fy))
923 923   #end
924 924   #end
1085 + #set($fyRemaining = $fyNextRem)
925 925  #end
1087 +## 年度未設定の活動は末尾に表示（fySetに'unknown'は入らないため無条件追加）
1088 +#set($discard = $fyDesc.add('unknown'))
1089 +## Step2: 年度降順で featured → normal の順にインデックスを収集
926 926  #set($orderedActivityIndices = [])
927 -#set($discard = $orderedActivityIndices.addAll($featuredActivities))
928 -#set($discard = $orderedActivityIndices.addAll($normalActivities))
1091 +#foreach($curFY in $fyDesc)
1092 + ## 同年度の特色あり活動を先頭に
1093 + #set($actIdx2 = 0)
1094 + #foreach($act in $activities)
1095 + #set($aFY2 = $!act.getValue('fiscalYear'))
1096 + #if(!$aFY2 || $aFY2 == '') #set($aFY2 = 'unknown') #end
1097 + #if($aFY2 == $curFY && $act.getValue('featured') == '1')
1098 + #set($discard = $orderedActivityIndices.add($actIdx2))
1099 + #end
1100 + #set($actIdx2 = $actIdx2 + 1)
1101 + #end
1102 + ## 同年度の通常活動
1103 + #set($actIdx2 = 0)
1104 + #foreach($act in $activities)
1105 + #set($aFY2 = $!act.getValue('fiscalYear'))
1106 + #if(!$aFY2 || $aFY2 == '') #set($aFY2 = 'unknown') #end
1107 + #if($aFY2 == $curFY && $act.getValue('featured') != '1')
1108 + #set($discard = $orderedActivityIndices.add($actIdx2))
1109 + #end
1110 + #set($actIdx2 = $actIdx2 + 1)
1111 + #end
1112 +#end
929 929  
930 930  #if($activities && $activities.size() > 0)
931 931   #foreach($actIdx in $orderedActivityIndices)
... ... @@ -1190,6 +1190,25 @@
1190 1190   #if($postVis != 'public')
1191 1191   <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>
1192 1192   #end
1377 + ## いいねボタン
1378 + #set($postLikeCount = $!post.getValue('likeCount'))
1379 + #if(!$postLikeCount || $postLikeCount == '') #set($postLikeCount = 0) #end
1380 + #set($postLikedBy = $!post.getValue('likedBy'))
1381 + #set($isLikedByMe = false)
1382 + #if($postLikedBy && $postLikedBy.contains($xcontext.user)) #set($isLikedByMe = true) #end
1383 + <div class="post-like-row post-action-mt">
1384 + #if($xcontext.user != 'XWiki.XWikiGuest')
1385 + <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)">
1386 + <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>
1387 + <span class="like-count">$postLikeCount</span>
1388 + </button>
1389 + #else
1390 + <span class="btn-like disabled">
1391 + <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>
1392 + <span class="like-count">$postLikeCount</span>
1393 + </span>
1394 + #end
1395 + </div>
1193 1193   ## 固定/編集/削除/通報/非表示ボタン（横並び）
1194 1194   #set($postAuthorRef = $!post.getValue('authorRef'))
1195 1195   #set($postObjNumED = $post.number)
... ... @@ -1310,10 +1310,68 @@
1310 1310  {{/html}}
1311 1311  #end
1312 1312  
1516 +## --- OGP / SNSシェア対応 ---
1517 +#set($ogpTitle = "${schoolName} — 生徒会Wiki")
1518 +#set($ogpDesc = "${schoolName}の生徒会活動情報。")
1519 +#if($prefecture && $prefecture != '') #set($ogpDesc = "${ogpDesc}${prefecture}") #end
1520 +#if($city && $city != '') #set($ogpDesc = "${ogpDesc}${city}。") #end
1521 +#if($dailyActivities && $dailyActivities != '') #set($ogpDesc = "${ogpDesc} 主な活動: ${dailyActivities}") #end
1522 +#set($ogpUrl = "https://${request.serverName}${doc.getURL()}")
1523 +
1313 1313  ## --- 年度タブ切り替え JavaScript ---
1314 1314  {{html clean="false"}}
1315 1315  <script>
1527 +// OGPメタタグ挿入
1528 +(function() {
1529 + var ogp = {
1530 + 'og:title': '$escapetool.javascript($ogpTitle)',
1531 + 'og:description': '$escapetool.javascript($ogpDesc)',
1532 + 'og:type': 'article',
1533 + 'og:url': '$escapetool.javascript($ogpUrl)',
1534 + 'og:site_name': '生徒会Wiki',
1535 + 'twitter:card': 'summary'
1536 + };
1537 + for (var p in ogp) {
1538 + var meta = document.createElement('meta');
1539 + meta.setAttribute('property', p);
1540 + meta.setAttribute('content', ogp[p]);
1541 + document.head.appendChild(meta);
1542 + }
1543 + // twitter用
1544 + var tw = document.createElement('meta');
1545 + tw.setAttribute('name', 'twitter:card');
1546 + tw.setAttribute('content', 'summary');
1547 + document.head.appendChild(tw);
1548 +})();
1316 1316  // コンパクト表示（タイトルのみ）トグル
1550 +// いいねトグル
1551 +function toggleLike(btn) {
1552 + var page = btn.getAttribute('data-page');
1553 + var obj = btn.getAttribute('data-obj');
1554 + var csrf = btn.getAttribute('data-csrf');
1555 + btn.disabled = true;
1556 + var fd = new FormData();
1557 + fd.append('page', page);
1558 + fd.append('obj', obj);
1559 + fd.append('form_token', csrf);
1560 + fetch('/bin/SeitokaiCode/LikePost', { method: 'POST', body: fd })
1561 + .then(function(r) { return r.json(); })
1562 + .then(function(data) {
1563 + btn.querySelector('.like-count').textContent = data.count;
1564 + if (data.action === 'liked') {
1565 + btn.classList.add('liked');
1566 + btn.querySelector('svg').setAttribute('fill', 'currentColor');
1567 + btn.querySelector('svg').setAttribute('stroke', 'none');
1568 + } else {
1569 + btn.classList.remove('liked');
1570 + btn.querySelector('svg').removeAttribute('fill');
1571 + btn.querySelector('svg').setAttribute('stroke', 'currentColor');
1572 + }
1573 + })
1574 + .catch(function() { alert('エラーが発生しました'); })
1575 + .finally(function() { btn.disabled = false; });
1576 +}
1577 +
1317 1317  function toggleCompactView() {
1318 1318   var container = document.querySelector('.xwiki-content') || document.body;
1319 1319   var isCompact = container.classList.toggle('activity-compact-view');
... ... @@ -1357,7 +1357,7 @@
1357 1357  }
1358 1358  // ページ読み込み時の初期化
1359 1359  document.addEventListener('DOMContentLoaded', function() {
1360 - // 年度タブを降順にソート（「全期間」タブは末尾に固定）
1621 + // 年度タブを降順にソート（「全期間」タブは先頭に固定）
1361 1361   var tabContainer = document.querySelector('.activity-fy-tabs');
1362 1362   if (tabContainer) {
1363 1363   var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
... ... @@ -1374,11 +1374,11 @@
1374 1374   var bYear = parseInt(b.textContent) || 0;
1375 1375   return bYear - aYear;
1376 1376   });
1377 - // DOM再配置
1378 - fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1638 + // DOM再配置（全期間を先頭、年度タブを降順で続ける）
1379 1379   if (allTab) { tabContainer.appendChild(allTab); }
1640 + fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1380 1380   }
1381 - // デフォルトで現在の年度を表示
1642 + // デフォルトで全期間を表示
1382 1382   var defaultTab = document.querySelector('.activity-fy-tab.active');
1383 1383   if (defaultTab) { defaultTab.click(); }
1384 1384   // 保存成功時のトースト通知
... ... @@ -1431,7 +1431,15 @@
1431 1431   };
1432 1432   var toast = document.createElement('div');
1433 1433   toast.className = 'toast toast-' + type;
1434 - toast.innerHTML = (icons[type] || '') + '<span>' + message + '</span>';
1695 + var iconSvg = icons[type] || '';
1696 + if (iconSvg) {
1697 + var iconSpan = document.createElement('span');
1698 + iconSpan.innerHTML = iconSvg;
1699 + toast.appendChild(iconSpan);
1700 + }
1701 + var msgSpan = document.createElement('span');
1702 + msgSpan.textContent = message;
1703 + toast.appendChild(msgSpan);
1435 1435   container.appendChild(toast);
1436 1436   setTimeout(function() { toast.remove(); }, 3200);
1437 1437  }
... ... @@ -1470,6 +1470,7 @@
1470 1470   var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
1471 1471  
1472 1472   // コメント以外は添付ファイル編集を表示
1742 + function escAttr(s) { return s.replace(/&/g,'&amp;').replace(/"/g,'&quot;').replace(/'/g,'&#39;').replace(/</g,'&lt;').replace(/>/g,'&gt;'); }
1473 1473   if (postType !== 'comment') {
1474 1474   // 既存画像
1475 1475   html += '<div class="edit-attachments">';
... ... @@ -1479,10 +1479,10 @@
1479 1479   for (var i = 0; i < imgs.length; i++) {
1480 1480   var img = imgs[i].trim();
1481 1481   if (!img) continue;
1482 - html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'&quot;') + '">' +
1752 + html += '<div class="edit-attach-item" data-name="' + escAttr(img) + '">' +
1483 1483   '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
1484 1484   '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1485 - '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'&quot;') + '" />' +
1755 + '<input type="hidden" name="keepImages" value="' + escAttr(img) + '" />' +
1486 1486   '</div>';
1487 1487   }
1488 1488   html += '</div>';
... ... @@ -1496,10 +1496,10 @@
1496 1496   if (!f) continue;
1497 1497   var displayName = f;
1498 1498   if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
1499 - html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'&quot;') + '">' +
1500 - '<span class="edit-attach-fname">' + displayName.replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</span>' +
1769 + html += '<div class="edit-attach-item" data-name="' + escAttr(f) + '">' +
1770 + '<span class="edit-attach-fname">' + escAttr(displayName) + '</span>' +
1501 1501   '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1502 - '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'&quot;') + '" />' +
1772 + '<input type="hidden" name="keepFiles" value="' + escAttr(f) + '" />' +
1503 1503   '</div>';
1504 1504   }
1505 1505   html += '</div>';