diff --git a/src/main/webapp/app/exam/participate/exercises/programming/programming-exam-submission.component.html b/src/main/webapp/app/exam/participate/exercises/programming/programming-exam-submission.component.html index 012c5192b2f1..effe40216224 100644 --- a/src/main/webapp/app/exam/participate/exercises/programming/programming-exam-submission.component.html +++ b/src/main/webapp/app/exam/participate/exercises/programming/programming-exam-submission.component.html @@ -61,7 +61,7 @@

} - + @if (!exercise.allowOnlineEditor && exercise.allowOfflineIde) {
diff --git a/src/main/webapp/app/orion/participation/orion-exercise-details-student-actions.component.html b/src/main/webapp/app/orion/participation/orion-exercise-details-student-actions.component.html index 2b66ec81324a..e91dda6f3f21 100644 --- a/src/main/webapp/app/orion/participation/orion-exercise-details-student-actions.component.html +++ b/src/main/webapp/app/orion/participation/orion-exercise-details-student-actions.component.html @@ -1,5 +1,5 @@ - + @if (isOfflineIdeAllowed && (orionState.view !== ExerciseView.STUDENT || orionState.opened !== this.exercise.id)) { } - + @if (shouldDisplayIDEButtons()) { - + @if (!examMode && programmingExercise?.allowOnlineEditor) { ; + @ContentChild('overrideCodeAndOnlineEditorButton') overrideCodeAndOnlineEditorButton: TemplateRef; uninitializedQuiz: boolean; quizNotStarted: boolean; @@ -265,7 +265,7 @@ export class ExerciseDetailsStudentActionsComponent implements OnInit, OnChanges } /** - * Display the 'open code editor' or 'clone repo' buttons if + * Display the 'open code editor' or 'code' buttons if * - the participation is initialized (build plan exists, this is always the case during an exam), or * - the participation is inactive (build plan cleaned up), but can not be resumed (e.g. because we're after the due date) * diff --git a/src/main/webapp/i18n/de/exercise.json b/src/main/webapp/i18n/de/exercise.json index 7982f0aa227f..e198497deaa9 100644 --- a/src/main/webapp/i18n/de/exercise.json +++ b/src/main/webapp/i18n/de/exercise.json @@ -162,7 +162,7 @@ "type": "Typ", "mcqType": "Multiple-Choice Fragen", "dndType": "Drag und Drop Fragen", - "personalRepositoryClone": "Dein persönliches Repository wurde eingerichtet. Klicke auf den Button Repository klonen!", + "personalRepositoryClone": "Dein persönliches Repository wurde eingerichtet. Klicke auf den Code-Button!", "personalRepositoryOnline": "Dein persönliches Repository wurde eingerichtet. Klicke auf den Button Programmiereditor öffnen!", "resumeProgrammingExercise": "Die Aufgabe wurde wieder aufgenommen. Du kannst nun weiterarbeiten!", "feedbackRequestSent": "Deine Feedbackanfrage wurde gesendet.", diff --git a/src/main/webapp/i18n/en/exercise.json b/src/main/webapp/i18n/en/exercise.json index ca43c1f4e32d..fbc47e4093dc 100644 --- a/src/main/webapp/i18n/en/exercise.json +++ b/src/main/webapp/i18n/en/exercise.json @@ -162,7 +162,7 @@ "type": "Type", "mcqType": "Multiple Choice Question", "dndType": "Drag and Drop Question", - "personalRepositoryClone": "Your personal repository has been set up. Click the button Clone repository!", + "personalRepositoryClone": "Your personal repository has been set up. Click the Code button!", "personalRepositoryOnline": "Your personal repository has been set up. Click the button Open code editor!", "resumeProgrammingExercise": "The exercise has been resumed. You can now continue working on the exercise!", "feedbackRequestSent": "Your feedback request has been sent.", diff --git a/src/test/javascript/spec/component/exam/participate/summary/exercises/programming-exam-summary.component.spec.ts b/src/test/javascript/spec/component/exam/participate/summary/exercises/programming-exam-summary.component.spec.ts index 565cc17855fd..deaa197ba1b6 100644 --- a/src/test/javascript/spec/component/exam/participate/summary/exercises/programming-exam-summary.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/summary/exercises/programming-exam-summary.component.spec.ts @@ -165,8 +165,8 @@ describe('ProgrammingExamSummaryComponent', () => { expect(component.feedbackComponentParameters.result).toEqual(result); expect(component.feedbackComponentParameters.exerciseType).toEqual(programmingExercise.type); - const modelingSubmissionComponent = fixture.debugElement.query(By.directive(FeedbackComponent))?.componentInstance; - expect(modelingSubmissionComponent).toBeTruthy(); + const feedbackComponent = fixture.debugElement.query(By.directive(FeedbackComponent))?.componentInstance; + expect(feedbackComponent).toBeTruthy(); }); it('should not show results if not yet published', () => { @@ -174,12 +174,12 @@ describe('ProgrammingExamSummaryComponent', () => { fixture.detectChanges(); - const modelingSubmissionComponent = fixture.debugElement.query(By.directive(FeedbackComponent))?.componentInstance; - expect(modelingSubmissionComponent).not.toBeTruthy(); + const feedbackComponent = fixture.debugElement.query(By.directive(FeedbackComponent))?.componentInstance; + expect(feedbackComponent).not.toBeTruthy(); }); - it('should display clone button', () => { - const modelingSubmissionComponent = fixture.debugElement.query(By.directive(CodeButtonComponent))?.componentInstance; - expect(modelingSubmissionComponent).toBeTruthy(); + it('should display code button', () => { + const codeButtonComponent = fixture.debugElement.query(By.directive(CodeButtonComponent))?.componentInstance; + expect(codeButtonComponent).toBeTruthy(); }); }); diff --git a/src/test/javascript/spec/component/shared/code-button.component.spec.ts b/src/test/javascript/spec/component/shared/code-button.component.spec.ts index 44ed9b2d26c4..497e334875e6 100644 --- a/src/test/javascript/spec/component/shared/code-button.component.spec.ts +++ b/src/test/javascript/spec/component/shared/code-button.component.spec.ts @@ -65,7 +65,7 @@ describe('CodeButtonComponent', () => { versionControlUrl: 'https://gitlab.ase.in.tum.de/scm/ITCPLEASE1/itcplease1-exercise-team1.git', versionControlAccessToken: true, git: { - branch: 'clone-repo-button', + branch: 'code-button', commit: { id: { abbrev: '95ef2a', diff --git a/src/test/javascript/spec/component/shared/navbar.component.spec.ts b/src/test/javascript/spec/component/shared/navbar.component.spec.ts index 431b06cb0c81..b02e161d1f22 100644 --- a/src/test/javascript/spec/component/shared/navbar.component.spec.ts +++ b/src/test/javascript/spec/component/shared/navbar.component.spec.ts @@ -77,7 +77,7 @@ describe('NavbarComponent', () => { const profileInfo = { git: { - branch: 'clone-repo-button', + branch: 'code-button', commit: { id: { abbrev: '95ef2a', @@ -278,7 +278,7 @@ describe('NavbarComponent', () => { fixture.detectChanges(); expect(component.gitCommitId).toBe('95ef2a'); - expect(component.gitBranchName).toBe('clone-repo-button'); + expect(component.gitBranchName).toBe('code-button'); expect(component.gitTimestamp).toBe('Sun, 20 Nov 2022 20:35:01 GMT'); expect(component.gitUsername).toBe('Max Musterman'); })); diff --git a/src/test/javascript/spec/service/profile.service.spec.ts b/src/test/javascript/spec/service/profile.service.spec.ts index 6305d7ab221b..521a80fe0d30 100644 --- a/src/test/javascript/spec/service/profile.service.spec.ts +++ b/src/test/javascript/spec/service/profile.service.spec.ts @@ -134,7 +134,7 @@ describe('Profile Service', () => { allowedEmailPatternReadable: '@tum.de, @in.tum.de, @mytum.de', activeProfiles: ['prod', 'jenkins', 'gitlab', 'athena', 'openapi', 'apollon'], git: { - branch: 'clone-repo-button', + branch: 'code-button', commit: { id: { abbrev: '95ef2a', @@ -249,7 +249,7 @@ describe('Profile Service', () => { }, ], git: { - branch: 'clone-repo-button', + branch: 'code-button', commit: { id: { abbrev: '95ef2a',