Merge pull request #673 from Lunatic-Labs/SKIL-395

SKIL-395
Lunatic-Labs · Sep 12, 2024 · 26ab50f · 26ab50f
2 parents 788b34b + 4c507e1
commit 26ab50f
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 2 deletions.
diff --git a/FrontEndReact/src/View/Navbar/AppState.js b/FrontEndReact/src/View/Navbar/AppState.js
@@ -157,6 +157,22 @@ class AppState extends Component {
             });
         }
 
+        this.setSelectCurrentTeam = (assessmentTasks, assessmentTaskId) => {
+            var assessmentTask = null;
+
+            for (var index = 0; index < assessmentTasks.length; index++) {
+                if (assessmentTasks[index]["assessment_task_id"] === assessmentTaskId) {
+                    assessmentTask = assessmentTasks[index];
+                }
+            }
+
+            this.setState({
+                activeTab: "SelectTeam",
+                chosenAssessmentTask: assessmentTask,
+                unitOfAssessment: assessmentTask["unit_of_assessment"]
+            });
+        }
+
         this.setAddAssessmentTaskTabWithAssessmentTask = (assessmentTasks, assessmentTaskId, course, roleNames, rubricNames) => {
             var newAssessmentTask = null;
 

diff --git a/FrontEndReact/src/View/Student/View/AssessmentTask/ViewAssessmentTasks.js b/FrontEndReact/src/View/Student/View/AssessmentTask/ViewAssessmentTasks.js
@@ -63,6 +63,8 @@ class ViewAssessmentTasks extends Component {
     render() {
         var navbar = this.props.navbar;
 
+        const fixedTeams = this.props.navbar.state.chosenCourse["use_fixed_teams"];
+
         const role = this.props.role;
 
         var chosenCAT = null;
@@ -145,7 +147,11 @@ class ViewAssessmentTasks extends Component {
                                         variant='contained'
 
                                         onClick={() => {
-                                            navbar.setConfirmCurrentTeam(assessmentTasks, atId, this.props.checkin.indexOf(atId) !== -1);
+                                            if (!fixedTeams && navbar.state.team === null) {
+                                                navbar.setSelectCurrentTeam(assessmentTasks, atId)
+                                            } else {
+                                                navbar.setConfirmCurrentTeam(assessmentTasks, atId, this.props.checkin.indexOf(atId) !== -1);
+                                            }
                                         }}
                                     >
                                         {this.props.checkin.indexOf(atId) === -1 ? 'Check In' : 'Switch Teams'}

diff --git a/FrontEndReact/src/View/Student/View/SelectTeam/SelectTeam.js b/FrontEndReact/src/View/Student/View/SelectTeam/SelectTeam.js
@@ -12,18 +12,28 @@ class SelectTeam extends Component {
 
         this.state = {
             teams: null,
-            teamID: ""
+            teamID: "",
+            error: false,
+            errorMessage: ""
         };
 
         this.handleSelect = (event) => {
             this.setState({
                 teamID: event.target.value,
+                error: false
             })
         };
 
         this.checkInUser = () => {
             var navbar = this.props.navbar; 
 	        var atId = navbar.state.chosenAssessmentTask["assessment_task_id"];
+
+            if (this.state.teamID === '') {
+                this.setState({
+                    error: true
+                });
+                return;
+            }
 
 	        genericResourcePOST(`/checkin?assessment_task_id=${atId}&team_id=${this.state.teamID}`, this, {});
 
@@ -42,6 +52,7 @@ class SelectTeam extends Component {
                 "teams", this);
         }
         else {
+        // using Ad Hoc teams
             let teams = [];
             let numTeams = this.props.navbar.state.chosenAssessmentTask["number_of_teams"];