Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 113.1 Icon
edited by Super Admin
on 2026/03/27 03:42
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  
... ... @@ -419,7 +419,19 @@
419 419   <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
420 420   <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
421 421   <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
422 - <tr><th>共学・別学</th><td>$!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>
423 423   <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
424 424   <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
425 425   <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
... ... @@ -481,8 +481,12 @@
481 481   <span class="info-label">普段の活動場所</span>
482 482   <span class="info-value">
483 483   <div class="selection-display">
484 - #foreach($ap in $activityPlace)
485 - <span class="selection-item">$!escapetool.xml($ap.trim())</span>
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
486 486   #end
487 487   </div>
488 488   </span>
... ... @@ -593,9 +593,13 @@
593 593   <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>
594 594   <div class="seitokai-subsection-content">
595 595   <p class="activity-hint">活動時間が多い3つ</p>
596 - <div class="tag-container">
597 - #foreach($da in $dailyActivities)
598 - <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
599 599   #end
600 600   </div>
601 601   #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
... ... @@ -646,7 +646,17 @@
646 646   #if($assemblyFormat && $assemblyFormat != '')
647 647   <div class="info-row">
648 648   <span class="info-label">開催方式</span>
649 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span>
669 + <span class="info-value">
670 + <div class="selection-display">
671 + #foreach($afo in ["全生徒の対面開催","オンラインと併用","完全オンライン開催","開催なし","その他"])
672 + #if($assemblyFormat == $afo)
673 + <span class="selection-item">$!escapetool.xml($afo)</span>
674 + #else
675 + <span class="selection-item selection-item-off">$!escapetool.xml($afo)</span>
676 + #end
677 + #end
678 + </div>
679 + </span>
650 650   </div>
651 651   #end
652 652   #if($assemblyCount && $assemblyCount > 0)
... ... @@ -660,8 +660,12 @@
660 660   <span class="info-label">議案の集め方</span>
661 661   <span class="info-value">
662 662   <div class="selection-display">
663 - #foreach($aa in $assemblyAgenda)
664 - <span class="selection-item">$!escapetool.xml($aa.trim())</span>
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
665 665   #end
666 666   </div>
667 667   </span>
... ... @@ -672,8 +672,12 @@
672 672   <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>
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
677 677   #end
678 678   </div>
679 679   </span>
... ... @@ -742,8 +742,12 @@
742 742   <span class="info-label">見直しの内容</span>
743 743   <span class="info-value">
744 744   <div class="selection-display">
745 - #foreach($rc in $ruleReviewContent)
746 - <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
747 747   #end
748 748   </div>
749 749   </span>
... ... @@ -754,8 +754,12 @@
754 754   <span class="info-label">見直しの提案者</span>
755 755   <span class="info-value">
756 756   <div class="selection-display">
757 - #foreach($rp in $ruleReviewProposer)
758 - <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
759 759   #end
760 760   </div>
761 761   </span>
... ... @@ -766,8 +766,12 @@
766 766   <span class="info-label">見直しの実施者</span>
767 767   <span class="info-value">
768 768   <div class="selection-display">
769 - #foreach($ri in $ruleReviewImplementer)
770 - <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
771 771   #end
772 772   </div>
773 773   </span>
... ... @@ -832,8 +832,12 @@
832 832   <span class="info-label">主な予算配分</span>
833 833   <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>
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
837 837   #end
838 838   </div>
839 839   </span>
... ... @@ -905,7 +905,17 @@
905 905   #if($externalCooperation && $externalCooperation != '')
906 906   <div class="info-row">
907 907   <span class="info-label">他校の生徒会との連携</span>
908 - <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>
909 909   </div>
910 910   #end
911 911   #if($externalOrgName && $externalOrgName != '')
... ... @@ -919,8 +919,12 @@
919 919   <span class="info-label">社会参加・地域連携・ボランティア</span>
920 920   <span class="info-value">
921 921   <div class="selection-display">
922 - #foreach($sp2 in $socialParticipation)
923 - <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
924 924   #end
925 925   </div>
926 926   </span>
... ... @@ -1049,22 +1049,67 @@
1049 1049  
1050 1050  {{/html}}
1051 1051  
1052 -## 特色ある活動を先頭に表示するため、並び替え用リストを作成
1053 -#set($featuredActivities = [])
1054 -#set($normalActivities = [])
1055 -#if($activities && $activities.size() > 0)
1056 - #foreach($act in $activities)
1057 - #set($isFeatured = $!act.getValue('featured'))
1058 - #if($isFeatured == '1')
1059 - #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)
1060 1060   #else
1061 - #set($discard = $normalActivities.add($foreach.index))
1150 + #set($discard = $fyNextRem.add($fy))
1062 1062   #end
1063 1063   #end
1153 + #set($fyRemaining = $fyNextRem)
1064 1064  #end
1155 +## 年度未設定の活動は末尾に表示（fySetに'unknown'は入らないため無条件追加）
1156 +#set($discard = $fyDesc.add('unknown'))
1157 +## Step2: 年度降順で featured → normal の順にインデックスを収集
1065 1065  #set($orderedActivityIndices = [])
1066 -#set($discard = $orderedActivityIndices.addAll($featuredActivities))
1067 -#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
1068 1068  
1069 1069  #if($activities && $activities.size() > 0)
1070 1070   #foreach($actIdx in $orderedActivityIndices)
... ... @@ -1573,7 +1573,7 @@
1573 1573  }
1574 1574  // ページ読み込み時の初期化
1575 1575  document.addEventListener('DOMContentLoaded', function() {
1576 - // 年度タブを降順にソート（「全期間」タブは末尾に固定）
1689 + // 年度タブを降順にソート（「全期間」タブは先頭に固定）
1577 1577   var tabContainer = document.querySelector('.activity-fy-tabs');
1578 1578   if (tabContainer) {
1579 1579   var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
... ... @@ -1590,9 +1590,9 @@
1590 1590   var bYear = parseInt(b.textContent) || 0;
1591 1591   return bYear - aYear;
1592 1592   });
1593 - // DOM再配置
1594 - fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1706 + // DOM再配置（全期間を先頭、年度タブを降順で続ける）
1595 1595   if (allTab) { tabContainer.appendChild(allTab); }
1708 + fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1596 1596   }
1597 1597   // デフォルトで全期間を表示
1598 1598   var defaultTab = document.querySelector('.activity-fy-tab.active');