Changes for page 学校ページ テンプレート
Last modified by Super Admin on 2026/04/05 18:59
From version 
109.1 
109.1
edited by Super Admin
on 2026/03/24 19:08
on 2026/03/24 19:08
Change comment:
There is no comment for this version
To version 111.1
111.1
edited by Super Admin
on 2026/03/24 21:32
on 2026/03/24 21:32
Change comment:
There is no comment for this version
Summary
Details
-
Page properties
-
- Content
-
... ... @@ -409,23 +409,102 @@ 409 409 </div> 410 410 #end 411 411 412 -## --- 未入力ガイド（自校ユーザー向け） ---412 +## --- 入力進捗ガイド（自校ユーザー向け） --- 413 413 #if(!$isGuest && $canEdit) 414 - #set($missingItems = []) 415 - #if(!$studentCount || $studentCount == '' || $studentCount == '0') #set($discard = $missingItems.add('生徒数')) #end 416 - #if(!$orgChart || $orgChart == '') #set($discard = $missingItems.add('生徒会組織')) #end 417 - #if(!$dailyActivities || $dailyActivities == '') #set($discard = $missingItems.add('日常の活動')) #end 418 - #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. 活動報告 419 419 #set($activityCount = $doc.getObjects('SeitokaiCode.ActivityClass').size()) 420 - #if($activityCount == 0) #set($discard = $missingItems.add('活動報告（まだ投稿がありません）')) #end 421 - #if($missingItems.size() > 0) 422 -<div class="form-message-info" style="margin-bottom:var(--sp-4);"> 423 - <strong>入力のお願い</strong> — 以下の項目がまだ入力されていません。<a href="$doc.getURL('view', 'sheet=SeitokaiCode.SchoolEditForm')">編集画面</a>から入力すると、他校の生徒会の参考になります。 424 - <ul style="margin:var(--sp-2) 0 0; padding-left:var(--sp-5);"> 425 - #foreach($item in $missingItems) 426 - <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 427 427 #end 428 428 </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> 429 429 </div> 430 430 #end 431 431 #end ... ... @@ -486,6 +486,123 @@ 486 486 #end 487 487 #end 488 488 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 + 489 489 ## --- 日常の活動 --- 490 490 #if($dailyActivities && !$dailyActivities.isEmpty()) 491 491 #set($canViewDA = true) ... ... @@ -512,36 +512,6 @@ 512 512 #end 513 513 #end 514 514 515 - ## --- 選挙 --- 516 - #if($electionExists && $electionExists != '') 517 - #set($canViewEL = true) 518 - #if($visibilityElection == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEL = false) 519 - #elseif($visibilityElection == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEL = false) 520 - #end 521 - #if($canViewEL) 522 - <div class="seitokai-subsection"> 523 - <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> 524 - <div class="seitokai-subsection-content"> 525 - <div class="info-row"> 526 - <span class="info-label">役員選挙</span> 527 - <span class="info-value">$!escapetool.xml($!electionExists)</span> 528 - </div> 529 - #if($electionType && $electionType != '') 530 - <div class="info-row"> 531 - <span class="info-label">直近の選挙方式</span> 532 - <span class="info-value">$!escapetool.xml($!electionType)</span> 533 - </div> 534 - #end 535 - #if($electionNote && $electionNote.trim() != '') 536 - <div class="free-note">$!escapetool.xml($electionNote)</div> 537 - #end 538 - </div> 539 - </div> 540 - #else 541 - <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> 542 - #end 543 - #end 544 - 545 545 ## --- 定例活動 --- 546 546 #if($meetingFrequency && $meetingFrequency != '') 547 547 #set($canViewMT = true) ... ... @@ -566,68 +566,96 @@ 566 566 #end 567 567 #end 568 568 569 - ## --- 予算---570 - #set($has Budget= ($budgetProcess &&!$budgetProcess.isEmpty()) || ($studentFee&& $studentFee != '') || ($budgetScale && $budgetScale != ''))571 - #if($has Budget)572 - #set($canView Budget= true)573 - #if($visibility Budget== 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget= false)574 - #elseif($visibility Budget== '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) 575 575 #end 576 - #if($canView Budget)742 + #if($canViewAS) 577 577 <div class="seitokai-subsection"> 578 - <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>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> 579 579 <div class="seitokai-subsection-content"> 580 - #if($ budgetProcess &&!$budgetProcess.isEmpty())746 + #if($assemblyFormat && $assemblyFormat != '') 581 581 <div class="info-row"> 582 - <span class="info-label">作成過程の生徒関与</span> 583 - <span class="info-value"> 584 - <div class="selection-display"> 585 - #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整（折衝等）","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"]) 586 - #foreach($bpOpt in $allBpOpts) 587 - #if($budgetProcess.contains($bpOpt)) 588 - <span class="selection-item">$!escapetool.xml($bpOpt)</span> 589 - #else 590 - <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span> 591 - #end 592 - #end 593 - </div> 594 - </span> 748 + <span class="info-label">開催方式</span> 749 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span> 595 595 </div> 596 596 #end 597 - #if($s tudentFee&& $studentFee!='')752 + #if($assemblyCount && $assemblyCount > 0) 598 598 <div class="info-row"> 599 - <span class="info-label"> 生徒会費（年額）</span>600 - <span class="info-value">$!escapetool.xml($ !studentFee)</span>754 + <span class="info-label">開催回数（年）</span> 755 + <span class="info-value">$!escapetool.xml($assemblyCount)回</span> 601 601 </div> 602 602 #end 603 - #if($b udgetScale&& $budgetScale != '')758 + #if($assemblyAgenda && !$assemblyAgenda.isEmpty()) 604 604 <div class="info-row"> 605 - <span class="info-label">予算規模</span> 606 - <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> 607 607 </div> 608 608 #end 609 - #if($ budgetAllocation&& !$budgetAllocation.isEmpty())770 + #if($assemblyTopics && !$assemblyTopics.isEmpty()) 610 610 <div class="info-row"> 611 - <span class="info-label"> 主な予算配分</span>772 + <span class="info-label">扱う内容</span> 612 612 <span class="info-value"> 613 613 <div class="selection-display"> 614 - #foreach($ ba in $budgetAllocation)615 - <span class="selection-item">$!escapetool.xml($ ba.trim())</span>775 + #foreach($at in $assemblyTopics) 776 + <span class="selection-item">$!escapetool.xml($at.trim())</span> 616 616 #end 617 617 </div> 618 618 </span> 619 619 </div> 620 620 #end 621 - #if($budgetNote && $budgetNote.trim() != '') 622 - <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> 623 623 #end 624 624 </div> 625 625 </div> 626 626 #else 627 - <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> 628 628 #end 629 629 #end 630 630 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 + 631 631 ## --- 校則・生徒会会則の見直し --- 632 632 #if($ruleReviewStatus && $ruleReviewStatus != '') 633 633 #set($canViewRuleReview = true) ... ... @@ -693,151 +693,65 @@ 693 693 #end 694 694 #end 695 695 696 - ## --- 活動環境---697 - #set($has ActivityEnv= ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '')|| ($ictTools && !$ictTools.isEmpty()) || ($ictUsage && !$ictUsage.isEmpty()))698 - #if($has ActivityEnv)699 - #set($canView AE= true)700 - #if($visibility ActivityEnv== 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAE= false)701 - #elseif($visibility ActivityEnv== '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) 702 702 #end 703 - #if($canView AE)897 + #if($canViewBudget) 704 704 <div class="seitokai-subsection"> 705 - <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>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> 706 706 <div class="seitokai-subsection-content"> 707 - #if($ activityPlace && !$activityPlace.isEmpty())901 + #if($budgetProcess && !$budgetProcess.isEmpty()) 708 708 <div class="info-row"> 709 - <span class="info-label"> 普段の活動場所</span>903 + <span class="info-label">作成過程の生徒関与</span> 710 710 <span class="info-value"> 711 711 <div class="selection-display"> 712 - #foreach($ap in $activityPlace) 713 - <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 714 714 #end 715 715 </div> 716 716 </span> 717 717 </div> 718 718 #end 719 - #if($ activityRoomEquipment && $activityRoomEquipment != '')918 + #if($studentFee && $studentFee != '') 720 720 <div class="info-row"> 721 - <span class="info-label">生徒会 室の設備</span>722 - <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> 723 723 </div> 724 724 #end 725 - #if($ activityRoomImage && $activityRoomImage != '')924 + #if($budgetScale && $budgetScale != '') 726 726 <div class="info-row"> 727 - <span class="info-label"> 活動場所の写真</span>728 - <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> 729 729 </div> 730 730 #end 731 - #if($ ictTools&& !$ictTools.isEmpty())930 + #if($budgetAllocation && !$budgetAllocation.isEmpty()) 732 732 <div class="info-row"> 733 - <span class="info-label"> 利用しているICTツール</span>932 + <span class="info-label">主な予算配分</span> 734 734 <span class="info-value"> 735 - #set($ictCatDisplay = [ 736 - ["連絡ツール", ["メール","LINE","LINE WORKS","Discord","Slack","Microsoft Teams","Google Chat","InstagramのDM","XのDM","その他（連絡）"]], 737 - ["ドキュメント作成・共有", ["Googleドキュメント","Googleスプレッドシート","Googleスライド","Googleドライブ","Word","Excel","PowerPoint","OneDrive","SharePoint","Notion","Pages","Numbers","Keynote","Dropbox","Box","その他（ドキュメント）"]], 738 - ["タスク管理", ["Googleカレンダー","Google ToDoリスト","Trello","Asana","Excel等スプレッドシート","その他（タスク管理）"]], 739 - ["ビデオ会議ツール", ["Zoom","Google Meet","その他（ビデオ会議）"]], 740 - ["アンケート", ["Googleフォーム","Microsoft Forms","その他（アンケート）"]], 741 - ["デザイン・クリエイティブ", ["Canva","各種Adobe","CapCut","LumaFusion","AviUtl","ibisPaint","その他（デザイン）"]], 742 - ["その他", ["独自のWebシステム・自作アプリ"]] 743 - ]) 744 - #foreach($catD in $ictCatDisplay) 745 - #set($catHasItems = false) 746 - #foreach($t in $catD.get(1)) 747 - #if($ictTools.contains($t)) #set($catHasItems = true) #end 748 - #end 749 - #if($catHasItems) 750 - <div style="margin-bottom:6px"> 751 - <span style="font-size:0.8em;font-weight:600;color:var(--text-mid)">$catD.get(0):</span> 752 - <div class="selection-display" style="margin-top:2px"> 753 - #foreach($t in $catD.get(1)) 754 - #if($ictTools.contains($t)) 755 - <span class="selection-item">$!escapetool.xml($t)</span> 756 - #end 757 - #end 758 - </div> 759 - </div> 760 - #end 761 - #end 762 - </span> 763 - </div> 764 - #end 765 - #if($ictUsage && !$ictUsage.isEmpty()) 766 - <div class="info-row"> 767 - <span class="info-label">ICT活用している場面</span> 768 - <span class="info-value"> 769 769 <div class="selection-display"> 770 - #foreach($ iuin $ictUsage)771 - <span class="selection-item">$!escapetool.xml($ iu.trim())</span>935 + #foreach($ba in $budgetAllocation) 936 + <span class="selection-item">$!escapetool.xml($ba.trim())</span> 772 772 #end 773 773 </div> 774 774 </span> 775 775 </div> 776 776 #end 777 - </div> 778 - </div> 779 - #else 780 - <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> 781 - #end 782 - #end 783 - 784 - ## --- 生徒総会 --- 785 - #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != '')) 786 - #if($hasAssembly) 787 - #set($canViewAS = true) 788 - #if($visibilityAssembly == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAS = false) 789 - #elseif($visibilityAssembly == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAS = false) 790 - #end 791 - #if($canViewAS) 792 - <div class="seitokai-subsection"> 793 - <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> 794 - <div class="seitokai-subsection-content"> 795 - #if($assemblyFormat && $assemblyFormat != '') 796 - <div class="info-row"> 797 - <span class="info-label">開催方式</span> 798 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span> 799 - </div> 942 + #if($budgetNote && $budgetNote.trim() != '') 943 + <div class="free-note">$!escapetool.xml($budgetNote)</div> 800 800 #end 801 - #if($assemblyCount && $assemblyCount > 0) 802 - <div class="info-row"> 803 - <span class="info-label">開催回数（年）</span> 804 - <span class="info-value">$!escapetool.xml($assemblyCount)回</span> 805 - </div> 806 - #end 807 - #if($assemblyAgenda && !$assemblyAgenda.isEmpty()) 808 - <div class="info-row"> 809 - <span class="info-label">議案の集め方</span> 810 - <span class="info-value"> 811 - <div class="selection-display"> 812 - #foreach($aa in $assemblyAgenda) 813 - <span class="selection-item">$!escapetool.xml($aa.trim())</span> 814 - #end 815 - </div> 816 - </span> 817 - </div> 818 - #end 819 - #if($assemblyTopics && !$assemblyTopics.isEmpty()) 820 - <div class="info-row"> 821 - <span class="info-label">扱う内容</span> 822 - <span class="info-value"> 823 - <div class="selection-display"> 824 - #foreach($at in $assemblyTopics) 825 - <span class="selection-item">$!escapetool.xml($at.trim())</span> 826 - #end 827 - </div> 828 - </span> 829 - </div> 830 - #end 831 - #if($assemblyNote && $assemblyNote != '') 832 - <div class="info-row"> 833 - <span class="info-label">自由記述</span> 834 - <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span> 835 - </div> 836 - #end 837 837 </div> 838 838 </div> 839 839 #else 840 - <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> 841 841 #end 842 842 #end 843 843 ... ... @@ -925,35 +925,6 @@ 925 925 #end 926 926 #end 927 927 928 - ## --- 年間主要行事 --- 929 - #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]]) 930 - #set($hasAnyEvent = false) 931 - #foreach($m in $months) 932 - #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end 933 - #end 934 - #if($hasAnyEvent) 935 - #set($canViewAN = true) 936 - #if($visibilityAnnualEvents == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAN = false) 937 - #elseif($visibilityAnnualEvents == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAN = false) 938 - #end 939 - #if($canViewAN) 940 - <div class="seitokai-subsection"> 941 - <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> 942 - <div class="seitokai-subsection-content"> 943 - <table class="wiki-table school-info-table" style="margin:0"> 944 - #foreach($m in $months) 945 - #if($m.get(1) && $m.get(1) != '') 946 - <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr> 947 - #end 948 - #end 949 - </table> 950 - </div> 951 - </div> 952 - #else 953 - <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> 954 - #end 955 - #end 956 - 957 957 ## --- 生徒会の課題意識 --- 958 958 #if($challenges && $challenges != '') 959 959 #set($canViewChallenges = true)