Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 110.1 Icon
edited by Super Admin
on 2026/03/24 19:13
Change comment: There is no comment for this version
To version Icon 115.1 Icon
edited by Super Admin
on 2026/03/27 05:08
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -409,106 +409,6 @@
409 409  </div>
410 410  #end
411 411  
412 -## --- 入力進捗ガイド（自校ユーザー向け） ---
413 -#if(!$isGuest && $canEdit)
414 - #set($stepItems = [])
415 - #set($completedCount = 0)
416 - #set($totalSteps = 8)
417 - ## 1. 基本情報（生徒数）
418 - #if($studentCount && $studentCount != '' && $studentCount != '0')
419 - #set($discard = $stepItems.add({'name': '基本情報（生徒数・学級数）', 'done': true}))
420 - #set($completedCount = $completedCount + 1)
421 - #else
422 - #set($discard = $stepItems.add({'name': '基本情報（生徒数・学級数）', 'done': false}))
423 - #end
424 - ## 2. 生徒会組織
425 - #if($orgChart && $orgChart != '')
426 - #set($discard = $stepItems.add({'name': '生徒会組織', 'done': true}))
427 - #set($completedCount = $completedCount + 1)
428 - #else
429 - #set($discard = $stepItems.add({'name': '生徒会組織', 'done': false}))
430 - #end
431 - ## 3. 日常の活動
432 - #if($dailyActivities && $dailyActivities != '')
433 - #set($discard = $stepItems.add({'name': '日常の活動', 'done': true}))
434 - #set($completedCount = $completedCount + 1)
435 - #else
436 - #set($discard = $stepItems.add({'name': '日常の活動', 'done': false}))
437 - #end
438 - ## 4. 選挙
439 - #if($electionExists && $electionExists != '')
440 - #set($discard = $stepItems.add({'name': '選挙', 'done': true}))
441 - #set($completedCount = $completedCount + 1)
442 - #else
443 - #set($discard = $stepItems.add({'name': '選挙', 'done': false}))
444 - #end
445 - ## 5. 予算
446 - #set($budgetFilled = false)
447 - #if(($budgetScale && $budgetScale != '') || ($studentFee && $studentFee != '')) #set($budgetFilled = true) #end
448 - #if($budgetFilled)
449 - #set($discard = $stepItems.add({'name': '予算', 'done': true}))
450 - #set($completedCount = $completedCount + 1)
451 - #else
452 - #set($discard = $stepItems.add({'name': '予算', 'done': false}))
453 - #end
454 - ## 6. 校則の見直し
455 - #if($ruleReviewStatus && $ruleReviewStatus != '')
456 - #set($discard = $stepItems.add({'name': '校則・生徒会会則の見直し', 'done': true}))
457 - #set($completedCount = $completedCount + 1)
458 - #else
459 - #set($discard = $stepItems.add({'name': '校則・生徒会会則の見直し', 'done': false}))
460 - #end
461 - ## 7. 生徒総会
462 - #if($assemblyFormat && $assemblyFormat != '')
463 - #set($discard = $stepItems.add({'name': '生徒総会', 'done': true}))
464 - #set($completedCount = $completedCount + 1)
465 - #else
466 - #set($discard = $stepItems.add({'name': '生徒総会', 'done': false}))
467 - #end
468 - ## 8. 活動報告
469 - #set($activityCount = $doc.getObjects('SeitokaiCode.ActivityClass').size())
470 - #if($activityCount > 0)
471 - #set($discard = $stepItems.add({'name': '活動報告', 'done': true}))
472 - #set($completedCount = $completedCount + 1)
473 - #else
474 - #set($discard = $stepItems.add({'name': '活動報告（まだ投稿がありません）', 'done': false}))
475 - #end
476 - ## 全完了なら非表示
477 - #if($completedCount < $totalSteps)
478 - #set($progressPct = $mathtool.mul($mathtool.div($completedCount, $totalSteps), 100))
479 - #set($progressPctInt = $mathtool.toInteger($progressPct))
480 - #set($firstMissing = false)
481 -<div class="progress-guide" style="margin-bottom:var(--sp-4);">
482 - <div class="progress-guide-header">
483 - <span class="progress-guide-title"><svg class="ico" viewBox="0 0 24 24" style="width:1.1em;height:1.1em;vertical-align:-2px;"><circle cx="12" cy="12" r="10"/><polyline points="12 6 12 12 16 14"/></svg> 学校情報の入力状況</span>
484 - <span class="progress-guide-count">${completedCount} / ${totalSteps} 完了</span>
485 - </div>
486 - <div class="progress-bar-track">
487 - <div class="progress-bar-fill" style="width:${progressPctInt}%"></div>
488 - </div>
489 - <ul class="progress-step-list">
490 - #foreach($step in $stepItems)
491 - #if($step.done)
492 - <li class="progress-step done"><svg class="ico" viewBox="0 0 24 24" style="width:0.9em;height:0.9em;"><path d="M20 6L9 17l-5-5"/></svg> $step.name</li>
493 - #else
494 - #if(!$firstMissing)
495 - <li class="progress-step next"><svg class="ico" viewBox="0 0 24 24" style="width:0.9em;height:0.9em;"><circle cx="12" cy="12" r="10"/></svg> $step.name <span class="progress-next-label">← 次はここ！</span></li>
496 - #set($firstMissing = true)
497 - #else
498 - <li class="progress-step pending"><svg class="ico" viewBox="0 0 24 24" style="width:0.9em;height:0.9em;"><rect x="3" y="3" width="18" height="18" rx="2"/></svg> $step.name</li>
499 - #end
500 - #end
501 - #end
502 - </ul>
503 - <div style="margin-top:var(--sp-3);">
504 - <a href="$doc.getURL('view', 'sheet=SeitokaiCode.SchoolEditForm')" class="btn-primary-sm">
505 - <svg class="ico" viewBox="0 0 24 24" style="width:0.9em;height:0.9em;"><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> 編集画面を開く
506 - </a>
507 - </div>
508 -</div>
509 - #end
510 -#end
511 -
512 512  ## --- ① 学校基本情報 ---
513 513  <div class="school-info-card collapsed" id="card-basic-info">
514 514   <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>
... ... @@ -565,6 +565,123 @@
565 565   #end
566 566   #end
567 567  
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 +
568 568   ## --- 日常の活動 ---
569 569   #if($dailyActivities && !$dailyActivities.isEmpty())
570 570   #set($canViewDA = true)
... ... @@ -591,36 +591,6 @@
591 591   #end
592 592   #end
593 593  
594 - ## --- 選挙 ---
595 - #if($electionExists && $electionExists != '')
596 - #set($canViewEL = true)
597 - #if($visibilityElection == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEL = false)
598 - #elseif($visibilityElection == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEL = false)
599 - #end
600 - #if($canViewEL)
601 - <div class="seitokai-subsection">
602 - <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>
603 - <div class="seitokai-subsection-content">
604 - <div class="info-row">
605 - <span class="info-label">役員選挙</span>
606 - <span class="info-value">$!escapetool.xml($!electionExists)</span>
607 - </div>
608 - #if($electionType && $electionType != '')
609 - <div class="info-row">
610 - <span class="info-label">直近の選挙方式</span>
611 - <span class="info-value">$!escapetool.xml($!electionType)</span>
612 - </div>
613 - #end
614 - #if($electionNote && $electionNote.trim() != '')
615 - <div class="free-note">$!escapetool.xml($electionNote)</div>
616 - #end
617 - </div>
618 - </div>
619 - #else
620 - <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>
621 - #end
622 - #end
623 -
624 624   ## --- 定例活動 ---
625 625   #if($meetingFrequency && $meetingFrequency != '')
626 626   #set($canViewMT = true)
... ... @@ -645,68 +645,96 @@
645 645   #end
646 646   #end
647 647  
648 - ## --- 予算 ---
649 - #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
650 - #if($hasBudget)
651 - #set($canViewBudget = true)
652 - #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
653 - #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)
654 654   #end
655 - #if($canViewBudget)
642 + #if($canViewAS)
656 656   <div class="seitokai-subsection">
657 - <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>
658 658   <div class="seitokai-subsection-content">
659 - #if($budgetProcess && !$budgetProcess.isEmpty())
646 + #if($assemblyFormat && $assemblyFormat != '')
660 660   <div class="info-row">
661 - <span class="info-label">作成過程の生徒関与</span>
662 - <span class="info-value">
663 - <div class="selection-display">
664 - #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整（折衝等）","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"])
665 - #foreach($bpOpt in $allBpOpts)
666 - #if($budgetProcess.contains($bpOpt))
667 - <span class="selection-item">$!escapetool.xml($bpOpt)</span>
668 - #else
669 - <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span>
670 - #end
671 - #end
672 - </div>
673 - </span>
648 + <span class="info-label">開催方式</span>
649 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span>
674 674   </div>
675 675   #end
676 - #if($studentFee && $studentFee != '')
652 + #if($assemblyCount && $assemblyCount > 0)
677 677   <div class="info-row">
678 - <span class="info-label">生徒会費（年額）</span>
679 - <span class="info-value">$!escapetool.xml($!studentFee)</span>
654 + <span class="info-label">開催回数（年）</span>
655 + <span class="info-value">$!escapetool.xml($assemblyCount)回</span>
680 680   </div>
681 681   #end
682 - #if($budgetScale && $budgetScale != '')
658 + #if($assemblyAgenda && !$assemblyAgenda.isEmpty())
683 683   <div class="info-row">
684 - <span class="info-label">予算規模</span>
685 - <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>
686 686   </div>
687 687   #end
688 - #if($budgetAllocation && !$budgetAllocation.isEmpty())
670 + #if($assemblyTopics && !$assemblyTopics.isEmpty())
689 689   <div class="info-row">
690 - <span class="info-label">主な予算配分</span>
672 + <span class="info-label">扱う内容</span>
691 691   <span class="info-value">
692 692   <div class="selection-display">
693 - #foreach($ba in $budgetAllocation)
694 - <span class="selection-item">$!escapetool.xml($ba.trim())</span>
675 + #foreach($at in $assemblyTopics)
676 + <span class="selection-item">$!escapetool.xml($at.trim())</span>
695 695   #end
696 696   </div>
697 697   </span>
698 698   </div>
699 699   #end
700 - #if($budgetNote && $budgetNote.trim() != '')
701 - <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>
702 702   #end
703 703   </div>
704 704   </div>
705 705   #else
706 - <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>
707 707   #end
708 708   #end
709 709  
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 +
710 710   ## --- 校則・生徒会会則の見直し ---
711 711   #if($ruleReviewStatus && $ruleReviewStatus != '')
712 712   #set($canViewRuleReview = true)
... ... @@ -772,151 +772,65 @@
772 772   #end
773 773   #end
774 774  
775 - ## --- 活動環境 ---
776 - #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictTools && !$ictTools.isEmpty()) || ($ictUsage && !$ictUsage.isEmpty()))
777 - #if($hasActivityEnv)
778 - #set($canViewAE = true)
779 - #if($visibilityActivityEnv == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAE = false)
780 - #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)
781 781   #end
782 - #if($canViewAE)
797 + #if($canViewBudget)
783 783   <div class="seitokai-subsection">
784 - <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>
785 785   <div class="seitokai-subsection-content">
786 - #if($activityPlace && !$activityPlace.isEmpty())
801 + #if($budgetProcess && !$budgetProcess.isEmpty())
787 787   <div class="info-row">
788 - <span class="info-label">普段の活動場所</span>
803 + <span class="info-label">作成過程の生徒関与</span>
789 789   <span class="info-value">
790 790   <div class="selection-display">
791 - #foreach($ap in $activityPlace)
792 - <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
793 793   #end
794 794   </div>
795 795   </span>
796 796   </div>
797 797   #end
798 - #if($activityRoomEquipment && $activityRoomEquipment != '')
818 + #if($studentFee && $studentFee != '')
799 799   <div class="info-row">
800 - <span class="info-label">生徒会室の設備</span>
801 - <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>
802 802   </div>
803 803   #end
804 - #if($activityRoomImage && $activityRoomImage != '')
824 + #if($budgetScale && $budgetScale != '')
805 805   <div class="info-row">
806 - <span class="info-label">活動場所の写真</span>
807 - <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>
808 808   </div>
809 809   #end
810 - #if($ictTools && !$ictTools.isEmpty())
830 + #if($budgetAllocation && !$budgetAllocation.isEmpty())
811 811   <div class="info-row">
812 - <span class="info-label">利用しているICTツール</span>
832 + <span class="info-label">主な予算配分</span>
813 813   <span class="info-value">
814 - #set($ictCatDisplay = [
815 - ["連絡ツール", ["メール","LINE","LINE WORKS","Discord","Slack","Microsoft Teams","Google Chat","InstagramのDM","XのDM","その他（連絡）"]],
816 - ["ドキュメント作成・共有", ["Googleドキュメント","Googleスプレッドシート","Googleスライド","Googleドライブ","Word","Excel","PowerPoint","OneDrive","SharePoint","Notion","Pages","Numbers","Keynote","Dropbox","Box","その他（ドキュメント）"]],
817 - ["タスク管理", ["Googleカレンダー","Google ToDoリスト","Trello","Asana","Excel等スプレッドシート","その他（タスク管理）"]],
818 - ["ビデオ会議ツール", ["Zoom","Google Meet","その他（ビデオ会議）"]],
819 - ["アンケート", ["Googleフォーム","Microsoft Forms","その他（アンケート）"]],
820 - ["デザイン・クリエイティブ", ["Canva","各種Adobe","CapCut","LumaFusion","AviUtl","ibisPaint","その他（デザイン）"]],
821 - ["その他", ["独自のWebシステム・自作アプリ"]]
822 - ])
823 - #foreach($catD in $ictCatDisplay)
824 - #set($catHasItems = false)
825 - #foreach($t in $catD.get(1))
826 - #if($ictTools.contains($t)) #set($catHasItems = true) #end
827 - #end
828 - #if($catHasItems)
829 - <div style="margin-bottom:6px">
830 - <span style="font-size:0.8em;font-weight:600;color:var(--text-mid)">$catD.get(0):</span>
831 - <div class="selection-display" style="margin-top:2px">
832 - #foreach($t in $catD.get(1))
833 - #if($ictTools.contains($t))
834 - <span class="selection-item">$!escapetool.xml($t)</span>
835 - #end
836 - #end
837 - </div>
838 - </div>
839 - #end
840 - #end
841 - </span>
842 - </div>
843 - #end
844 - #if($ictUsage && !$ictUsage.isEmpty())
845 - <div class="info-row">
846 - <span class="info-label">ICT活用している場面</span>
847 - <span class="info-value">
848 848   <div class="selection-display">
849 - #foreach($iu in $ictUsage)
850 - <span class="selection-item">$!escapetool.xml($iu.trim())</span>
835 + #foreach($ba in $budgetAllocation)
836 + <span class="selection-item">$!escapetool.xml($ba.trim())</span>
851 851   #end
852 852   </div>
853 853   </span>
854 854   </div>
855 855   #end
856 - </div>
857 - </div>
858 - #else
859 - <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>
860 - #end
861 - #end
862 -
863 - ## --- 生徒総会 ---
864 - #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != ''))
865 - #if($hasAssembly)
866 - #set($canViewAS = true)
867 - #if($visibilityAssembly == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAS = false)
868 - #elseif($visibilityAssembly == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAS = false)
869 - #end
870 - #if($canViewAS)
871 - <div class="seitokai-subsection">
872 - <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>
873 - <div class="seitokai-subsection-content">
874 - #if($assemblyFormat && $assemblyFormat != '')
875 - <div class="info-row">
876 - <span class="info-label">開催方式</span>
877 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span>
878 - </div>
842 + #if($budgetNote && $budgetNote.trim() != '')
843 + <div class="free-note">$!escapetool.xml($budgetNote)</div>
879 879   #end
880 - #if($assemblyCount && $assemblyCount > 0)
881 - <div class="info-row">
882 - <span class="info-label">開催回数（年）</span>
883 - <span class="info-value">$!escapetool.xml($assemblyCount)回</span>
884 - </div>
885 - #end
886 - #if($assemblyAgenda && !$assemblyAgenda.isEmpty())
887 - <div class="info-row">
888 - <span class="info-label">議案の集め方</span>
889 - <span class="info-value">
890 - <div class="selection-display">
891 - #foreach($aa in $assemblyAgenda)
892 - <span class="selection-item">$!escapetool.xml($aa.trim())</span>
893 - #end
894 - </div>
895 - </span>
896 - </div>
897 - #end
898 - #if($assemblyTopics && !$assemblyTopics.isEmpty())
899 - <div class="info-row">
900 - <span class="info-label">扱う内容</span>
901 - <span class="info-value">
902 - <div class="selection-display">
903 - #foreach($at in $assemblyTopics)
904 - <span class="selection-item">$!escapetool.xml($at.trim())</span>
905 - #end
906 - </div>
907 - </span>
908 - </div>
909 - #end
910 - #if($assemblyNote && $assemblyNote != '')
911 - <div class="info-row">
912 - <span class="info-label">自由記述</span>
913 - <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span>
914 - </div>
915 - #end
916 916   </div>
917 917   </div>
918 918   #else
919 - <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>
920 920   #end
921 921   #end
922 922  
... ... @@ -1004,35 +1004,6 @@
1004 1004   #end
1005 1005   #end
1006 1006  
1007 - ## --- 年間主要行事 ---
1008 - #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]])
1009 - #set($hasAnyEvent = false)
1010 - #foreach($m in $months)
1011 - #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end
1012 - #end
1013 - #if($hasAnyEvent)
1014 - #set($canViewAN = true)
1015 - #if($visibilityAnnualEvents == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAN = false)
1016 - #elseif($visibilityAnnualEvents == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAN = false)
1017 - #end
1018 - #if($canViewAN)
1019 - <div class="seitokai-subsection">
1020 - <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>
1021 - <div class="seitokai-subsection-content">
1022 - <table class="wiki-table school-info-table" style="margin:0">
1023 - #foreach($m in $months)
1024 - #if($m.get(1) && $m.get(1) != '')
1025 - <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr>
1026 - #end
1027 - #end
1028 - </table>
1029 - </div>
1030 - </div>
1031 - #else
1032 - <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>
1033 - #end
1034 - #end
1035 -
1036 1036   ## --- 生徒会の課題意識 ---
1037 1037   #if($challenges && $challenges != '')
1038 1038   #set($canViewChallenges = true)
... ... @@ -1104,13 +1104,13 @@
1104 1104  
1105 1105  <div class="activity-toolbar">
1106 1106   <div class="activity-fy-tabs">
1107 - <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
1007 + <button class="activity-fy-tab" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
1108 1108   #foreach($fy in $fySet)
1109 1109   #if($fy != $currentFYStr)
1110 1110   <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
1111 1111   #end
1112 1112   #end
1113 - <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
1013 + <button class="activity-fy-tab active" onclick="switchActivityFY('all', this)">全期間</button>
1114 1114   </div>
1115 1115   <div class="activity-toolbar-right">
1116 1116   <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示">
... ... @@ -1149,22 +1149,64 @@
1149 1149  
1150 1150  {{/html}}
1151 1151  
1152 -## 特色ある活動を先頭に表示するため、並び替え用リストを作成
1153 -#set($featuredActivities = [])
1154 -#set($normalActivities = [])
1155 -#if($activities && $activities.size() > 0)
1156 - #foreach($act in $activities)
1157 - #set($isFeatured = $!act.getValue('featured'))
1158 - #if($isFeatured == '1')
1159 - #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($discard = $fyNums.add($fy))
1058 + #end
1059 +#end
1060 +## 最大値を順番に取り出して降順リストを構築（最大20年度まで対応）
1061 +#set($fyDesc = [])
1062 +#set($fyRemaining = [])
1063 +#foreach($fy in $fyNums)
1064 + #set($discard = $fyRemaining.add($fy))
1065 +#end
1066 +#foreach($dummy in [1..20])
1067 + #if($fyRemaining.isEmpty())#break#end
1068 + #set($fyMax = $fyRemaining.get(0))
1069 + #foreach($fy in $fyRemaining)
1070 + #if($fy > $fyMax)#set($fyMax = $fy)#end
1071 + #end
1072 + #set($discard = $fyDesc.add($fyMax))
1073 + #set($fyNextRem = [])
1074 + #set($fyMaxRemoved = false)
1075 + #foreach($fy in $fyRemaining)
1076 + #if(!$fyMaxRemoved && $fy == $fyMax)
1077 + #set($fyMaxRemoved = true)
1160 1160   #else
1161 - #set($discard = $normalActivities.add($foreach.index))
1079 + #set($discard = $fyNextRem.add($fy))
1162 1162   #end
1163 1163   #end
1082 + #set($fyRemaining = $fyNextRem)
1164 1164  #end
1084 +## 年度未設定の活動は末尾に表示（fySetに'unknown'は入らないため無条件追加）
1085 +#set($discard = $fyDesc.add('unknown'))
1086 +## Step2: 年度降順で featured → normal の順にインデックスを収集
1165 1165  #set($orderedActivityIndices = [])
1166 -#set($discard = $orderedActivityIndices.addAll($featuredActivities))
1167 -#set($discard = $orderedActivityIndices.addAll($normalActivities))
1088 +#foreach($curFY in $fyDesc)
1089 + ## 同年度の特色あり活動を先頭に
1090 + #set($actIdx2 = 0)
1091 + #foreach($act in $activities)
1092 + #set($aFY2 = $!act.getValue('fiscalYear'))
1093 + #if(!$aFY2 || $aFY2 == '') #set($aFY2 = 'unknown') #end
1094 + #if($aFY2 == $curFY && $act.getValue('featured') == '1')
1095 + #set($discard = $orderedActivityIndices.add($actIdx2))
1096 + #end
1097 + #set($actIdx2 = $actIdx2 + 1)
1098 + #end
1099 + ## 同年度の通常活動
1100 + #set($actIdx2 = 0)
1101 + #foreach($act in $activities)
1102 + #set($aFY2 = $!act.getValue('fiscalYear'))
1103 + #if(!$aFY2 || $aFY2 == '') #set($aFY2 = 'unknown') #end
1104 + #if($aFY2 == $curFY && $act.getValue('featured') != '1')
1105 + #set($discard = $orderedActivityIndices.add($actIdx2))
1106 + #end
1107 + #set($actIdx2 = $actIdx2 + 1)
1108 + #end
1109 +#end
1168 1168  
1169 1169  #if($activities && $activities.size() > 0)
1170 1170   #foreach($actIdx in $orderedActivityIndices)
... ... @@ -1694,7 +1694,7 @@
1694 1694   fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1695 1695   if (allTab) { tabContainer.appendChild(allTab); }
1696 1696   }
1697 - // デフォルトで現在の年度を表示
1639 + // デフォルトで全期間を表示
1698 1698   var defaultTab = document.querySelector('.activity-fy-tab.active');
1699 1699   if (defaultTab) { defaultTab.click(); }
1700 1700   // 保存成功時のトースト通知