Skip to content

Commit bc3adeb

Browse files
committed
Revert "A couple renames" (only the big one)
This reverts commit 1b6840f.
1 parent 0ecc525 commit bc3adeb

File tree

5 files changed

+8
-9
lines changed

5 files changed

+8
-9
lines changed

src/RealtimeServer/scriptureforge/models/question.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ export interface Question extends ProjectData {
2929
dateArchived?: string;
3030
dateModified: string;
3131
dateCreated: string;
32-
sourceQuestionId?: string;
32+
transceleratorQuestionId?: string;
3333
}

src/RealtimeServer/scriptureforge/services/question-service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ export class QuestionService extends SFProjectDataService<Question> {
187187
dateCreated: {
188188
bsonType: 'string'
189189
},
190-
sourceQuestionId: {
190+
transceleratorQuestionId: {
191191
bsonType: 'string'
192192
}
193193
},

src/SIL.XForge.Scripture/ClientApp/src/app/checking/import-questions-dialog/import-questions-dialog.component.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ describe('ImportQuestionsDialogComponent', () => {
247247
verseNum: 1,
248248
verse: '1-3'
249249
});
250-
expect(question.sourceQuestionId).toBe('2');
250+
expect(question.transceleratorQuestionId).toBe('2');
251251
}));
252252

253253
it('should properly import questions that are on a single verse', fakeAsync(() => {
@@ -891,7 +891,7 @@ class TestEnvironment {
891891
this.existingQuestions.push({
892892
data: {
893893
text: doc.text + ' [before edit]',
894-
sourceQuestionId: doc.id,
894+
transceleratorQuestionId: doc.id,
895895
answers: [] as Answer[],
896896
verseRef: fromVerseRef(new VerseRef(doc.book, doc.startChapter, verse))
897897
} as Question,
@@ -924,7 +924,7 @@ class TestEnvironment {
924924
static createQuestionDocWithSource(sourceId: string, verse: VerseRef, text: string): QuestionDoc {
925925
return {
926926
data: {
927-
sourceQuestionId: sourceId,
927+
transceleratorQuestionId: sourceId,
928928
verseRef: fromVerseRef(verse),
929929
text,
930930
answers: [] as Answer[]

src/SIL.XForge.Scripture/ClientApp/src/app/checking/import-questions-dialog/import-questions-dialog.component.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ export class ImportQuestionsDialogComponent implements OnDestroy {
344344
const sfVersionOfQuestion: QuestionDoc | undefined = questionQuery.docs.find(
345345
doc =>
346346
doc.data != null &&
347-
(useQuestionIds ? doc.data.sourceQuestionId === question.id : doc.data.text === question.text) &&
347+
(useQuestionIds ? doc.data.transceleratorQuestionId === question.id : doc.data.text === question.text) &&
348348
toVerseRef(doc.data.verseRef).equals(question.verseRef)
349349
);
350350

@@ -443,7 +443,7 @@ export class ImportQuestionsDialogComponent implements OnDestroy {
443443
isArchived: false,
444444
dateCreated: currentDate,
445445
dateModified: currentDate,
446-
sourceQuestionId: listItem.question.id
446+
transceleratorQuestionId: listItem.question.id
447447
};
448448
await this.zone.runOutsideAngular(() =>
449449
this.checkingQuestionsService.createQuestion(this.data.projectId, newQuestion, undefined, undefined)
@@ -521,7 +521,6 @@ export class ImportQuestionsDialogComponent implements OnDestroy {
521521
if (this.paratextTagOptions.length > 0) {
522522
this.selectedParatextTagId = this.paratextTagOptions[0].id;
523523
}
524-
throw new Error();
525524
} catch (error) {
526525
console.error('Failed to load notes from Paratext: ', error);
527526
this.paratextNotes = [];

src/SIL.XForge.Scripture/Models/Question.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ public class Question : ProjectData
1515
public DateTime? DateArchived { get; set; }
1616
public DateTime DateModified { get; set; }
1717
public DateTime DateCreated { get; set; }
18-
public string SourceQuestionId { get; set; }
18+
public string TransceleratorQuestionId { get; set; }
1919
}

0 commit comments

Comments
 (0)