Changes for page ユーザープロフィール

Summary

• Page properties (1 modified, 0 added, 0 removed)

Details

Page properties

Content

...	...	@@ -117,27 +117,48 @@
117	117	#elseif($profileUserRole == 'graduate')卒業生
118	118	#else$!profileUserRole#end
119	119	</td></tr>
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>
	120	+ ## --- 学校情報を中学・高校・現任校ラベルで表示 ---
127	127	#set($profileSecondarySchoolCode = $!targetDoc.getValue('secondarySchoolCode'))
128	128	#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
134	134	#set($profileAlumniSchoolCode = $!targetDoc.getValue('alumniSchoolCode'))
135	135	#set($profileAlumniSchoolName = $!targetDoc.getValue('alumniSchoolName'))
136		- #if($profileAlumniSchoolCode && $profileAlumniSchoolCode != '' && $profileAlumniSchoolCode != $profileSchoolCode)
137		- <tr><th>出身校</th><td>
138		- <a href="/bin/Schools/${profileAlumniSchoolCode}/WebHome">$!profileAlumniSchoolName</a>
139		- </td></tr>
	125	+ #set($pMidCode = '')#set($pMidName = '')
	126	+ #set($pHiCode = '')#set($pHiName = '')
	127	+ #set($pOthCode = '')#set($pOthName = '')
	128	+ #if($profileSchoolCode && $profileSchoolCode.length() >= 2)
	129	+ #set($pst = $profileSchoolCode.substring(0, 2))
	130	+ #if($pst == 'C1' || $pst == 'C2')#set($pMidCode = $profileSchoolCode)#set($pMidName = $profileSchoolName)
	131	+ #elseif($pst == 'D1' || $pst == 'D2')#set($pHiCode = $profileSchoolCode)#set($pHiName = $profileSchoolName)
	132	+ #else#set($pOthCode = $profileSchoolCode)#set($pOthName = $profileSchoolName)#end
140	140	#end
	134	+ #if($profileSecondarySchoolCode && $profileSecondarySchoolCode.length() >= 2)
	135	+ #set($ps2t = $profileSecondarySchoolCode.substring(0, 2))
	136	+ #if($ps2t == 'C1' || $ps2t == 'C2')#set($pMidCode = $profileSecondarySchoolCode)#set($pMidName = $profileSecondarySchoolName)
	137	+ #elseif($ps2t == 'D1' || $ps2t == 'D2')#set($pHiCode = $profileSecondarySchoolCode)#set($pHiName = $profileSecondarySchoolName)
	138	+ #else#set($pOthCode = $profileSecondarySchoolCode)#set($pOthName = $profileSecondarySchoolName)#end
	139	+ #end
	140	+ #set($pIsGrad = ($profileUserRole == 'graduate'))
	141	+ #if($profileUserRole == 'teacher')
	142	+ #if($profileSchoolCode && $profileSchoolCode != '')
	143	+ <tr><th>現任校</th><td><a href="/bin/Schools/${profileSchoolCode}/WebHome">$!profileSchoolName</a></td></tr>
	144	+ #end
	145	+ ## 教員の出身校を alumni から復元
	146	+ #if($profileAlumniSchoolCode && $profileAlumniSchoolCode.length() >= 2)
	147	+ #set($pat = $profileAlumniSchoolCode.substring(0, 2))
	148	+ #if(($pat == 'D1' || $pat == 'D2') && $pHiCode == '')#set($pHiCode = $profileAlumniSchoolCode)#set($pHiName = $profileAlumniSchoolName)
	149	+ #elseif(($pat == 'C1' || $pat == 'C2') && $pMidCode == '')#set($pMidCode = $profileAlumniSchoolCode)#set($pMidName = $profileAlumniSchoolName)
	150	+ #elseif($pOthCode == '')#set($pOthCode = $profileAlumniSchoolCode)#set($pOthName = $profileAlumniSchoolName)#end
	151	+ #end
	152	+ #end
	153	+ #if($pMidCode != '')
	154	+ <tr><th>#if($pIsGrad || $profileUserRole == 'teacher')出身中学#else中学校#end</th><td><a href="/bin/Schools/${pMidCode}/WebHome">$!pMidName</a></td></tr>
	155	+ #end
	156	+ #if($pHiCode != '')
	157	+ <tr><th>#if($pIsGrad || $profileUserRole == 'teacher')出身高校#else高等学校#end</th><td><a href="/bin/Schools/${pHiCode}/WebHome">$!pHiName</a></td></tr>
	158	+ #end
	159	+ #if($pOthCode != '')
	160	+ <tr><th>#if($pIsGrad || $profileUserRole == 'teacher')出身校（その他）#elseその他の学校#end</th><td><a href="/bin/Schools/${pOthCode}/WebHome">$!pOthName</a></td></tr>
	161	+ #end
141	141	## 学年はプライバシー保護のため公開プロフィールには表示しない
142	142	</table>
143	143	</div>