+ style="padding: 0.5em 0.25em 0 0.25em;">
{{ 'EXERCISE_GENERATE' | translate }}
{{'TEXT_SELECTION' | translate }}
{{'TEXT_COMPLEXITY' | translate }}
{{'VOCABULARY_CHECK' | translate }}
{{'EXERCISE_PARAMETERS' | translate }}
-
{{ 'CONTINUE' | translate }}
@@ -53,13 +52,12 @@
+ style="padding: 0.5em 0.25em 0 0.25em;">
{{ 'EXERCISE_LIST' | translate }}
{{'EXERCISES_CREATED' | translate }}
{{'EXERCISE_TYPE_CLOZE' | translate }}
{{'EXERCISE_TYPE_MARK_WORDS' | translate }}
{{'EXERCISE_TYPE_MATCHING' | translate }}
-
{{ 'CONTINUE' | translate }}
@@ -70,7 +68,7 @@
+ style="padding: 0.5em 0.25em 0 0.25em;">
{{ 'TEST' | translate }}
{{'TEXT_WORK' | translate }}
@@ -86,8 +84,9 @@
-
+
{{ 'DOCUMENTATION' | translate }}
{{'ABOUT' | translate }}
{{'DOC_SOFTWARE' | translate }}
@@ -101,14 +100,6 @@
-
- {{corpusService.currentCorpus?.title}}
+
+ {{cc.title}}
{{corpusService.currentUrn?.split(":")[corpusService.currentUrn?.split(":").length - 1]}}
@@ -27,7 +27,7 @@
@@ -38,18 +38,17 @@
{{node.annis_tok}}{{ getWhiteSpace(i) }}
+ [class.oov]="node.is_oov">{{node.annis_tok}}{{ getWhiteSpace(i) }}
{{corpusService.currentText}}
-
- {{corpusService.currentCorpus?.title}}
+ {{cc.title}}
@@ -17,163 +17,166 @@
-
-
- {{'TEXT_RANGE' | translate}}
-
-
-
- {{ 'START_OF_TEXT' | translate }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ 'END_OF_TEXT' | translate }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ 'BACK' | translate }}
-
-
- {{ "SHOW_TEXT" | translate }}
-
-
- {{ "EXERCISE_SET_PARAMETERS" | translate }}
-
-
-
+
+
+
+ {{'TEXT_RANGE' | translate}}
+
+
+
+ {{ 'START_OF_TEXT' | translate }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ 'END_OF_TEXT' | translate }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ 'BACK' | translate }}
+
+
+
+ {{ (HelperService.isVocabularyCheck ? "VOCABULARY_CHECK" : "SHOW_TEXT") | translate }}
+
+
+
+ {{ "EXERCISE_SET_PARAMETERS" | translate }}
+
+
+
+
diff --git a/src/app/text-range/text-range.page.ts b/src/app/text-range/text-range.page.ts
index d1f454d48ff89530ca24d776e1f879a4fbdb71dc..31ed2d6edee79080e7996514aed85505bd1ac8bc 100644
--- a/src/app/text-range/text-range.page.ts
+++ b/src/app/text-range/text-range.page.ts
@@ -8,6 +8,10 @@ import {CitationLevel} from 'src/app/models/enum';
import {TranslateService} from '@ngx-translate/core';
import {HelperService} from '../helper.service';
import {CorpusService} from 'src/app/corpus.service';
+import {CorpusMC} from '../models/corpusMC';
+import {BehaviorSubject} from 'rxjs';
+import {take} from 'rxjs/operators';
+import {TextRange} from '../models/textRange';
@Component({
selector: 'app-text-range',
@@ -22,6 +26,10 @@ export class TextRangePage {
public currentInputId = 0;
public citationValuesStart: number[];
public citationValuesEnd: number[];
+ public isInputDisabled: { [isStart: number]: BehaviorSubject } = {
+ 0: new BehaviorSubject(true),
+ 1: new BehaviorSubject(true)
+ };
public isTextRangeCheckRunning = false;
HelperService = HelperService;
@@ -32,23 +40,16 @@ export class TextRangePage {
public helperService: HelperService) {
this.currentlyAvailableCitations = [];
this.corpusService.isTextRangeCorrect = false;
- if (!this.corpusService.currentCorpus) {
- this.corpusService.checkAnnisResponse().then(() => {
- this.corpusService.restoreLastCorpus().then(() => {
- this.addReferences(this.corpusService.currentCorpus.citation_level_1).then(() => {
- this.initPage();
- }, () => {
- });
+ this.corpusService.currentCorpus.pipe(take(1)).subscribe((cc: CorpusMC) => {
+ if (Object.keys(cc.citations).length === 0) {
+ this.addReferences(cc.citation_level_1).then(() => {
+ this.initPage(cc);
+ }, () => {
});
- });
- } else if (Object.keys(this.corpusService.currentCorpus.citations).length === 0) {
- this.addReferences(this.corpusService.currentCorpus.citation_level_1).then(() => {
- this.initPage();
- }, () => {
- });
- } else {
- this.initPage();
- }
+ } else {
+ this.initPage(cc);
+ }
+ });
}
addMissingCitations(citationLabelsStart: string[], citationLabelsEnd: string[]) {
@@ -86,51 +87,59 @@ export class TextRangePage {
return resolve();
}
const urnLastPart: string = relevantCitations.map(x => x.isNumeric ? x.value.toString() : x.label).join('.');
- const fullUrn: string = this.corpusService.currentCorpus.source_urn + (urnLastPart ? ':' + urnLastPart : '');
- this.corpusService.getCTSvalidReff(fullUrn).then((result: string[]) => {
- const newCitations: Citation[] = [];
- const urnList: string[] = result as string[];
- const replaceString: string = fullUrn + (urnLastPart ? '.' : ':');
- urnList.forEach((urn) => {
- const urnModified: string = urn.replace(replaceString, '');
- const isNumeric: boolean = !isNaN(+urnModified);
- newCitations.push(new Citation({
- isNumeric,
- level: targetCitationLevel,
- label: urnModified,
- value: (isNumeric ? +urnModified : newCitations.length + 1)
- }));
- });
- newCitations.forEach((citation) => {
- citation.subcitations = {};
- if (relevantCitations.length === 0) {
- this.corpusService.currentCorpus.citations[citation.label] = citation;
- this.currentlyAvailableCitations.push(citation.label);
- } else if (relevantCitations.length === 1) {
- this.corpusService.currentCorpus.citations[relevantCitations[0].label].subcitations[citation.label] = citation;
- const firstLabel: string = this.corpusService.currentCorpus.citations[relevantCitations[0].label].label;
- this.currentlyAvailableCitations.push(firstLabel.concat('.', citation.label));
- } else if (relevantCitations.length === 2) {
- const rc0Label: string = relevantCitations[0].label;
- const rc1Label: string = relevantCitations[1].label;
- this.corpusService.currentCorpus.citations[rc0Label].subcitations[rc1Label].subcitations[citation.label] = citation;
- const firstLabel: string = this.corpusService.currentCorpus.citations[rc0Label].label;
- const secondLabel: string = this.corpusService.currentCorpus.citations[rc0Label].subcitations[rc1Label].label;
- this.currentlyAvailableCitations.push(firstLabel.concat('.', secondLabel, '.', citation.label));
- }
- return resolve();
+ this.corpusService.currentCorpus.pipe(take(1)).subscribe((cc: CorpusMC) => {
+ const fullUrn: string = cc.source_urn + (urnLastPart ? ':' + urnLastPart : '');
+ this.corpusService.getCTSvalidReff(fullUrn).then((result: string[]) => {
+ const newCitations: Citation[] = [];
+ const urnList: string[] = result as string[];
+ const replaceString: string = fullUrn + (urnLastPart ? '.' : ':');
+ urnList.forEach((urn) => {
+ const urnModified: string = urn.replace(replaceString, '');
+ const isNumeric: boolean = !isNaN(+urnModified);
+ newCitations.push(new Citation({
+ isNumeric,
+ level: targetCitationLevel,
+ label: urnModified,
+ value: (isNumeric ? +urnModified : newCitations.length + 1)
+ }));
+ });
+ newCitations.forEach((citation) => {
+ citation.subcitations = {};
+ if (relevantCitations.length === 0) {
+ cc.citations[citation.label] = citation;
+ this.currentlyAvailableCitations.push(citation.label);
+ } else if (relevantCitations.length === 1) {
+ cc.citations[relevantCitations[0].label].subcitations[citation.label] = citation;
+ const firstLabel: string = cc.citations[relevantCitations[0].label].label;
+ this.currentlyAvailableCitations.push(firstLabel.concat('.', citation.label));
+ } else if (relevantCitations.length === 2) {
+ const rc0Label: string = relevantCitations[0].label;
+ const rc1Label: string = relevantCitations[1].label;
+ cc.citations[rc0Label].subcitations[rc1Label].subcitations[citation.label] = citation;
+ const firstLabel: string = cc.citations[rc0Label].label;
+ const secondLabel: string = cc.citations[rc0Label].subcitations[rc1Label].label;
+ this.currentlyAvailableCitations.push(firstLabel.concat('.', secondLabel, '.', citation.label));
+ }
+ return resolve();
+ });
+ }, async (error: HttpErrorResponse) => {
+ return reject(error);
});
- }, async (error: HttpErrorResponse) => {
- return reject(error);
});
});
}
applyAutoComplete(isStart: boolean) {
this.showFurtherReferences(isStart).then(() => {
- const newId: string = 'input' + (this.currentInputId + 1).toString();
+ const oldId: number = this.currentInputId;
this.currentInputId = 0;
- const newEl: HTMLInputElement = document.getElementById(newId) as HTMLInputElement;
+ let nextIdx = oldId;
+ let newEl: HTMLInputElement = null;
+ while (nextIdx < Math.min(oldId + 4, 6) && !newEl) {
+ nextIdx++;
+ const newId: string = 'input' + nextIdx.toString();
+ newEl = document.getElementById(newId) as HTMLInputElement;
+ }
if (newEl) {
// adjust disabled state manually because the focus won't work otherwise and the automatic check comes too late
newEl.disabled = false;
@@ -139,34 +148,52 @@ export class TextRangePage {
});
}
+ checkInputDisabled(): void {
+ Object.keys(this.isInputDisabled).forEach((isStart: string) => {
+ this.corpusService.currentCorpus.pipe(take(1)).subscribe((cc: CorpusMC) => {
+ this.corpusService.currentTextRange.pipe(take(1)).subscribe((tr: TextRange) => {
+ const baseCits: { [label: string]: Citation } = cc.citations;
+ const ctrPart: string[] = +isStart ? tr.start : tr.end;
+ if (!baseCits.hasOwnProperty(ctrPart[0])) {
+ this.isInputDisabled[+isStart].next(true);
+ } else {
+ this.isInputDisabled[+isStart].next(!baseCits[ctrPart[0]].subcitations.hasOwnProperty(ctrPart[1]));
+ }
+ });
+ });
+ });
+ }
+
checkTextRange(citationLabelsStart: string[], citationLabelsEnd: string[]) {
return new Promise(resolve => {
citationLabelsStart = citationLabelsStart.filter(x => x);
citationLabelsEnd = citationLabelsEnd.filter(x => x);
- if (this.corpusService.currentCorpus.citation_level_2 === CitationLevel[CitationLevel.default]) {
- if (citationLabelsStart.length !== 1 || citationLabelsEnd.length !== 1) {
- return resolve(false);
- }
- } else {
- if (citationLabelsStart.length < 2 || citationLabelsEnd.length < 2) {
- return resolve(false);
+ this.corpusService.currentCorpus.pipe(take(1)).subscribe((cc: CorpusMC) => {
+ if (cc.citation_level_2 === CitationLevel[CitationLevel.default]) {
+ if (citationLabelsStart.length !== 1 || citationLabelsEnd.length !== 1) {
+ return resolve(false);
+ }
} else {
- if (this.corpusService.currentCorpus.citation_level_3 === CitationLevel[CitationLevel.default]) {
- if (citationLabelsStart.length !== 2 || citationLabelsEnd.length !== 2) {
+ if (citationLabelsStart.length < 2 || citationLabelsEnd.length < 2) {
+ return resolve(false);
+ } else {
+ if (cc.citation_level_3 === CitationLevel[CitationLevel.default]) {
+ if (citationLabelsStart.length !== 2 || citationLabelsEnd.length !== 2) {
+ return resolve(false);
+ }
+ } else if (citationLabelsStart.length !== 3 || citationLabelsEnd.length !== 3) {
return resolve(false);
}
- } else if (citationLabelsStart.length !== 3 || citationLabelsEnd.length !== 3) {
- return resolve(false);
}
}
- }
- this.citationValuesEnd = [];
- this.citationValuesStart = [];
- this.addMissingCitations(citationLabelsStart, citationLabelsEnd).then(() => {
- this.compareCitationValues().then((result: boolean) => resolve(result));
- }, () => {
- // if the citation system does not work, we allow the user to choose the correct citations on his own
- return resolve(true);
+ this.citationValuesEnd = [];
+ this.citationValuesStart = [];
+ this.addMissingCitations(citationLabelsStart, citationLabelsEnd).then(() => {
+ this.compareCitationValues().then((result: boolean) => resolve(result));
+ }, () => {
+ // if the citation system does not work, we allow the user to choose the correct citations on his own
+ return resolve(true);
+ });
});
});
}
@@ -208,149 +235,152 @@ export class TextRangePage {
return;
}
this.isTextRangeCheckRunning = true;
- const citationLabelsStart: string[] = this.corpusService.currentTextRange.start;
- const citationLabelsEnd: string[] = this.corpusService.currentTextRange.end;
- this.checkTextRange(citationLabelsStart, citationLabelsEnd).then(async (isTextRangeCorrect: boolean) => {
- this.isTextRangeCheckRunning = false;
- if (!isTextRangeCorrect) {
- const toast = await this.toastCtrl.create({
- message: this.corpusService.invalidTextRangeString,
- duration: 3000,
- position: 'top'
- });
- toast.present().then();
- return;
- }
- const newUrnBase: string = this.corpusService.currentCorpus.source_urn + ':';
- if (this.citationValuesStart.concat(this.citationValuesEnd).some(x => isNaN(x))) {
- this.corpusService.currentUrn = newUrnBase +
- this.corpusService.currentTextRange.start.filter(x => x).join('.') + '-' +
- this.corpusService.currentTextRange.end.filter(x => x).join('.');
- } else {
- this.corpusService.currentUrn = newUrnBase + this.citationValuesStart.join('.') + '-' + this.citationValuesEnd.join('.');
- }
- HelperService.mostRecentSetup = new ApplicationState({
- currentUrn: this.corpusService.currentUrn,
- currentCorpus: this.corpusService.currentCorpus,
- currentTextRange: this.corpusService.currentTextRange
- });
- this.helperService.saveMostRecentSetup().then(() => {
- this.corpusService.isTextRangeCorrect = true;
- this.corpusService.getText().then(() => {
- if (skipText) {
- HelperService.goToExerciseParametersPage(this.navCtrl).then();
- } else if (HelperService.isVocabularyCheck) {
- HelperService.goToVocabularyCheckPage(this.navCtrl).then();
+ this.corpusService.currentTextRange.pipe(take(1)).subscribe((tr: TextRange) => {
+ const citationLabelsStart: string[] = tr.start;
+ const citationLabelsEnd: string[] = tr.end;
+ this.checkTextRange(citationLabelsStart, citationLabelsEnd).then(async (isTextRangeCorrect: boolean) => {
+ this.isTextRangeCheckRunning = false;
+ if (!isTextRangeCorrect) {
+ const toast = await this.toastCtrl.create({
+ message: this.corpusService.invalidTextRangeString,
+ duration: 3000,
+ position: 'top'
+ });
+ toast.present().then();
+ return;
+ }
+ this.corpusService.currentCorpus.pipe(take(1)).subscribe((cc: CorpusMC) => {
+ const newUrnBase: string = cc.source_urn + ':';
+ if (this.citationValuesStart.concat(this.citationValuesEnd).some(x => isNaN(x))) {
+ this.corpusService.currentUrn = newUrnBase + tr.start.filter(x => x).join('.') + '-' +
+ tr.end.filter(x => x).join('.');
} else {
- HelperService.goToShowTextPage(this.navCtrl).then();
+ this.corpusService.currentUrn = newUrnBase + this.citationValuesStart.join('.') + '-' +
+ this.citationValuesEnd.join('.');
}
- }, () => {
+ HelperService.applicationState.pipe(take(1)).subscribe((state: ApplicationState) => {
+ state.currentSetup.currentTextRange = tr;
+ state.currentSetup.currentUrn = this.corpusService.currentUrn;
+ state.mostRecentSetup = state.currentSetup;
+ this.helperService.saveApplicationState(state).then(() => {
+ this.corpusService.isTextRangeCorrect = true;
+ this.corpusService.getText().then(() => {
+ if (skipText) {
+ HelperService.goToExerciseParametersPage(this.navCtrl).then();
+ } else if (HelperService.isVocabularyCheck) {
+ HelperService.goToVocabularyCheckPage(this.navCtrl).then();
+ } else {
+ HelperService.goToShowTextPage(this.navCtrl).then();
+ }
+ }, () => {
+ });
+ });
+ });
});
});
});
}
- initPage() {
- if (this.corpusService.currentCorpus.citation_level_2 === CitationLevel[CitationLevel.default]) {
- const firstKey: string = Object.keys(this.corpusService.currentCorpus.citations)[0];
- const randomLabel: string = this.corpusService.currentCorpus.citations[firstKey].label;
- this.corpusService.currentTextRange.start[0] = this.corpusService.currentTextRange.end[0] = randomLabel;
- }
- }
-
- isInputDisabled(isStart: boolean) {
- if (!this.corpusService.currentCorpus) {
- return true;
- }
- const baseCits: { [label: string]: Citation } = this.corpusService.currentCorpus.citations;
- const ctrPart: string[] = isStart ? this.corpusService.currentTextRange.start : this.corpusService.currentTextRange.end;
- if (!baseCits.hasOwnProperty(ctrPart[0])) {
- return true;
+ initPage(currentCorpus: CorpusMC) {
+ if (currentCorpus.citation_level_2 === CitationLevel[CitationLevel.default]) {
+ const firstKey: string = Object.keys(currentCorpus.citations)[0];
+ const randomLabel: string = currentCorpus.citations[firstKey].label;
+ this.corpusService.currentTextRange.pipe(take(1)).subscribe((tr: TextRange) => {
+ tr.start[0] = tr.end[0] = randomLabel;
+ });
}
- return !baseCits[ctrPart[0]].subcitations.hasOwnProperty(ctrPart[1]);
}
public mapCitationLabelsToValues(label: string, index: number, citationLabels: string[], valueList: number[]) {
return new Promise((resolve, reject) => {
- if (index === 0 && this.corpusService.currentCorpus.citations[label]) {
- valueList.push(this.corpusService.currentCorpus.citations[label].value);
- return resolve();
- } else if (index === 1) {
- if (!this.corpusService.currentCorpus.citations[citationLabels[index - 1]]) {
- if (!!+label) {
- valueList.push(+label);
- return resolve();
- } else {
- return reject();
- }
- }
- if (Object.keys(this.corpusService.currentCorpus.citations[citationLabels[index - 1]].subcitations).length === 0) {
- const relevantCitations: Citation[] = [this.corpusService.currentCorpus.citations[citationLabels[index - 1]]];
- this.addReferences(this.corpusService.currentCorpus.citation_level_2, relevantCitations).then(() => {
- valueList.push(this.corpusService.currentCorpus.citations[citationLabels[index - 1]].subcitations[label].value);
- return resolve();
- }, () => {
- return reject();
- });
- } else {
- valueList.push(this.corpusService.currentCorpus.citations[citationLabels[index - 1]].subcitations[label].value);
+ this.corpusService.currentCorpus.pipe(take(1)).subscribe((cc: CorpusMC) => {
+ if (index === 0 && cc.citations[label]) {
+ valueList.push(cc.citations[label].value);
return resolve();
- }
- } else if (index === 2) {
- if (!this.corpusService.currentCorpus.citations[citationLabels[index - 2]] ||
- !this.corpusService.currentCorpus.citations[citationLabels[index - 2]].subcitations[citationLabels[index - 1]]) {
- if (!!+label) {
- valueList.push(+label);
- return resolve();
+ } else if (index === 1) {
+ if (!cc.citations[citationLabels[index - 1]]) {
+ if (!!+label) {
+ valueList.push(+label);
+ return resolve();
+ } else {
+ return reject();
+ }
+ }
+ if (Object.keys(cc.citations[citationLabels[index - 1]].subcitations).length === 0) {
+ const relevantCitations: Citation[] = [cc.citations[citationLabels[index - 1]]];
+ this.addReferences(cc.citation_level_2, relevantCitations).then(() => {
+ valueList.push(cc.citations[citationLabels[index - 1]].subcitations[label].value);
+ return resolve();
+ }, () => {
+ return reject();
+ });
} else {
- return reject();
+ valueList.push(cc.citations[citationLabels[index - 1]].subcitations[label].value);
+ return resolve();
}
- }
- const citation: Citation = this.corpusService.currentCorpus.citations[citationLabels[index - 2]];
- const subCitation: Citation = citation.subcitations[citationLabels[index - 1]];
- if (Object.keys(subCitation.subcitations).length === 0) {
- this.addReferences(this.corpusService.currentCorpus.citation_level_3, [citation, subCitation]).then(() => {
+ } else if (index === 2) {
+ if (!cc.citations[citationLabels[index - 2]] ||
+ !cc.citations[citationLabels[index - 2]].subcitations[citationLabels[index - 1]]) {
+ if (!!+label) {
+ valueList.push(+label);
+ return resolve();
+ } else {
+ return reject();
+ }
+ }
+ const citation: Citation = cc.citations[citationLabels[index - 2]];
+ const subCitation: Citation = citation.subcitations[citationLabels[index - 1]];
+ if (Object.keys(subCitation.subcitations).length === 0) {
+ this.addReferences(cc.citation_level_3, [citation, subCitation]).then(() => {
+ valueList.push(subCitation.subcitations[label].value);
+ return resolve();
+ }, () => reject());
+ } else {
+ if (!subCitation.subcitations[label]) {
+ return reject();
+ }
valueList.push(subCitation.subcitations[label].value);
return resolve();
- }, () => reject());
- } else {
- valueList.push(subCitation.subcitations[label].value);
+ }
+ } else if (!!+label) {
+ valueList.push(+label);
return resolve();
}
- } else if (!!+label) {
- valueList.push(+label);
- return resolve();
- }
+ });
});
}
resetCitations() {
- switch (this.currentInputId) {
- case 1:
- if (this.corpusService.currentCorpus.citation_level_2 !== CitationLevel[CitationLevel.default]) {
- this.corpusService.currentTextRange.start[1] = '';
- this.corpusService.currentTextRange.start[2] = '';
- }
- break;
- case 2:
- if (this.corpusService.currentCorpus.citation_level_3 !== CitationLevel[CitationLevel.default]) {
- this.corpusService.currentTextRange.start[2] = '';
- }
- break;
- case 4:
- if (this.corpusService.currentCorpus.citation_level_2 !== CitationLevel[CitationLevel.default]) {
- this.corpusService.currentTextRange.end[1] = '';
- this.corpusService.currentTextRange.end[2] = '';
- }
- break;
- case 5:
- if (this.corpusService.currentCorpus.citation_level_3 !== CitationLevel[CitationLevel.default]) {
- this.corpusService.currentTextRange.end[2] = '';
+ this.corpusService.currentCorpus.pipe(take(1)).subscribe((cc: CorpusMC) => {
+ this.corpusService.currentTextRange.pipe(take(1)).subscribe((tr: TextRange) => {
+ switch (this.currentInputId) {
+ case 1:
+ if (cc.citation_level_2 !== CitationLevel[CitationLevel.default]) {
+ tr.start[1] = '';
+ tr.start[2] = '';
+ }
+ break;
+ case 2:
+ if (cc.citation_level_3 !== CitationLevel[CitationLevel.default]) {
+ tr.start[2] = '';
+ }
+ break;
+ case 4:
+ if (cc.citation_level_2 !== CitationLevel[CitationLevel.default]) {
+ tr.end[1] = '';
+ tr.end[2] = '';
+ }
+ break;
+ case 5:
+ if (cc.citation_level_3 !== CitationLevel[CitationLevel.default]) {
+ tr.end[2] = '';
+ }
+ break;
+ default:
+ break;
}
- break;
- default:
- break;
- }
+ });
+ });
}
resetCurrentInputId() {
@@ -364,32 +394,42 @@ export class TextRangePage {
}
async showFurtherReferences(isStart: boolean): Promise {
- const relTextRangePart: string[] = isStart ? this.corpusService.currentTextRange.start : this.corpusService.currentTextRange.end;
- if (!relTextRangePart[0]) {
- return;
- }
- this.resetCitations();
- return new Promise((resolve, reject) => {
- const baseCit: Citation = this.corpusService.currentCorpus.citations[relTextRangePart[0]];
- if (baseCit && (Object.keys(baseCit.subcitations).length ||
- this.corpusService.currentCorpus.citation_level_2 === CitationLevel[CitationLevel.default])) {
- return resolve();
- } else {
- this.addReferences(this.corpusService.currentCorpus.citation_level_2, [baseCit]).then(() => {
- return resolve();
- }, () => {
- return resolve();
- });
- }
- }).then(() => {
- if ([2, 3, 5, 6].indexOf(this.currentInputId) > -1) {
- const baseCit: Citation = this.corpusService.currentCorpus.citations[relTextRangePart[0]];
- const relCit: Citation = baseCit.subcitations[relTextRangePart[1]];
- const hasLvl3: boolean = this.corpusService.currentCorpus.citation_level_3 !== CitationLevel[CitationLevel.default];
- if (relTextRangePart[1] && !(relCit && Object.keys(relCit.subcitations).length) && hasLvl3) {
- this.addReferences(this.corpusService.currentCorpus.citation_level_3, [baseCit, relCit]).then();
+ return new Promise(outerResolve => {
+ this.corpusService.currentTextRange.pipe(take(1)).subscribe((tr: TextRange) => {
+ const relTextRangePart: string[] = isStart ? tr.start : tr.end;
+ this.resetCitations();
+ this.checkInputDisabled();
+ if (!relTextRangePart[0]) {
+ return outerResolve();
}
- }
+ this.corpusService.currentCorpus.pipe(take(1)).subscribe((cc: CorpusMC) => {
+ new Promise(innerResolve => {
+ const baseCit: Citation = cc.citations[relTextRangePart[0]];
+ if (baseCit && (Object.keys(baseCit.subcitations).length ||
+ cc.citation_level_2 === CitationLevel[CitationLevel.default])) {
+ innerResolve();
+ return outerResolve();
+ } else {
+ this.addReferences(cc.citation_level_2, [baseCit]).then(() => {
+ innerResolve();
+ return outerResolve();
+ }, () => {
+ innerResolve();
+ return outerResolve();
+ });
+ }
+ }).then(() => {
+ if ([2, 3, 5, 6].indexOf(this.currentInputId) > -1) {
+ const baseCit: Citation = cc.citations[relTextRangePart[0]];
+ const relCit: Citation = baseCit.subcitations[relTextRangePart[1]];
+ const hasLvl3: boolean = cc.citation_level_3 !== CitationLevel[CitationLevel.default];
+ if (relTextRangePart[1] && !(relCit && Object.keys(relCit.subcitations).length) && hasLvl3) {
+ this.addReferences(cc.citation_level_3, [baseCit, relCit]).then();
+ }
+ }
+ });
+ });
+ });
});
}
}
diff --git a/src/app/vocabulary-check/vocabulary-check.page.html b/src/app/vocabulary-check/vocabulary-check.page.html
index 3acac3e9aa280e0b356c09ea76d9111fbccf4a3e..56ec1f215ef7e875d92d8da690f7e56fc8b54173 100644
--- a/src/app/vocabulary-check/vocabulary-check.page.html
+++ b/src/app/vocabulary-check/vocabulary-check.page.html
@@ -22,8 +22,18 @@
@@ -82,7 +92,7 @@
- {{ 'VOCABULARY_CHECK' | translate }}
+ {{ 'VOCABULARY_CHECK' | translate }}
diff --git a/src/app/vocabulary-check/vocabulary-check.page.scss b/src/app/vocabulary-check/vocabulary-check.page.scss
index bd20da06ec760b8a1ecb32d141938a1ccce49896..17892142ebfc8412ffde3a12855f6c60be7433cd 100644
--- a/src/app/vocabulary-check/vocabulary-check.page.scss
+++ b/src/app/vocabulary-check/vocabulary-check.page.scss
@@ -9,15 +9,3 @@
border-bottom-color: #333333;
cursor: pointer;
}
-
-//label > span:first-of-type {
-// font-weight: bold;
-// padding-right: 1em;
-// word-wrap: break-spaces;
-//}
-//
-//select {
-// max-width: 95%;
-// text-overflow: ellipsis;
-//}
-
diff --git a/src/app/vocabulary-check/vocabulary-check.page.ts b/src/app/vocabulary-check/vocabulary-check.page.ts
index 6b72c8da0a70aacd4d073b2ac548cda941af3900..2df447a5bf5377a9ce77c3d35457349e76d0bb00 100644
--- a/src/app/vocabulary-check/vocabulary-check.page.ts
+++ b/src/app/vocabulary-check/vocabulary-check.page.ts
@@ -1,5 +1,5 @@
import {NavController, ToastController} from '@ionic/angular';
-import {AfterViewInit, Component, OnInit} from '@angular/core';
+import {AfterViewInit, Component} from '@angular/core';
import {VocabularyCorpus, VocabularyCorpusTranslation} from 'src/app/models/enum';
import {VocabularyService} from 'src/app/vocabulary.service';
import {HttpClient, HttpErrorResponse} from '@angular/common/http';
@@ -8,20 +8,22 @@ import {TranslateService} from '@ngx-translate/core';
import {HelperService} from '../helper.service';
import {ExerciseService} from 'src/app/exercise.service';
import {CorpusService} from 'src/app/corpus.service';
+import {CorpusMC} from '../models/corpusMC';
+import {take} from 'rxjs/operators';
+import {TextRange} from '../models/textRange';
@Component({
selector: 'app-vocabulary-check',
templateUrl: './vocabulary-check.page.html',
styleUrls: ['./vocabulary-check.page.scss'],
})
-export class VocabularyCheckPage implements AfterViewInit {
+export class VocabularyCheckPage {
HelperService = HelperService;
invalidSentenceCountString: string;
ObjectKeys = Object.keys;
VocabularyCorpus = VocabularyCorpus;
VocabularyCorpusTranslation = VocabularyCorpusTranslation;
public adaptPassages = true;
- public currentCorpusString: string;
public currentRankingUnits: Sentence[][];
public invalidQueryCorpusString: string;
@@ -36,34 +38,37 @@ export class VocabularyCheckPage implements AfterViewInit {
this.translate.get('INVALID_QUERY_CORPUS').subscribe(value => this.invalidQueryCorpusString = value);
}
- async checkVocabulary() {
- if (this.vocService.desiredSentenceCount < 0 || this.vocService.frequencyUpperBound < 0) {
- const toast = await this.toastCtrl.create({
- message: this.invalidSentenceCountString,
- duration: 3000,
- position: 'top'
- });
- toast.present().then();
- return;
- } else if (!this.corpusService.currentCorpus || this.corpusService.currentTextRange.start.length === 0 ||
- this.corpusService.currentTextRange.end.length === 0 || !this.corpusService.isTextRangeCorrect) {
- const toast = await this.toastCtrl.create({
- message: this.invalidQueryCorpusString,
- duration: 3000,
- position: 'top'
+ checkVocabulary() {
+ this.corpusService.currentCorpus.pipe(take(1)).subscribe(async (cc: CorpusMC) => {
+ this.corpusService.currentTextRange.pipe(take(1)).subscribe(async (tr: TextRange) => {
+ if (this.vocService.desiredSentenceCount < 0 || this.vocService.frequencyUpperBound < 0) {
+ const toast = await this.toastCtrl.create({
+ message: this.invalidSentenceCountString,
+ duration: 3000,
+ position: 'top'
+ });
+ toast.present().then();
+ return;
+ } else if (!cc || tr.start.length === 0 || tr.end.length === 0 || !this.corpusService.isTextRangeCorrect) {
+ const toast = await this.toastCtrl.create({
+ message: this.invalidQueryCorpusString,
+ duration: 3000,
+ position: 'top'
+ });
+ toast.present().then();
+ return;
+ }
+ this.vocService.currentSentences = [];
+ this.currentRankingUnits = [];
+ this.vocService.ranking = [];
+ // remove old sentence boundaries
+ this.corpusService.currentUrn = this.corpusService.currentUrn.split('@')[0];
+ this.vocService.getVocabularyCheck(this.corpusService.currentUrn, false).then((sentences: Sentence[]) => {
+ this.processSentences(sentences);
+ this.navCtrl.navigateForward('/ranking').then();
+ }, async (error: HttpErrorResponse) => {
+ });
});
- toast.present().then();
- return;
- }
- this.vocService.currentSentences = [];
- this.currentRankingUnits = [];
- this.vocService.ranking = [];
- // remove old sentence boundaries
- this.corpusService.currentUrn = this.corpusService.currentUrn.split('@')[0];
- this.vocService.getVocabularyCheck(this.corpusService.currentUrn, false).then((sentences: Sentence[]) => {
- this.processSentences(sentences);
- this.navCtrl.navigateForward('/ranking').then();
- }, async (error: HttpErrorResponse) => {
});
}
@@ -71,14 +76,8 @@ export class VocabularyCheckPage implements AfterViewInit {
this.navCtrl.navigateForward('/author').then();
}
- ngAfterViewInit(): void {
- const timeout: number = this.corpusService.isMostRecentSetupLoaded ? 0 : 200;
- // dirty hack to avoid ExpressionChangedAfterItHasBeenCheckedError
- setTimeout(() => {
- this.currentCorpusString = this.corpusService.currentCorpus.author + ': ' + this.corpusService.currentCorpus.title + ' ' +
- this.corpusService.currentTextRange.start.filter(x => x).join('.') + '-' +
- this.corpusService.currentTextRange.end.filter(x => x).join('.');
- }, timeout);
+ filterArray(array: string[]): string[] {
+ return array.filter(x => x);
}
processSentences(sentences: Sentence[]) {
diff --git a/src/assets/config.json b/src/assets/config.json
index 892df47f4870cd623970f597a67cd61ca113d232..b91a74ee7a6cc9fdf650ab0b8e52b245fa53cead 100644
--- a/src/assets/config.json
+++ b/src/assets/config.json
@@ -17,9 +17,9 @@
"developerMailTo": "mailto:sulzkons@hu-berlin.de",
"frontendExercisePage": "exercise",
"intervalCorporaUpdate": 1209600000,
+ "localStorageKeyApplicationState": "mc/applicationState",
"localStorageKeyCorpora": "mc/corpora",
"localStorageKeyH5P": "mc/h5p",
- "localStorageKeyMostRecentSetup": "mc/mostRecentSetup",
"localStorageKeyUpdateInfo": "mc/updateInfo",
"machinaCallidaBackendUrl": "https://scm.cms.hu-berlin.de/callidus/mc_backend",
"machinaCallidaConceptUrl": "https://www.projekte.hu-berlin.de/de/callidus/machina-callida",
diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
index 4575baf1c73eb2fb07de968860db753aa5f3645e..0f6e154456214a8ca9369de6bcafd95f922f2573 100644
--- a/src/assets/i18n/de.json
+++ b/src/assets/i18n/de.json
@@ -230,6 +230,7 @@
"MACHINA_CALLIDA_FRONTEND": "Machina Callida Frontend",
"MACHINA_CALLIDA_INTRO": "Die entwickelte Software (Open Source-Projekt auf GitLab) unterstützt eine korpusbasierte Wortschatzarbeit in der Lektürephase des Lateinunterrichts. Sie bietet Zugriff auf zahlreiche bekannte und weniger bekannte lateinische Korpora, um für ausgewählte Textstellen Übungen zu generieren. Im Folgenden werden einige wesentliche Entwicklungsschritte nachgezeichnet.",
"MOST_RECENT_SETUP": "Zuletzt genutzte Einstellungen",
+ "NO_ENTRY_FOUND": "Kein Eintrag verfügbar",
"NO_EXERCISES_FOUND": "Keine Übungen gefunden",
"OF": "von",
"PART_OF_SPEECH_ADJECTIVE": "Adjektiv",
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 409c39f19ff4db6c1d2a452abf2d7d6ddd36c380..b542828ca3d7e1a7e5f003a426ce4970d698582a 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -230,6 +230,7 @@
"MACHINA_CALLIDA_FRONTEND": "Machina Callida Frontend",
"MACHINA_CALLIDA_INTRO": "The software (open source project, GitLab) is able to create corpus-based exercises which can be used by beginners and intermediate learners as well as by teachers of Latin. Thus, it provides access to numerous known and lesser known Latin corpora. Some essential steps of development are given below.",
"MOST_RECENT_SETUP": "Most recent settings",
+ "NO_ENTRY_FOUND": "No entry available",
"NO_EXERCISES_FOUND": "No exercises found",
"OF": "of",
"PART_OF_SPEECH_ADJECTIVE": "Adjective",
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index df8beaf5885f9540e0f4b9bfb2580c3bddca7d61..1f3425a2ed0ac04b4f124e61c50a4c673c7794b3 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -29,6 +29,7 @@
input[type=text] {
border-radius: 10px;
border: 0.5px solid darkgrey;
+ padding: 0.2em;
}
ion-back-button {
