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

From version Icon 100.1 Icon
edited by Super Admin
on 2026/03/21 17:40
Change comment: There is no comment for this version
To version Icon 90.1 Icon
edited by Super Admin
on 2026/03/20 02:23
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -64,44 +64,6 @@
64 64  #set($ruleReviewImplementer = $doc.getValue('ruleReviewImplementer'))
65 65  #set($ruleReviewSystem = $doc.getValue('ruleReviewSystem'))
66 66  
67 -## --- 活動環境 ---
68 -#set($activityPlace = $doc.getValue('activityPlace'))
69 -#set($activityRoomEquipment = $doc.getValue('activityRoomEquipment'))
70 -#set($activityRoomImage = $doc.getValue('activityRoomImage'))
71 -#set($ictTools = $doc.getValue('ictTools'))
72 -#set($ictUsage = $doc.getValue('ictUsage'))
73 -
74 -## --- 生徒総会 ---
75 -#set($assemblyFormat = $doc.getValue('assemblyFormat'))
76 -#set($assemblyCount = $doc.getValue('assemblyCount'))
77 -#set($assemblyAgenda = $doc.getValue('assemblyAgenda'))
78 -#set($assemblyTopics = $doc.getValue('assemblyTopics'))
79 -#set($assemblyNote = $doc.getValue('assemblyNote'))
80 -
81 -## --- 広報 ---
82 -#set($publicityMethod = $doc.getValue('publicityMethod'))
83 -#set($publicityFrequency = $doc.getValue('publicityFrequency'))
84 -#set($publicityNote = $doc.getValue('publicityNote'))
85 -
86 -## --- 外部連携 ---
87 -#set($externalCooperation = $doc.getValue('externalCooperation'))
88 -#set($externalOrgName = $doc.getValue('externalOrgName'))
89 -#set($socialParticipation = $doc.getValue('socialParticipation'))
90 -
91 -## --- 年間主要行事 ---
92 -#set($eventApril = $doc.getValue('eventApril'))
93 -#set($eventMay = $doc.getValue('eventMay'))
94 -#set($eventJune = $doc.getValue('eventJune'))
95 -#set($eventJuly = $doc.getValue('eventJuly'))
96 -#set($eventAugust = $doc.getValue('eventAugust'))
97 -#set($eventSeptember = $doc.getValue('eventSeptember'))
98 -#set($eventOctober = $doc.getValue('eventOctober'))
99 -#set($eventNovember = $doc.getValue('eventNovember'))
100 -#set($eventDecember = $doc.getValue('eventDecember'))
101 -#set($eventJanuary = $doc.getValue('eventJanuary'))
102 -#set($eventFebruary = $doc.getValue('eventFebruary'))
103 -#set($eventMarch = $doc.getValue('eventMarch'))
104 -
105 105  ## --- 課題・連絡先 ---
106 106  #set($challenges = $doc.getValue('challenges'))
107 107  #set($contactInfo = $doc.getValue('contactInfo'))
... ... @@ -126,14 +126,6 @@
126 126  #set($visibilityBudget = $!doc.getValue('visibilityBudget'))
127 127  #set($visibilityRuleReview = $!doc.getValue('visibilityRuleReview'))
128 128  #set($visibilityChallenges = $!doc.getValue('visibilityChallenges'))
129 -#set($visibilityDailyActivities = $!doc.getValue('visibilityDailyActivities'))
130 -#set($visibilityElection = $!doc.getValue('visibilityElection'))
131 -#set($visibilityMeeting = $!doc.getValue('visibilityMeeting'))
132 -#set($visibilityActivityEnv = $!doc.getValue('visibilityActivityEnv'))
133 -#set($visibilityAssembly = $!doc.getValue('visibilityAssembly'))
134 -#set($visibilityPublicity = $!doc.getValue('visibilityPublicity'))
135 -#set($visibilityExternal = $!doc.getValue('visibilityExternal'))
136 -#set($visibilityAnnualEvents = $!doc.getValue('visibilityAnnualEvents'))
137 137  ## デフォルト値(未設定なら全体公開)
138 138  #if(!$visibilityOrgChart || $visibilityOrgChart == '') #set($visibilityOrgChart = 'public') #end
139 139  #if(!$visibilityBudget || $visibilityBudget == '') #set($visibilityBudget = 'public') #end
... ... @@ -145,7 +145,6 @@
145 145  #set($isGuest = $viewerUser == 'XWiki.XWikiGuest')
146 146  #set($isViewerAdmin = false)
147 147  #set($viewerSchoolCode = '')
148 -#set($viewerSecondaryGraduated = false)
149 149  #if(!$isGuest)
150 150   #set($viewerDoc = $xwiki.getDocument($viewerUser))
151 151   #set($viewerAccountType = $!viewerDoc.getValue('accountType'))
... ... @@ -155,24 +155,6 @@
155 155   #if($viewerAccountType == 'admin')
156 156   #set($isViewerAdmin = true)
157 157   #end
158 - ## 第2所属校の在学年数超過チェック
159 - #set($viewerSecEnrollYear = $!viewerDoc.getValue('secondaryEnrollmentYear'))
160 - #if($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecEnrollYear && $viewerSecEnrollYear != '')
161 - #set($vNow = $datetool.date)
162 - #set($vCurYear = $mathtool.toInteger($datetool.format('yyyy', $vNow)))
163 - #set($vCurMonth = $mathtool.toInteger($datetool.format('MM', $vNow)))
164 - #if($vCurMonth >= 4)#set($vSchoolYear = $vCurYear)#else#set($vSchoolYear = $mathtool.sub($vCurYear, 1))#end
165 - #set($vSecEnroll = $mathtool.toInteger($viewerSecEnrollYear))
166 - #set($vSecMax = 3)
167 - #if($viewerSecondarySchoolCode.length() >= 2)
168 - #set($vSecType = $viewerSecondarySchoolCode.substring(0, 2))
169 - #if($vSecType == 'C2')#set($vSecMax = 9)#elseif($vSecType == 'D2')#set($vSecMax = 6)#end
170 - #end
171 - #set($vSecGrade = $mathtool.add($mathtool.sub($vSchoolYear, $vSecEnroll), 1))
172 - #if($vSecGrade > $vSecMax)
173 - #set($viewerSecondaryGraduated = true)
174 - #end
175 - #end
176 176  #end
177 177  
178 178  ## --- 関連校(中高一貫校)情報 ---
... ... @@ -182,7 +182,7 @@
182 182  #if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
183 183   #if($viewerSchoolCode == $affiliatedSchoolCode)
184 184   #set($isAffiliated = true)
185 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode && !$viewerSecondaryGraduated)
120 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode)
186 186   #set($isAffiliated = true)
187 187   #end
188 188  #end
... ... @@ -192,7 +192,7 @@
192 192  #if(!$isGuest && $viewerUserRole != 'graduate')
193 193   #if($viewerSchoolCode == $schoolCode || $isAffiliated)
194 194   #set($isSchoolMember = true)
195 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode && !$viewerSecondaryGraduated)
130 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode)
196 196   #set($isSchoolMember = true)
197 197   #end
198 198  #end
... ... @@ -369,7 +369,7 @@
369 369  
370 370  ## --- 編集ボタン(権限があるユーザーのみ表示) ---
371 371  #set($canEditSchool = false)
372 -#if(!$isGuest && ($isViewerAdmin || $isSchoolMember || $isAlumniOfSchool))
307 +#if(!$isGuest && ($isViewerAdmin || $isSchoolMember))
373 373   #set($canEditSchool = true)
374 374  #end
375 375  #if($canEditSchool)
... ... @@ -425,9 +425,9 @@
425 425  
426 426  </div>
427 427  
428 -## --- ② 生徒会情報(折りたたみカード) ---
363 +## --- ② 生徒会基本情報(折りたたみカード) ---
429 429  <div class="school-info-card" id="card-seitokai-info">
430 - <h2 role="button" tabindex="0" aria-expanded="true" onclick="toggleInfoCard('card-seitokai-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-seitokai-info')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/></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>
365 + <h2 role="button" tabindex="0" aria-expanded="true" onclick="toggleInfoCard('card-seitokai-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-seitokai-info')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/></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>
431 431   <div class="seitokai-info-body">
432 432  
433 433   ## --- 生徒会組織 ---
... ... @@ -454,13 +454,8 @@
454 454  
455 455   ## --- 日常の活動 ---
456 456   #if($dailyActivities && !$dailyActivities.isEmpty())
457 - #set($canViewDA = true)
458 - #if($visibilityDailyActivities == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewDA = false)
459 - #elseif($visibilityDailyActivities == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewDA = false)
460 - #end
461 - #if($canViewDA)
462 462   <div class="seitokai-subsection">
463 - <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>
393 + <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> 日常の活動</h3>
464 464   <div class="seitokai-subsection-content">
465 465   <p class="activity-hint">活動時間が多い3つ</p>
466 466   <div class="tag-container">
... ... @@ -473,20 +473,12 @@
473 473   #end
474 474   </div>
475 475   </div>
476 - #else
477 - <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($visibilityDailyActivities == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
478 - #end
479 479   #end
480 480  
481 481   ## --- 選挙 ---
482 482   #if($electionExists && $electionExists != '')
483 - #set($canViewEL = true)
484 - #if($visibilityElection == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEL = false)
485 - #elseif($visibilityElection == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEL = false)
486 - #end
487 - #if($canViewEL)
488 488   <div class="seitokai-subsection">
489 - <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>
411 + <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> 選挙</h3>
490 490   <div class="seitokai-subsection-content">
491 491   <div class="info-row">
492 492   <span class="info-label">役員選挙</span>
... ... @@ -503,20 +503,12 @@
503 503   #end
504 504   </div>
505 505   </div>
506 - #else
507 - <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>
508 - #end
509 509   #end
510 510  
511 511   ## --- 定例活動 ---
512 512   #if($meetingFrequency && $meetingFrequency != '')
513 - #set($canViewMT = true)
514 - #if($visibilityMeeting == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewMT = false)
515 - #elseif($visibilityMeeting == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewMT = false)
516 - #end
517 - #if($canViewMT)
518 518   <div class="seitokai-subsection">
519 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="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($visibilityMeeting != '' && $visibilityMeeting != 'public')<span class="visibility-badge visibility-${visibilityMeeting}">#if($visibilityMeeting == '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>
433 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="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> 定例活動</h3>
520 520   <div class="seitokai-subsection-content">
521 521   <div class="info-row">
522 522   <span class="info-label">役員定例会の頻度</span>
... ... @@ -527,9 +527,6 @@
527 527   #end
528 528   </div>
529 529   </div>
530 - #else
531 - <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($visibilityMeeting == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
532 - #end
533 533   #end
534 534  
535 535   ## --- 予算 ---
... ... @@ -608,7 +608,6 @@
608 608   <span class="info-label">見直しの有無(3年以内)</span>
609 609   <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
610 610   </div>
611 - #if($ruleReviewStatus != '実施なし')
612 612   #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
613 613   <div class="info-row">
614 614   <span class="info-label">見直しの内容</span>
... ... @@ -645,7 +645,6 @@
645 645   </span>
646 646   </div>
647 647   #end
648 - #end
649 649   #if($ruleReviewSystem && $ruleReviewSystem != '')
650 650   <div class="info-row">
651 651   <span class="info-label">見直しの仕組み</span>
... ... @@ -659,267 +659,6 @@
659 659   #end
660 660   #end
661 661  
662 - ## --- 活動環境 ---
663 - #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictTools && !$ictTools.isEmpty()) || ($ictUsage && !$ictUsage.isEmpty()))
664 - #if($hasActivityEnv)
665 - #set($canViewAE = true)
666 - #if($visibilityActivityEnv == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAE = false)
667 - #elseif($visibilityActivityEnv == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAE = false)
668 - #end
669 - #if($canViewAE)
670 - <div class="seitokai-subsection">
671 - <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>
672 - <div class="seitokai-subsection-content">
673 - #if($activityPlace && !$activityPlace.isEmpty())
674 - <div class="info-row">
675 - <span class="info-label">普段の活動場所</span>
676 - <span class="info-value">
677 - <div class="selection-display">
678 - #foreach($ap in $activityPlace)
679 - <span class="selection-item">$!escapetool.xml($ap.trim())</span>
680 - #end
681 - </div>
682 - </span>
683 - </div>
684 - #end
685 - #if($activityRoomEquipment && $activityRoomEquipment != '')
686 - <div class="info-row">
687 - <span class="info-label">生徒会室の設備</span>
688 - <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span>
689 - </div>
690 - #end
691 - #if($activityRoomImage && $activityRoomImage != '')
692 - <div class="info-row">
693 - <span class="info-label">活動場所の写真</span>
694 - <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span>
695 - </div>
696 - #end
697 - #if($ictTools && !$ictTools.isEmpty())
698 - <div class="info-row">
699 - <span class="info-label">利用しているICTツール</span>
700 - <span class="info-value">
701 - #set($ictCatDisplay = [
702 - ["連絡ツール", ["メール","LINE","LINE WORKS","Discord","Slack","Microsoft Teams","Google Chat","InstagramのDM","XのDM","その他(連絡)"]],
703 - ["ドキュメント作成・共有", ["Googleドキュメント","Googleスプレッドシート","Googleスライド","Googleドライブ","Word","Excel","PowerPoint","OneDrive","SharePoint","Notion","Pages","Numbers","Keynote","Dropbox","Box","その他(ドキュメント)"]],
704 - ["タスク管理", ["Googleカレンダー","Google ToDoリスト","Trello","Asana","Excel等スプレッドシート","その他(タスク管理)"]],
705 - ["ビデオ会議ツール", ["Zoom","Google Meet","その他(ビデオ会議)"]],
706 - ["アンケート", ["Googleフォーム","Microsoft Forms","その他(アンケート)"]],
707 - ["デザイン・クリエイティブ", ["Canva","各種Adobe","CapCut","LumaFusion","AviUtl","ibisPaint","その他(デザイン)"]],
708 - ["その他", ["独自のWebシステム・自作アプリ"]]
709 - ])
710 - #foreach($catD in $ictCatDisplay)
711 - #set($catHasItems = false)
712 - #foreach($t in $catD.get(1))
713 - #if($ictTools.contains($t)) #set($catHasItems = true) #end
714 - #end
715 - #if($catHasItems)
716 - <div style="margin-bottom:6px">
717 - <span style="font-size:0.8em;font-weight:600;color:var(--text-mid)">$catD.get(0):</span>
718 - <div class="selection-display" style="margin-top:2px">
719 - #foreach($t in $catD.get(1))
720 - #if($ictTools.contains($t))
721 - <span class="selection-item">$!escapetool.xml($t)</span>
722 - #end
723 - #end
724 - </div>
725 - </div>
726 - #end
727 - #end
728 - </span>
729 - </div>
730 - #end
731 - #if($ictUsage && !$ictUsage.isEmpty())
732 - <div class="info-row">
733 - <span class="info-label">ICT活用している場面</span>
734 - <span class="info-value">
735 - <div class="selection-display">
736 - #foreach($iu in $ictUsage)
737 - <span class="selection-item">$!escapetool.xml($iu.trim())</span>
738 - #end
739 - </div>
740 - </span>
741 - </div>
742 - #end
743 - </div>
744 - </div>
745 - #else
746 - <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>
747 - #end
748 - #end
749 -
750 - ## --- 生徒総会 ---
751 - #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != ''))
752 - #if($hasAssembly)
753 - #set($canViewAS = true)
754 - #if($visibilityAssembly == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAS = false)
755 - #elseif($visibilityAssembly == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAS = false)
756 - #end
757 - #if($canViewAS)
758 - <div class="seitokai-subsection">
759 - <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>
760 - <div class="seitokai-subsection-content">
761 - #if($assemblyFormat && $assemblyFormat != '')
762 - <div class="info-row">
763 - <span class="info-label">開催方式</span>
764 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span>
765 - </div>
766 - #end
767 - #if($assemblyCount && $assemblyCount > 0)
768 - <div class="info-row">
769 - <span class="info-label">開催回数(年)</span>
770 - <span class="info-value">$!escapetool.xml($assemblyCount)回</span>
771 - </div>
772 - #end
773 - #if($assemblyAgenda && !$assemblyAgenda.isEmpty())
774 - <div class="info-row">
775 - <span class="info-label">議案の集め方</span>
776 - <span class="info-value">
777 - <div class="selection-display">
778 - #foreach($aa in $assemblyAgenda)
779 - <span class="selection-item">$!escapetool.xml($aa.trim())</span>
780 - #end
781 - </div>
782 - </span>
783 - </div>
784 - #end
785 - #if($assemblyTopics && !$assemblyTopics.isEmpty())
786 - <div class="info-row">
787 - <span class="info-label">扱う内容</span>
788 - <span class="info-value">
789 - <div class="selection-display">
790 - #foreach($at in $assemblyTopics)
791 - <span class="selection-item">$!escapetool.xml($at.trim())</span>
792 - #end
793 - </div>
794 - </span>
795 - </div>
796 - #end
797 - #if($assemblyNote && $assemblyNote != '')
798 - <div class="info-row">
799 - <span class="info-label">自由記述</span>
800 - <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span>
801 - </div>
802 - #end
803 - </div>
804 - </div>
805 - #else
806 - <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>
807 - #end
808 - #end
809 -
810 - ## --- 広報 ---
811 - #set($hasPublicity = ($publicityMethod && !$publicityMethod.isEmpty()) || ($publicityFrequency && $publicityFrequency != '') || ($publicityNote && $publicityNote != ''))
812 - #if($hasPublicity)
813 - #set($canViewPB = true)
814 - #if($visibilityPublicity == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPB = false)
815 - #elseif($visibilityPublicity == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPB = false)
816 - #end
817 - #if($canViewPB)
818 - <div class="seitokai-subsection">
819 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z"/><circle cx="12" cy="12" r="3"/></svg> 広報 #if($visibilityPublicity != '' && $visibilityPublicity != 'public')<span class="visibility-badge visibility-${visibilityPublicity}">#if($visibilityPublicity == '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>
820 - <div class="seitokai-subsection-content">
821 - #if($publicityMethod && !$publicityMethod.isEmpty())
822 - <div class="info-row">
823 - <span class="info-label">方法</span>
824 - <span class="info-value">
825 - <div class="selection-display">
826 - #foreach($pm in $publicityMethod)
827 - <span class="selection-item">$!escapetool.xml($pm.trim())</span>
828 - #end
829 - </div>
830 - </span>
831 - </div>
832 - #end
833 - #if($publicityFrequency && $publicityFrequency != '')
834 - <div class="info-row">
835 - <span class="info-label">頻度</span>
836 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($publicityFrequency)</span></span>
837 - </div>
838 - #end
839 - #if($publicityNote && $publicityNote != '')
840 - <div class="info-row">
841 - <span class="info-label">自由記述</span>
842 - <span class="info-value free-text-value">$!escapetool.xml($publicityNote)</span>
843 - </div>
844 - #end
845 - </div>
846 - </div>
847 - #else
848 - <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($visibilityPublicity == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
849 - #end
850 - #end
851 -
852 - ## --- 外部連携 ---
853 - #set($hasExternal = ($externalCooperation && $externalCooperation != '') || ($externalOrgName && $externalOrgName != '') || ($socialParticipation && !$socialParticipation.isEmpty()))
854 - #if($hasExternal)
855 - #set($canViewEX = true)
856 - #if($visibilityExternal == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEX = false)
857 - #elseif($visibilityExternal == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEX = false)
858 - #end
859 - #if($canViewEX)
860 - <div class="seitokai-subsection">
861 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><circle cx="18" cy="5" r="3"/><circle cx="6" cy="12" r="3"/><circle cx="18" cy="19" r="3"/><line x1="8.59" y1="13.51" x2="15.42" y2="17.49"/><line x1="15.41" y1="6.51" x2="8.59" y2="10.49"/></svg> 外部連携 #if($visibilityExternal != '' && $visibilityExternal != 'public')<span class="visibility-badge visibility-${visibilityExternal}">#if($visibilityExternal == '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>
862 - <div class="seitokai-subsection-content">
863 - #if($externalCooperation && $externalCooperation != '')
864 - <div class="info-row">
865 - <span class="info-label">他校の生徒会との連携</span>
866 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($externalCooperation)</span></span>
867 - </div>
868 - #end
869 - #if($externalOrgName && $externalOrgName != '')
870 - <div class="info-row">
871 - <span class="info-label">参加している生徒会団体の名前</span>
872 - <span class="info-value">$!escapetool.xml($externalOrgName)</span>
873 - </div>
874 - #end
875 - #if($socialParticipation && !$socialParticipation.isEmpty())
876 - <div class="info-row">
877 - <span class="info-label">社会参加・地域連携・ボランティア</span>
878 - <span class="info-value">
879 - <div class="selection-display">
880 - #foreach($sp2 in $socialParticipation)
881 - <span class="selection-item">$!escapetool.xml($sp2.trim())</span>
882 - #end
883 - </div>
884 - </span>
885 - </div>
886 - #end
887 - </div>
888 - </div>
889 - #else
890 - <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($visibilityExternal == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
891 - #end
892 - #end
893 -
894 - ## --- 年間主要行事 ---
895 - #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]])
896 - #set($hasAnyEvent = false)
897 - #foreach($m in $months)
898 - #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end
899 - #end
900 - #if($hasAnyEvent)
901 - #set($canViewAN = true)
902 - #if($visibilityAnnualEvents == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAN = false)
903 - #elseif($visibilityAnnualEvents == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAN = false)
904 - #end
905 - #if($canViewAN)
906 - <div class="seitokai-subsection">
907 - <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>
908 - <div class="seitokai-subsection-content">
909 - <table class="wiki-table school-info-table" style="margin:0">
910 - #foreach($m in $months)
911 - #if($m.get(1) && $m.get(1) != '')
912 - <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr>
913 - #end
914 - #end
915 - </table>
916 - </div>
917 - </div>
918 - #else
919 - <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>
920 - #end
921 - #end
922 -
923 923   ## --- 生徒会の課題意識 ---
924 924   #if($challenges && $challenges != '')
925 925   #set($canViewChallenges = true)
... ... @@ -1402,12 +1402,12 @@
1402 1402  
1403 1403   #if($xcontext.user != "XWiki.XWikiGuest")
1404 1404   <div class="thread-add-post">
1405 - #if($isSchoolMember || $isAlumniOfSchool || $isViewerAdmin)
1406 - <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
1053 + #if($isSchoolMember || $isViewerAdmin)
1054 + <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
1407 1407   + 活動報告を追加
1408 1408   </a>
1409 1409   #end
1410 - <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
1058 + <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
1411 1411   <svg class="ico" viewBox="0 0 24 24"><path d="M21 15a2 2 0 01-2 2H7l-4 4V5a2 2 0 012-2h14a2 2 0 012 2z"/></svg> コメントを書く
1412 1412   </a>
1413 1413   </div>
... ... @@ -1429,7 +1429,7 @@
1429 1429  #if($xcontext.user != "XWiki.XWikiGuest")
1430 1430  {{html clean="false"}}
1431 1431  <div class="activity-add-section">
1432 - <a href="/bin/view/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
1080 + <a href="/bin/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
1433 1433   <svg class="ico" viewBox="0 0 24 24" stroke-width="2.5"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg> 活動を追加
1434 1434   </a>
1435 1435  </div>