Changes for page 学校ページ テンプレート
Last modified by Super Admin on 2026/04/05 18:59
From version 
108.1 
108.1
edited by Super Admin
on 2026/03/24 17:20
on 2026/03/24 17:20
Change comment:
There is no comment for this version
To version 119.1
119.1
edited by Super Admin
on 2026/04/05 18:59
on 2026/04/05 18:59
Change comment:
There is no comment for this version
Summary
Details
-
Page properties
-
- Content
-
... ... @@ -7,6 +7,19 @@ 7 7 #stop 8 8 #end 9 9 {{html clean="false"}} 10 +## --- OGP メタタグ（SNSシェア対応） --- 11 +#set($ogTitle = "$!{schoolName} — 生徒会Wiki") 12 +#set($ogDesc = "$!{schoolName}の生徒会活動情報。全国の高校の生徒会活動事例を集積・共有するプラットフォーム。") 13 +#set($ogUrl = "https://${request.serverName}${doc.getURL('view')}") 14 +<meta property="og:type" content="article" /> 15 +<meta property="og:title" content="$escapetool.xml($ogTitle)" /> 16 +<meta property="og:description" content="$escapetool.xml($ogDesc)" /> 17 +<meta property="og:url" content="$escapetool.xml($ogUrl)" /> 18 +<meta property="og:site_name" content="生徒会Wiki" /> 19 +<meta property="og:locale" content="ja_JP" /> 20 +<meta name="twitter:card" content="summary" /> 21 +<meta name="twitter:title" content="$escapetool.xml($ogTitle)" /> 22 +<meta name="twitter:description" content="$escapetool.xml($ogDesc)" /> 10 10 ## メンテナンスバナー（{{include}}ではなくインラインで記述し、<p>タグ挿入を回避） 11 11 #set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner')) 12 12 #set($bannerObj = $bannerDoc.getObject('SeitokaiCode.MaintenanceBannerClass')) ... ... @@ -374,7 +374,7 @@ 374 374 #end 375 375 #if($canEditSchool) 376 376 <div style="text-align:right; margin-bottom:12px;"> 377 - <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> 378 378 </div> 379 379 #end 380 380 ... ... @@ -396,27 +396,6 @@ 396 396 </div> 397 397 #end 398 398 399 -## --- 未入力ガイド（自校ユーザー向け） --- 400 -#if(!$isGuest && $canEdit) 401 - #set($missingItems = []) 402 - #if(!$studentCount || $studentCount == '' || $studentCount == '0') #set($discard = $missingItems.add('生徒数')) #end 403 - #if(!$orgChart || $orgChart == '') #set($discard = $missingItems.add('生徒会組織')) #end 404 - #if(!$dailyActivities || $dailyActivities == '') #set($discard = $missingItems.add('日常の活動')) #end 405 - #if(!$ruleReviewStatus || $ruleReviewStatus == '') #set($discard = $missingItems.add('校則・生徒会会則の見直し')) #end 406 - #set($activityCount = $doc.getObjects('SeitokaiCode.ActivityClass').size()) 407 - #if($activityCount == 0) #set($discard = $missingItems.add('活動報告（まだ投稿がありません）')) #end 408 - #if($missingItems.size() > 0) 409 -<div class="form-message-info" style="margin-bottom:var(--sp-4);"> 410 - <strong>入力のお願い</strong> — 以下の項目がまだ入力されていません。<a href="$doc.getURL('view', 'sheet=SeitokaiCode.SchoolEditForm')">編集画面</a>から入力すると、他校の生徒会の参考になります。 411 - <ul style="margin:var(--sp-2) 0 0; padding-left:var(--sp-5);"> 412 - #foreach($item in $missingItems) 413 - <li>$item</li> 414 - #end 415 - </ul> 416 -</div> 417 - #end 418 -#end 419 - 420 420 ## --- ① 学校基本情報 --- 421 421 <div class="school-info-card collapsed" id="card-basic-info"> 422 422 <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> ... ... @@ -427,7 +427,19 @@ 427 427 <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr> 428 428 <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr> 429 429 <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr> 430 - <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> 431 431 <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr> 432 432 <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr> 433 433 <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr> ... ... @@ -473,6 +473,127 @@ 473 473 #end 474 474 #end 475 475 480 + ## --- 活動環境 --- 481 + #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictTools && !$ictTools.isEmpty()) || ($ictUsage && !$ictUsage.isEmpty())) 482 + #if($hasActivityEnv) 483 + #set($canViewAE = true) 484 + #if($visibilityActivityEnv == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAE = false) 485 + #elseif($visibilityActivityEnv == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAE = false) 486 + #end 487 + #if($canViewAE) 488 + <div class="seitokai-subsection"> 489 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 9l9-7 9 7v11a2 2 0 01-2 2H5a2 2 0 01-2-2z"/><polyline points="9 22 9 12 15 12 15 22"/></svg> 生徒会の活動環境 #if($visibilityActivityEnv != '' && $visibilityActivityEnv != 'public')<span class="visibility-badge visibility-${visibilityActivityEnv}">#if($visibilityActivityEnv == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3> 490 + <div class="seitokai-subsection-content"> 491 + #if($activityPlace && !$activityPlace.isEmpty()) 492 + <div class="info-row"> 493 + <span class="info-label">普段の活動場所</span> 494 + <span class="info-value"> 495 + <div class="selection-display"> 496 + #foreach($apo in ["専用の生徒会室","他の部活・委員会と併用した教室","空き教室を活用","インターネット中心","その他"]) 497 + #if($activityPlace.contains($apo)) 498 + <span class="selection-item">$!escapetool.xml($apo)</span> 499 + #else 500 + <span class="selection-item selection-item-off">$!escapetool.xml($apo)</span> 501 + #end 502 + #end 503 + </div> 504 + </span> 505 + </div> 506 + #end 507 + #if($activityRoomEquipment && $activityRoomEquipment != '') 508 + <div class="info-row"> 509 + <span class="info-label">生徒会室の設備</span> 510 + <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span> 511 + </div> 512 + #end 513 + #if($activityRoomImage && $activityRoomImage != '') 514 + <div class="info-row"> 515 + <span class="info-label">活動場所の写真</span> 516 + <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span> 517 + </div> 518 + #end 519 + #if($ictTools && !$ictTools.isEmpty()) 520 + <div class="info-row"> 521 + <span class="info-label">利用しているICTツール</span> 522 + <span class="info-value"> 523 + #set($ictCatDisplay = [ 524 + ["連絡ツール", ["メール","LINE","LINE WORKS","Discord","Slack","Microsoft Teams","Google Chat","InstagramのDM","XのDM","その他（連絡）"]], 525 + ["ドキュメント作成・共有", ["Googleドキュメント","Googleスプレッドシート","Googleスライド","Googleドライブ","Word","Excel","PowerPoint","OneDrive","SharePoint","Notion","Pages","Numbers","Keynote","Dropbox","Box","その他（ドキュメント）"]], 526 + ["タスク管理", ["Googleカレンダー","Google ToDoリスト","Trello","Asana","Excel等スプレッドシート","その他（タスク管理）"]], 527 + ["ビデオ会議ツール", ["Zoom","Google Meet","その他（ビデオ会議）"]], 528 + ["アンケート", ["Googleフォーム","Microsoft Forms","その他（アンケート）"]], 529 + ["デザイン・クリエイティブ", ["Canva","各種Adobe","CapCut","LumaFusion","AviUtl","ibisPaint","その他（デザイン）"]], 530 + ["その他", ["独自のWebシステム・自作アプリ"]] 531 + ]) 532 + #foreach($catD in $ictCatDisplay) 533 + #set($catHasItems = false) 534 + #foreach($t in $catD.get(1)) 535 + #if($ictTools.contains($t)) #set($catHasItems = true) #end 536 + #end 537 + #if($catHasItems) 538 + <div style="margin-bottom:6px"> 539 + <span style="font-size:0.8em;font-weight:600;color:var(--text-mid)">$catD.get(0):</span> 540 + <div class="selection-display" style="margin-top:2px"> 541 + #foreach($t in $catD.get(1)) 542 + #if($ictTools.contains($t)) 543 + <span class="selection-item">$!escapetool.xml($t)</span> 544 + #end 545 + #end 546 + </div> 547 + </div> 548 + #end 549 + #end 550 + </span> 551 + </div> 552 + #end 553 + #if($ictUsage && !$ictUsage.isEmpty()) 554 + <div class="info-row"> 555 + <span class="info-label">ICT活用している場面</span> 556 + <span class="info-value"> 557 + <div class="selection-display"> 558 + #foreach($iu in $ictUsage) 559 + <span class="selection-item">$!escapetool.xml($iu.trim())</span> 560 + #end 561 + </div> 562 + </span> 563 + </div> 564 + #end 565 + </div> 566 + </div> 567 + #else 568 + <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 活動環境情報は #if($visibilityActivityEnv == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 569 + #end 570 + #end 571 + 572 + ## --- 年間主要行事 --- 573 + #set($months = [["4月", $eventApril], ["5月", $eventMay], ["6月", $eventJune], ["7月", $eventJuly], ["8月", $eventAugust], ["9月", $eventSeptember], ["10月", $eventOctober], ["11月", $eventNovember], ["12月", $eventDecember], ["1月", $eventJanuary], ["2月", $eventFebruary], ["3月", $eventMarch]]) 574 + #set($hasAnyEvent = false) 575 + #foreach($m in $months) 576 + #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end 577 + #end 578 + #if($hasAnyEvent) 579 + #set($canViewAN = true) 580 + #if($visibilityAnnualEvents == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAN = false) 581 + #elseif($visibilityAnnualEvents == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAN = false) 582 + #end 583 + #if($canViewAN) 584 + <div class="seitokai-subsection"> 585 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2" ry="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 年間主要行事 #if($visibilityAnnualEvents != '' && $visibilityAnnualEvents != 'public')<span class="visibility-badge visibility-${visibilityAnnualEvents}">#if($visibilityAnnualEvents == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3> 586 + <div class="seitokai-subsection-content"> 587 + <table class="wiki-table school-info-table" style="margin:0"> 588 + #foreach($m in $months) 589 + #if($m.get(1) && $m.get(1) != '') 590 + <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr> 591 + #end 592 + #end 593 + </table> 594 + </div> 595 + </div> 596 + #else 597 + <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 年間主要行事情報は #if($visibilityAnnualEvents == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 598 + #end 599 + #end 600 + 476 476 ## --- 日常の活動 --- 477 477 #if($dailyActivities && !$dailyActivities.isEmpty()) 478 478 #set($canViewDA = true) ... ... @@ -484,9 +484,13 @@ 484 484 <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> 485 485 <div class="seitokai-subsection-content"> 486 486 <p class="activity-hint">活動時間が多い3つ</p> 487 - <div class="tag-container"> 488 - #foreach($da in $dailyActivities) 489 - <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 490 490 #end 491 491 </div> 492 492 #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '') ... ... @@ -499,36 +499,6 @@ 499 499 #end 500 500 #end 501 501 502 - ## --- 選挙 --- 503 - #if($electionExists && $electionExists != '') 504 - #set($canViewEL = true) 505 - #if($visibilityElection == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEL = false) 506 - #elseif($visibilityElection == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEL = false) 507 - #end 508 - #if($canViewEL) 509 - <div class="seitokai-subsection"> 510 - <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> 511 - <div class="seitokai-subsection-content"> 512 - <div class="info-row"> 513 - <span class="info-label">役員選挙</span> 514 - <span class="info-value">$!escapetool.xml($!electionExists)</span> 515 - </div> 516 - #if($electionType && $electionType != '') 517 - <div class="info-row"> 518 - <span class="info-label">直近の選挙方式</span> 519 - <span class="info-value">$!escapetool.xml($!electionType)</span> 520 - </div> 521 - #end 522 - #if($electionNote && $electionNote.trim() != '') 523 - <div class="free-note">$!escapetool.xml($electionNote)</div> 524 - #end 525 - </div> 526 - </div> 527 - #else 528 - <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> 529 - #end 530 - #end 531 - 532 532 ## --- 定例活動 --- 533 533 #if($meetingFrequency && $meetingFrequency != '') 534 534 #set($canViewMT = true) ... ... @@ -553,28 +553,27 @@ 553 553 #end 554 554 #end 555 555 556 - ## --- 予算---557 - #set($has Budget= ($budgetProcess &&!$budgetProcess.isEmpty()) || ($studentFee&& $studentFee != '') || ($budgetScale && $budgetScale != ''))558 - #if($has Budget)559 - #set($canView Budget= true)560 - #if($visibility Budget== 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget= false)561 - #elseif($visibility Budget== 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget= false)655 + ## --- 生徒総会 --- 656 + #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != '')) 657 + #if($hasAssembly) 658 + #set($canViewAS = true) 659 + #if($visibilityAssembly == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAS = false) 660 + #elseif($visibilityAssembly == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAS = false) 562 562 #end 563 - #if($canView Budget)662 + #if($canViewAS) 564 564 <div class="seitokai-subsection"> 565 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24">< linex1="12"y1="1"x2="12"y2="23"/><path d="M175H9.5a3.53.50 000 7h5a3.53.50 010 7H6"/></svg>予算#if($visibilityBudget != 'public')<span class="visibility-badge visibility-${visibilityBudget}">#if($visibilityBudget== 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>664 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 生徒総会 #if($visibilityAssembly != '' && $visibilityAssembly != 'public')<span class="visibility-badge visibility-${visibilityAssembly}">#if($visibilityAssembly == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3> 566 566 <div class="seitokai-subsection-content"> 567 - #if($ budgetProcess &&!$budgetProcess.isEmpty())666 + #if($assemblyFormat && $assemblyFormat != '') 568 568 <div class="info-row"> 569 - <span class="info-label"> 作成過程の生徒関与</span>668 + <span class="info-label">開催方式</span> 570 570 <span class="info-value"> 571 571 <div class="selection-display"> 572 - #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整（折衝等）","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"]) 573 - #foreach($bpOpt in $allBpOpts) 574 - #if($budgetProcess.contains($bpOpt)) 575 - <span class="selection-item">$!escapetool.xml($bpOpt)</span> 671 + #foreach($afo in ["全生徒の対面開催","オンラインと併用","完全オンライン開催","開催なし","その他"]) 672 + #if($assemblyFormat == $afo) 673 + <span class="selection-item">$!escapetool.xml($afo)</span> 576 576 #else 577 - <span class="selection-item selection-item-off">$!escapetool.xml($ bpOpt)</span>675 + <span class="selection-item selection-item-off">$!escapetool.xml($afo)</span> 578 578 #end 579 579 #end 580 580 </div> ... ... @@ -581,40 +581,87 @@ 581 581 </span> 582 582 </div> 583 583 #end 584 - #if($s tudentFee&& $studentFee!='')682 + #if($assemblyCount && $assemblyCount > 0) 585 585 <div class="info-row"> 586 - <span class="info-label"> 生徒会費（年額）</span>587 - <span class="info-value">$!escapetool.xml($ !studentFee)</span>684 + <span class="info-label">開催回数（年）</span> 685 + <span class="info-value">$!escapetool.xml($assemblyCount)回</span> 588 588 </div> 589 589 #end 590 - #if($b udgetScale&& $budgetScale != '')688 + #if($assemblyAgenda && !$assemblyAgenda.isEmpty()) 591 591 <div class="info-row"> 592 - <span class="info-label">予算規模</span> 593 - <span class="info-value">$!escapetool.xml($!budgetScale)</span> 690 + <span class="info-label">議案の集め方</span> 691 + <span class="info-value"> 692 + <div class="selection-display"> 693 + #foreach($aao in ["教員からの提案","執行部からの提案","クラスごとの討議","目安箱","アンケート","総会時の発議","その他"]) 694 + #if($assemblyAgenda.contains($aao)) 695 + <span class="selection-item">$!escapetool.xml($aao)</span> 696 + #else 697 + <span class="selection-item selection-item-off">$!escapetool.xml($aao)</span> 698 + #end 699 + #end 700 + </div> 701 + </span> 594 594 </div> 595 595 #end 596 - #if($ budgetAllocation&& !$budgetAllocation.isEmpty())704 + #if($assemblyTopics && !$assemblyTopics.isEmpty()) 597 597 <div class="info-row"> 598 - <span class="info-label"> 主な予算配分</span>706 + <span class="info-label">扱う内容</span> 599 599 <span class="info-value"> 600 600 <div class="selection-display"> 601 - #foreach($ba in $budgetAllocation) 602 - <span class="selection-item">$!escapetool.xml($ba.trim())</span> 709 + #foreach($ato in ["生徒会決算案","生徒会予算案","会則/校則の改正","生徒会の活動方針","学校への要望事項","外部へのアピール（宣言の採択など）","その他"]) 710 + #if($assemblyTopics.contains($ato)) 711 + <span class="selection-item">$!escapetool.xml($ato)</span> 712 + #else 713 + <span class="selection-item selection-item-off">$!escapetool.xml($ato)</span> 714 + #end 603 603 #end 604 604 </div> 605 605 </span> 606 606 </div> 607 607 #end 608 - #if($budgetNote && $budgetNote.trim() != '') 609 - <div class="free-note">$!escapetool.xml($budgetNote)</div> 720 + #if($assemblyNote && $assemblyNote != '') 721 + <div class="info-row"> 722 + <span class="info-label">自由記述</span> 723 + <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span> 724 + </div> 610 610 #end 611 611 </div> 612 612 </div> 613 613 #else 614 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 予算情報は #if($visibilityBudget== 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>729 + <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 生徒総会情報は #if($visibilityAssembly == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 615 615 #end 616 616 #end 617 617 733 + ## --- 選挙 --- 734 + #if($electionExists && $electionExists != '') 735 + #set($canViewEL = true) 736 + #if($visibilityElection == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEL = false) 737 + #elseif($visibilityElection == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEL = false) 738 + #end 739 + #if($canViewEL) 740 + <div class="seitokai-subsection"> 741 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M7 13l3 3 7-7"/></svg> 選挙 #if($visibilityElection != '' && $visibilityElection != 'public')<span class="visibility-badge visibility-${visibilityElection}">#if($visibilityElection == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3> 742 + <div class="seitokai-subsection-content"> 743 + <div class="info-row"> 744 + <span class="info-label">役員選挙</span> 745 + <span class="info-value">$!escapetool.xml($!electionExists)</span> 746 + </div> 747 + #if($electionType && $electionType != '') 748 + <div class="info-row"> 749 + <span class="info-label">直近の選挙方式</span> 750 + <span class="info-value">$!escapetool.xml($!electionType)</span> 751 + </div> 752 + #end 753 + #if($electionNote && $electionNote.trim() != '') 754 + <div class="free-note">$!escapetool.xml($electionNote)</div> 755 + #end 756 + </div> 757 + </div> 758 + #else 759 + <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 選挙情報は #if($visibilityElection == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 760 + #end 761 + #end 762 + 618 618 ## --- 校則・生徒会会則の見直し --- 619 619 #if($ruleReviewStatus && $ruleReviewStatus != '') 620 620 #set($canViewRuleReview = true) ... ... @@ -635,8 +635,12 @@ 635 635 <span class="info-label">見直しの内容</span> 636 636 <span class="info-value"> 637 637 <div class="selection-display"> 638 - #foreach($rc in $ruleReviewContent) 639 - <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 640 640 #end 641 641 </div> 642 642 </span> ... ... @@ -647,8 +647,12 @@ 647 647 <span class="info-label">見直しの提案者</span> 648 648 <span class="info-value"> 649 649 <div class="selection-display"> 650 - #foreach($rp in $ruleReviewProposer) 651 - <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 652 652 #end 653 653 </div> 654 654 </span> ... ... @@ -659,8 +659,12 @@ 659 659 <span class="info-label">見直しの実施者</span> 660 660 <span class="info-value"> 661 661 <div class="selection-display"> 662 - #foreach($ri in $ruleReviewImplementer) 663 - <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 664 664 #end 665 665 </div> 666 666 </span> ... ... @@ -680,151 +680,69 @@ 680 680 #end 681 681 #end 682 682 683 - ## --- 活動環境---684 - #set($has ActivityEnv= ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '')|| ($ictTools && !$ictTools.isEmpty()) || ($ictUsage && !$ictUsage.isEmpty()))685 - #if($has ActivityEnv)686 - #set($canView AE= true)687 - #if($visibility ActivityEnv== 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAE= false)688 - #elseif($visibility ActivityEnv== 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAE= false)840 + ## --- 予算 --- 841 + #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != '')) 842 + #if($hasBudget) 843 + #set($canViewBudget = true) 844 + #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false) 845 + #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false) 689 689 #end 690 - #if($canView AE)847 + #if($canViewBudget) 691 691 <div class="seitokai-subsection"> 692 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24">< pathd="M39l9-7 9 7v11a220 01-2 2H5a22 0 01-2-2z"/><polyline points="92291215121522"/></svg>生徒会の活動環境#if($visibilityActivityEnv!= '' && $visibilityActivityEnv != 'public')<span class="visibility-badge visibility-${visibilityActivityEnv}">#if($visibilityActivityEnv== 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>849 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><line x1="12" y1="1" x2="12" y2="23"/><path d="M17 5H9.5a3.5 3.5 0 000 7h5a3.5 3.5 0 010 7H6"/></svg> 予算 #if($visibilityBudget != 'public')<span class="visibility-badge visibility-${visibilityBudget}">#if($visibilityBudget == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3> 693 693 <div class="seitokai-subsection-content"> 694 - #if($ activityPlace && !$activityPlace.isEmpty())851 + #if($budgetProcess && !$budgetProcess.isEmpty()) 695 695 <div class="info-row"> 696 - <span class="info-label"> 普段の活動場所</span>853 + <span class="info-label">作成過程の生徒関与</span> 697 697 <span class="info-value"> 698 698 <div class="selection-display"> 699 - #foreach($ap in $activityPlace) 700 - <span class="selection-item">$!escapetool.xml($ap.trim())</span> 856 + #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整（折衝等）","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"]) 857 + #foreach($bpOpt in $allBpOpts) 858 + #if($budgetProcess.contains($bpOpt)) 859 + <span class="selection-item">$!escapetool.xml($bpOpt)</span> 860 + #else 861 + <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span> 862 + #end 701 701 #end 702 702 </div> 703 703 </span> 704 704 </div> 705 705 #end 706 - #if($ activityRoomEquipment && $activityRoomEquipment != '')868 + #if($studentFee && $studentFee != '') 707 707 <div class="info-row"> 708 - <span class="info-label">生徒会 室の設備</span>709 - <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span>870 + <span class="info-label">生徒会費（年額）</span> 871 + <span class="info-value">$!escapetool.xml($!studentFee)</span> 710 710 </div> 711 711 #end 712 - #if($ activityRoomImage && $activityRoomImage != '')874 + #if($budgetScale && $budgetScale != '') 713 713 <div class="info-row"> 714 - <span class="info-label"> 活動場所の写真</span>715 - <span class="info-value"> <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span>876 + <span class="info-label">予算規模</span> 877 + <span class="info-value">$!escapetool.xml($!budgetScale)</span> 716 716 </div> 717 717 #end 718 - #if($ ictTools&& !$ictTools.isEmpty())880 + #if($budgetAllocation && !$budgetAllocation.isEmpty()) 719 719 <div class="info-row"> 720 - <span class="info-label"> 利用しているICTツール</span>882 + <span class="info-label">主な予算配分</span> 721 721 <span class="info-value"> 722 - #set($ictCatDisplay = [ 723 - ["連絡ツール", ["メール","LINE","LINE WORKS","Discord","Slack","Microsoft Teams","Google Chat","InstagramのDM","XのDM","その他（連絡）"]], 724 - ["ドキュメント作成・共有", ["Googleドキュメント","Googleスプレッドシート","Googleスライド","Googleドライブ","Word","Excel","PowerPoint","OneDrive","SharePoint","Notion","Pages","Numbers","Keynote","Dropbox","Box","その他（ドキュメント）"]], 725 - ["タスク管理", ["Googleカレンダー","Google ToDoリスト","Trello","Asana","Excel等スプレッドシート","その他（タスク管理）"]], 726 - ["ビデオ会議ツール", ["Zoom","Google Meet","その他（ビデオ会議）"]], 727 - ["アンケート", ["Googleフォーム","Microsoft Forms","その他（アンケート）"]], 728 - ["デザイン・クリエイティブ", ["Canva","各種Adobe","CapCut","LumaFusion","AviUtl","ibisPaint","その他（デザイン）"]], 729 - ["その他", ["独自のWebシステム・自作アプリ"]] 730 - ]) 731 - #foreach($catD in $ictCatDisplay) 732 - #set($catHasItems = false) 733 - #foreach($t in $catD.get(1)) 734 - #if($ictTools.contains($t)) #set($catHasItems = true) #end 735 - #end 736 - #if($catHasItems) 737 - <div style="margin-bottom:6px"> 738 - <span style="font-size:0.8em;font-weight:600;color:var(--text-mid)">$catD.get(0):</span> 739 - <div class="selection-display" style="margin-top:2px"> 740 - #foreach($t in $catD.get(1)) 741 - #if($ictTools.contains($t)) 742 - <span class="selection-item">$!escapetool.xml($t)</span> 743 - #end 744 - #end 745 - </div> 746 - </div> 747 - #end 748 - #end 749 - </span> 750 - </div> 751 - #end 752 - #if($ictUsage && !$ictUsage.isEmpty()) 753 - <div class="info-row"> 754 - <span class="info-label">ICT活用している場面</span> 755 - <span class="info-value"> 756 756 <div class="selection-display"> 757 - #foreach($iu in $ictUsage) 758 - <span class="selection-item">$!escapetool.xml($iu.trim())</span> 885 + #foreach($bao in ["行事費用","部活動","寄付","HR活動","執行部等","委員会活動","その他"]) 886 + #if($budgetAllocation.contains($bao)) 887 + <span class="selection-item">$!escapetool.xml($bao)</span> 888 + #else 889 + <span class="selection-item selection-item-off">$!escapetool.xml($bao)</span> 890 + #end 759 759 #end 760 760 </div> 761 761 </span> 762 762 </div> 763 763 #end 764 - </div> 765 - </div> 766 - #else 767 - <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> 768 - #end 769 - #end 770 - 771 - ## --- 生徒総会 --- 772 - #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != '')) 773 - #if($hasAssembly) 774 - #set($canViewAS = true) 775 - #if($visibilityAssembly == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAS = false) 776 - #elseif($visibilityAssembly == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAS = false) 777 - #end 778 - #if($canViewAS) 779 - <div class="seitokai-subsection"> 780 - <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> 781 - <div class="seitokai-subsection-content"> 782 - #if($assemblyFormat && $assemblyFormat != '') 783 - <div class="info-row"> 784 - <span class="info-label">開催方式</span> 785 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span> 786 - </div> 896 + #if($budgetNote && $budgetNote.trim() != '') 897 + <div class="free-note">$!escapetool.xml($budgetNote)</div> 787 787 #end 788 - #if($assemblyCount && $assemblyCount > 0) 789 - <div class="info-row"> 790 - <span class="info-label">開催回数（年）</span> 791 - <span class="info-value">$!escapetool.xml($assemblyCount)回</span> 792 - </div> 793 - #end 794 - #if($assemblyAgenda && !$assemblyAgenda.isEmpty()) 795 - <div class="info-row"> 796 - <span class="info-label">議案の集め方</span> 797 - <span class="info-value"> 798 - <div class="selection-display"> 799 - #foreach($aa in $assemblyAgenda) 800 - <span class="selection-item">$!escapetool.xml($aa.trim())</span> 801 - #end 802 - </div> 803 - </span> 804 - </div> 805 - #end 806 - #if($assemblyTopics && !$assemblyTopics.isEmpty()) 807 - <div class="info-row"> 808 - <span class="info-label">扱う内容</span> 809 - <span class="info-value"> 810 - <div class="selection-display"> 811 - #foreach($at in $assemblyTopics) 812 - <span class="selection-item">$!escapetool.xml($at.trim())</span> 813 - #end 814 - </div> 815 - </span> 816 - </div> 817 - #end 818 - #if($assemblyNote && $assemblyNote != '') 819 - <div class="info-row"> 820 - <span class="info-label">自由記述</span> 821 - <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span> 822 - </div> 823 - #end 824 824 </div> 825 825 </div> 826 826 #else 827 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 生徒総会情報は #if($visibilityAssembly== 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>902 + <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 予算情報は #if($visibilityBudget == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 828 828 #end 829 829 #end 830 830 ... ... @@ -884,7 +884,17 @@ 884 884 #if($externalCooperation && $externalCooperation != '') 885 885 <div class="info-row"> 886 886 <span class="info-label">他校の生徒会との連携</span> 887 - <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> 888 888 </div> 889 889 #end 890 890 #if($externalOrgName && $externalOrgName != '') ... ... @@ -898,8 +898,12 @@ 898 898 <span class="info-label">社会参加・地域連携・ボランティア</span> 899 899 <span class="info-value"> 900 900 <div class="selection-display"> 901 - #foreach($sp2 in $socialParticipation) 902 - <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 903 903 #end 904 904 </div> 905 905 </span> ... ... @@ -912,35 +912,6 @@ 912 912 #end 913 913 #end 914 914 915 - ## --- 年間主要行事 --- 916 - #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]]) 917 - #set($hasAnyEvent = false) 918 - #foreach($m in $months) 919 - #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end 920 - #end 921 - #if($hasAnyEvent) 922 - #set($canViewAN = true) 923 - #if($visibilityAnnualEvents == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAN = false) 924 - #elseif($visibilityAnnualEvents == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAN = false) 925 - #end 926 - #if($canViewAN) 927 - <div class="seitokai-subsection"> 928 - <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> 929 - <div class="seitokai-subsection-content"> 930 - <table class="wiki-table school-info-table" style="margin:0"> 931 - #foreach($m in $months) 932 - #if($m.get(1) && $m.get(1) != '') 933 - <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr> 934 - #end 935 - #end 936 - </table> 937 - </div> 938 - </div> 939 - #else 940 - <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> 941 - #end 942 - #end 943 - 944 944 ## --- 生徒会の課題意識 --- 945 945 #if($challenges && $challenges != '') 946 946 #set($canViewChallenges = true) ... ... @@ -1012,13 +1012,13 @@ 1012 1012 1013 1013 <div class="activity-toolbar"> 1014 1014 <div class="activity-fy-tabs"> 1015 - <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>1075 + <button class="activity-fy-tab" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button> 1016 1016 #foreach($fy in $fySet) 1017 1017 #if($fy != $currentFYStr) 1018 1018 <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button> 1019 1019 #end 1020 1020 #end 1021 - <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button> 1081 + <button class="activity-fy-tab active" onclick="switchActivityFY('all', this)">全期間</button> 1022 1022 </div> 1023 1023 <div class="activity-toolbar-right"> 1024 1024 <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示"> ... ... @@ -1057,22 +1057,67 @@ 1057 1057 1058 1058 {{/html}} 1059 1059 1060 -## 特色ある活動を先頭に表示するため、並び替え用リストを作成 1061 -#set($featuredActivities = []) 1062 -#set($normalActivities = []) 1063 -#if($activities && $activities.size() > 0) 1064 - #foreach($act in $activities) 1065 - #set($isFeatured = $!act.getValue('featured')) 1066 - #if($isFeatured == '1') 1067 - #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) 1068 1068 #else 1069 - #set($discard = $ normalActivities.add($foreach.index))1150 + #set($discard = $fyNextRem.add($fy)) 1070 1070 #end 1071 1071 #end 1153 + #set($fyRemaining = $fyNextRem) 1072 1072 #end 1155 +## 年度未設定の活動は末尾に表示（fySetに'unknown'は入らないため無条件追加） 1156 +#set($discard = $fyDesc.add('unknown')) 1157 +## Step2: 年度降順で featured → normal の順にインデックスを収集 1073 1073 #set($orderedActivityIndices = []) 1074 -#set($discard = $orderedActivityIndices.addAll($featuredActivities)) 1075 -#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 1076 1076 1077 1077 #if($activities && $activities.size() > 0) 1078 1078 #foreach($actIdx in $orderedActivityIndices) ... ... @@ -1581,7 +1581,7 @@ 1581 1581 } 1582 1582 // ページ読み込み時の初期化 1583 1583 document.addEventListener('DOMContentLoaded', function() { 1584 - // 年度タブを降順にソート（「全期間」タブは 末尾に固定）1689 + // 年度タブを降順にソート（「全期間」タブは先頭に固定） 1585 1585 var tabContainer = document.querySelector('.activity-fy-tabs'); 1586 1586 if (tabContainer) { 1587 1587 var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab')); ... ... @@ -1598,11 +1598,11 @@ 1598 1598 var bYear = parseInt(b.textContent) || 0; 1599 1599 return bYear - aYear; 1600 1600 }); 1601 - // DOM再配置 1602 - fyTabs.forEach(function(t) { tabContainer.appendChild(t); }); 1706 + // DOM再配置（全期間を先頭、年度タブを降順で続ける） 1603 1603 if (allTab) { tabContainer.appendChild(allTab); } 1708 + fyTabs.forEach(function(t) { tabContainer.appendChild(t); }); 1604 1604 } 1605 - // デフォルトで 現在の年度を表示1710 + // デフォルトで全期間を表示 1606 1606 var defaultTab = document.querySelector('.activity-fy-tab.active'); 1607 1607 if (defaultTab) { defaultTab.click(); } 1608 1608 // 保存成功時のトースト通知