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

Summary

Details

Icon Page properties
Content
... ... @@ -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)
166 + #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)
176 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode)
196 196   #set($isSchoolMember = true)
197 197   #end
198 198  #end