Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 119.1
edited by Super Admin
on 2026/04/05 18:59
Change comment: There is no comment for this version
To version Icon 113.1 Icon
edited by Super Admin
on 2026/03/27 03:42
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,19 +419,7 @@
419 419   <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
420 420   <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
421 421   <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
422 - <tr><th>共学・別学</th><td>
423 - #if($coeducation && $coeducation != '')
424 - <div class="selection-display">
425 - #foreach($ceo in ["共学","男子校","女子校","その他"])
426 - #if($coeducation == $ceo)
427 - <span class="selection-item">$!escapetool.xml($ceo)</span>
428 - #else
429 - <span class="selection-item selection-item-off">$!escapetool.xml($ceo)</span>
430 - #end
431 - #end
432 - </div>
433 - #end
434 - </td></tr>
422 + <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
435 435   <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
436 436   <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
437 437   <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
... ... @@ -493,12 +493,8 @@
493 493   <span class="info-label">普段の活動場所</span>
494 494   <span class="info-value">
495 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
484 + #foreach($ap in $activityPlace)
485 + <span class="selection-item">$!escapetool.xml($ap.trim())</span>
502 502   #end
503 503   </div>
504 504   </span>
... ... @@ -609,13 +609,9 @@
609 609   <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg> 日常の活動 #if($visibilityDailyActivities != '' && $visibilityDailyActivities != 'public')<span class="visibility-badge visibility-${visibilityDailyActivities}">#if($visibilityDailyActivities == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
610 610   <div class="seitokai-subsection-content">
611 611   <p class="activity-hint">活動時間が多い3つ</p>
612 - <div class="selection-display">
613 - #foreach($dao in ["文化祭","体育祭","生徒会企画","歓送迎会","その他学校行事","校則改正","選挙","総会","予算編成・会計活動","教員との連携","他校との連携","地域との連携","ボランティア","広報","引き継ぎ","DX","目安箱","委員会","学級・HRとの連携","アンケート","三者協議会等","企業との連携","保護者との連携","その他"])
614 - #if($dailyActivities.contains($dao))
615 - <span class="selection-item">$!escapetool.xml($dao)</span>
616 - #else
617 - <span class="selection-item selection-item-off">$!escapetool.xml($dao)</span>
618 - #end
596 + <div class="tag-container">
597 + #foreach($da in $dailyActivities)
598 + <span class="tag tag-accent">$!escapetool.xml($da.trim())</span>
619 619   #end
620 620   </div>
621 621   #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
... ... @@ -666,17 +666,7 @@
666 666   #if($assemblyFormat && $assemblyFormat != '')
667 667   <div class="info-row">
668 668   <span class="info-label">開催方式</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>
649 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span>
680 680   </div>
681 681   #end
682 682   #if($assemblyCount && $assemblyCount > 0)
... ... @@ -690,12 +690,8 @@
690 690   <span class="info-label">議案の集め方</span>
691 691   <span class="info-value">
692 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
663 + #foreach($aa in $assemblyAgenda)
664 + <span class="selection-item">$!escapetool.xml($aa.trim())</span>
699 699   #end
700 700   </div>
701 701   </span>
... ... @@ -706,12 +706,8 @@
706 706   <span class="info-label">扱う内容</span>
707 707   <span class="info-value">
708 708   <div class="selection-display">
709 - #foreach($ato in ["生徒会決算案","生徒会予算案","会則/校則の改正","生徒会の活動方針","学校への要望事項","外部へのアピール（宣言の採択など）","その他"])
710 - #if($assemblyTopics.contains($ato))
711 - <span class="selection-item">$!escapetool.xml($ato)</span>
712 - #else
713 - <span class="selection-item selection-item-off">$!escapetool.xml($ato)</span>
714 - #end
675 + #foreach($at in $assemblyTopics)
676 + <span class="selection-item">$!escapetool.xml($at.trim())</span>
715 715   #end
716 716   </div>
717 717   </span>
... ... @@ -780,12 +780,8 @@
780 780   <span class="info-label">見直しの内容</span>
781 781   <span class="info-value">
782 782   <div class="selection-display">
783 - #foreach($rco in ["服飾規定（制服など）","持ち物規定","校則改正の仕組み","生徒会の仕組み","その他"])
784 - #if($ruleReviewContent.contains($rco))
785 - <span class="selection-item">$!escapetool.xml($rco)</span>
786 - #else
787 - <span class="selection-item selection-item-off">$!escapetool.xml($rco)</span>
788 - #end
745 + #foreach($rc in $ruleReviewContent)
746 + <span class="selection-item">$!escapetool.xml($rc.trim())</span>
789 789   #end
790 790   </div>
791 791   </span>
... ... @@ -796,12 +796,8 @@
796 796   <span class="info-label">見直しの提案者</span>
797 797   <span class="info-value">
798 798   <div class="selection-display">
799 - #foreach($rpo in ["教員","生徒会役員","専門委員会","その他の生徒","その他"])
800 - #if($ruleReviewProposer.contains($rpo))
801 - <span class="selection-item">$!escapetool.xml($rpo)</span>
802 - #else
803 - <span class="selection-item selection-item-off">$!escapetool.xml($rpo)</span>
804 - #end
757 + #foreach($rp in $ruleReviewProposer)
758 + <span class="selection-item">$!escapetool.xml($rp.trim())</span>
805 805   #end
806 806   </div>
807 807   </span>
... ... @@ -812,12 +812,8 @@
812 812   <span class="info-label">見直しの実施者</span>
813 813   <span class="info-value">
814 814   <div class="selection-display">
815 - #foreach($rio in ["教員","生徒会役員","専門委員会","その他の生徒","その他"])
816 - #if($ruleReviewImplementer.contains($rio))
817 - <span class="selection-item">$!escapetool.xml($rio)</span>
818 - #else
819 - <span class="selection-item selection-item-off">$!escapetool.xml($rio)</span>
820 - #end
769 + #foreach($ri in $ruleReviewImplementer)
770 + <span class="selection-item">$!escapetool.xml($ri.trim())</span>
821 821   #end
822 822   </div>
823 823   </span>
... ... @@ -882,12 +882,8 @@
882 882   <span class="info-label">主な予算配分</span>
883 883   <span class="info-value">
884 884   <div class="selection-display">
885 - #foreach($bao in ["行事費用","部活動","寄付","HR活動","執行部等","委員会活動","その他"])
886 - #if($budgetAllocation.contains($bao))
887 - <span class="selection-item">$!escapetool.xml($bao)</span>
888 - #else
889 - <span class="selection-item selection-item-off">$!escapetool.xml($bao)</span>
890 - #end
835 + #foreach($ba in $budgetAllocation)
836 + <span class="selection-item">$!escapetool.xml($ba.trim())</span>
891 891   #end
892 892   </div>
893 893   </span>
... ... @@ -959,17 +959,7 @@
959 959   #if($externalCooperation && $externalCooperation != '')
960 960   <div class="info-row">
961 961   <span class="info-label">他校の生徒会との連携</span>
962 - <span class="info-value">
963 - <div class="selection-display">
964 - #foreach($eco in ["定期的な連盟等の会合への参加","自治体等が主催するイベントへの参加","個別学校との交流","なし","その他"])
965 - #if($externalCooperation == $eco)
966 - <span class="selection-item">$!escapetool.xml($eco)</span>
967 - #else
968 - <span class="selection-item selection-item-off">$!escapetool.xml($eco)</span>
969 - #end
970 - #end
971 - </div>
972 - </span>
908 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($externalCooperation)</span></span>
973 973   </div>
974 974   #end
975 975   #if($externalOrgName && $externalOrgName != '')
... ... @@ -983,12 +983,8 @@
983 983   <span class="info-label">社会参加・地域連携・ボランティア</span>
984 984   <span class="info-value">
985 985   <div class="selection-display">
986 - #foreach($spo in ["三者協議会等","学校運営協議会等","町内会や商工会等との意見交換","企業や地域との商品開発","ゴミ拾い・地域清掃","募金","あいさつ運動","地域のお祭り・イベント等への協力・出展","その他"])
987 - #if($socialParticipation.contains($spo))
988 - <span class="selection-item">$!escapetool.xml($spo)</span>
989 - #else
990 - <span class="selection-item selection-item-off">$!escapetool.xml($spo)</span>
991 - #end
922 + #foreach($sp2 in $socialParticipation)
923 + <span class="selection-item">$!escapetool.xml($sp2.trim())</span>
992 992   #end
993 993   </div>
994 994   </span>
... ... @@ -1117,67 +1117,22 @@
1117 1117  
1118 1118  {{/html}}
1119 1119  
1120 -## 活動を「年度降順 + 特色あり先頭」で並び替え
1121 -## Step1: fySet から年度を降順ソート（Velocity ネイティブ実装）
1122 -#set($fyNums = [])
1123 -#foreach($fy in $fySet)
1124 - #if($fy && $fy != '' && $fy != 'unknown')
1125 - #set($fyInt = $mathtool.toInteger($fy))
1126 - #if($fyInt)
1127 - #set($discard = $fyNums.add($fyInt))
1128 - #end
1129 - #end
1130 -#end
1131 -## 最大値を順番に取り出して降順リストを構築（最大20年度まで対応）
1132 -#set($fyDesc = [])
1133 -#set($fyRemaining = [])
1134 -#foreach($fy in $fyNums)
1135 - #set($discard = $fyRemaining.add($fy))
1136 -#end
1137 -#foreach($dummy in [1..20])
1138 - #if($fyRemaining.isEmpty())#break#end
1139 - #set($fyMax = $fyRemaining.get(0))
1140 - #foreach($fy in $fyRemaining)
1141 - #if($fy > $fyMax)#set($fyMax = $fy)#end
1142 - #end
1143 - #set($discard = $fyDesc.add($fyMax))
1144 - #set($fyNextRem = [])
1145 - #set($fyMaxRemoved = false)
1146 - #foreach($fy in $fyRemaining)
1147 - #if(!$fyMaxRemoved && $fy == $fyMax)
1148 - #set($fyMaxRemoved = true)
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))
1149 1149   #else
1150 - #set($discard = $fyNextRem.add($fy))
1061 + #set($discard = $normalActivities.add($foreach.index))
1151 1151   #end
1152 1152   #end
1153 - #set($fyRemaining = $fyNextRem)
1154 1154  #end
1155 -## 年度未設定の活動は末尾に表示（fySetに'unknown'は入らないため無条件追加）
1156 -#set($discard = $fyDesc.add('unknown'))
1157 -## Step2: 年度降順で featured → normal の順にインデックスを収集
1158 1158  #set($orderedActivityIndices = [])
1159 -#foreach($curFY in $fyDesc)
1160 - ## 同年度の特色あり活動を先頭に
1161 - #set($actIdx2 = 0)
1162 - #foreach($act in $activities)
1163 - #set($aFY2 = $!act.getValue('fiscalYear'))
1164 - #if(!$aFY2 || $aFY2 == '') #set($aFY2 = 'unknown') #end
1165 - #if($aFY2 == $curFY && $act.getValue('featured') == '1')
1166 - #set($discard = $orderedActivityIndices.add($actIdx2))
1167 - #end
1168 - #set($actIdx2 = $actIdx2 + 1)
1169 - #end
1170 - ## 同年度の通常活動
1171 - #set($actIdx2 = 0)
1172 - #foreach($act in $activities)
1173 - #set($aFY2 = $!act.getValue('fiscalYear'))
1174 - #if(!$aFY2 || $aFY2 == '') #set($aFY2 = 'unknown') #end
1175 - #if($aFY2 == $curFY && $act.getValue('featured') != '1')
1176 - #set($discard = $orderedActivityIndices.add($actIdx2))
1177 - #end
1178 - #set($actIdx2 = $actIdx2 + 1)
1179 - #end
1180 -#end
1066 +#set($discard = $orderedActivityIndices.addAll($featuredActivities))
1067 +#set($discard = $orderedActivityIndices.addAll($normalActivities))
1181 1181  
1182 1182  #if($activities && $activities.size() > 0)
1183 1183   #foreach($actIdx in $orderedActivityIndices)
... ... @@ -1686,7 +1686,7 @@
1686 1686  }
1687 1687  // ページ読み込み時の初期化
1688 1688  document.addEventListener('DOMContentLoaded', function() {
1689 - // 年度タブを降順にソート（「全期間」タブは先頭に固定）
1576 + // 年度タブを降順にソート（「全期間」タブは末尾に固定）
1690 1690   var tabContainer = document.querySelector('.activity-fy-tabs');
1691 1691   if (tabContainer) {
1692 1692   var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
... ... @@ -1703,9 +1703,9 @@
1703 1703   var bYear = parseInt(b.textContent) || 0;
1704 1704   return bYear - aYear;
1705 1705   });
1706 - // DOM再配置（全期間を先頭、年度タブを降順で続ける）
1707 - if (allTab) { tabContainer.appendChild(allTab); }
1593 + // DOM再配置
1708 1708   fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1595 + if (allTab) { tabContainer.appendChild(allTab); }
1709 1709   }
1710 1710   // デフォルトで全期間を表示
1711 1711   var defaultTab = document.querySelector('.activity-fy-tab.active');