@@ -18,13 +18,15 @@ import { cache, compose, errorLogger } from 'next-ssr-middleware';
1818import { Button , Carousel , Col , Container , Image , Row , Tab , Tabs } from 'react-bootstrap' ;
1919
2020import { getActivityStatusText } from '../../../components/Activity/ActivityEntry' ;
21+ import { AwardList } from '../../../components/Activity/AwardList' ;
2122import { CommentBox } from '../../../components/CommentBox' ;
2223import { PageHead } from '../../../components/layout/PageHead' ;
2324import { AnnouncementList } from '../../../components/Message/MessageList' ;
2425import { OrganizationCard } from '../../../components/Organization/OrganizationCard' ;
2526import { TeamCard } from '../../../components/Team/TeamCard' ;
2627import { TeamCreateModal } from '../../../components/Team/TeamCreateModal' ;
2728import { TeamListLayout } from '../../../components/Team/TeamList' ;
29+ import { TeamRank } from '../../../components/Team/TeamRank' ;
2830import { isServer } from '../../../configuration' ;
2931import activityStore , { ActivityModel } from '../../../models/Activity' ;
3032import { i18n , I18nContext } from '../../../models/Base/Translation' ;
@@ -64,6 +66,7 @@ const StatusName = ({ t }: typeof i18n): Record<EnrollmentStatus, string> => ({
6466export default class ActivityPage extends ObservedComponent < ActivityPageProps , typeof i18n > {
6567 static contextType = I18nContext ;
6668
69+ awardStore = activityStore . awardOf ( this . props . activity . name ) ;
6770 logStore = activityStore . logOf ( this . props . activity . id ) ;
6871 enrollmentStore = activityStore . enrollmentOf ( this . props . activity . name ) ;
6972 teamStore = activityStore . teamOf ( this . props . activity . name ) ;
@@ -231,9 +234,9 @@ export default class ActivityPage extends ObservedComponent<ActivityPageProps, t
231234
232235 render ( ) {
233236 const { t } = this . observedContext ,
234- { name, displayName, tags, banners, location, detail } = this . props . activity ,
237+ { activity, organizationList } = this . props ;
238+ const { name, displayName, tags, banners, location, detail } = activity ,
235239 { showCreateTeam, loading } = this ,
236- { organizationList } = this . props ,
237240 myTeam = activityStore . currentTeam ?. sessionOne ,
238241 myMessage = this . messageStore ;
239242
@@ -302,6 +305,14 @@ export default class ActivityPage extends ObservedComponent<ActivityPageProps, t
302305 />
303306 </ Tab >
304307 </ Tabs >
308+ < Tab eventKey = "award" title = { t ( 'award' ) } className = "pt-2" >
309+ < AwardList store = { this . awardStore } />
310+ </ Tab >
311+ { ActivityModel . isEvaluatable ( activity ) && (
312+ < Tab eventKey = "team-rank" title = { t ( 'works_awards' ) } className = "pt-2" >
313+ < TeamRank activityName = { name } teamStore = { this . teamStore } />
314+ </ Tab >
315+ ) }
305316 </ Col >
306317 < Col className = "d-flex flex-column" >
307318 { organizationList . length > 0 && (
0 commit comments