diff --git a/src/commons/Sidebar/index.jsx b/src/commons/Sidebar/index.jsx index abde994..9a6e214 100644 --- a/src/commons/Sidebar/index.jsx +++ b/src/commons/Sidebar/index.jsx @@ -86,7 +86,7 @@ const SidebarItems = ({ backupName, backupData }) => { - {/* */} + {/* */} @@ -152,7 +152,7 @@ const SidebarItems = ({ backupName, backupData }) => { Feedback */} - {/* */} + {isAdmin && (
{ @@ -44,6 +45,15 @@ export default class EditMember extends React.Component { this.setState({ participant: participant || {} }) }); + + getSetting("editTeamEnabled").then((data)=>{ + if(data) + { + this.setState({teamEditEnabled: data}) + }else{ + this.setState({teamEditEnabled: false}) + } + }); } render = () => ( @@ -51,7 +61,7 @@ export default class EditMember extends React.Component {

Edit Participant {this.state.participant.name}

- {!isTeamChangeFreezed() ? (
+ {this.state.teamEditEnabled ? (
Name
{ let user = getUser(); - let response = await collegesService.getAllEventRankings(user.college); + let response = await collegesService.getPublishedEventRankings(user.college); let college = await collegesService.get(user.college); console.log(response); this.setState({ ranks: response, college, showLoader: false }) @@ -36,11 +36,14 @@ export default class Teams extends React.Component { - {this.state.ranks.map(eventRanks => + {this.state.ranks.map(eventRanks => { + console.log(eventRanks) + return {eventRanks.event.name} {/* uncomment this to show ranks to public */} - {/* {eventRanks.ranks.map(rank => #{rank.rank})} */} - )} + {eventRanks.ranks.map(rank => #{rank.rank})} + + })} ) diff --git a/src/services/colleges.js b/src/services/colleges.js index 50494f1..b084a6f 100644 --- a/src/services/colleges.js +++ b/src/services/colleges.js @@ -123,6 +123,21 @@ const getAllEventRankings = async (collegeID) => { return []; } }; + +const getPublishedEventRankings = async (collegeID) => { + let response; + if (collegeID) + response = await request("/colleges/" + collegeID + "/public-rankings"); + + if (response && response.status === 200) { + return response.data; + } else { + if (response && response.status === "401") + toast("Your session has expired, please logout and login again.") + return []; + } +}; + export default { create, update, @@ -131,5 +146,6 @@ export default { getTeams, getParticipants, getCollege, - getAllEventRankings + getAllEventRankings, + getPublishedEventRankings, };