Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 108.1 Icon
edited by Super Admin
on 2026/03/24 17:20
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'))
... ... @@ -374,7 +374,7 @@
374 374  #end
375 375  #if($canEditSchool)
376 376  <div style="text-align:right; margin-bottom:12px;">
377 - <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>
378 378  </div>
379 379  #end
380 380  
... ... @@ -396,27 +396,6 @@
396 396  </div>
397 397  #end
398 398  
399 -## --- 未入力ガイド（自校ユーザー向け） ---
400 -#if(!$isGuest && $canEdit)
401 - #set($missingItems = [])
402 - #if(!$studentCount || $studentCount == '' || $studentCount == '0') #set($discard = $missingItems.add('生徒数')) #end
403 - #if(!$orgChart || $orgChart == '') #set($discard = $missingItems.add('生徒会組織')) #end
404 - #if(!$dailyActivities || $dailyActivities == '') #set($discard = $missingItems.add('日常の活動')) #end
405 - #if(!$ruleReviewStatus || $ruleReviewStatus == '') #set($discard = $missingItems.add('校則・生徒会会則の見直し')) #end
406 - #set($activityCount = $doc.getObjects('SeitokaiCode.ActivityClass').size())
407 - #if($activityCount == 0) #set($discard = $missingItems.add('活動報告（まだ投稿がありません）')) #end
408 - #if($missingItems.size() > 0)
409 -<div class="form-message-info" style="margin-bottom:var(--sp-4);">
410 - <strong>入力のお願い</strong> — 以下の項目がまだ入力されていません。<a href="$doc.getURL('view', 'sheet=SeitokaiCode.SchoolEditForm')">編集画面</a>から入力すると、他校の生徒会の参考になります。
411 - <ul style="margin:var(--sp-2) 0 0; padding-left:var(--sp-5);">
412 - #foreach($item in $missingItems)
413 - <li>$item</li>
414 - #end
415 - </ul>
416 -</div>
417 - #end
418 -#end
419 -
420 420  ## --- ① 学校基本情報 ---
421 421  <div class="school-info-card collapsed" id="card-basic-info">
422 422   <h2 role="button" tabindex="0" aria-expanded="false" onclick="toggleInfoCard('card-basic-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-basic-info')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></svg> 学校基本情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
... ... @@ -473,6 +473,123 @@
473 473   #end
474 474   #end
475 475  
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 +
476 476   ## --- 日常の活動 ---
477 477   #if($dailyActivities && !$dailyActivities.isEmpty())
478 478   #set($canViewDA = true)
... ... @@ -499,36 +499,6 @@
499 499   #end
500 500   #end
501 501  
502 - ## --- 選挙 ---
503 - #if($electionExists && $electionExists != '')
504 - #set($canViewEL = true)
505 - #if($visibilityElection == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEL = false)
506 - #elseif($visibilityElection == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEL = false)
507 - #end
508 - #if($canViewEL)
509 - <div class="seitokai-subsection">
510 - <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>
511 - <div class="seitokai-subsection-content">
512 - <div class="info-row">
513 - <span class="info-label">役員選挙</span>
514 - <span class="info-value">$!escapetool.xml($!electionExists)</span>
515 - </div>
516 - #if($electionType && $electionType != '')
517 - <div class="info-row">
518 - <span class="info-label">直近の選挙方式</span>
519 - <span class="info-value">$!escapetool.xml($!electionType)</span>
520 - </div>
521 - #end
522 - #if($electionNote && $electionNote.trim() != '')
523 - <div class="free-note">$!escapetool.xml($electionNote)</div>
524 - #end
525 - </div>
526 - </div>
527 - #else
528 - <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>
529 - #end
530 - #end
531 -
532 532   ## --- 定例活動 ---
533 533   #if($meetingFrequency && $meetingFrequency != '')
534 534   #set($canViewMT = true)
... ... @@ -553,68 +553,96 @@
553 553   #end
554 554   #end
555 555  
556 - ## --- 予算 ---
557 - #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
558 - #if($hasBudget)
559 - #set($canViewBudget = true)
560 - #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
561 - #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)
562 562   #end
563 - #if($canViewBudget)
642 + #if($canViewAS)
564 564   <div class="seitokai-subsection">
565 - <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>
566 566   <div class="seitokai-subsection-content">
567 - #if($budgetProcess && !$budgetProcess.isEmpty())
646 + #if($assemblyFormat && $assemblyFormat != '')
568 568   <div class="info-row">
569 - <span class="info-label">作成過程の生徒関与</span>
570 - <span class="info-value">
571 - <div class="selection-display">
572 - #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整（折衝等）","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"])
573 - #foreach($bpOpt in $allBpOpts)
574 - #if($budgetProcess.contains($bpOpt))
575 - <span class="selection-item">$!escapetool.xml($bpOpt)</span>
576 - #else
577 - <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span>
578 - #end
579 - #end
580 - </div>
581 - </span>
648 + <span class="info-label">開催方式</span>
649 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span>
582 582   </div>
583 583   #end
584 - #if($studentFee && $studentFee != '')
652 + #if($assemblyCount && $assemblyCount > 0)
585 585   <div class="info-row">
586 - <span class="info-label">生徒会費（年額）</span>
587 - <span class="info-value">$!escapetool.xml($!studentFee)</span>
654 + <span class="info-label">開催回数（年）</span>
655 + <span class="info-value">$!escapetool.xml($assemblyCount)回</span>
588 588   </div>
589 589   #end
590 - #if($budgetScale && $budgetScale != '')
658 + #if($assemblyAgenda && !$assemblyAgenda.isEmpty())
591 591   <div class="info-row">
592 - <span class="info-label">予算規模</span>
593 - <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>
594 594   </div>
595 595   #end
596 - #if($budgetAllocation && !$budgetAllocation.isEmpty())
670 + #if($assemblyTopics && !$assemblyTopics.isEmpty())
597 597   <div class="info-row">
598 - <span class="info-label">主な予算配分</span>
672 + <span class="info-label">扱う内容</span>
599 599   <span class="info-value">
600 600   <div class="selection-display">
601 - #foreach($ba in $budgetAllocation)
602 - <span class="selection-item">$!escapetool.xml($ba.trim())</span>
675 + #foreach($at in $assemblyTopics)
676 + <span class="selection-item">$!escapetool.xml($at.trim())</span>
603 603   #end
604 604   </div>
605 605   </span>
606 606   </div>
607 607   #end
608 - #if($budgetNote && $budgetNote.trim() != '')
609 - <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>
610 610   #end
611 611   </div>
612 612   </div>
613 613   #else
614 - <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>
615 615   #end
616 616   #end
617 617  
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 +
618 618   ## --- 校則・生徒会会則の見直し ---
619 619   #if($ruleReviewStatus && $ruleReviewStatus != '')
620 620   #set($canViewRuleReview = true)
... ... @@ -680,151 +680,65 @@
680 680   #end
681 681   #end
682 682  
683 - ## --- 活動環境 ---
684 - #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictTools && !$ictTools.isEmpty()) || ($ictUsage && !$ictUsage.isEmpty()))
685 - #if($hasActivityEnv)
686 - #set($canViewAE = true)
687 - #if($visibilityActivityEnv == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAE = false)
688 - #elseif($visibilityActivityEnv == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAE = false)
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)
689 689   #end
690 - #if($canViewAE)
797 + #if($canViewBudget)
691 691   <div class="seitokai-subsection">
692 - <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>
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>
693 693   <div class="seitokai-subsection-content">
694 - #if($activityPlace && !$activityPlace.isEmpty())
801 + #if($budgetProcess && !$budgetProcess.isEmpty())
695 695   <div class="info-row">
696 - <span class="info-label">普段の活動場所</span>
803 + <span class="info-label">作成過程の生徒関与</span>
697 697   <span class="info-value">
698 698   <div class="selection-display">
699 - #foreach($ap in $activityPlace)
700 - <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
701 701   #end
702 702   </div>
703 703   </span>
704 704   </div>
705 705   #end
706 - #if($activityRoomEquipment && $activityRoomEquipment != '')
818 + #if($studentFee && $studentFee != '')
707 707   <div class="info-row">
708 - <span class="info-label">生徒会室の設備</span>
709 - <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>
710 710   </div>
711 711   #end
712 - #if($activityRoomImage && $activityRoomImage != '')
824 + #if($budgetScale && $budgetScale != '')
713 713   <div class="info-row">
714 - <span class="info-label">活動場所の写真</span>
715 - <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>
716 716   </div>
717 717   #end
718 - #if($ictTools && !$ictTools.isEmpty())
830 + #if($budgetAllocation && !$budgetAllocation.isEmpty())
719 719   <div class="info-row">
720 - <span class="info-label">利用しているICTツール</span>
832 + <span class="info-label">主な予算配分</span>
721 721   <span class="info-value">
722 - #set($ictCatDisplay = [
723 - ["連絡ツール", ["メール","LINE","LINE WORKS","Discord","Slack","Microsoft Teams","Google Chat","InstagramのDM","XのDM","その他（連絡）"]],
724 - ["ドキュメント作成・共有", ["Googleドキュメント","Googleスプレッドシート","Googleスライド","Googleドライブ","Word","Excel","PowerPoint","OneDrive","SharePoint","Notion","Pages","Numbers","Keynote","Dropbox","Box","その他（ドキュメント）"]],
725 - ["タスク管理", ["Googleカレンダー","Google ToDoリスト","Trello","Asana","Excel等スプレッドシート","その他（タスク管理）"]],
726 - ["ビデオ会議ツール", ["Zoom","Google Meet","その他（ビデオ会議）"]],
727 - ["アンケート", ["Googleフォーム","Microsoft Forms","その他（アンケート）"]],
728 - ["デザイン・クリエイティブ", ["Canva","各種Adobe","CapCut","LumaFusion","AviUtl","ibisPaint","その他（デザイン）"]],
729 - ["その他", ["独自のWebシステム・自作アプリ"]]
730 - ])
731 - #foreach($catD in $ictCatDisplay)
732 - #set($catHasItems = false)
733 - #foreach($t in $catD.get(1))
734 - #if($ictTools.contains($t)) #set($catHasItems = true) #end
735 - #end
736 - #if($catHasItems)
737 - <div style="margin-bottom:6px">
738 - <span style="font-size:0.8em;font-weight:600;color:var(--text-mid)">$catD.get(0):</span>
739 - <div class="selection-display" style="margin-top:2px">
740 - #foreach($t in $catD.get(1))
741 - #if($ictTools.contains($t))
742 - <span class="selection-item">$!escapetool.xml($t)</span>
743 - #end
744 - #end
745 - </div>
746 - </div>
747 - #end
748 - #end
749 - </span>
750 - </div>
751 - #end
752 - #if($ictUsage && !$ictUsage.isEmpty())
753 - <div class="info-row">
754 - <span class="info-label">ICT活用している場面</span>
755 - <span class="info-value">
756 756   <div class="selection-display">
757 - #foreach($iu in $ictUsage)
758 - <span class="selection-item">$!escapetool.xml($iu.trim())</span>
835 + #foreach($ba in $budgetAllocation)
836 + <span class="selection-item">$!escapetool.xml($ba.trim())</span>
759 759   #end
760 760   </div>
761 761   </span>
762 762   </div>
763 763   #end
764 - </div>
765 - </div>
766 - #else
767 - <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>
768 - #end
769 - #end
770 -
771 - ## --- 生徒総会 ---
772 - #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != ''))
773 - #if($hasAssembly)
774 - #set($canViewAS = true)
775 - #if($visibilityAssembly == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAS = false)
776 - #elseif($visibilityAssembly == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAS = false)
777 - #end
778 - #if($canViewAS)
779 - <div class="seitokai-subsection">
780 - <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>
781 - <div class="seitokai-subsection-content">
782 - #if($assemblyFormat && $assemblyFormat != '')
783 - <div class="info-row">
784 - <span class="info-label">開催方式</span>
785 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span>
786 - </div>
842 + #if($budgetNote && $budgetNote.trim() != '')
843 + <div class="free-note">$!escapetool.xml($budgetNote)</div>
787 787   #end
788 - #if($assemblyCount && $assemblyCount > 0)
789 - <div class="info-row">
790 - <span class="info-label">開催回数（年）</span>
791 - <span class="info-value">$!escapetool.xml($assemblyCount)回</span>
792 - </div>
793 - #end
794 - #if($assemblyAgenda && !$assemblyAgenda.isEmpty())
795 - <div class="info-row">
796 - <span class="info-label">議案の集め方</span>
797 - <span class="info-value">
798 - <div class="selection-display">
799 - #foreach($aa in $assemblyAgenda)
800 - <span class="selection-item">$!escapetool.xml($aa.trim())</span>
801 - #end
802 - </div>
803 - </span>
804 - </div>
805 - #end
806 - #if($assemblyTopics && !$assemblyTopics.isEmpty())
807 - <div class="info-row">
808 - <span class="info-label">扱う内容</span>
809 - <span class="info-value">
810 - <div class="selection-display">
811 - #foreach($at in $assemblyTopics)
812 - <span class="selection-item">$!escapetool.xml($at.trim())</span>
813 - #end
814 - </div>
815 - </span>
816 - </div>
817 - #end
818 - #if($assemblyNote && $assemblyNote != '')
819 - <div class="info-row">
820 - <span class="info-label">自由記述</span>
821 - <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span>
822 - </div>
823 - #end
824 824   </div>
825 825   </div>
826 826   #else
827 - <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>
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>
828 828   #end
829 829   #end
830 830  
... ... @@ -912,35 +912,6 @@
912 912   #end
913 913   #end
914 914  
915 - ## --- 年間主要行事 ---
916 - #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]])
917 - #set($hasAnyEvent = false)
918 - #foreach($m in $months)
919 - #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end
920 - #end
921 - #if($hasAnyEvent)
922 - #set($canViewAN = true)
923 - #if($visibilityAnnualEvents == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAN = false)
924 - #elseif($visibilityAnnualEvents == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAN = false)
925 - #end
926 - #if($canViewAN)
927 - <div class="seitokai-subsection">
928 - <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>
929 - <div class="seitokai-subsection-content">
930 - <table class="wiki-table school-info-table" style="margin:0">
931 - #foreach($m in $months)
932 - #if($m.get(1) && $m.get(1) != '')
933 - <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr>
934 - #end
935 - #end
936 - </table>
937 - </div>
938 - </div>
939 - #else
940 - <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>
941 - #end
942 - #end
943 -
944 944   ## --- 生徒会の課題意識 ---
945 945   #if($challenges && $challenges != '')
946 946   #set($canViewChallenges = true)
... ... @@ -1012,13 +1012,13 @@
1012 1012  
1013 1013  <div class="activity-toolbar">
1014 1014   <div class="activity-fy-tabs">
1015 - <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
1007 + <button class="activity-fy-tab" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
1016 1016   #foreach($fy in $fySet)
1017 1017   #if($fy != $currentFYStr)
1018 1018   <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
1019 1019   #end
1020 1020   #end
1021 - <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
1013 + <button class="activity-fy-tab active" onclick="switchActivityFY('all', this)">全期間</button>
1022 1022   </div>
1023 1023   <div class="activity-toolbar-right">
1024 1024   <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示">
... ... @@ -1057,22 +1057,67 @@
1057 1057  
1058 1058  {{/html}}
1059 1059  
1060 -## 特色ある活動を先頭に表示するため、並び替え用リストを作成
1061 -#set($featuredActivities = [])
1062 -#set($normalActivities = [])
1063 -#if($activities && $activities.size() > 0)
1064 - #foreach($act in $activities)
1065 - #set($isFeatured = $!act.getValue('featured'))
1066 - #if($isFeatured == '1')
1067 - #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)
1068 1068   #else
1069 - #set($discard = $normalActivities.add($foreach.index))
1082 + #set($discard = $fyNextRem.add($fy))
1070 1070   #end
1071 1071   #end
1085 + #set($fyRemaining = $fyNextRem)
1072 1072  #end
1087 +## 年度未設定の活動は末尾に表示（fySetに'unknown'は入らないため無条件追加）
1088 +#set($discard = $fyDesc.add('unknown'))
1089 +## Step2: 年度降順で featured → normal の順にインデックスを収集
1073 1073  #set($orderedActivityIndices = [])
1074 -#set($discard = $orderedActivityIndices.addAll($featuredActivities))
1075 -#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
1076 1076  
1077 1077  #if($activities && $activities.size() > 0)
1078 1078   #foreach($actIdx in $orderedActivityIndices)
... ... @@ -1581,7 +1581,7 @@
1581 1581  }
1582 1582  // ページ読み込み時の初期化
1583 1583  document.addEventListener('DOMContentLoaded', function() {
1584 - // 年度タブを降順にソート（「全期間」タブは末尾に固定）
1621 + // 年度タブを降順にソート（「全期間」タブは先頭に固定）
1585 1585   var tabContainer = document.querySelector('.activity-fy-tabs');
1586 1586   if (tabContainer) {
1587 1587   var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
... ... @@ -1598,11 +1598,11 @@
1598 1598   var bYear = parseInt(b.textContent) || 0;
1599 1599   return bYear - aYear;
1600 1600   });
1601 - // DOM再配置
1602 - fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1638 + // DOM再配置（全期間を先頭、年度タブを降順で続ける）
1603 1603   if (allTab) { tabContainer.appendChild(allTab); }
1640 + fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1604 1604   }
1605 - // デフォルトで現在の年度を表示
1642 + // デフォルトで全期間を表示
1606 1606   var defaultTab = document.querySelector('.activity-fy-tab.active');
1607 1607   if (defaultTab) { defaultTab.click(); }
1608 1608   // 保存成功時のトースト通知