Last modified by Super Admin on 2026/03/22 00:39

From version Icon 35.1 Icon
edited by XWikiGuest
on 2026/03/22 00:34
Change comment: There is no comment for this version
To version Icon 31.1 Icon
edited by Super Admin
on 2026/03/18 23:33
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Author
... ... @@ -1,1 +1,1 @@
1 -XWiki.XWikiGuest
1 +XWiki.superadmin
Content
... ... @@ -117,42 +117,34 @@
117 117   #elseif($profileUserRole == 'graduate')卒業生
118 118   #else$!profileUserRole#end
119 119   </td></tr>
120 - ## --- 学校情報を中学・高校・現任校ラベルで表示 ---
120 + <tr><th>#if($profileUserRole == 'graduate')母校#else所属校#end</th><td>
121 + #if($profileSchoolCode && $profileSchoolCode != '')
122 + <a href="/bin/Schools/${profileSchoolCode}/WebHome">$!profileSchoolName</a>
123 + #else
124 + 未公開
125 + #end
126 + </td></tr>
121 121   #set($profileSecondarySchoolCode = $!targetDoc.getValue('secondarySchoolCode'))
122 122   #set($profileSecondarySchoolName = $!targetDoc.getValue('secondarySchoolName'))
129 + #if($profileSecondarySchoolCode && $profileSecondarySchoolCode != '')
130 + <tr><th>第2所属校</th><td>
131 + <a href="/bin/Schools/${profileSecondarySchoolCode}/WebHome">$!profileSecondarySchoolName</a>
132 + </td></tr>
133 + #end
123 123   #set($profileAlumniSchoolCode = $!targetDoc.getValue('alumniSchoolCode'))
124 124   #set($profileAlumniSchoolName = $!targetDoc.getValue('alumniSchoolName'))
125 - #set($pMidCode = '')#set($pMidName = '')
126 - #set($pHiCode = '')#set($pHiName = '')
127 - #if($profileSchoolCode && $profileSchoolCode.length() >= 2)
128 - #set($pst = $profileSchoolCode.substring(0, 2))
129 - #if($pst == 'C1' || $pst == 'C2')#set($pMidCode = $profileSchoolCode)#set($pMidName = $profileSchoolName)
130 - #elseif($pst == 'D1' || $pst == 'D2')#set($pHiCode = $profileSchoolCode)#set($pHiName = $profileSchoolName)#end
136 + #if($profileAlumniSchoolCode && $profileAlumniSchoolCode != '' && $profileAlumniSchoolCode != $profileSchoolCode)
137 + <tr><th>出身校</th><td>
138 + <a href="/bin/Schools/${profileAlumniSchoolCode}/WebHome">$!profileAlumniSchoolName</a>
139 + </td></tr>
131 131   #end
132 - #if($profileSecondarySchoolCode && $profileSecondarySchoolCode.length() >= 2)
133 - #set($ps2t = $profileSecondarySchoolCode.substring(0, 2))
134 - #if($ps2t == 'C1' || $ps2t == 'C2')#set($pMidCode = $profileSecondarySchoolCode)#set($pMidName = $profileSecondarySchoolName)
135 - #elseif($ps2t == 'D1' || $ps2t == 'D2')#set($pHiCode = $profileSecondarySchoolCode)#set($pHiName = $profileSecondarySchoolName)#end
136 - #end
137 - #set($pIsGrad = ($profileUserRole == 'graduate'))
138 - #if($profileUserRole == 'teacher')
139 - #if($profileSchoolCode && $profileSchoolCode != '')
140 - <tr><th>現任校</th><td><a href="/bin/Schools/${profileSchoolCode}/WebHome">$!profileSchoolName</a></td></tr>
141 - #end
142 - ## 教員の出身校を alumni から復元
143 - #if($profileAlumniSchoolCode && $profileAlumniSchoolCode.length() >= 2)
144 - #set($pat = $profileAlumniSchoolCode.substring(0, 2))
145 - #if(($pat == 'D1' || $pat == 'D2') && $pHiCode == '')#set($pHiCode = $profileAlumniSchoolCode)#set($pHiName = $profileAlumniSchoolName)#end
146 - #if(($pat == 'C1' || $pat == 'C2') && $pMidCode == '')#set($pMidCode = $profileAlumniSchoolCode)#set($pMidName = $profileAlumniSchoolName)#end
147 - #end
148 - #end
149 - #if($pMidCode != '')
150 - <tr><th>#if($pIsGrad || $profileUserRole == 'teacher')出身中学#else中学校#end</th><td><a href="/bin/Schools/${pMidCode}/WebHome">$!pMidName</a></td></tr>
151 - #end
152 - #if($pHiCode != '')
153 - <tr><th>#if($pIsGrad || $profileUserRole == 'teacher')出身高校#else高等学校#end</th><td><a href="/bin/Schools/${pHiCode}/WebHome">$!pHiName</a></td></tr>
154 - #end
155 155   ## 学年はプライバシー保護のため公開プロフィールには表示しない
142 + <tr><th>在籍状態</th><td>
143 + #if($profileUserStatus == 'active')在籍中
144 + #elseif($profileUserStatus == 'graduated')卒業済み
145 + #elseif($profileUserStatus == 'on_leave')休学中
146 + #else$!profileUserStatus#end
147 + </td></tr>
156 156   </table>
157 157  </div>
158 158  {{/html}}