Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 115.1 Icon
edited by Super Admin
on 2026/03/27 05:08
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
... ... @@ -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>
... ... @@ -465,123 +465,6 @@
465 465   #end
466 466   #end
467 467  
468 - ## --- 活動環境 ---
469 - #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictTools && !$ictTools.isEmpty()) || ($ictUsage && !$ictUsage.isEmpty()))
470 - #if($hasActivityEnv)
471 - #set($canViewAE = true)
472 - #if($visibilityActivityEnv == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAE = false)
473 - #elseif($visibilityActivityEnv == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAE = false)
474 - #end
475 - #if($canViewAE)
476 - <div class="seitokai-subsection">
477 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 9l9-7 9 7v11a2 2 0 01-2 2H5a2 2 0 01-2-2z"/><polyline points="9 22 9 12 15 12 15 22"/></svg> 生徒会の活動環境 #if($visibilityActivityEnv != '' && $visibilityActivityEnv != 'public')<span class="visibility-badge visibility-${visibilityActivityEnv}">#if($visibilityActivityEnv == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
478 - <div class="seitokai-subsection-content">
479 - #if($activityPlace && !$activityPlace.isEmpty())
480 - <div class="info-row">
481 - <span class="info-label">普段の活動場所</span>
482 - <span class="info-value">
483 - <div class="selection-display">
484 - #foreach($ap in $activityPlace)
485 - <span class="selection-item">$!escapetool.xml($ap.trim())</span>
486 - #end
487 - </div>
488 - </span>
489 - </div>
490 - #end
491 - #if($activityRoomEquipment && $activityRoomEquipment != '')
492 - <div class="info-row">
493 - <span class="info-label">生徒会室の設備</span>
494 - <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span>
495 - </div>
496 - #end
497 - #if($activityRoomImage && $activityRoomImage != '')
498 - <div class="info-row">
499 - <span class="info-label">活動場所の写真</span>
500 - <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span>
501 - </div>
502 - #end
503 - #if($ictTools && !$ictTools.isEmpty())
504 - <div class="info-row">
505 - <span class="info-label">利用しているICTツール</span>
506 - <span class="info-value">
507 - #set($ictCatDisplay = [
508 - ["連絡ツール", ["メール","LINE","LINE WORKS","Discord","Slack","Microsoft Teams","Google Chat","InstagramのDM","XのDM","その他（連絡）"]],
509 - ["ドキュメント作成・共有", ["Googleドキュメント","Googleスプレッドシート","Googleスライド","Googleドライブ","Word","Excel","PowerPoint","OneDrive","SharePoint","Notion","Pages","Numbers","Keynote","Dropbox","Box","その他（ドキュメント）"]],
510 - ["タスク管理", ["Googleカレンダー","Google ToDoリスト","Trello","Asana","Excel等スプレッドシート","その他（タスク管理）"]],
511 - ["ビデオ会議ツール", ["Zoom","Google Meet","その他（ビデオ会議）"]],
512 - ["アンケート", ["Googleフォーム","Microsoft Forms","その他（アンケート）"]],
513 - ["デザイン・クリエイティブ", ["Canva","各種Adobe","CapCut","LumaFusion","AviUtl","ibisPaint","その他（デザイン）"]],
514 - ["その他", ["独自のWebシステム・自作アプリ"]]
515 - ])
516 - #foreach($catD in $ictCatDisplay)
517 - #set($catHasItems = false)
518 - #foreach($t in $catD.get(1))
519 - #if($ictTools.contains($t)) #set($catHasItems = true) #end
520 - #end
521 - #if($catHasItems)
522 - <div style="margin-bottom:6px">
523 - <span style="font-size:0.8em;font-weight:600;color:var(--text-mid)">$catD.get(0):</span>
524 - <div class="selection-display" style="margin-top:2px">
525 - #foreach($t in $catD.get(1))
526 - #if($ictTools.contains($t))
527 - <span class="selection-item">$!escapetool.xml($t)</span>
528 - #end
529 - #end
530 - </div>
531 - </div>
532 - #end
533 - #end
534 - </span>
535 - </div>
536 - #end
537 - #if($ictUsage && !$ictUsage.isEmpty())
538 - <div class="info-row">
539 - <span class="info-label">ICT活用している場面</span>
540 - <span class="info-value">
541 - <div class="selection-display">
542 - #foreach($iu in $ictUsage)
543 - <span class="selection-item">$!escapetool.xml($iu.trim())</span>
544 - #end
545 - </div>
546 - </span>
547 - </div>
548 - #end
549 - </div>
550 - </div>
551 - #else
552 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 活動環境情報は #if($visibilityActivityEnv == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
553 - #end
554 - #end
555 -
556 - ## --- 年間主要行事 ---
557 - #set($months = [["4月", $eventApril], ["5月", $eventMay], ["6月", $eventJune], ["7月", $eventJuly], ["8月", $eventAugust], ["9月", $eventSeptember], ["10月", $eventOctober], ["11月", $eventNovember], ["12月", $eventDecember], ["1月", $eventJanuary], ["2月", $eventFebruary], ["3月", $eventMarch]])
558 - #set($hasAnyEvent = false)
559 - #foreach($m in $months)
560 - #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end
561 - #end
562 - #if($hasAnyEvent)
563 - #set($canViewAN = true)
564 - #if($visibilityAnnualEvents == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAN = false)
565 - #elseif($visibilityAnnualEvents == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAN = false)
566 - #end
567 - #if($canViewAN)
568 - <div class="seitokai-subsection">
569 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2" ry="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 年間主要行事 #if($visibilityAnnualEvents != '' && $visibilityAnnualEvents != 'public')<span class="visibility-badge visibility-${visibilityAnnualEvents}">#if($visibilityAnnualEvents == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
570 - <div class="seitokai-subsection-content">
571 - <table class="wiki-table school-info-table" style="margin:0">
572 - #foreach($m in $months)
573 - #if($m.get(1) && $m.get(1) != '')
574 - <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr>
575 - #end
576 - #end
577 - </table>
578 - </div>
579 - </div>
580 - #else
581 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 年間主要行事情報は #if($visibilityAnnualEvents == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
582 - #end
583 - #end
584 -
585 585   ## --- 日常の活動 ---
586 586   #if($dailyActivities && !$dailyActivities.isEmpty())
587 587   #set($canViewDA = true)
... ... @@ -608,6 +608,36 @@
608 608   #end
609 609   #end
610 610  
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 +
611 611   ## --- 定例活動 ---
612 612   #if($meetingFrequency && $meetingFrequency != '')
613 613   #set($canViewMT = true)
... ... @@ -632,96 +632,68 @@
632 632   #end
633 633   #end
634 634  
635 - ## --- 生徒総会 ---
636 - #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != ''))
637 - #if($hasAssembly)
638 - #set($canViewAS = true)
639 - #if($visibilityAssembly == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAS = false)
640 - #elseif($visibilityAssembly == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAS = false)
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)
641 641   #end
642 - #if($canViewAS)
576 + #if($canViewBudget)
643 643   <div class="seitokai-subsection">
644 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 生徒総会 #if($visibilityAssembly != '' && $visibilityAssembly != 'public')<span class="visibility-badge visibility-${visibilityAssembly}">#if($visibilityAssembly == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
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>
645 645   <div class="seitokai-subsection-content">
646 - #if($assemblyFormat && $assemblyFormat != '')
580 + #if($budgetProcess && !$budgetProcess.isEmpty())
647 647   <div class="info-row">
648 - <span class="info-label">開催方式</span>
649 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span>
582 + <span class="info-label">作成過程の生徒関与</span>
583 + <span class="info-value">
584 + <div class="selection-display">
585 + #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整（折衝等）","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"])
586 + #foreach($bpOpt in $allBpOpts)
587 + #if($budgetProcess.contains($bpOpt))
588 + <span class="selection-item">$!escapetool.xml($bpOpt)</span>
589 + #else
590 + <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span>
591 + #end
592 + #end
593 + </div>
594 + </span>
650 650   </div>
651 651   #end
652 - #if($assemblyCount && $assemblyCount > 0)
597 + #if($studentFee && $studentFee != '')
653 653   <div class="info-row">
654 - <span class="info-label">開催回数（年）</span>
655 - <span class="info-value">$!escapetool.xml($assemblyCount)回</span>
599 + <span class="info-label">生徒会費（年額）</span>
600 + <span class="info-value">$!escapetool.xml($!studentFee)</span>
656 656   </div>
657 657   #end
658 - #if($assemblyAgenda && !$assemblyAgenda.isEmpty())
603 + #if($budgetScale && $budgetScale != '')
659 659   <div class="info-row">
660 - <span class="info-label">議案の集め方</span>
661 - <span class="info-value">
662 - <div class="selection-display">
663 - #foreach($aa in $assemblyAgenda)
664 - <span class="selection-item">$!escapetool.xml($aa.trim())</span>
665 - #end
666 - </div>
667 - </span>
605 + <span class="info-label">予算規模</span>
606 + <span class="info-value">$!escapetool.xml($!budgetScale)</span>
668 668   </div>
669 669   #end
670 - #if($assemblyTopics && !$assemblyTopics.isEmpty())
609 + #if($budgetAllocation && !$budgetAllocation.isEmpty())
671 671   <div class="info-row">
672 - <span class="info-label">扱う内容</span>
611 + <span class="info-label">主な予算配分</span>
673 673   <span class="info-value">
674 674   <div class="selection-display">
675 - #foreach($at in $assemblyTopics)
676 - <span class="selection-item">$!escapetool.xml($at.trim())</span>
614 + #foreach($ba in $budgetAllocation)
615 + <span class="selection-item">$!escapetool.xml($ba.trim())</span>
677 677   #end
678 678   </div>
679 679   </span>
680 680   </div>
681 681   #end
682 - #if($assemblyNote && $assemblyNote != '')
683 - <div class="info-row">
684 - <span class="info-label">自由記述</span>
685 - <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span>
686 - </div>
621 + #if($budgetNote && $budgetNote.trim() != '')
622 + <div class="free-note">$!escapetool.xml($budgetNote)</div>
687 687   #end
688 688   </div>
689 689   </div>
690 690   #else
691 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 生徒総会情報は #if($visibilityAssembly == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
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>
692 692   #end
693 693   #end
694 694  
695 - ## --- 選挙 ---
696 - #if($electionExists && $electionExists != '')
697 - #set($canViewEL = true)
698 - #if($visibilityElection == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEL = false)
699 - #elseif($visibilityElection == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEL = false)
700 - #end
701 - #if($canViewEL)
702 - <div class="seitokai-subsection">
703 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M7 13l3 3 7-7"/></svg> 選挙 #if($visibilityElection != '' && $visibilityElection != 'public')<span class="visibility-badge visibility-${visibilityElection}">#if($visibilityElection == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
704 - <div class="seitokai-subsection-content">
705 - <div class="info-row">
706 - <span class="info-label">役員選挙</span>
707 - <span class="info-value">$!escapetool.xml($!electionExists)</span>
708 - </div>
709 - #if($electionType && $electionType != '')
710 - <div class="info-row">
711 - <span class="info-label">直近の選挙方式</span>
712 - <span class="info-value">$!escapetool.xml($!electionType)</span>
713 - </div>
714 - #end
715 - #if($electionNote && $electionNote.trim() != '')
716 - <div class="free-note">$!escapetool.xml($electionNote)</div>
717 - #end
718 - </div>
719 - </div>
720 - #else
721 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 選挙情報は #if($visibilityElection == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
722 - #end
723 - #end
724 -
725 725   ## --- 校則・生徒会会則の見直し ---
726 726   #if($ruleReviewStatus && $ruleReviewStatus != '')
727 727   #set($canViewRuleReview = true)
... ... @@ -787,65 +787,151 @@
787 787   #end
788 788   #end
789 789  
790 - ## --- 予算 ---
791 - #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
792 - #if($hasBudget)
793 - #set($canViewBudget = true)
794 - #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
795 - #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
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)
796 796   #end
797 - #if($canViewBudget)
703 + #if($canViewAE)
798 798   <div class="seitokai-subsection">
799 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><line x1="12" y1="1" x2="12" y2="23"/><path d="M17 5H9.5a3.5 3.5 0 000 7h5a3.5 3.5 0 010 7H6"/></svg> 予算 #if($visibilityBudget != 'public')<span class="visibility-badge visibility-${visibilityBudget}">#if($visibilityBudget == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
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>
800 800   <div class="seitokai-subsection-content">
801 - #if($budgetProcess && !$budgetProcess.isEmpty())
707 + #if($activityPlace && !$activityPlace.isEmpty())
802 802   <div class="info-row">
803 - <span class="info-label">作成過程の生徒関与</span>
709 + <span class="info-label">普段の活動場所</span>
804 804   <span class="info-value">
805 805   <div class="selection-display">
806 - #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整（折衝等）","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"])
807 - #foreach($bpOpt in $allBpOpts)
808 - #if($budgetProcess.contains($bpOpt))
809 - <span class="selection-item">$!escapetool.xml($bpOpt)</span>
810 - #else
811 - <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span>
812 - #end
712 + #foreach($ap in $activityPlace)
713 + <span class="selection-item">$!escapetool.xml($ap.trim())</span>
813 813   #end
814 814   </div>
815 815   </span>
816 816   </div>
817 817   #end
818 - #if($studentFee && $studentFee != '')
719 + #if($activityRoomEquipment && $activityRoomEquipment != '')
819 819   <div class="info-row">
820 - <span class="info-label">生徒会費（年額）</span>
821 - <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>
822 822   </div>
823 823   #end
824 - #if($budgetScale && $budgetScale != '')
725 + #if($activityRoomImage && $activityRoomImage != '')
825 825   <div class="info-row">
826 - <span class="info-label">予算規模</span>
827 - <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>
828 828   </div>
829 829   #end
830 - #if($budgetAllocation && !$budgetAllocation.isEmpty())
731 + #if($ictTools && !$ictTools.isEmpty())
831 831   <div class="info-row">
832 - <span class="info-label">主な予算配分</span>
733 + <span class="info-label">利用しているICTツール</span>
833 833   <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">
834 834   <div class="selection-display">
835 - #foreach($ba in $budgetAllocation)
836 - <span class="selection-item">$!escapetool.xml($ba.trim())</span>
770 + #foreach($iu in $ictUsage)
771 + <span class="selection-item">$!escapetool.xml($iu.trim())</span>
837 837   #end
838 838   </div>
839 839   </span>
840 840   </div>
841 841   #end
842 - #if($budgetNote && $budgetNote.trim() != '')
843 - <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>
844 844   #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
845 845   </div>
846 846   </div>
847 847   #else
848 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 予算情報は #if($visibilityBudget == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
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>
849 849   #end
850 850   #end
851 851  
... ... @@ -933,6 +933,35 @@
933 933   #end
934 934   #end
935 935  
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 +
936 936   ## --- 生徒会の課題意識 ---
937 937   #if($challenges && $challenges != '')
938 938   #set($canViewChallenges = true)
... ... @@ -1004,13 +1004,13 @@
1004 1004  
1005 1005  <div class="activity-toolbar">
1006 1006   <div class="activity-fy-tabs">
1007 - <button class="activity-fy-tab" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
1028 + <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
1008 1008   #foreach($fy in $fySet)
1009 1009   #if($fy != $currentFYStr)
1010 1010   <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
1011 1011   #end
1012 1012   #end
1013 - <button class="activity-fy-tab active" onclick="switchActivityFY('all', this)">全期間</button>
1034 + <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
1014 1014   </div>
1015 1015   <div class="activity-toolbar-right">
1016 1016   <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示">
... ... @@ -1049,64 +1049,22 @@
1049 1049  
1050 1050  {{/html}}
1051 1051  
1052 -## 活動を「年度降順 + 特色あり先頭」で並び替え
1053 -## Step1: fySet から年度を降順ソート（Velocity ネイティブ実装）
1054 -#set($fyNums = [])
1055 -#foreach($fy in $fySet)
1056 - #if($fy && $fy != '' && $fy != 'unknown')
1057 - #set($discard = $fyNums.add($fy))
1058 - #end
1059 -#end
1060 -## 最大値を順番に取り出して降順リストを構築（最大20年度まで対応）
1061 -#set($fyDesc = [])
1062 -#set($fyRemaining = [])
1063 -#foreach($fy in $fyNums)
1064 - #set($discard = $fyRemaining.add($fy))
1065 -#end
1066 -#foreach($dummy in [1..20])
1067 - #if($fyRemaining.isEmpty())#break#end
1068 - #set($fyMax = $fyRemaining.get(0))
1069 - #foreach($fy in $fyRemaining)
1070 - #if($fy > $fyMax)#set($fyMax = $fy)#end
1071 - #end
1072 - #set($discard = $fyDesc.add($fyMax))
1073 - #set($fyNextRem = [])
1074 - #set($fyMaxRemoved = false)
1075 - #foreach($fy in $fyRemaining)
1076 - #if(!$fyMaxRemoved && $fy == $fyMax)
1077 - #set($fyMaxRemoved = true)
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))
1078 1078   #else
1079 - #set($discard = $fyNextRem.add($fy))
1082 + #set($discard = $normalActivities.add($foreach.index))
1080 1080   #end
1081 1081   #end
1082 - #set($fyRemaining = $fyNextRem)
1083 1083  #end
1084 -## 年度未設定の活動は末尾に表示（fySetに'unknown'は入らないため無条件追加）
1085 -#set($discard = $fyDesc.add('unknown'))
1086 -## Step2: 年度降順で featured → normal の順にインデックスを収集
1087 1087  #set($orderedActivityIndices = [])
1088 -#foreach($curFY in $fyDesc)
1089 - ## 同年度の特色あり活動を先頭に
1090 - #set($actIdx2 = 0)
1091 - #foreach($act in $activities)
1092 - #set($aFY2 = $!act.getValue('fiscalYear'))
1093 - #if(!$aFY2 || $aFY2 == '') #set($aFY2 = 'unknown') #end
1094 - #if($aFY2 == $curFY && $act.getValue('featured') == '1')
1095 - #set($discard = $orderedActivityIndices.add($actIdx2))
1096 - #end
1097 - #set($actIdx2 = $actIdx2 + 1)
1098 - #end
1099 - ## 同年度の通常活動
1100 - #set($actIdx2 = 0)
1101 - #foreach($act in $activities)
1102 - #set($aFY2 = $!act.getValue('fiscalYear'))
1103 - #if(!$aFY2 || $aFY2 == '') #set($aFY2 = 'unknown') #end
1104 - #if($aFY2 == $curFY && $act.getValue('featured') != '1')
1105 - #set($discard = $orderedActivityIndices.add($actIdx2))
1106 - #end
1107 - #set($actIdx2 = $actIdx2 + 1)
1108 - #end
1109 -#end
1087 +#set($discard = $orderedActivityIndices.addAll($featuredActivities))
1088 +#set($discard = $orderedActivityIndices.addAll($normalActivities))
1110 1110  
1111 1111  #if($activities && $activities.size() > 0)
1112 1112   #foreach($actIdx in $orderedActivityIndices)
... ... @@ -1636,7 +1636,7 @@
1636 1636   fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1637 1637   if (allTab) { tabContainer.appendChild(allTab); }
1638 1638   }
1639 - // デフォルトで全期間を表示
1618 + // デフォルトで現在の年度を表示
1640 1640   var defaultTab = document.querySelector('.activity-fy-tab.active');
1641 1641   if (defaultTab) { defaultTab.click(); }
1642 1642   // 保存成功時のトースト通知