Last modified by Super Admin on 2026/04/05 18:59

From version Icon 111.1 Icon
edited by Super Admin
on 2026/03/24 21:32
Change comment: There is no comment for this version
To version Icon 110.1 Icon
edited by Super Admin
on 2026/03/24 19:13
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -435,14 +435,7 @@
435 435   #else
436 436   #set($discard = $stepItems.add({'name': '日常の活動', 'done': false}))
437 437   #end
438 - ## 4. 生徒総会
439 - #if($assemblyFormat && $assemblyFormat != '')
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. 選挙
438 + ## 4. 選挙
446 446   #if($electionExists && $electionExists != '')
447 447   #set($discard = $stepItems.add({'name': '選挙', 'done': true}))
448 448   #set($completedCount = $completedCount + 1)
... ... @@ -449,6 +449,15 @@
449 449   #else
450 450   #set($discard = $stepItems.add({'name': '選挙', 'done': false}))
451 451   #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
452 452   ## 6. 校則の見直し
453 453   #if($ruleReviewStatus && $ruleReviewStatus != '')
454 454   #set($discard = $stepItems.add({'name': '校則・生徒会会則の見直し', 'done': true}))
... ... @@ -456,14 +456,12 @@
456 456   #else
457 457   #set($discard = $stepItems.add({'name': '校則・生徒会会則の見直し', 'done': false}))
458 458   #end
459 - ## 7. 予算
460 - #set($budgetFilled = false)
461 - #if(($budgetScale && $budgetScale != '') || ($studentFee && $studentFee != '')) #set($budgetFilled = true) #end
462 - #if($budgetFilled)
463 - #set($discard = $stepItems.add({'name': '予算', 'done': true}))
461 + ## 7. 生徒総会
462 + #if($assemblyFormat && $assemblyFormat != '')
463 + #set($discard = $stepItems.add({'name': '生徒総会', 'done': true}))
464 464   #set($completedCount = $completedCount + 1)
465 465   #else
466 - #set($discard = $stepItems.add({'name': '予算', 'done': false}))
466 + #set($discard = $stepItems.add({'name': '生徒総会', 'done': false}))
467 467   #end
468 468   ## 8. 活動報告
469 469   #set($activityCount = $doc.getObjects('SeitokaiCode.ActivityClass').size())
... ... @@ -565,123 +565,6 @@
565 565   #end
566 566   #end
567 567  
568 - ## --- 活動環境 ---
569 - #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictTools && !$ictTools.isEmpty()) || ($ictUsage && !$ictUsage.isEmpty()))
570 - #if($hasActivityEnv)
571 - #set($canViewAE = true)
572 - #if($visibilityActivityEnv == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAE = false)
573 - #elseif($visibilityActivityEnv == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAE = false)
574 - #end
575 - #if($canViewAE)
576 - <div class="seitokai-subsection">
577 - <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>
578 - <div class="seitokai-subsection-content">
579 - #if($activityPlace && !$activityPlace.isEmpty())
580 - <div class="info-row">
581 - <span class="info-label">普段の活動場所</span>
582 - <span class="info-value">
583 - <div class="selection-display">
584 - #foreach($ap in $activityPlace)
585 - <span class="selection-item">$!escapetool.xml($ap.trim())</span>
586 - #end
587 - </div>
588 - </span>
589 - </div>
590 - #end
591 - #if($activityRoomEquipment && $activityRoomEquipment != '')
592 - <div class="info-row">
593 - <span class="info-label">生徒会室の設備</span>
594 - <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span>
595 - </div>
596 - #end
597 - #if($activityRoomImage && $activityRoomImage != '')
598 - <div class="info-row">
599 - <span class="info-label">活動場所の写真</span>
600 - <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span>
601 - </div>
602 - #end
603 - #if($ictTools && !$ictTools.isEmpty())
604 - <div class="info-row">
605 - <span class="info-label">利用しているICTツール</span>
606 - <span class="info-value">
607 - #set($ictCatDisplay = [
608 - ["連絡ツール", ["メール","LINE","LINE WORKS","Discord","Slack","Microsoft Teams","Google Chat","InstagramのDM","XのDM","その他(連絡)"]],
609 - ["ドキュメント作成・共有", ["Googleドキュメント","Googleスプレッドシート","Googleスライド","Googleドライブ","Word","Excel","PowerPoint","OneDrive","SharePoint","Notion","Pages","Numbers","Keynote","Dropbox","Box","その他(ドキュメント)"]],
610 - ["タスク管理", ["Googleカレンダー","Google ToDoリスト","Trello","Asana","Excel等スプレッドシート","その他(タスク管理)"]],
611 - ["ビデオ会議ツール", ["Zoom","Google Meet","その他(ビデオ会議)"]],
612 - ["アンケート", ["Googleフォーム","Microsoft Forms","その他(アンケート)"]],
613 - ["デザイン・クリエイティブ", ["Canva","各種Adobe","CapCut","LumaFusion","AviUtl","ibisPaint","その他(デザイン)"]],
614 - ["その他", ["独自のWebシステム・自作アプリ"]]
615 - ])
616 - #foreach($catD in $ictCatDisplay)
617 - #set($catHasItems = false)
618 - #foreach($t in $catD.get(1))
619 - #if($ictTools.contains($t)) #set($catHasItems = true) #end
620 - #end
621 - #if($catHasItems)
622 - <div style="margin-bottom:6px">
623 - <span style="font-size:0.8em;font-weight:600;color:var(--text-mid)">$catD.get(0):</span>
624 - <div class="selection-display" style="margin-top:2px">
625 - #foreach($t in $catD.get(1))
626 - #if($ictTools.contains($t))
627 - <span class="selection-item">$!escapetool.xml($t)</span>
628 - #end
629 - #end
630 - </div>
631 - </div>
632 - #end
633 - #end
634 - </span>
635 - </div>
636 - #end
637 - #if($ictUsage && !$ictUsage.isEmpty())
638 - <div class="info-row">
639 - <span class="info-label">ICT活用している場面</span>
640 - <span class="info-value">
641 - <div class="selection-display">
642 - #foreach($iu in $ictUsage)
643 - <span class="selection-item">$!escapetool.xml($iu.trim())</span>
644 - #end
645 - </div>
646 - </span>
647 - </div>
648 - #end
649 - </div>
650 - </div>
651 - #else
652 - <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>
653 - #end
654 - #end
655 -
656 - ## --- 年間主要行事 ---
657 - #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]])
658 - #set($hasAnyEvent = false)
659 - #foreach($m in $months)
660 - #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end
661 - #end
662 - #if($hasAnyEvent)
663 - #set($canViewAN = true)
664 - #if($visibilityAnnualEvents == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAN = false)
665 - #elseif($visibilityAnnualEvents == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAN = false)
666 - #end
667 - #if($canViewAN)
668 - <div class="seitokai-subsection">
669 - <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>
670 - <div class="seitokai-subsection-content">
671 - <table class="wiki-table school-info-table" style="margin:0">
672 - #foreach($m in $months)
673 - #if($m.get(1) && $m.get(1) != '')
674 - <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr>
675 - #end
676 - #end
677 - </table>
678 - </div>
679 - </div>
680 - #else
681 - <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>
682 - #end
683 - #end
684 -
685 685   ## --- 日常の活動 ---
686 686   #if($dailyActivities && !$dailyActivities.isEmpty())
687 687   #set($canViewDA = true)
... ... @@ -708,6 +708,36 @@
708 708   #end
709 709   #end
710 710  
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 +
711 711   ## --- 定例活動 ---
712 712   #if($meetingFrequency && $meetingFrequency != '')
713 713   #set($canViewMT = true)
... ... @@ -732,96 +732,68 @@
732 732   #end
733 733   #end
734 734  
735 - ## --- 生徒総会 ---
736 - #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != ''))
737 - #if($hasAssembly)
738 - #set($canViewAS = true)
739 - #if($visibilityAssembly == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAS = false)
740 - #elseif($visibilityAssembly == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAS = false)
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)
741 741   #end
742 - #if($canViewAS)
655 + #if($canViewBudget)
743 743   <div class="seitokai-subsection">
744 - <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>
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>
745 745   <div class="seitokai-subsection-content">
746 - #if($assemblyFormat && $assemblyFormat != '')
659 + #if($budgetProcess && !$budgetProcess.isEmpty())
747 747   <div class="info-row">
748 - <span class="info-label">開催方式</span>
749 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span>
661 + <span class="info-label">作成過程の生徒関与</span>
662 + <span class="info-value">
663 + <div class="selection-display">
664 + #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整(折衝等)","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"])
665 + #foreach($bpOpt in $allBpOpts)
666 + #if($budgetProcess.contains($bpOpt))
667 + <span class="selection-item">$!escapetool.xml($bpOpt)</span>
668 + #else
669 + <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span>
670 + #end
671 + #end
672 + </div>
673 + </span>
750 750   </div>
751 751   #end
752 - #if($assemblyCount && $assemblyCount > 0)
676 + #if($studentFee && $studentFee != '')
753 753   <div class="info-row">
754 - <span class="info-label">開催回数(年)</span>
755 - <span class="info-value">$!escapetool.xml($assemblyCount)</span>
678 + <span class="info-label">生徒会費(年)</span>
679 + <span class="info-value">$!escapetool.xml($!studentFee)</span>
756 756   </div>
757 757   #end
758 - #if($assemblyAgenda && !$assemblyAgenda.isEmpty())
682 + #if($budgetScale && $budgetScale != '')
759 759   <div class="info-row">
760 - <span class="info-label">議案の集め方</span>
761 - <span class="info-value">
762 - <div class="selection-display">
763 - #foreach($aa in $assemblyAgenda)
764 - <span class="selection-item">$!escapetool.xml($aa.trim())</span>
765 - #end
766 - </div>
767 - </span>
684 + <span class="info-label">予算規模</span>
685 + <span class="info-value">$!escapetool.xml($!budgetScale)</span>
768 768   </div>
769 769   #end
770 - #if($assemblyTopics && !$assemblyTopics.isEmpty())
688 + #if($budgetAllocation && !$budgetAllocation.isEmpty())
771 771   <div class="info-row">
772 - <span class="info-label">扱う内容</span>
690 + <span class="info-label">主な予算配分</span>
773 773   <span class="info-value">
774 774   <div class="selection-display">
775 - #foreach($at in $assemblyTopics)
776 - <span class="selection-item">$!escapetool.xml($at.trim())</span>
693 + #foreach($ba in $budgetAllocation)
694 + <span class="selection-item">$!escapetool.xml($ba.trim())</span>
777 777   #end
778 778   </div>
779 779   </span>
780 780   </div>
781 781   #end
782 - #if($assemblyNote && $assemblyNote != '')
783 - <div class="info-row">
784 - <span class="info-label">自由記述</span>
785 - <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span>
786 - </div>
700 + #if($budgetNote && $budgetNote.trim() != '')
701 + <div class="free-note">$!escapetool.xml($budgetNote)</div>
787 787   #end
788 788   </div>
789 789   </div>
790 790   #else
791 - <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>
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>
792 792   #end
793 793   #end
794 794  
795 - ## --- 選挙 ---
796 - #if($electionExists && $electionExists != '')
797 - #set($canViewEL = true)
798 - #if($visibilityElection == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEL = false)
799 - #elseif($visibilityElection == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEL = false)
800 - #end
801 - #if($canViewEL)
802 - <div class="seitokai-subsection">
803 - <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>
804 - <div class="seitokai-subsection-content">
805 - <div class="info-row">
806 - <span class="info-label">役員選挙</span>
807 - <span class="info-value">$!escapetool.xml($!electionExists)</span>
808 - </div>
809 - #if($electionType && $electionType != '')
810 - <div class="info-row">
811 - <span class="info-label">直近の選挙方式</span>
812 - <span class="info-value">$!escapetool.xml($!electionType)</span>
813 - </div>
814 - #end
815 - #if($electionNote && $electionNote.trim() != '')
816 - <div class="free-note">$!escapetool.xml($electionNote)</div>
817 - #end
818 - </div>
819 - </div>
820 - #else
821 - <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>
822 - #end
823 - #end
824 -
825 825   ## --- 校則・生徒会会則の見直し ---
826 826   #if($ruleReviewStatus && $ruleReviewStatus != '')
827 827   #set($canViewRuleReview = true)
... ... @@ -887,65 +887,151 @@
887 887   #end
888 888   #end
889 889  
890 - ## --- 予算 ---
891 - #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
892 - #if($hasBudget)
893 - #set($canViewBudget = true)
894 - #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
895 - #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
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)
896 896   #end
897 - #if($canViewBudget)
782 + #if($canViewAE)
898 898   <div class="seitokai-subsection">
899 - <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>
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>
900 900   <div class="seitokai-subsection-content">
901 - #if($budgetProcess && !$budgetProcess.isEmpty())
786 + #if($activityPlace && !$activityPlace.isEmpty())
902 902   <div class="info-row">
903 - <span class="info-label">作成過程生徒関与</span>
788 + <span class="info-label">普段活動場所</span>
904 904   <span class="info-value">
905 905   <div class="selection-display">
906 - #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整(折衝等)","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"])
907 - #foreach($bpOpt in $allBpOpts)
908 - #if($budgetProcess.contains($bpOpt))
909 - <span class="selection-item">$!escapetool.xml($bpOpt)</span>
910 - #else
911 - <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span>
912 - #end
791 + #foreach($ap in $activityPlace)
792 + <span class="selection-item">$!escapetool.xml($ap.trim())</span>
913 913   #end
914 914   </div>
915 915   </span>
916 916   </div>
917 917   #end
918 - #if($studentFee && $studentFee != '')
798 + #if($activityRoomEquipment && $activityRoomEquipment != '')
919 919   <div class="info-row">
920 - <span class="info-label">生徒会費(年額)</span>
921 - <span class="info-value">$!escapetool.xml($!studentFee)</span>
800 + <span class="info-label">生徒会室の設備</span>
801 + <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span>
922 922   </div>
923 923   #end
924 - #if($budgetScale && $budgetScale != '')
804 + #if($activityRoomImage && $activityRoomImage != '')
925 925   <div class="info-row">
926 - <span class="info-label">予算規模</span>
927 - <span class="info-value">$!escapetool.xml($!budgetScale)</span>
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>
928 928   </div>
929 929   #end
930 - #if($budgetAllocation && !$budgetAllocation.isEmpty())
810 + #if($ictTools && !$ictTools.isEmpty())
931 931   <div class="info-row">
932 - <span class="info-label">主な予算配分</span>
812 + <span class="info-label">利用しているICTツール</span>
933 933   <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">
934 934   <div class="selection-display">
935 - #foreach($ba in $budgetAllocation)
936 - <span class="selection-item">$!escapetool.xml($ba.trim())</span>
849 + #foreach($iu in $ictUsage)
850 + <span class="selection-item">$!escapetool.xml($iu.trim())</span>
937 937   #end
938 938   </div>
939 939   </span>
940 940   </div>
941 941   #end
942 - #if($budgetNote && $budgetNote.trim() != '')
943 - <div class="free-note">$!escapetool.xml($budgetNote)</div>
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>
944 944   #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
945 945   </div>
946 946   </div>
947 947   #else
948 - <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>
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>
949 949   #end
950 950   #end
951 951  
... ... @@ -1033,6 +1033,35 @@
1033 1033   #end
1034 1034   #end
1035 1035  
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)