Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 98.1 Icon
edited by Super Admin
on 2026/03/20 18:16
Change comment: There is no comment for this version
To version Icon 100.1 Icon
edited by Super Admin
on 2026/03/21 17:40
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -145,6 +145,7 @@
145 145  #set($isGuest = $viewerUser == 'XWiki.XWikiGuest')
146 146  #set($isViewerAdmin = false)
147 147  #set($viewerSchoolCode = '')
148 +#set($viewerSecondaryGraduated = false)
148 148  #if(!$isGuest)
149 149   #set($viewerDoc = $xwiki.getDocument($viewerUser))
150 150   #set($viewerAccountType = $!viewerDoc.getValue('accountType'))
... ... @@ -154,6 +154,24 @@
154 154   #if($viewerAccountType == 'admin')
155 155   #set($isViewerAdmin = true)
156 156   #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
157 157  #end
158 158  
159 159  ## --- 関連校（中高一貫校）情報 ---
... ... @@ -163,7 +163,7 @@
163 163  #if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
164 164   #if($viewerSchoolCode == $affiliatedSchoolCode)
165 165   #set($isAffiliated = true)
166 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode)
185 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode && !$viewerSecondaryGraduated)
167 167   #set($isAffiliated = true)
168 168   #end
169 169  #end
... ... @@ -173,7 +173,7 @@
173 173  #if(!$isGuest && $viewerUserRole != 'graduate')
174 174   #if($viewerSchoolCode == $schoolCode || $isAffiliated)
175 175   #set($isSchoolMember = true)
176 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode)
195 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode && !$viewerSecondaryGraduated)
177 177   #set($isSchoolMember = true)
178 178   #end
179 179  #end
... ... @@ -1384,11 +1384,11 @@
1384 1384   #if($xcontext.user != "XWiki.XWikiGuest")
1385 1385   <div class="thread-add-post">
1386 1386   #if($isSchoolMember || $isAlumniOfSchool || $isViewerAdmin)
1387 - <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
1406 + <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
1388 1388   ＋ 活動報告を追加
1389 1389   </a>
1390 1390   #end
1391 - <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
1410 + <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
1392 1392   <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> コメントを書く
1393 1393   </a>
1394 1394   </div>
... ... @@ -1410,7 +1410,7 @@
1410 1410  #if($xcontext.user != "XWiki.XWikiGuest")
1411 1411  {{html clean="false"}}
1412 1412  <div class="activity-add-section">
1413 - <a href="/bin/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
1432 + <a href="/bin/view/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
1414 1414   <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> 活動を追加
1415 1415   </a>
1416 1416  </div>