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

Summary

Details

Icon Page properties
Content
... ... @@ -387,7 +387,7 @@
387 387  #end
388 388  #if($canEditSchool)
389 389  <div style="text-align:right; margin-bottom:12px;">
390 - <a href="$doc.getURL('view', 'sheet=SeitokaiCode.SchoolEditForm')" class="btn-school-edit"><svg class="ico" viewBox="0 0 24 24"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 情報を編集</a>
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>
391 391  </div>
392 392  #end
393 393  
... ... @@ -409,6 +409,27 @@
409 409  </div>
410 410  #end
411 411  
412 +## --- 未入力ガイド（自校ユーザー向け） ---
413 +#if(!$isGuest && $canEdit)
414 + #set($missingItems = [])
415 + #if(!$studentCount || $studentCount == '' || $studentCount == '0') #set($discard = $missingItems.add('生徒数')) #end
416 + #if(!$orgChart || $orgChart == '') #set($discard = $missingItems.add('生徒会組織')) #end
417 + #if(!$dailyActivities || $dailyActivities == '') #set($discard = $missingItems.add('日常の活動')) #end
418 + #if(!$ruleReviewStatus || $ruleReviewStatus == '') #set($discard = $missingItems.add('校則・生徒会会則の見直し')) #end
419 + #set($activityCount = $doc.getObjects('SeitokaiCode.ActivityClass').size())
420 + #if($activityCount == 0) #set($discard = $missingItems.add('活動報告（まだ投稿がありません）')) #end
421 + #if($missingItems.size() > 0)
422 +<div class="form-message-info" style="margin-bottom:var(--sp-4);">
423 + <strong>入力のお願い</strong> — 以下の項目がまだ入力されていません。<a href="$doc.getURL('view', 'sheet=SeitokaiCode.SchoolEditForm')">編集画面</a>から入力すると、他校の生徒会の参考になります。
424 + <ul style="margin:var(--sp-2) 0 0; padding-left:var(--sp-5);">
425 + #foreach($item in $missingItems)
426 + <li>$item</li>
427 + #end
428 + </ul>
429 +</div>
430 + #end
431 +#end
432 +
412 412  ## --- ① 学校基本情報 ---
413 413  <div class="school-info-card collapsed" id="card-basic-info">
414 414   <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>
... ... @@ -419,19 +419,7 @@
419 419   <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
420 420   <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
421 421   <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
422 - <tr><th>共学・別学</th><td>
423 - #if($coeducation && $coeducation != '')
424 - <div class="selection-display">
425 - #foreach($ceo in ["共学","男子校","女子校","その他"])
426 - #if($coeducation == $ceo)
427 - <span class="selection-item">$!escapetool.xml($ceo)</span>
428 - #else
429 - <span class="selection-item selection-item-off">$!escapetool.xml($ceo)</span>
430 - #end
431 - #end
432 - </div>
433 - #end
434 - </td></tr>
443 + <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
435 435   <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
436 436   <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
437 437   <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
... ... @@ -477,127 +477,6 @@
477 477   #end
478 478   #end
479 479  
480 - ## --- 活動環境 ---
481 - #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictTools && !$ictTools.isEmpty()) || ($ictUsage && !$ictUsage.isEmpty()))
482 - #if($hasActivityEnv)
483 - #set($canViewAE = true)
484 - #if($visibilityActivityEnv == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAE = false)
485 - #elseif($visibilityActivityEnv == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAE = false)
486 - #end
487 - #if($canViewAE)
488 - <div class="seitokai-subsection">
489 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 9l9-7 9 7v11a2 2 0 01-2 2H5a2 2 0 01-2-2z"/><polyline points="9 22 9 12 15 12 15 22"/></svg> 生徒会の活動環境 #if($visibilityActivityEnv != '' && $visibilityActivityEnv != 'public')<span class="visibility-badge visibility-${visibilityActivityEnv}">#if($visibilityActivityEnv == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
490 - <div class="seitokai-subsection-content">
491 - #if($activityPlace && !$activityPlace.isEmpty())
492 - <div class="info-row">
493 - <span class="info-label">普段の活動場所</span>
494 - <span class="info-value">
495 - <div class="selection-display">
496 - #foreach($apo in ["専用の生徒会室","他の部活・委員会と併用した教室","空き教室を活用","インターネット中心","その他"])
497 - #if($activityPlace.contains($apo))
498 - <span class="selection-item">$!escapetool.xml($apo)</span>
499 - #else
500 - <span class="selection-item selection-item-off">$!escapetool.xml($apo)</span>
501 - #end
502 - #end
503 - </div>
504 - </span>
505 - </div>
506 - #end
507 - #if($activityRoomEquipment && $activityRoomEquipment != '')
508 - <div class="info-row">
509 - <span class="info-label">生徒会室の設備</span>
510 - <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span>
511 - </div>
512 - #end
513 - #if($activityRoomImage && $activityRoomImage != '')
514 - <div class="info-row">
515 - <span class="info-label">活動場所の写真</span>
516 - <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span>
517 - </div>
518 - #end
519 - #if($ictTools && !$ictTools.isEmpty())
520 - <div class="info-row">
521 - <span class="info-label">利用しているICTツール</span>
522 - <span class="info-value">
523 - #set($ictCatDisplay = [
524 - ["連絡ツール", ["メール","LINE","LINE WORKS","Discord","Slack","Microsoft Teams","Google Chat","InstagramのDM","XのDM","その他（連絡）"]],
525 - ["ドキュメント作成・共有", ["Googleドキュメント","Googleスプレッドシート","Googleスライド","Googleドライブ","Word","Excel","PowerPoint","OneDrive","SharePoint","Notion","Pages","Numbers","Keynote","Dropbox","Box","その他（ドキュメント）"]],
526 - ["タスク管理", ["Googleカレンダー","Google ToDoリスト","Trello","Asana","Excel等スプレッドシート","その他（タスク管理）"]],
527 - ["ビデオ会議ツール", ["Zoom","Google Meet","その他（ビデオ会議）"]],
528 - ["アンケート", ["Googleフォーム","Microsoft Forms","その他（アンケート）"]],
529 - ["デザイン・クリエイティブ", ["Canva","各種Adobe","CapCut","LumaFusion","AviUtl","ibisPaint","その他（デザイン）"]],
530 - ["その他", ["独自のWebシステム・自作アプリ"]]
531 - ])
532 - #foreach($catD in $ictCatDisplay)
533 - #set($catHasItems = false)
534 - #foreach($t in $catD.get(1))
535 - #if($ictTools.contains($t)) #set($catHasItems = true) #end
536 - #end
537 - #if($catHasItems)
538 - <div style="margin-bottom:6px">
539 - <span style="font-size:0.8em;font-weight:600;color:var(--text-mid)">$catD.get(0):</span>
540 - <div class="selection-display" style="margin-top:2px">
541 - #foreach($t in $catD.get(1))
542 - #if($ictTools.contains($t))
543 - <span class="selection-item">$!escapetool.xml($t)</span>
544 - #end
545 - #end
546 - </div>
547 - </div>
548 - #end
549 - #end
550 - </span>
551 - </div>
552 - #end
553 - #if($ictUsage && !$ictUsage.isEmpty())
554 - <div class="info-row">
555 - <span class="info-label">ICT活用している場面</span>
556 - <span class="info-value">
557 - <div class="selection-display">
558 - #foreach($iu in $ictUsage)
559 - <span class="selection-item">$!escapetool.xml($iu.trim())</span>
560 - #end
561 - </div>
562 - </span>
563 - </div>
564 - #end
565 - </div>
566 - </div>
567 - #else
568 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 活動環境情報は #if($visibilityActivityEnv == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
569 - #end
570 - #end
571 -
572 - ## --- 年間主要行事 ---
573 - #set($months = [["4月", $eventApril], ["5月", $eventMay], ["6月", $eventJune], ["7月", $eventJuly], ["8月", $eventAugust], ["9月", $eventSeptember], ["10月", $eventOctober], ["11月", $eventNovember], ["12月", $eventDecember], ["1月", $eventJanuary], ["2月", $eventFebruary], ["3月", $eventMarch]])
574 - #set($hasAnyEvent = false)
575 - #foreach($m in $months)
576 - #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end
577 - #end
578 - #if($hasAnyEvent)
579 - #set($canViewAN = true)
580 - #if($visibilityAnnualEvents == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAN = false)
581 - #elseif($visibilityAnnualEvents == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAN = false)
582 - #end
583 - #if($canViewAN)
584 - <div class="seitokai-subsection">
585 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2" ry="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 年間主要行事 #if($visibilityAnnualEvents != '' && $visibilityAnnualEvents != 'public')<span class="visibility-badge visibility-${visibilityAnnualEvents}">#if($visibilityAnnualEvents == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
586 - <div class="seitokai-subsection-content">
587 - <table class="wiki-table school-info-table" style="margin:0">
588 - #foreach($m in $months)
589 - #if($m.get(1) && $m.get(1) != '')
590 - <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr>
591 - #end
592 - #end
593 - </table>
594 - </div>
595 - </div>
596 - #else
597 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 年間主要行事情報は #if($visibilityAnnualEvents == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
598 - #end
599 - #end
600 -
601 601   ## --- 日常の活動 ---
602 602   #if($dailyActivities && !$dailyActivities.isEmpty())
603 603   #set($canViewDA = true)
... ... @@ -609,13 +609,9 @@
609 609   <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg> 日常の活動 #if($visibilityDailyActivities != '' && $visibilityDailyActivities != 'public')<span class="visibility-badge visibility-${visibilityDailyActivities}">#if($visibilityDailyActivities == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
610 610   <div class="seitokai-subsection-content">
611 611   <p class="activity-hint">活動時間が多い3つ</p>
612 - <div class="selection-display">
613 - #foreach($dao in ["文化祭","体育祭","生徒会企画","歓送迎会","その他学校行事","校則改正","選挙","総会","予算編成・会計活動","教員との連携","他校との連携","地域との連携","ボランティア","広報","引き継ぎ","DX","目安箱","委員会","学級・HRとの連携","アンケート","三者協議会等","企業との連携","保護者との連携","その他"])
614 - #if($dailyActivities.contains($dao))
615 - <span class="selection-item">$!escapetool.xml($dao)</span>
616 - #else
617 - <span class="selection-item selection-item-off">$!escapetool.xml($dao)</span>
618 - #end
500 + <div class="tag-container">
501 + #foreach($da in $dailyActivities)
502 + <span class="tag tag-accent">$!escapetool.xml($da.trim())</span>
619 619   #end
620 620   </div>
621 621   #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
... ... @@ -628,6 +628,36 @@
628 628   #end
629 629   #end
630 630  
515 + ## --- 選挙 ---
516 + #if($electionExists && $electionExists != '')
517 + #set($canViewEL = true)
518 + #if($visibilityElection == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEL = false)
519 + #elseif($visibilityElection == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEL = false)
520 + #end
521 + #if($canViewEL)
522 + <div class="seitokai-subsection">
523 + <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>
524 + <div class="seitokai-subsection-content">
525 + <div class="info-row">
526 + <span class="info-label">役員選挙</span>
527 + <span class="info-value">$!escapetool.xml($!electionExists)</span>
528 + </div>
529 + #if($electionType && $electionType != '')
530 + <div class="info-row">
531 + <span class="info-label">直近の選挙方式</span>
532 + <span class="info-value">$!escapetool.xml($!electionType)</span>
533 + </div>
534 + #end
535 + #if($electionNote && $electionNote.trim() != '')
536 + <div class="free-note">$!escapetool.xml($electionNote)</div>
537 + #end
538 + </div>
539 + </div>
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($visibilityElection == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
542 + #end
543 + #end
544 +
631 631   ## --- 定例活動 ---
632 632   #if($meetingFrequency && $meetingFrequency != '')
633 633   #set($canViewMT = true)
... ... @@ -652,27 +652,28 @@
652 652   #end
653 653   #end
654 654  
655 - ## --- 生徒総会 ---
656 - #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != ''))
657 - #if($hasAssembly)
658 - #set($canViewAS = true)
659 - #if($visibilityAssembly == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAS = false)
660 - #elseif($visibilityAssembly == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAS = false)
569 + ## --- 予算 ---
570 + #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
571 + #if($hasBudget)
572 + #set($canViewBudget = true)
573 + #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
574 + #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
661 661   #end
662 - #if($canViewAS)
576 + #if($canViewBudget)
663 663   <div class="seitokai-subsection">
664 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 生徒総会 #if($visibilityAssembly != '' && $visibilityAssembly != 'public')<span class="visibility-badge visibility-${visibilityAssembly}">#if($visibilityAssembly == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
578 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><line x1="12" y1="1" x2="12" y2="23"/><path d="M17 5H9.5a3.5 3.5 0 000 7h5a3.5 3.5 0 010 7H6"/></svg> 予算 #if($visibilityBudget != 'public')<span class="visibility-badge visibility-${visibilityBudget}">#if($visibilityBudget == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
665 665   <div class="seitokai-subsection-content">
666 - #if($assemblyFormat && $assemblyFormat != '')
580 + #if($budgetProcess && !$budgetProcess.isEmpty())
667 667   <div class="info-row">
668 - <span class="info-label">開催方式</span>
582 + <span class="info-label">作成過程の生徒関与</span>
669 669   <span class="info-value">
670 670   <div class="selection-display">
671 - #foreach($afo in ["全生徒の対面開催","オンラインと併用","完全オンライン開催","開催なし","その他"])
672 - #if($assemblyFormat == $afo)
673 - <span class="selection-item">$!escapetool.xml($afo)</span>
585 + #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整（折衝等）","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"])
586 + #foreach($bpOpt in $allBpOpts)
587 + #if($budgetProcess.contains($bpOpt))
588 + <span class="selection-item">$!escapetool.xml($bpOpt)</span>
674 674   #else
675 - <span class="selection-item selection-item-off">$!escapetool.xml($afo)</span>
590 + <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span>
676 676   #end
677 677   #end
678 678   </div>
... ... @@ -679,87 +679,40 @@
679 679   </span>
680 680   </div>
681 681   #end
682 - #if($assemblyCount && $assemblyCount > 0)
597 + #if($studentFee && $studentFee != '')
683 683   <div class="info-row">
684 - <span class="info-label">開催回数（年）</span>
685 - <span class="info-value">$!escapetool.xml($assemblyCount)回</span>
599 + <span class="info-label">生徒会費（年額）</span>
600 + <span class="info-value">$!escapetool.xml($!studentFee)</span>
686 686   </div>
687 687   #end
688 - #if($assemblyAgenda && !$assemblyAgenda.isEmpty())
603 + #if($budgetScale && $budgetScale != '')
689 689   <div class="info-row">
690 - <span class="info-label">議案の集め方</span>
691 - <span class="info-value">
692 - <div class="selection-display">
693 - #foreach($aao in ["教員からの提案","執行部からの提案","クラスごとの討議","目安箱","アンケート","総会時の発議","その他"])
694 - #if($assemblyAgenda.contains($aao))
695 - <span class="selection-item">$!escapetool.xml($aao)</span>
696 - #else
697 - <span class="selection-item selection-item-off">$!escapetool.xml($aao)</span>
698 - #end
699 - #end
700 - </div>
701 - </span>
605 + <span class="info-label">予算規模</span>
606 + <span class="info-value">$!escapetool.xml($!budgetScale)</span>
702 702   </div>
703 703   #end
704 - #if($assemblyTopics && !$assemblyTopics.isEmpty())
609 + #if($budgetAllocation && !$budgetAllocation.isEmpty())
705 705   <div class="info-row">
706 - <span class="info-label">扱う内容</span>
611 + <span class="info-label">主な予算配分</span>
707 707   <span class="info-value">
708 708   <div class="selection-display">
709 - #foreach($ato in ["生徒会決算案","生徒会予算案","会則/校則の改正","生徒会の活動方針","学校への要望事項","外部へのアピール（宣言の採択など）","その他"])
710 - #if($assemblyTopics.contains($ato))
711 - <span class="selection-item">$!escapetool.xml($ato)</span>
712 - #else
713 - <span class="selection-item selection-item-off">$!escapetool.xml($ato)</span>
714 - #end
614 + #foreach($ba in $budgetAllocation)
615 + <span class="selection-item">$!escapetool.xml($ba.trim())</span>
715 715   #end
716 716   </div>
717 717   </span>
718 718   </div>
719 719   #end
720 - #if($assemblyNote && $assemblyNote != '')
721 - <div class="info-row">
722 - <span class="info-label">自由記述</span>
723 - <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span>
724 - </div>
621 + #if($budgetNote && $budgetNote.trim() != '')
622 + <div class="free-note">$!escapetool.xml($budgetNote)</div>
725 725   #end
726 726   </div>
727 727   </div>
728 728   #else
729 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 生徒総会情報は #if($visibilityAssembly == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
627 + <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 予算情報は #if($visibilityBudget == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
730 730   #end
731 731   #end
732 732  
733 - ## --- 選挙 ---
734 - #if($electionExists && $electionExists != '')
735 - #set($canViewEL = true)
736 - #if($visibilityElection == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEL = false)
737 - #elseif($visibilityElection == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEL = false)
738 - #end
739 - #if($canViewEL)
740 - <div class="seitokai-subsection">
741 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M7 13l3 3 7-7"/></svg> 選挙 #if($visibilityElection != '' && $visibilityElection != 'public')<span class="visibility-badge visibility-${visibilityElection}">#if($visibilityElection == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
742 - <div class="seitokai-subsection-content">
743 - <div class="info-row">
744 - <span class="info-label">役員選挙</span>
745 - <span class="info-value">$!escapetool.xml($!electionExists)</span>
746 - </div>
747 - #if($electionType && $electionType != '')
748 - <div class="info-row">
749 - <span class="info-label">直近の選挙方式</span>
750 - <span class="info-value">$!escapetool.xml($!electionType)</span>
751 - </div>
752 - #end
753 - #if($electionNote && $electionNote.trim() != '')
754 - <div class="free-note">$!escapetool.xml($electionNote)</div>
755 - #end
756 - </div>
757 - </div>
758 - #else
759 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 選挙情報は #if($visibilityElection == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
760 - #end
761 - #end
762 -
763 763   ## --- 校則・生徒会会則の見直し ---
764 764   #if($ruleReviewStatus && $ruleReviewStatus != '')
765 765   #set($canViewRuleReview = true)
... ... @@ -780,12 +780,8 @@
780 780   <span class="info-label">見直しの内容</span>
781 781   <span class="info-value">
782 782   <div class="selection-display">
783 - #foreach($rco in ["服飾規定（制服など）","持ち物規定","校則改正の仕組み","生徒会の仕組み","その他"])
784 - #if($ruleReviewContent.contains($rco))
785 - <span class="selection-item">$!escapetool.xml($rco)</span>
786 - #else
787 - <span class="selection-item selection-item-off">$!escapetool.xml($rco)</span>
788 - #end
651 + #foreach($rc in $ruleReviewContent)
652 + <span class="selection-item">$!escapetool.xml($rc.trim())</span>
789 789   #end
790 790   </div>
791 791   </span>
... ... @@ -796,12 +796,8 @@
796 796   <span class="info-label">見直しの提案者</span>
797 797   <span class="info-value">
798 798   <div class="selection-display">
799 - #foreach($rpo in ["教員","生徒会役員","専門委員会","その他の生徒","その他"])
800 - #if($ruleReviewProposer.contains($rpo))
801 - <span class="selection-item">$!escapetool.xml($rpo)</span>
802 - #else
803 - <span class="selection-item selection-item-off">$!escapetool.xml($rpo)</span>
804 - #end
663 + #foreach($rp in $ruleReviewProposer)
664 + <span class="selection-item">$!escapetool.xml($rp.trim())</span>
805 805   #end
806 806   </div>
807 807   </span>
... ... @@ -812,12 +812,8 @@
812 812   <span class="info-label">見直しの実施者</span>
813 813   <span class="info-value">
814 814   <div class="selection-display">
815 - #foreach($rio in ["教員","生徒会役員","専門委員会","その他の生徒","その他"])
816 - #if($ruleReviewImplementer.contains($rio))
817 - <span class="selection-item">$!escapetool.xml($rio)</span>
818 - #else
819 - <span class="selection-item selection-item-off">$!escapetool.xml($rio)</span>
820 - #end
675 + #foreach($ri in $ruleReviewImplementer)
676 + <span class="selection-item">$!escapetool.xml($ri.trim())</span>
821 821   #end
822 822   </div>
823 823   </span>
... ... @@ -837,69 +837,151 @@
837 837   #end
838 838   #end
839 839  
840 - ## --- 予算 ---
841 - #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
842 - #if($hasBudget)
843 - #set($canViewBudget = true)
844 - #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
845 - #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
696 + ## --- 活動環境 ---
697 + #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictTools && !$ictTools.isEmpty()) || ($ictUsage && !$ictUsage.isEmpty()))
698 + #if($hasActivityEnv)
699 + #set($canViewAE = true)
700 + #if($visibilityActivityEnv == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAE = false)
701 + #elseif($visibilityActivityEnv == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAE = false)
846 846   #end
847 - #if($canViewBudget)
703 + #if($canViewAE)
848 848   <div class="seitokai-subsection">
849 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><line x1="12" y1="1" x2="12" y2="23"/><path d="M17 5H9.5a3.5 3.5 0 000 7h5a3.5 3.5 0 010 7H6"/></svg> 予算 #if($visibilityBudget != 'public')<span class="visibility-badge visibility-${visibilityBudget}">#if($visibilityBudget == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
705 + <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>
850 850   <div class="seitokai-subsection-content">
851 - #if($budgetProcess && !$budgetProcess.isEmpty())
707 + #if($activityPlace && !$activityPlace.isEmpty())
852 852   <div class="info-row">
853 - <span class="info-label">作成過程の生徒関与</span>
709 + <span class="info-label">普段の活動場所</span>
854 854   <span class="info-value">
855 855   <div class="selection-display">
856 - #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整（折衝等）","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"])
857 - #foreach($bpOpt in $allBpOpts)
858 - #if($budgetProcess.contains($bpOpt))
859 - <span class="selection-item">$!escapetool.xml($bpOpt)</span>
860 - #else
861 - <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span>
862 - #end
712 + #foreach($ap in $activityPlace)
713 + <span class="selection-item">$!escapetool.xml($ap.trim())</span>
863 863   #end
864 864   </div>
865 865   </span>
866 866   </div>
867 867   #end
868 - #if($studentFee && $studentFee != '')
719 + #if($activityRoomEquipment && $activityRoomEquipment != '')
869 869   <div class="info-row">
870 - <span class="info-label">生徒会費（年額）</span>
871 - <span class="info-value">$!escapetool.xml($!studentFee)</span>
721 + <span class="info-label">生徒会室の設備</span>
722 + <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span>
872 872   </div>
873 873   #end
874 - #if($budgetScale && $budgetScale != '')
725 + #if($activityRoomImage && $activityRoomImage != '')
875 875   <div class="info-row">
876 - <span class="info-label">予算規模</span>
877 - <span class="info-value">$!escapetool.xml($!budgetScale)</span>
727 + <span class="info-label">活動場所の写真</span>
728 + <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span>
878 878   </div>
879 879   #end
880 - #if($budgetAllocation && !$budgetAllocation.isEmpty())
731 + #if($ictTools && !$ictTools.isEmpty())
881 881   <div class="info-row">
882 - <span class="info-label">主な予算配分</span>
733 + <span class="info-label">利用しているICTツール</span>
883 883   <span class="info-value">
735 + #set($ictCatDisplay = [
736 + ["連絡ツール", ["メール","LINE","LINE WORKS","Discord","Slack","Microsoft Teams","Google Chat","InstagramのDM","XのDM","その他（連絡）"]],
737 + ["ドキュメント作成・共有", ["Googleドキュメント","Googleスプレッドシート","Googleスライド","Googleドライブ","Word","Excel","PowerPoint","OneDrive","SharePoint","Notion","Pages","Numbers","Keynote","Dropbox","Box","その他（ドキュメント）"]],
738 + ["タスク管理", ["Googleカレンダー","Google ToDoリスト","Trello","Asana","Excel等スプレッドシート","その他（タスク管理）"]],
739 + ["ビデオ会議ツール", ["Zoom","Google Meet","その他（ビデオ会議）"]],
740 + ["アンケート", ["Googleフォーム","Microsoft Forms","その他（アンケート）"]],
741 + ["デザイン・クリエイティブ", ["Canva","各種Adobe","CapCut","LumaFusion","AviUtl","ibisPaint","その他（デザイン）"]],
742 + ["その他", ["独自のWebシステム・自作アプリ"]]
743 + ])
744 + #foreach($catD in $ictCatDisplay)
745 + #set($catHasItems = false)
746 + #foreach($t in $catD.get(1))
747 + #if($ictTools.contains($t)) #set($catHasItems = true) #end
748 + #end
749 + #if($catHasItems)
750 + <div style="margin-bottom:6px">
751 + <span style="font-size:0.8em;font-weight:600;color:var(--text-mid)">$catD.get(0):</span>
752 + <div class="selection-display" style="margin-top:2px">
753 + #foreach($t in $catD.get(1))
754 + #if($ictTools.contains($t))
755 + <span class="selection-item">$!escapetool.xml($t)</span>
756 + #end
757 + #end
758 + </div>
759 + </div>
760 + #end
761 + #end
762 + </span>
763 + </div>
764 + #end
765 + #if($ictUsage && !$ictUsage.isEmpty())
766 + <div class="info-row">
767 + <span class="info-label">ICT活用している場面</span>
768 + <span class="info-value">
884 884   <div class="selection-display">
885 - #foreach($bao in ["行事費用","部活動","寄付","HR活動","執行部等","委員会活動","その他"])
886 - #if($budgetAllocation.contains($bao))
887 - <span class="selection-item">$!escapetool.xml($bao)</span>
888 - #else
889 - <span class="selection-item selection-item-off">$!escapetool.xml($bao)</span>
890 - #end
770 + #foreach($iu in $ictUsage)
771 + <span class="selection-item">$!escapetool.xml($iu.trim())</span>
891 891   #end
892 892   </div>
893 893   </span>
894 894   </div>
895 895   #end
896 - #if($budgetNote && $budgetNote.trim() != '')
897 - <div class="free-note">$!escapetool.xml($budgetNote)</div>
777 + </div>
778 + </div>
779 + #else
780 + <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>
781 + #end
782 + #end
783 +
784 + ## --- 生徒総会 ---
785 + #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != ''))
786 + #if($hasAssembly)
787 + #set($canViewAS = true)
788 + #if($visibilityAssembly == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAS = false)
789 + #elseif($visibilityAssembly == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAS = false)
790 + #end
791 + #if($canViewAS)
792 + <div class="seitokai-subsection">
793 + <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>
794 + <div class="seitokai-subsection-content">
795 + #if($assemblyFormat && $assemblyFormat != '')
796 + <div class="info-row">
797 + <span class="info-label">開催方式</span>
798 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span>
799 + </div>
898 898   #end
801 + #if($assemblyCount && $assemblyCount > 0)
802 + <div class="info-row">
803 + <span class="info-label">開催回数（年）</span>
804 + <span class="info-value">$!escapetool.xml($assemblyCount)回</span>
805 + </div>
806 + #end
807 + #if($assemblyAgenda && !$assemblyAgenda.isEmpty())
808 + <div class="info-row">
809 + <span class="info-label">議案の集め方</span>
810 + <span class="info-value">
811 + <div class="selection-display">
812 + #foreach($aa in $assemblyAgenda)
813 + <span class="selection-item">$!escapetool.xml($aa.trim())</span>
814 + #end
815 + </div>
816 + </span>
817 + </div>
818 + #end
819 + #if($assemblyTopics && !$assemblyTopics.isEmpty())
820 + <div class="info-row">
821 + <span class="info-label">扱う内容</span>
822 + <span class="info-value">
823 + <div class="selection-display">
824 + #foreach($at in $assemblyTopics)
825 + <span class="selection-item">$!escapetool.xml($at.trim())</span>
826 + #end
827 + </div>
828 + </span>
829 + </div>
830 + #end
831 + #if($assemblyNote && $assemblyNote != '')
832 + <div class="info-row">
833 + <span class="info-label">自由記述</span>
834 + <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span>
835 + </div>
836 + #end
899 899   </div>
900 900   </div>
901 901   #else
902 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 予算情報は #if($visibilityBudget == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
840 + <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>
903 903   #end
904 904   #end
905 905  
... ... @@ -959,17 +959,7 @@
959 959   #if($externalCooperation && $externalCooperation != '')
960 960   <div class="info-row">
961 961   <span class="info-label">他校の生徒会との連携</span>
962 - <span class="info-value">
963 - <div class="selection-display">
964 - #foreach($eco in ["定期的な連盟等の会合への参加","自治体等が主催するイベントへの参加","個別学校との交流","なし","その他"])
965 - #if($externalCooperation == $eco)
966 - <span class="selection-item">$!escapetool.xml($eco)</span>
967 - #else
968 - <span class="selection-item selection-item-off">$!escapetool.xml($eco)</span>
969 - #end
970 - #end
971 - </div>
972 - </span>
900 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($externalCooperation)</span></span>
973 973   </div>
974 974   #end
975 975   #if($externalOrgName && $externalOrgName != '')
... ... @@ -983,12 +983,8 @@
983 983   <span class="info-label">社会参加・地域連携・ボランティア</span>
984 984   <span class="info-value">
985 985   <div class="selection-display">
986 - #foreach($spo in ["三者協議会等","学校運営協議会等","町内会や商工会等との意見交換","企業や地域との商品開発","ゴミ拾い・地域清掃","募金","あいさつ運動","地域のお祭り・イベント等への協力・出展","その他"])
987 - #if($socialParticipation.contains($spo))
988 - <span class="selection-item">$!escapetool.xml($spo)</span>
989 - #else
990 - <span class="selection-item selection-item-off">$!escapetool.xml($spo)</span>
991 - #end
914 + #foreach($sp2 in $socialParticipation)
915 + <span class="selection-item">$!escapetool.xml($sp2.trim())</span>
992 992   #end
993 993   </div>
994 994   </span>
... ... @@ -1001,6 +1001,35 @@
1001 1001   #end
1002 1002   #end
1003 1003  
928 + ## --- 年間主要行事 ---
929 + #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]])
930 + #set($hasAnyEvent = false)
931 + #foreach($m in $months)
932 + #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end
933 + #end
934 + #if($hasAnyEvent)
935 + #set($canViewAN = true)
936 + #if($visibilityAnnualEvents == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAN = false)
937 + #elseif($visibilityAnnualEvents == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAN = false)
938 + #end
939 + #if($canViewAN)
940 + <div class="seitokai-subsection">
941 + <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>
942 + <div class="seitokai-subsection-content">
943 + <table class="wiki-table school-info-table" style="margin:0">
944 + #foreach($m in $months)
945 + #if($m.get(1) && $m.get(1) != '')
946 + <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr>
947 + #end
948 + #end
949 + </table>
950 + </div>
951 + </div>
952 + #else
953 + <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>
954 + #end
955 + #end
956 +
1004 1004   ## --- 生徒会の課題意識 ---
1005 1005   #if($challenges && $challenges != '')
1006 1006   #set($canViewChallenges = true)
... ... @@ -1072,13 +1072,13 @@
1072 1072  
1073 1073  <div class="activity-toolbar">
1074 1074   <div class="activity-fy-tabs">
1075 - <button class="activity-fy-tab" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
1028 + <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
1076 1076   #foreach($fy in $fySet)
1077 1077   #if($fy != $currentFYStr)
1078 1078   <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
1079 1079   #end
1080 1080   #end
1081 - <button class="activity-fy-tab active" onclick="switchActivityFY('all', this)">全期間</button>
1034 + <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
1082 1082   </div>
1083 1083   <div class="activity-toolbar-right">
1084 1084   <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示">
... ... @@ -1117,67 +1117,22 @@
1117 1117  
1118 1118  {{/html}}
1119 1119  
1120 -## 活動を「年度降順 + 特色あり先頭」で並び替え
1121 -## Step1: fySet から年度を降順ソート（Velocity ネイティブ実装）
1122 -#set($fyNums = [])
1123 -#foreach($fy in $fySet)
1124 - #if($fy && $fy != '' && $fy != 'unknown')
1125 - #set($fyInt = $mathtool.toInteger($fy))
1126 - #if($fyInt)
1127 - #set($discard = $fyNums.add($fyInt))
1128 - #end
1129 - #end
1130 -#end
1131 -## 最大値を順番に取り出して降順リストを構築（最大20年度まで対応）
1132 -#set($fyDesc = [])
1133 -#set($fyRemaining = [])
1134 -#foreach($fy in $fyNums)
1135 - #set($discard = $fyRemaining.add($fy))
1136 -#end
1137 -#foreach($dummy in [1..20])
1138 - #if($fyRemaining.isEmpty())#break#end
1139 - #set($fyMax = $fyRemaining.get(0))
1140 - #foreach($fy in $fyRemaining)
1141 - #if($fy > $fyMax)#set($fyMax = $fy)#end
1142 - #end
1143 - #set($discard = $fyDesc.add($fyMax))
1144 - #set($fyNextRem = [])
1145 - #set($fyMaxRemoved = false)
1146 - #foreach($fy in $fyRemaining)
1147 - #if(!$fyMaxRemoved && $fy == $fyMax)
1148 - #set($fyMaxRemoved = true)
1073 +## 特色ある活動を先頭に表示するため、並び替え用リストを作成
1074 +#set($featuredActivities = [])
1075 +#set($normalActivities = [])
1076 +#if($activities && $activities.size() > 0)
1077 + #foreach($act in $activities)
1078 + #set($isFeatured = $!act.getValue('featured'))
1079 + #if($isFeatured == '1')
1080 + #set($discard = $featuredActivities.add($foreach.index))
1149 1149   #else
1150 - #set($discard = $fyNextRem.add($fy))
1082 + #set($discard = $normalActivities.add($foreach.index))
1151 1151   #end
1152 1152   #end
1153 - #set($fyRemaining = $fyNextRem)
1154 1154  #end
1155 -## 年度未設定の活動は末尾に表示（fySetに'unknown'は入らないため無条件追加）
1156 -#set($discard = $fyDesc.add('unknown'))
1157 -## Step2: 年度降順で featured → normal の順にインデックスを収集
1158 1158  #set($orderedActivityIndices = [])
1159 -#foreach($curFY in $fyDesc)
1160 - ## 同年度の特色あり活動を先頭に
1161 - #set($actIdx2 = 0)
1162 - #foreach($act in $activities)
1163 - #set($aFY2 = $!act.getValue('fiscalYear'))
1164 - #if(!$aFY2 || $aFY2 == '') #set($aFY2 = 'unknown') #end
1165 - #if($aFY2 == $curFY && $act.getValue('featured') == '1')
1166 - #set($discard = $orderedActivityIndices.add($actIdx2))
1167 - #end
1168 - #set($actIdx2 = $actIdx2 + 1)
1169 - #end
1170 - ## 同年度の通常活動
1171 - #set($actIdx2 = 0)
1172 - #foreach($act in $activities)
1173 - #set($aFY2 = $!act.getValue('fiscalYear'))
1174 - #if(!$aFY2 || $aFY2 == '') #set($aFY2 = 'unknown') #end
1175 - #if($aFY2 == $curFY && $act.getValue('featured') != '1')
1176 - #set($discard = $orderedActivityIndices.add($actIdx2))
1177 - #end
1178 - #set($actIdx2 = $actIdx2 + 1)
1179 - #end
1180 -#end
1087 +#set($discard = $orderedActivityIndices.addAll($featuredActivities))
1088 +#set($discard = $orderedActivityIndices.addAll($normalActivities))
1181 1181  
1182 1182  #if($activities && $activities.size() > 0)
1183 1183   #foreach($actIdx in $orderedActivityIndices)
... ... @@ -1686,7 +1686,7 @@
1686 1686  }
1687 1687  // ページ読み込み時の初期化
1688 1688  document.addEventListener('DOMContentLoaded', function() {
1689 - // 年度タブを降順にソート（「全期間」タブは先頭に固定）
1597 + // 年度タブを降順にソート（「全期間」タブは末尾に固定）
1690 1690   var tabContainer = document.querySelector('.activity-fy-tabs');
1691 1691   if (tabContainer) {
1692 1692   var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
... ... @@ -1703,11 +1703,11 @@
1703 1703   var bYear = parseInt(b.textContent) || 0;
1704 1704   return bYear - aYear;
1705 1705   });
1706 - // DOM再配置（全期間を先頭、年度タブを降順で続ける）
1707 - if (allTab) { tabContainer.appendChild(allTab); }
1614 + // DOM再配置
1708 1708   fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1616 + if (allTab) { tabContainer.appendChild(allTab); }
1709 1709   }
1710 - // デフォルトで全期間を表示
1618 + // デフォルトで現在の年度を表示
1711 1711   var defaultTab = document.querySelector('.activity-fy-tab.active');
1712 1712   if (defaultTab) { defaultTab.click(); }
1713 1713   // 保存成功時のトースト通知