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

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

Summary

Details

Icon 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'))
... ... @@ -396,23 +396,102 @@
396 396  </div>
397 397  #end
398 398  
399 -## --- 入力ガイド(自校ユーザー向け) ---
412 +## --- 入力進捗ガイド(自校ユーザー向け) ---
400 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
414 + #set($stepItems = [])
415 + #set($completedCount = 0)
416 + #set($totalSteps = 8)
417 + ## 1. 基本情報(生徒数)
418 + #if($studentCount && $studentCount != '' && $studentCount != '0')
419 + #set($discard = $stepItems.add({'name': '基本情報(生徒数・学級数)', 'done': true}))
420 + #set($completedCount = $completedCount + 1)
421 + #else
422 + #set($discard = $stepItems.add({'name': '基本情報(生徒数・学級数)', 'done': false}))
423 + #end
424 + ## 2. 生徒会組織
425 + #if($orgChart && $orgChart != '')
426 + #set($discard = $stepItems.add({'name': '生徒会組織', 'done': true}))
427 + #set($completedCount = $completedCount + 1)
428 + #else
429 + #set($discard = $stepItems.add({'name': '生徒会組織', 'done': false}))
430 + #end
431 + ## 3. 日常の活動
432 + #if($dailyActivities && $dailyActivities != '')
433 + #set($discard = $stepItems.add({'name': '日常の活動', 'done': true}))
434 + #set($completedCount = $completedCount + 1)
435 + #else
436 + #set($discard = $stepItems.add({'name': '日常の活動', 'done': false}))
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. 選挙
446 + #if($electionExists && $electionExists != '')
447 + #set($discard = $stepItems.add({'name': '選挙', 'done': true}))
448 + #set($completedCount = $completedCount + 1)
449 + #else
450 + #set($discard = $stepItems.add({'name': '選挙', 'done': false}))
451 + #end
452 + ## 6. 校則の見直し
453 + #if($ruleReviewStatus && $ruleReviewStatus != '')
454 + #set($discard = $stepItems.add({'name': '校則・生徒会会則の見直し', 'done': true}))
455 + #set($completedCount = $completedCount + 1)
456 + #else
457 + #set($discard = $stepItems.add({'name': '校則・生徒会会則の見直し', 'done': false}))
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}))
464 + #set($completedCount = $completedCount + 1)
465 + #else
466 + #set($discard = $stepItems.add({'name': '予算', 'done': false}))
467 + #end
468 + ## 8. 活動報告
406 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>
470 + #if($activityCount > 0)
471 + #set($discard = $stepItems.add({'name': '活動報告', 'done': true}))
472 + #set($completedCount = $completedCount + 1)
473 + #else
474 + #set($discard = $stepItems.add({'name': '活動報告(まだ投稿がありません)', 'done': false}))
475 + #end
476 + ## 全完了なら非表示
477 + #if($completedCount < $totalSteps)
478 + #set($progressPct = $mathtool.mul($mathtool.div($completedCount, $totalSteps), 100))
479 + #set($progressPctInt = $mathtool.toInteger($progressPct))
480 + #set($firstMissing = false)
481 +<div class="progress-guide" style="margin-bottom:var(--sp-4);">
482 + <div class="progress-guide-header">
483 + <span class="progress-guide-title"><svg class="ico" viewBox="0 0 24 24" style="width:1.1em;height:1.1em;vertical-align:-2px;"><circle cx="12" cy="12" r="10"/><polyline points="12 6 12 12 16 14"/></svg> 学校情報の入力状況</span>
484 + <span class="progress-guide-count">${completedCount} / ${totalSteps} 完了</span>
485 + </div>
486 + <div class="progress-bar-track">
487 + <div class="progress-bar-fill" style="width:${progressPctInt}%"></div>
488 + </div>
489 + <ul class="progress-step-list">
490 + #foreach($step in $stepItems)
491 + #if($step.done)
492 + <li class="progress-step done"><svg class="ico" viewBox="0 0 24 24" style="width:0.9em;height:0.9em;"><path d="M20 6L9 17l-5-5"/></svg> $step.name</li>
493 + #else
494 + #if(!$firstMissing)
495 + <li class="progress-step next"><svg class="ico" viewBox="0 0 24 24" style="width:0.9em;height:0.9em;"><circle cx="12" cy="12" r="10"/></svg> $step.name <span class="progress-next-label">← 次はここ!</span></li>
496 + #set($firstMissing = true)
497 + #else
498 + <li class="progress-step pending"><svg class="ico" viewBox="0 0 24 24" style="width:0.9em;height:0.9em;"><rect x="3" y="3" width="18" height="18" rx="2"/></svg> $step.name</li>
499 + #end
500 + #end
414 414   #end
415 415   </ul>
503 + <div style="margin-top:var(--sp-3);">
504 + <a href="$doc.getURL('view', 'sheet=SeitokaiCode.SchoolEditForm')" class="btn-primary-sm">
505 + <svg class="ico" viewBox="0 0 24 24" style="width:0.9em;height:0.9em;"><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> 編集画面を開く
506 + </a>
507 + </div>
416 416  </div>
417 417   #end
418 418  #end
... ... @@ -473,6 +473,123 @@
473 473   #end
474 474   #end
475 475  
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 +
476 476   ## --- 日常の活動 ---
477 477   #if($dailyActivities && !$dailyActivities.isEmpty())
478 478   #set($canViewDA = true)
... ... @@ -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,68 +553,96 @@
553 553   #end
554 554   #end
555 555  
556 - ## --- 予算 ---
557 - #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
558 - #if($hasBudget)
559 - #set($canViewBudget = true)
560 - #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
561 - #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
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)
562 562   #end
563 - #if($canViewBudget)
742 + #if($canViewAS)
564 564   <div class="seitokai-subsection">
565 - <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>
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>
566 566   <div class="seitokai-subsection-content">
567 - #if($budgetProcess && !$budgetProcess.isEmpty())
746 + #if($assemblyFormat && $assemblyFormat != '')
568 568   <div class="info-row">
569 - <span class="info-label">作成過程の生徒関与</span>
570 - <span class="info-value">
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>
576 - #else
577 - <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span>
578 - #end
579 - #end
580 - </div>
581 - </span>
748 + <span class="info-label">開催方式</span>
749 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span>
582 582   </div>
583 583   #end
584 - #if($studentFee && $studentFee != '')
752 + #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>
754 + <span class="info-label">開催回数(年)</span>
755 + <span class="info-value">$!escapetool.xml($assemblyCount)</span>
588 588   </div>
589 589   #end
590 - #if($budgetScale && $budgetScale != '')
758 + #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>
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>
594 594   </div>
595 595   #end
596 - #if($budgetAllocation && !$budgetAllocation.isEmpty())
770 + #if($assemblyTopics && !$assemblyTopics.isEmpty())
597 597   <div class="info-row">
598 - <span class="info-label">主な予算配分</span>
772 + <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>
775 + #foreach($at in $assemblyTopics)
776 + <span class="selection-item">$!escapetool.xml($at.trim())</span>
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>
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>
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>
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>
615 615   #end
616 616   #end
617 617  
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 +
618 618   ## --- 校則・生徒会会則の見直し ---
619 619   #if($ruleReviewStatus && $ruleReviewStatus != '')
620 620   #set($canViewRuleReview = true)
... ... @@ -680,151 +680,65 @@
680 680   #end
681 681   #end
682 682  
683 - ## --- 活動環境 ---
684 - #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictTools && !$ictTools.isEmpty()) || ($ictUsage && !$ictUsage.isEmpty()))
685 - #if($hasActivityEnv)
686 - #set($canViewAE = true)
687 - #if($visibilityActivityEnv == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAE = false)
688 - #elseif($visibilityActivityEnv == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAE = false)
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)
689 689   #end
690 - #if($canViewAE)
897 + #if($canViewBudget)
691 691   <div class="seitokai-subsection">
692 - <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>
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>
693 693   <div class="seitokai-subsection-content">
694 - #if($activityPlace && !$activityPlace.isEmpty())
901 + #if($budgetProcess && !$budgetProcess.isEmpty())
695 695   <div class="info-row">
696 - <span class="info-label">普段活動場所</span>
903 + <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>
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
701 701   #end
702 702   </div>
703 703   </span>
704 704   </div>
705 705   #end
706 - #if($activityRoomEquipment && $activityRoomEquipment != '')
918 + #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>
920 + <span class="info-label">生徒会費(年額)</span>
921 + <span class="info-value">$!escapetool.xml($!studentFee)</span>
710 710   </div>
711 711   #end
712 - #if($activityRoomImage && $activityRoomImage != '')
924 + #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>
926 + <span class="info-label">予算規模</span>
927 + <span class="info-value">$!escapetool.xml($!budgetScale)</span>
716 716   </div>
717 717   #end
718 - #if($ictTools && !$ictTools.isEmpty())
930 + #if($budgetAllocation && !$budgetAllocation.isEmpty())
719 719   <div class="info-row">
720 - <span class="info-label">利用しているICTツール</span>
932 + <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>
935 + #foreach($ba in $budgetAllocation)
936 + <span class="selection-item">$!escapetool.xml($ba.trim())</span>
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>
942 + #if($budgetNote && $budgetNote.trim() != '')
943 + <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>
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>
828 828   #end
829 829   #end
830 830  
... ... @@ -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)