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 119.1
edited by Super Admin
on 2026/04/05 18:59
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -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,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>
... ... @@ -519,7 +519,19 @@
519 519   <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
520 520   <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
521 521   <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
522 - <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
422 + <tr><th>共学・別学</th><td>
423 + #if($coeducation && $coeducation != '')
424 + <div class="selection-display">
425 + #foreach($ceo in ["共学","男子校","女子校","その他"])
426 + #if($coeducation == $ceo)
427 + <span class="selection-item">$!escapetool.xml($ceo)</span>
428 + #else
429 + <span class="selection-item selection-item-off">$!escapetool.xml($ceo)</span>
430 + #end
431 + #end
432 + </div>
433 + #end
434 + </td></tr>
523 523   <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
524 524   <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
525 525   <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
... ... @@ -565,6 +565,127 @@
565 565   #end
566 566   #end
567 567  
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 +
568 568   ## --- 日常の活動 ---
569 569   #if($dailyActivities && !$dailyActivities.isEmpty())
570 570   #set($canViewDA = true)
... ... @@ -576,9 +576,13 @@
576 576   <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>
577 577   <div class="seitokai-subsection-content">
578 578   <p class="activity-hint">活動時間が多い3つ</p>
579 - <div class="tag-container">
580 - #foreach($da in $dailyActivities)
581 - <span class="tag tag-accent">$!escapetool.xml($da.trim())</span>
612 + <div class="selection-display">
613 + #foreach($dao in ["文化祭","体育祭","生徒会企画","歓送迎会","その他学校行事","校則改正","選挙","総会","予算編成・会計活動","教員との連携","他校との連携","地域との連携","ボランティア","広報","引き継ぎ","DX","目安箱","委員会","学級・HRとの連携","アンケート","三者協議会等","企業との連携","保護者との連携","その他"])
614 + #if($dailyActivities.contains($dao))
615 + <span class="selection-item">$!escapetool.xml($dao)</span>
616 + #else
617 + <span class="selection-item selection-item-off">$!escapetool.xml($dao)</span>
618 + #end
582 582   #end
583 583   </div>
584 584   #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
... ... @@ -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,28 +645,27 @@
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)
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)
654 654   #end
655 - #if($canViewBudget)
662 + #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>
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>
658 658   <div class="seitokai-subsection-content">
659 - #if($budgetProcess && !$budgetProcess.isEmpty())
666 + #if($assemblyFormat && $assemblyFormat != '')
660 660   <div class="info-row">
661 - <span class="info-label">作成過程の生徒関与</span>
668 + <span class="info-label">開催方式</span>
662 662   <span class="info-value">
663 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>
671 + #foreach($afo in ["全生徒の対面開催","オンラインと併用","完全オンライン開催","開催なし","その他"])
672 + #if($assemblyFormat == $afo)
673 + <span class="selection-item">$!escapetool.xml($afo)</span>
668 668   #else
669 - <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span>
675 + <span class="selection-item selection-item-off">$!escapetool.xml($afo)</span>
670 670   #end
671 671   #end
672 672   </div>
... ... @@ -673,40 +673,87 @@
673 673   </span>
674 674   </div>
675 675   #end
676 - #if($studentFee && $studentFee != '')
682 + #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>
684 + <span class="info-label">開催回数（年）</span>
685 + <span class="info-value">$!escapetool.xml($assemblyCount)回</span>
680 680   </div>
681 681   #end
682 - #if($budgetScale && $budgetScale != '')
688 + #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>
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>
686 686   </div>
687 687   #end
688 - #if($budgetAllocation && !$budgetAllocation.isEmpty())
704 + #if($assemblyTopics && !$assemblyTopics.isEmpty())
689 689   <div class="info-row">
690 - <span class="info-label">主な予算配分</span>
706 + <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>
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
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>
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>
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>
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>
707 707   #end
708 708   #end
709 709  
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 +
710 710   ## --- 校則・生徒会会則の見直し ---
711 711   #if($ruleReviewStatus && $ruleReviewStatus != '')
712 712   #set($canViewRuleReview = true)
... ... @@ -727,8 +727,12 @@
727 727   <span class="info-label">見直しの内容</span>
728 728   <span class="info-value">
729 729   <div class="selection-display">
730 - #foreach($rc in $ruleReviewContent)
731 - <span class="selection-item">$!escapetool.xml($rc.trim())</span>
783 + #foreach($rco in ["服飾規定（制服など）","持ち物規定","校則改正の仕組み","生徒会の仕組み","その他"])
784 + #if($ruleReviewContent.contains($rco))
785 + <span class="selection-item">$!escapetool.xml($rco)</span>
786 + #else
787 + <span class="selection-item selection-item-off">$!escapetool.xml($rco)</span>
788 + #end
732 732   #end
733 733   </div>
734 734   </span>
... ... @@ -739,8 +739,12 @@
739 739   <span class="info-label">見直しの提案者</span>
740 740   <span class="info-value">
741 741   <div class="selection-display">
742 - #foreach($rp in $ruleReviewProposer)
743 - <span class="selection-item">$!escapetool.xml($rp.trim())</span>
799 + #foreach($rpo in ["教員","生徒会役員","専門委員会","その他の生徒","その他"])
800 + #if($ruleReviewProposer.contains($rpo))
801 + <span class="selection-item">$!escapetool.xml($rpo)</span>
802 + #else
803 + <span class="selection-item selection-item-off">$!escapetool.xml($rpo)</span>
804 + #end
744 744   #end
745 745   </div>
746 746   </span>
... ... @@ -751,8 +751,12 @@
751 751   <span class="info-label">見直しの実施者</span>
752 752   <span class="info-value">
753 753   <div class="selection-display">
754 - #foreach($ri in $ruleReviewImplementer)
755 - <span class="selection-item">$!escapetool.xml($ri.trim())</span>
815 + #foreach($rio in ["教員","生徒会役員","専門委員会","その他の生徒","その他"])
816 + #if($ruleReviewImplementer.contains($rio))
817 + <span class="selection-item">$!escapetool.xml($rio)</span>
818 + #else
819 + <span class="selection-item selection-item-off">$!escapetool.xml($rio)</span>
820 + #end
756 756   #end
757 757   </div>
758 758   </span>
... ... @@ -772,151 +772,69 @@
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)
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)
781 781   #end
782 - #if($canViewAE)
847 + #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>
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>
785 785   <div class="seitokai-subsection-content">
786 - #if($activityPlace && !$activityPlace.isEmpty())
851 + #if($budgetProcess && !$budgetProcess.isEmpty())
787 787   <div class="info-row">
788 - <span class="info-label">普段の活動場所</span>
853 + <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>
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
793 793   #end
794 794   </div>
795 795   </span>
796 796   </div>
797 797   #end
798 - #if($activityRoomEquipment && $activityRoomEquipment != '')
868 + #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>
870 + <span class="info-label">生徒会費（年額）</span>
871 + <span class="info-value">$!escapetool.xml($!studentFee)</span>
802 802   </div>
803 803   #end
804 - #if($activityRoomImage && $activityRoomImage != '')
874 + #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>
876 + <span class="info-label">予算規模</span>
877 + <span class="info-value">$!escapetool.xml($!budgetScale)</span>
808 808   </div>
809 809   #end
810 - #if($ictTools && !$ictTools.isEmpty())
880 + #if($budgetAllocation && !$budgetAllocation.isEmpty())
811 811   <div class="info-row">
812 - <span class="info-label">利用しているICTツール</span>
882 + <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>
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
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>
896 + #if($budgetNote && $budgetNote.trim() != '')
897 + <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>
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>
920 920   #end
921 921   #end
922 922  
... ... @@ -976,7 +976,17 @@
976 976   #if($externalCooperation && $externalCooperation != '')
977 977   <div class="info-row">
978 978   <span class="info-label">他校の生徒会との連携</span>
979 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($externalCooperation)</span></span>
962 + <span class="info-value">
963 + <div class="selection-display">
964 + #foreach($eco in ["定期的な連盟等の会合への参加","自治体等が主催するイベントへの参加","個別学校との交流","なし","その他"])
965 + #if($externalCooperation == $eco)
966 + <span class="selection-item">$!escapetool.xml($eco)</span>
967 + #else
968 + <span class="selection-item selection-item-off">$!escapetool.xml($eco)</span>
969 + #end
970 + #end
971 + </div>
972 + </span>
980 980   </div>
981 981   #end
982 982   #if($externalOrgName && $externalOrgName != '')
... ... @@ -990,8 +990,12 @@
990 990   <span class="info-label">社会参加・地域連携・ボランティア</span>
991 991   <span class="info-value">
992 992   <div class="selection-display">
993 - #foreach($sp2 in $socialParticipation)
994 - <span class="selection-item">$!escapetool.xml($sp2.trim())</span>
986 + #foreach($spo in ["三者協議会等","学校運営協議会等","町内会や商工会等との意見交換","企業や地域との商品開発","ゴミ拾い・地域清掃","募金","あいさつ運動","地域のお祭り・イベント等への協力・出展","その他"])
987 + #if($socialParticipation.contains($spo))
988 + <span class="selection-item">$!escapetool.xml($spo)</span>
989 + #else
990 + <span class="selection-item selection-item-off">$!escapetool.xml($spo)</span>
991 + #end
995 995   #end
996 996   </div>
997 997   </span>
... ... @@ -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>
1075 + <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>
1081 + <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,67 @@
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))
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)
1160 1160   #else
1161 - #set($discard = $normalActivities.add($foreach.index))
1150 + #set($discard = $fyNextRem.add($fy))
1162 1162   #end
1163 1163   #end
1153 + #set($fyRemaining = $fyNextRem)
1164 1164  #end
1155 +## 年度未設定の活動は末尾に表示（fySetに'unknown'は入らないため無条件追加）
1156 +#set($discard = $fyDesc.add('unknown'))
1157 +## Step2: 年度降順で featured → normal の順にインデックスを収集
1165 1165  #set($orderedActivityIndices = [])
1166 -#set($discard = $orderedActivityIndices.addAll($featuredActivities))
1167 -#set($discard = $orderedActivityIndices.addAll($normalActivities))
1159 +#foreach($curFY in $fyDesc)
1160 + ## 同年度の特色あり活動を先頭に
1161 + #set($actIdx2 = 0)
1162 + #foreach($act in $activities)
1163 + #set($aFY2 = $!act.getValue('fiscalYear'))
1164 + #if(!$aFY2 || $aFY2 == '') #set($aFY2 = 'unknown') #end
1165 + #if($aFY2 == $curFY && $act.getValue('featured') == '1')
1166 + #set($discard = $orderedActivityIndices.add($actIdx2))
1167 + #end
1168 + #set($actIdx2 = $actIdx2 + 1)
1169 + #end
1170 + ## 同年度の通常活動
1171 + #set($actIdx2 = 0)
1172 + #foreach($act in $activities)
1173 + #set($aFY2 = $!act.getValue('fiscalYear'))
1174 + #if(!$aFY2 || $aFY2 == '') #set($aFY2 = 'unknown') #end
1175 + #if($aFY2 == $curFY && $act.getValue('featured') != '1')
1176 + #set($discard = $orderedActivityIndices.add($actIdx2))
1177 + #end
1178 + #set($actIdx2 = $actIdx2 + 1)
1179 + #end
1180 +#end
1168 1168  
1169 1169  #if($activities && $activities.size() > 0)
1170 1170   #foreach($actIdx in $orderedActivityIndices)
... ... @@ -1673,7 +1673,7 @@
1673 1673  }
1674 1674  // ページ読み込み時の初期化
1675 1675  document.addEventListener('DOMContentLoaded', function() {
1676 - // 年度タブを降順にソート（「全期間」タブは末尾に固定）
1689 + // 年度タブを降順にソート（「全期間」タブは先頭に固定）
1677 1677   var tabContainer = document.querySelector('.activity-fy-tabs');
1678 1678   if (tabContainer) {
1679 1679   var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
... ... @@ -1690,11 +1690,11 @@
1690 1690   var bYear = parseInt(b.textContent) || 0;
1691 1691   return bYear - aYear;
1692 1692   });
1693 - // DOM再配置
1694 - fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1706 + // DOM再配置（全期間を先頭、年度タブを降順で続ける）
1695 1695   if (allTab) { tabContainer.appendChild(allTab); }
1708 + fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1696 1696   }
1697 - // デフォルトで現在の年度を表示
1710 + // デフォルトで全期間を表示
1698 1698   var defaultTab = document.querySelector('.activity-fy-tab.active');
1699 1699   if (defaultTab) { defaultTab.click(); }
1700 1700   // 保存成功時のトースト通知