Changes for page 学校ページ テンプレート
Last modified by Super Admin on 2026/04/05 18:59
From version 
70.1 
70.1
edited by Super Admin
on 2026/03/18 18:54
on 2026/03/18 18:54
Change comment:
There is no comment for this version
To version 72.1
72.1
edited by Super Admin
on 2026/03/18 23:33
on 2026/03/18 23:33
Change comment:
There is no comment for this version
Summary
Details
-
Page properties
-
- Content
-
... ... @@ -101,6 +101,8 @@ 101 101 #set($viewerDoc = $xwiki.getDocument($viewerUser)) 102 102 #set($viewerAccountType = $!viewerDoc.getValue('accountType')) 103 103 #set($viewerSchoolCode = $!viewerDoc.getValue('schoolCode')) 104 + #set($viewerSecondarySchoolCode = $!viewerDoc.getValue('secondarySchoolCode')) 105 + #set($viewerUserRole = $!viewerDoc.getValue('userRole')) 104 104 #if($viewerAccountType == 'admin') 105 105 #set($isViewerAdmin = true) 106 106 #end ... ... @@ -110,10 +110,31 @@ 110 110 #set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode')) 111 111 #set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName')) 112 112 #set($isAffiliated = false) 113 -#if($affiliatedSchoolCode && $affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode) 114 - #set($isAffiliated = true) 115 +#if($affiliatedSchoolCode && $affiliatedSchoolCode != '') 116 + #if($viewerSchoolCode == $affiliatedSchoolCode) 117 + #set($isAffiliated = true) 118 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode) 119 + #set($isAffiliated = true) 120 + #end 115 115 #end 116 116 123 +## --- 校内判定（卒業生を除外、secondarySchoolCodeも含む） --- 124 +#set($isSchoolMember = false) 125 +#if(!$isGuest && $viewerUserRole != 'graduate') 126 + #if($viewerSchoolCode == $schoolCode || $isAffiliated) 127 + #set($isSchoolMember = true) 128 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode) 129 + #set($isSchoolMember = true) 130 + #end 131 +#end 132 +## 卒業生の母校判定（投稿バッジ用） 133 +#set($isAlumniOfSchool = false) 134 +#if(!$isGuest && $viewerUserRole == 'graduate') 135 + #if($viewerSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode)) 136 + #set($isAlumniOfSchool = true) 137 + #end 138 +#end 139 + 117 117 ## --- 学校ページ非表示チェック --- 118 118 #set($schoolHidden = $doc.getValue('hidden')) 119 119 #if($schoolHidden == 1) ... ... @@ -147,7 +147,7 @@ 147 147 148 148 ## --- 投稿固定/解除処理 --- 149 149 #set($pinAction = $!request.action) 150 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && ($viewerSchoolCode== $schoolCode|| $isAffiliated)))&& $services.csrf.isTokenValid($request.form_token))173 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token)) 151 151 #set($pinPostObjStr = $!request.postObj) 152 152 #if(!$pinPostObjStr.matches('^\d+$')) 153 153 ## 不正な値 → 無視 ... ... @@ -177,7 +177,7 @@ 177 177 178 178 ## --- 特色ある活動 選定/解除処理 --- 179 179 #set($featAction = $!request.action) 180 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $ viewerSchoolCode== $schoolCode)) && $services.csrf.isTokenValid($request.form_token))203 +#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token)) 181 181 #set($featActObjStr = $!request.actObj) 182 182 #if($featActObjStr.matches('^\d+$')) 183 183 #set($actObjNum = $mathtool.toInteger($featActObjStr)) ... ... @@ -279,7 +279,7 @@ 279 279 280 280 ## --- 編集ボタン（権限があるユーザーのみ表示） --- 281 281 #set($canEditSchool = false) 282 -#if(!$isGuest && ($isViewerAdmin || $ viewerSchoolCode== $schoolCode|| $isAffiliated))305 +#if(!$isGuest && ($isViewerAdmin || $isSchoolMember)) 283 283 #set($canEditSchool = true) 284 284 #end 285 285 #if($canEditSchool) ... ... @@ -336,8 +336,8 @@ 336 336 #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != '')) 337 337 #if($hasOrgContent) 338 338 #set($canViewOrgChart = true) 339 - #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $ viewerSchoolCode!= $schoolCode&& !$isAffiliated))) #set($canViewOrgChart = false)340 - #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($ viewerSchoolCode!= $schoolCode&& !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)362 + #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewOrgChart = false) 363 + #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false) 341 341 #end 342 342 #if($canViewOrgChart) 343 343 <div class="seitokai-subsection"> ... ... @@ -416,8 +416,8 @@ 416 416 #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != '')) 417 417 #if($hasBudget) 418 418 #set($canViewBudget = true) 419 - #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $ viewerSchoolCode!= $schoolCode&& !$isAffiliated))) #set($canViewBudget = false)420 - #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($ viewerSchoolCode!= $schoolCode&& !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)442 + #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false) 443 + #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false) 421 421 #end 422 422 #if($canViewBudget) 423 423 <div class="seitokai-subsection"> ... ... @@ -472,8 +472,8 @@ 472 472 ## --- 校則の見直し --- 473 473 #if($ruleReviewStatus && $ruleReviewStatus != '') 474 474 #set($canViewRuleReview = true) 475 - #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $ viewerSchoolCode!= $schoolCode&& !$isAffiliated))) #set($canViewRuleReview = false)476 - #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($ viewerSchoolCode!= $schoolCode&& !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)498 + #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false) 499 + #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false) 477 477 #end 478 478 #if($canViewRuleReview) 479 479 <div class="seitokai-subsection"> ... ... @@ -535,8 +535,8 @@ 535 535 ## --- 生徒会の課題意識 --- 536 536 #if($challenges && $challenges != '') 537 537 #set($canViewChallenges = true) 538 - #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $ viewerSchoolCode!= $schoolCode&& !$isAffiliated))) #set($canViewChallenges = false)539 - #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($ viewerSchoolCode!= $schoolCode&& !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)561 + #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewChallenges = false) 562 + #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false) 540 540 #end 541 541 #if($canViewChallenges) 542 542 <div class="seitokai-subsection"> ... ... @@ -627,6 +627,7 @@ 627 627 <span class="author-legend-title">所属:</span> 628 628 <span class="author-legend-item"><span class="badge badge-school-internal-confirmed badge-sm"><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> 校内（確認済）</span> <span class="text-hint">所属が確認されたこの学校のユーザー</span></span> 629 629 <span class="author-legend-item"><span class="badge badge-school-internal badge-sm"><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> 校内</span> <span class="text-hint">この学校に所属登録しているユーザー</span></span> 653 + <span class="author-legend-item"><span class="badge badge-alumni badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業生</span> <span class="text-hint">この学校の卒業生</span></span> 630 630 <span class="author-legend-item"><span class="badge badge-school-external badge-sm"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> 他校</span> <span class="text-hint">別の学校に所属しているユーザー</span></span> 631 631 <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span> 632 632 </div> ... ... @@ -771,8 +771,8 @@ 771 771 #set($postVis = $!post.getValue('visibility')) 772 772 #if(!$postVis || $postVis == '') #set($postVis = 'public') #end 773 773 #set($canViewPost = true) 774 - #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $ viewerSchoolCode!= $schoolCode&& !$isAffiliated))) #set($canViewPost = false)775 - #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($ viewerSchoolCode!= $schoolCode&& !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)798 + #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPost = false) 799 + #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false) 776 776 #end 777 777 #if(!$canViewPost) 778 778 <div class="thread-post visibility-restricted-post"> ... ... @@ -816,8 +816,11 @@ 816 816 <span class="badge badge-general badge-sm">一般</span> 817 817 #end 818 818 ## 所属バッジ（投稿者の学校コードとページの学校コードを比較） 843 + #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode))) 819 819 #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general') 820 - #if($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)) 845 + #if($postUserRole == 'graduate' && $postIsSchoolMatch) 846 + <span class="badge badge-alumni badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業生</span> 847 + #elseif($postIsSchoolMatch && $postUserRole != 'graduate') 821 821 #if($postAccountType == 'verified' || $postAccountType == 'admin') 822 822 <span class="badge badge-school-internal-confirmed badge-sm"><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> 校内（確認済）</span> 823 823 #else ... ... @@ -1066,6 +1066,27 @@ 1066 1066 } 1067 1067 // ページ読み込み時の初期化 1068 1068 document.addEventListener('DOMContentLoaded', function() { 1096 + // 年度タブを降順にソート（「全期間」タブは末尾に固定） 1097 + var tabContainer = document.querySelector('.activity-fy-tabs'); 1098 + if (tabContainer) { 1099 + var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab')); 1100 + var allTab = null; 1101 + var fyTabs = []; 1102 + tabs.forEach(function(t) { 1103 + var onclickStr = t.getAttribute('onclick') || ''; 1104 + if (onclickStr.indexOf("'all'") !== -1) { allTab = t; } 1105 + else { fyTabs.push(t); } 1106 + }); 1107 + // 年度タブを数値の降順でソート 1108 + fyTabs.sort(function(a, b) { 1109 + var aYear = parseInt(a.textContent) || 0; 1110 + var bYear = parseInt(b.textContent) || 0; 1111 + return bYear - aYear; 1112 + }); 1113 + // DOM再配置 1114 + fyTabs.forEach(function(t) { tabContainer.appendChild(t); }); 1115 + if (allTab) { tabContainer.appendChild(allTab); } 1116 + } 1069 1069 // デフォルトで現在の年度を表示 1070 1070 var defaultTab = document.querySelector('.activity-fy-tab.active'); 1071 1071 if (defaultTab) { defaultTab.click(); }