From 0369d8942b327be63afbf7a831db516076245007 Mon Sep 17 00:00:00 2001 From: Konstantin Schulz Date: Tue, 26 Nov 2019 11:23:18 +0100 Subject: [PATCH] refactoring for the recent major UI changes --- package.json | 2 +- src/app/app.component.html | 110 +++-- src/app/author-detail/author-detail.page.html | 16 +- src/app/author-detail/author-detail.page.scss | 3 + src/app/author/author.page.html | 17 +- src/app/author/author.page.scss | 2 +- src/app/author/author.page.ts | 5 +- src/app/corpus.service.ts | 4 + src/app/doc-exercises/doc-exercises.page.html | 459 +++++------------- src/app/doc-exercises/doc-exercises.page.ts | 44 +- src/app/doc-software/doc-software.page.html | 252 +++++----- src/app/doc-software/doc-software.page.scss | 3 + src/app/doc-software/doc-software.page.ts | 23 +- src/app/doc-voc-unit/doc-voc-unit.page.html | 242 +++++---- src/app/doc-voc-unit/doc-voc-unit.page.scss | 3 + src/app/doc-voc-unit/doc-voc-unit.page.ts | 27 +- src/app/exercise-list/exercise-list.page.html | 4 +- .../exercise-parameters.page.html | 161 +++--- src/app/home/home.page.html | 4 +- src/app/imprint/imprint.page.html | 254 +++++----- src/app/imprint/imprint.page.scss | 3 + src/app/info/info.page.html | 169 ++++--- src/app/info/info.page.scss | 3 + src/app/info/info.page.ts | 27 +- src/app/kwic/kwic.page.html | 64 +-- src/app/models/applicationState.ts | 2 + src/app/models/exerciseDocumentation.ts | 10 + src/app/preview/preview.page.html | 8 +- src/app/ranking/ranking.page.html | 6 +- src/app/show-text/show-text.page.html | 98 ++-- src/app/text-range/text-range.page.html | 87 ++-- .../vocabulary-check.page.html | 33 +- .../vocabulary-check/vocabulary-check.page.ts | 3 +- src/assets/imgs/callidus_skizze.png | Bin 629493 -> 0 bytes src/assets/imgs/callidus_skizze_klein.png | Bin 0 -> 206203 bytes 35 files changed, 986 insertions(+), 1162 deletions(-) create mode 100644 src/app/models/exerciseDocumentation.ts delete mode 100644 src/assets/imgs/callidus_skizze.png create mode 100644 src/assets/imgs/callidus_skizze_klein.png diff --git a/package.json b/package.json index e47b1b4..7f4e0b3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mc_frontend", - "version": "1.3.9", + "version": "1.4.0", "author": "Ionic Framework", "homepage": "https://ionicframework.com/", "scripts": { diff --git a/src/app/app.component.html b/src/app/app.component.html index 8c3d2c6..341d8be 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -6,52 +6,72 @@ - - - - {{'HOME' | translate}} - - - - - {{ 'EXERCISE_GENERATE' | translate }} - - - - {{ 'EXERCISE_LIST' | translate }} - - - - {{ 'TEST' | translate }} - - - - + + + + + {{'HOME' | translate}} + + + + + + + {{ 'EXERCISE_GENERATE' | translate }} + + + + + + + {{ 'EXERCISE_LIST' | translate }} + + + + + + + {{ 'TEST' | translate }} + + + + + +

{{ 'DOCUMENTATION' | translate }}

- - - - {{ 'ABOUT' | translate }} - - - - {{ 'DOC_SOFTWARE' | translate }} - - - - {{ 'DOC_EXERCISES' | translate }} - - - - {{ 'DOC_VOC_UNIT' | translate }} - - - - - + + + + + {{ 'ABOUT' | translate }} + + + + + + + {{ 'DOC_SOFTWARE' | translate }} + + + + + + + {{ 'DOC_EXERCISES' | translate }} + + + + + + + {{ 'DOC_VOC_UNIT' | translate }} + + + + + + - \ No newline at end of file + diff --git a/src/app/author-detail/author-detail.page.html b/src/app/author-detail/author-detail.page.html index 2fed1ea..765d8de 100644 --- a/src/app/author-detail/author-detail.page.html +++ b/src/app/author-detail/author-detail.page.html @@ -2,15 +2,13 @@ -
- - {{ corpusService.currentAuthor.name }} -
+ + {{ corpusService.currentAuthor?.name }} @@ -21,11 +19,11 @@ - + - + - {{ 'BACK' | translate }} - \ No newline at end of file + {{ 'BACK' | translate }} + diff --git a/src/app/author-detail/author-detail.page.scss b/src/app/author-detail/author-detail.page.scss index e69de29..dbff053 100644 --- a/src/app/author-detail/author-detail.page.scss +++ b/src/app/author-detail/author-detail.page.scss @@ -0,0 +1,3 @@ +button { + color: var(--ion-color-primary-shade); +} diff --git a/src/app/author/author.page.html b/src/app/author/author.page.html index 93f3685..9db8090 100644 --- a/src/app/author/author.page.html +++ b/src/app/author/author.page.html @@ -2,15 +2,13 @@ -
- - {{ 'AUTHOR_SELECT' | translate }} -
+ + {{ 'AUTHOR_SELECT' | translate }} @@ -36,7 +34,7 @@ @@ -46,13 +44,11 @@ - -

{{'AUTHOR' | translate}}

@@ -66,7 +62,6 @@ - - \ No newline at end of file + diff --git a/src/app/author/author.page.scss b/src/app/author/author.page.scss index ce7681e..2fc085d 100644 --- a/src/app/author/author.page.scss +++ b/src/app/author/author.page.scss @@ -1,5 +1,5 @@ .author { - text-align: left; + text-align: center; font-size: 0.9em; } diff --git a/src/app/author/author.page.ts b/src/app/author/author.page.ts index c2780ed..3821fd6 100644 --- a/src/app/author/author.page.ts +++ b/src/app/author/author.page.ts @@ -25,7 +25,8 @@ export class AuthorPage { public translate: TranslateService, public corpusService: CorpusService, public http: HttpClient, - public exerciseService: ExerciseService) { + public exerciseService: ExerciseService, + public helperService: HelperService) { if (!this.corpusService.availableAuthors) { this.corpusService.loadCorporaFromLocalStorage(); } @@ -70,6 +71,8 @@ export class AuthorPage { showCorpora(author: Author) { this.corpusService.currentAuthor = author; + HelperService.mostRecentSetup.currentAuthor = author; + this.helperService.saveMostRecentSetup().then(); this.navCtrl.navigateForward('/author-detail').then(); } diff --git a/src/app/corpus.service.ts b/src/app/corpus.service.ts index 2aaee94..c797c17 100644 --- a/src/app/corpus.service.ts +++ b/src/app/corpus.service.ts @@ -55,6 +55,7 @@ export class CorpusService { instructionsTranslation: '' }); public invalidTextRangeString: string; + public isMostRecentSetupLoaded = false; public isTextRangeCorrect = false; public phenomenonMap: PhenomenonMap = new PhenomenonMap({ case: new PhenomenonMapContent({translationObject: CaseTranslations}), @@ -69,10 +70,12 @@ export class CorpusService { public toastCtrl: ToastController, public helperService: HelperService, ) { + this.isMostRecentSetupLoaded = false; HelperService.waitForConfig().then(() => { this.checkForUpdates().then(() => { this.checkAnnisResponse().then(() => { this.restoreLastCorpus().then(() => { + this.isMostRecentSetupLoaded = true; }, () => { }); }, () => { @@ -121,6 +124,7 @@ export class CorpusService { } this.helperService.loadMostRecentSetup().then(() => { this.annisResponse = HelperService.mostRecentSetup.annisResponse; + this.currentAuthor = HelperService.mostRecentSetup.currentAuthor; this.currentUrn = HelperService.mostRecentSetup.currentUrn; this.currentCorpus = HelperService.mostRecentSetup.currentCorpus; return outerResolve(); diff --git a/src/app/doc-exercises/doc-exercises.page.html b/src/app/doc-exercises/doc-exercises.page.html index e4e5d65..c6a8b59 100644 --- a/src/app/doc-exercises/doc-exercises.page.html +++ b/src/app/doc-exercises/doc-exercises.page.html @@ -1,341 +1,138 @@ - - - -
- - {{ 'DOC_EXERCISES' | translate }} - -
- - - - - + + + +
+ + {{ 'DOC_EXERCISES' | translate }} + +
+ + + + + - - - - -

{{'TEST' | translate}}

- - - - - {{'DOC_EXERCISES_VOC_UNIT_INTRO' | translate}} - - - - -

ID

- - -

{{'DOC_EXERCISES_NAME' | translate}}

- - -

{{'DOC_EXERCISES_TYPE' | translate}}

- - -

{{'DOC_EXERCISES_LEVEL' | translate}}

- - -

{{'DOC_EXERCISES_FUNCTION' | translate}}

- - - - - - 1 - - - {{'DOC_EXERCISES_VOC_UNIT_1' | translate}} - - - {{'DOC_EXERCISES_VOC_UNIT_1_TYPE' | translate}} - - - {{'DOC_EXERCISES_VOC_UNIT_1_LEVEL' | translate}} - - - {{'DOC_EXERCISES_VOC_UNIT_1_FUNCTION' | translate}} - - - - - - 2 - - - {{'DOC_EXERCISES_VOC_UNIT_2' | translate}} - - - {{'DOC_EXERCISES_VOC_UNIT_2_TYPE' | translate}} - - - {{'DOC_EXERCISES_VOC_UNIT_2_LEVEL' | translate}} - - - {{'DOC_EXERCISES_VOC_UNIT_2_FUNCTION' | translate}} - - - - - - 3 - - - {{'DOC_EXERCISES_VOC_UNIT_3' | translate}} - - - {{'DOC_EXERCISES_VOC_UNIT_3_TYPE' | translate}} - - - {{'DOC_EXERCISES_VOC_UNIT_3_LEVEL' | translate}} - - - {{'DOC_EXERCISES_VOC_UNIT_3_FUNCTION' | translate}} - - - - - - 4 - - - {{'DOC_EXERCISES_VOC_UNIT_4' | translate}} - - - {{'DOC_EXERCISES_VOC_UNIT_4_TYPE' | translate}} - - - {{'DOC_EXERCISES_VOC_UNIT_4_LEVEL' | translate}} - - - {{'DOC_EXERCISES_VOC_UNIT_4_FUNCTION' | translate}} - - - - - - 5 - - - {{'DOC_EXERCISES_VOC_UNIT_5' | translate}} - - - {{'DOC_EXERCISES_VOC_UNIT_5_TYPE' | translate}} - - - {{'DOC_EXERCISES_VOC_UNIT_5_LEVEL' | translate}} - - - {{'DOC_EXERCISES_VOC_UNIT_5_FUNCTION' | translate}} - - - - - - 6 - - - {{'DOC_EXERCISES_VOC_UNIT_6' | translate}} - - - {{'DOC_EXERCISES_VOC_UNIT_6_TYPE' | translate}} - - - {{'DOC_EXERCISES_VOC_UNIT_6_LEVEL' | translate}} - - - {{'DOC_EXERCISES_VOC_UNIT_6_FUNCTION' | translate}} - - - - - - 7 - - - {{'DOC_EXERCISES_VOC_UNIT_7' | translate}} - - - {{'DOC_EXERCISES_VOC_UNIT_7_TYPE' | translate}} - - - {{'DOC_EXERCISES_VOC_UNIT_7_LEVEL' | translate}} - - - {{'DOC_EXERCISES_VOC_UNIT_7_FUNCTION' | translate}} - - - - - - 8 - - - {{'DOC_EXERCISES_VOC_UNIT_8' | translate}} - - - {{'DOC_EXERCISES_VOC_UNIT_8_TYPE' | translate}} - - - {{'DOC_EXERCISES_VOC_UNIT_8_LEVEL' | translate}} - - - {{'DOC_EXERCISES_VOC_UNIT_8_FUNCTION' | translate}} - - - - - - 9 - - - {{'DOC_EXERCISES_VOC_UNIT_9' | translate}} - - - {{'DOC_EXERCISES_VOC_UNIT_9_TYPE' | translate}} - - - {{'DOC_EXERCISES_VOC_UNIT_9_LEVEL' | translate}} - - - {{'DOC_EXERCISES_VOC_UNIT_9_FUNCTION' | translate}} - - - - - - 10 - - - {{'DOC_EXERCISES_VOC_UNIT_10' | translate}} - - - {{'DOC_EXERCISES_VOC_UNIT_10_TYPE' | translate}} - - - {{'DOC_EXERCISES_VOC_UNIT_10_LEVEL' | translate}} - - - {{'DOC_EXERCISES_VOC_UNIT_10_FUNCTION' | translate}} - - - - -
-
- - - - -

{{'EXERCISE_GENERATE' | translate}}

- - - - -

ID

- - -

{{'DOC_EXERCISES_NAME' | translate}}

- - -

{{'DOC_EXERCISES_TYPE' | translate}}

- - -

{{'DOC_EXERCISES_LEVEL' | translate}}

- - -

{{'DOC_EXERCISES_FUNCTION' | translate}}

- - - - - - 1 - - - {{'DOC_EXERCISES_GEN_1' | translate}} - - - {{'DOC_EXERCISES_GEN_1_TYPE' | translate}} - - - {{'DOC_EXERCISES_GEN_1_LEVEL' | translate}} - - - {{'DOC_EXERCISES_GEN_1_FUNCTION' | translate}} - - - - - 2 - - - {{'DOC_EXERCISES_GEN_2' | translate}} - - - {{'DOC_EXERCISES_GEN_2_TYPE' | translate}} - - - {{'DOC_EXERCISES_GEN_2_LEVEL' | translate}} - - - {{'DOC_EXERCISES_GEN_2_FUNCTION' | translate}} - - - - - 3 - - - {{'DOC_EXERCISES_GEN_3' | translate}} - - - {{'DOC_EXERCISES_GEN_3_TYPE' | translate}} - - - {{'DOC_EXERCISES_GEN_3_LEVEL' | translate}} - - - {{'DOC_EXERCISES_GEN_3_FUNCTION' | translate}} - - - -
- - + + + +

{{'TEST' | translate}}

+ + + + + {{'DOC_EXERCISES_VOC_UNIT_INTRO' | translate}} + + + + +

ID

+ + +

{{'DOC_EXERCISES_NAME' | translate}}

+ + +

{{'DOC_EXERCISES_TYPE' | translate}}

+ + +

{{'DOC_EXERCISES_LEVEL' | translate}}

+ + +

{{'DOC_EXERCISES_FUNCTION' | translate}}

+ + + + + {{i + 1}} + + {{ vud.name | translate}} + + + {{ vud.type | translate}} + + + {{ vud.level | translate}} + + + {{ vud.function | translate}} + + + +
+
+ + + +

{{'EXERCISE_GENERATE' | translate}}

+ + + + +

ID

+ + +

{{'DOC_EXERCISES_NAME' | translate}}

+ + +

{{'DOC_EXERCISES_TYPE' | translate}}

+ + +

{{'DOC_EXERCISES_LEVEL' | translate}}

+ + +

{{'DOC_EXERCISES_FUNCTION' | translate}}

+ + + + + {{i + 1}} + + {{ egd.name | translate}} + + + {{ egd.type | translate}} + + + {{ egd.level | translate}} + + + {{ egd.function | translate}} + + + +
+ + - - - - - {{ 'ABOUT' | translate }} - - - - {{ 'DOC_SOFTWARE' | translate}} - - - - {{'DOC_VOC_UNIT' | translate}} - - - - {{ 'IMPRINT' | translate }} - - - + + + + + {{ 'ABOUT' | translate }} + + + + {{ 'DOC_SOFTWARE' | translate}} + + + + {{'DOC_VOC_UNIT' | translate}} + + + + {{ 'IMPRINT' | translate }} + + + - \ No newline at end of file + diff --git a/src/app/doc-exercises/doc-exercises.page.ts b/src/app/doc-exercises/doc-exercises.page.ts index 9087120..114b26b 100644 --- a/src/app/doc-exercises/doc-exercises.page.ts +++ b/src/app/doc-exercises/doc-exercises.page.ts @@ -1,24 +1,42 @@ -import { Component, OnInit } from '@angular/core'; +import {Component, OnInit} from '@angular/core'; import {HelperService} from 'src/app/helper.service'; import {NavController} from '@ionic/angular'; import {HttpClient} from '@angular/common/http'; import {TranslateService} from '@ngx-translate/core'; +import {ExerciseDocumentation} from 'src/app/models/exerciseDocumentation'; @Component({ - selector: 'app-doc-exercises', - templateUrl: './doc-exercises.page.html', - styleUrls: ['./doc-exercises.page.scss'], + selector: 'app-doc-exercises', + templateUrl: './doc-exercises.page.html', + styleUrls: ['./doc-exercises.page.scss'], }) -export class DocExercisesPage { - HelperService = HelperService; +export class DocExercisesPage implements OnInit { + exerciseGenDocs: ExerciseDocumentation[] = []; + HelperService = HelperService; + vocUnitDocs: ExerciseDocumentation[] = []; - constructor(public navCtrl: NavController, - public http: HttpClient, - public translate: TranslateService) { } - - goToHomePage() { - this.navCtrl.navigateForward('/home').then(); - } + constructor(public navCtrl: NavController, + public http: HttpClient, + public translate: TranslateService) { + } + ngOnInit(): void { + [...Array(10).keys()].forEach((i: number) => { + this.vocUnitDocs.push(new ExerciseDocumentation({ + name: `DOC_EXERCISES_VOC_UNIT_${i + 1}`, + function: `DOC_EXERCISES_VOC_UNIT_${i + 1}_FUNCTION`, + level: `DOC_EXERCISES_VOC_UNIT_${i + 1}_LEVEL`, + type: `DOC_EXERCISES_VOC_UNIT_${i + 1}_TYPE` + })); + }); + [...Array(3).keys()].forEach((i: number) => { + this.exerciseGenDocs.push(new ExerciseDocumentation({ + name: `DOC_EXERCISES_GEN_${i + 1}`, + function: `DOC_EXERCISES_GEN_${i + 1}_FUNCTION`, + level: `DOC_EXERCISES_GEN_${i + 1}_LEVEL`, + type: `DOC_EXERCISES_GEN_${i + 1}_TYPE` + })); + }); + } } diff --git a/src/app/doc-software/doc-software.page.html b/src/app/doc-software/doc-software.page.html index dbc7d2b..3abaa3b 100644 --- a/src/app/doc-software/doc-software.page.html +++ b/src/app/doc-software/doc-software.page.html @@ -1,147 +1,121 @@ - - - -
+ + + + - {{ 'DOC_SOFTWARE' | translate }} - -
- - - - - + {{ 'DOC_SOFTWARE' | translate }} + + + + - -

{{'MACHINA_CALLIDA' | translate}}

- - {{'MACHINA_CALLIDA_INTRO' | translate}}
- -
-

{{'DOC_SOFTWARE_DEV_TITLE' | translate}}

-
    -
  1. - {{'DOC_SOFTWARE_DEV_1' | translate}}
    Skizze, wie die Software-Architektur aussehen soll -
    2. -
  2. - {{'DOC_SOFTWARE_DEV_2' | translate}} -
    3. -
  3. - {{'DOC_SOFTWARE_DEV_3' | translate}} -
    4. -
  4. - {{'DOC_SOFTWARE_DEV_4' | translate}} -
    5. -
  5. - {{'DOC_SOFTWARE_DEV_5' | translate}} -
    6. -
  6. - {{'DOC_SOFTWARE_DEV_6' | translate}} -
    7. -
  7. - {{'DOC_SOFTWARE_DEV_7' | translate}} -
    8. -
  8. - {{'DOC_SOFTWARE_DEV_8' | translate}} -
    9. -
  9. - {{'DOC_SOFTWARE_DEV_9' | translate}} -
    10. -
  10. - {{'DOC_SOFTWARE_DEV_10' | translate}} -
    11. -
  11. - {{'DOC_SOFTWARE_DEV_11' | translate}} -
    12. -
  12. - {{'DOC_SOFTWARE_DEV_12' | translate}} -
    13. -
  13. - {{'DOC_SOFTWARE_DEV_13' | translate}} -
    14. -
  14. - {{'DOC_SOFTWARE_DEV_14' | translate}} -
    15. -
- -

Software dependencies

-
    -
  • - Ancient Greek and Latin Dependency Treebank (AGLDT): The Ancient Greek and Latin Dependency Treebank (AGLDT) is - the earliest treebank for Ancient Greek - and Latin, called Perseus. -
    • -
  • - PROIEL Treebank: The PROIEL Treebank - is a treebank of ancient Indo-European languages, - including Latin and Ancient Greek. It uses a refined version of dependency grammar and - is available under a Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International. -
    • -
  • - ANNIS: ANNIS, - which stands for Annotation of Information Structure, is an open source, - versatile web browser-based search and visualization architecture for complex multilevel - linguistic corpora with diverse types of annotation. -
    • -
  • - CoNLL-U Viewer -
    • -
  • - Bamberger Wortschatz: The underlying reading corpus was determined by a detailed analysis of the current curricula - and a comparison of the most important text editions. It contains the full range of texts and authors read at - intermediate level. They are given in the epilogue together with the text passages recorded. The total volume of - the corpus examined is considerable, with over 140,000 word forms: after deduction of the references to names, - 7,154 lemmas, i.e. potential learning words. This makes the result all the more surprising and pleasing: with 1248 - vocabulary, the a good 83% of this text corpus can be captured. The detailed studies and preliminary work for the - new generation of word-studies were carried out within the framework of a didactic project sponsored by the - publishing house - under the title Bamberger Wortschatz - (ADEO-Basiswortschatz)is taking place. -
    • -
- -
- + + +

{{'MACHINA_CALLIDA' | translate}}

+ + + {{'MACHINA_CALLIDA_INTRO' | translate}} + + + + + +

{{'DOC_SOFTWARE_DEV_TITLE' | translate}}

+ + +
    +
  1. + {{'DOC_SOFTWARE_DEV_1' | translate}}
    Skizze, wie die Software-Architektur aussehen soll +
    2. +
  2. {{'DOC_SOFTWARE_DEV_' + (i + 2).toString() | translate}}
    3. +
+ + +

Software dependencies

+ + + Ancient Greek and Latin Dependency Treebank (AGLDT): The Ancient Greek and Latin Dependency + Treebank + (AGLDT) + is the earliest treebank for Ancient Greek and Latin, called Perseus. + + + + + PROIEL Treebank: The PROIEL Treebank is a + treebank of ancient Indo-European languages, including Latin and Ancient Greek. It uses a refined + version of dependency grammar and is available under a Creative Commons + Attribution-NonCommercial-ShareAlike + 4.0 International. + + + + ANNIS: ANNIS, + which stands for Annotation of Information Structure, is an open source, + versatile web browser-based search and visualization architecture for complex multilevel + linguistic corpora with diverse types of annotation. + + + + + CoNLL-U Viewer + + + + Bamberger Wortschatz: The underlying reading corpus was determined by a detailed analysis of the + current curricula and a comparison of the most important text editions. It contains the full range of + texts and authors read at intermediate level. They are given in the epilogue together with the text + passages recorded. The total volume of the corpus examined is considerable, with over 140,000 word + forms: after deduction of the references to names, 7,154 lemmas, i.e. potential learning words. This + makes the result all the more surprising and pleasing: with 1248 vocabulary, a good 83% of this text + corpus can be captured. The detailed studies and preliminary work for the new generation of word studies + were carried out within the framework of a didactic project sponsored by the publishing house under the + title Bamberger Wortschatz (ADEO-Basiswortschatz). + + + - - - - - - {{ 'ABOUT' | translate }} - - - - {{'DOC_EXERCISES' | translate}} - - - - {{'DOC_VOC_UNIT' | translate}} - - - - {{ 'IMPRINT' | translate }} - - - - - \ No newline at end of file + + + + + + {{ 'ABOUT' | translate }} + + + + {{'DOC_EXERCISES' | translate}} + + + + {{'DOC_VOC_UNIT' | translate}} + + + + {{ 'IMPRINT' | translate }} + + + + + diff --git a/src/app/doc-software/doc-software.page.scss b/src/app/doc-software/doc-software.page.scss index e69de29..e08b1ad 100644 --- a/src/app/doc-software/doc-software.page.scss +++ b/src/app/doc-software/doc-software.page.scss @@ -0,0 +1,3 @@ +ion-grid { + text-align: left; +} diff --git a/src/app/doc-software/doc-software.page.ts b/src/app/doc-software/doc-software.page.ts index d7a501f..46b80b4 100644 --- a/src/app/doc-software/doc-software.page.ts +++ b/src/app/doc-software/doc-software.page.ts @@ -1,24 +1,21 @@ -import { Component, OnInit } from '@angular/core'; +import {Component, OnInit} from '@angular/core'; import {HelperService} from 'src/app/helper.service'; import {NavController} from '@ionic/angular'; import {HttpClient} from '@angular/common/http'; import {TranslateService} from '@ngx-translate/core'; @Component({ - selector: 'app-doc-software', - templateUrl: './doc-software.page.html', - styleUrls: ['./doc-software.page.scss'], + selector: 'app-doc-software', + templateUrl: './doc-software.page.html', + styleUrls: ['./doc-software.page.scss'], }) export class DocSoftwarePage { - HelperService = HelperService; - - constructor(public navCtrl: NavController, - public http: HttpClient, - public translate: TranslateService) { } - - goToHomePage() { - this.navCtrl.navigateForward('/home').then(); - } + devIndices: number[] = [...Array(13).keys()]; + HelperService = HelperService; + constructor(public navCtrl: NavController, + public http: HttpClient, + public translate: TranslateService) { + } } diff --git a/src/app/doc-voc-unit/doc-voc-unit.page.html b/src/app/doc-voc-unit/doc-voc-unit.page.html index 280417c..f05b905 100644 --- a/src/app/doc-voc-unit/doc-voc-unit.page.html +++ b/src/app/doc-voc-unit/doc-voc-unit.page.html @@ -1,141 +1,115 @@ - - - -
- - {{ 'DOC_VOC_UNIT' | translate }} - -
- - - - - + + + +
+ + {{ 'DOC_VOC_UNIT' | translate }} + +
+ + + + + -

{{'DOC_VOC_UNIT_HYP_TITLE' | translate}}

-
    -
  • - {{'DOC_VOC_UNIT_HYP_1' | translate}} -
    • -
  • - {{'DOC_VOC_UNIT_HYP_2' | translate}} -
    • -
  • - {{'DOC_VOC_UNIT_HYP_3' | translate}} -
    • -
  • - {{'DOC_VOC_UNIT_HYP_4' | translate}} -
    • -
  • - {{'DOC_VOC_UNIT_HYP_5' | translate}} -
    • -
-

{{'DOC_VOC_UNIT_RQ_TITLE' | translate}}

-
    -
  1. - {{'DOC_VOC_UNIT_RQ_1' | translate}} -
    2. -
  2. - {{'DOC_VOC_UNIT_RQ_2' | translate}} -
    3. -
  3. - {{'DOC_VOC_UNIT_RQ_3' | translate}} -
    4. -
  4. - {{'DOC_VOC_UNIT_RQ_4' | translate}} -
    5. -
  5. - {{'DOC_VOC_UNIT_RQ_5' | translate}} -
    6. -
  6. - {{'DOC_VOC_UNIT_RQ_6' | translate}} -
    7. -
  7. - {{'DOC_VOC_UNIT_RQ_7' | translate}} -
    8. -
  8. - {{'DOC_VOC_UNIT_RQ_8' | translate}} -
    9. -
  9. - {{'DOC_VOC_UNIT_RQ_9' | translate}} -
    10. -
  10. - {{'DOC_VOC_UNIT_RQ_10' | translate}} -
    11. -
-

{{'DOC_VOC_UNIT_ST_TITLE' | translate}}

- - {{'DOC_VOC_UNIT_ST_TEXT_SELECTION' | translate}}
- {{'DOC_VOC_UNIT_ST_TEXT_SELECTION_JUSTIFICATION' | translate}}
- {{'DOC_VOC_UNIT_ST_VOC_SELECTION_GENERAL' | translate}}
- {{'DOC_VOC_UNIT_ST_VOC_SELECTION_SPECIAL' | translate}}
-
-

{{'DOC_VOC_UNIT_ST_SEQ_TITLE' | translate}}

-
    -
  1. - {{'DOC_VOC_UNIT_ST_SEQ_1' | translate}} -
    2. -
  2. - {{'DOC_VOC_UNIT_ST_SEQ_2' | translate}} -
    3. -
  3. - {{'DOC_VOC_UNIT_ST_SEQ_3' | translate}} -
    4. -
  4. - {{'DOC_VOC_UNIT_ST_SEQ_4' | translate}} -
    5. -
  5. - {{'DOC_VOC_UNIT_ST_SEQ_5' | translate}} -
    6. -
  6. - {{'DOC_VOC_UNIT_ST_SEQ_6' | translate}} -
    7. -
-
- {{'DOC_VOC_UNIT_ST_SEQ_JUSTIFICATION' | translate}} -
-
-

{{'DOC_VOC_UNIT_ST_EX_TYPES_TITLE' | translate}}

- {{'DOC_VOC_UNIT_ST_EX_TYPES_TEXT' | translate}}
-
-

{{'DOC_VOC_UNIT_ST_REAL_TITLE' | translate}}

- {{'DOC_VOC_UNIT_ST_REAL_TEXT' | translate}}
-
-

{{'DOC_VOC_UNIT_ST_EVA_TITLE' | translate}}

- {{'DOC_VOC_UNIT_ST_EVA_TEXT' | translate}}
-
- - + + +

{{'DOC_VOC_UNIT_HYP_TITLE' | translate}}

+ + +
    +
  • + {{ 'DOC_VOC_UNIT_HYP_' + (i + 1).toString() | translate }} +
    • +
+ + +

{{'DOC_VOC_UNIT_RQ_TITLE' | translate}}

+ + +
    +
  1. + {{ 'DOC_VOC_UNIT_RQ_' + (i + 1).toString() | translate }} +
    2. +
+ + +

{{'DOC_VOC_UNIT_ST_TITLE' | translate}}

+ + + {{'DOC_VOC_UNIT_ST_TEXT_SELECTION' | translate}} + + + {{'DOC_VOC_UNIT_ST_TEXT_SELECTION_JUSTIFICATION' | translate}} + + + {{'DOC_VOC_UNIT_ST_VOC_SELECTION_GENERAL' | translate}} + + + {{'DOC_VOC_UNIT_ST_VOC_SELECTION_SPECIAL' | translate}} + + +

{{'DOC_VOC_UNIT_ST_SEQ_TITLE' | translate}}

+ + +
    +
  1. + {{ 'DOC_VOC_UNIT_ST_SEQ_' + (i + 1).toString() | translate }} +
    2. +
+ + + {{'DOC_VOC_UNIT_ST_SEQ_JUSTIFICATION' | translate}} + + +

{{'DOC_VOC_UNIT_ST_EX_TYPES_TITLE' | translate}}

+ + + {{'DOC_VOC_UNIT_ST_EX_TYPES_TEXT' | translate}} + + +

{{'DOC_VOC_UNIT_ST_REAL_TITLE' | translate}}

+ + + {{'DOC_VOC_UNIT_ST_REAL_TEXT' | translate}} + + +

{{'DOC_VOC_UNIT_ST_EVA_TITLE' | translate}}

+ + + {{'DOC_VOC_UNIT_ST_EVA_TEXT' | translate}}
+ + - - - - - - {{ 'ABOUT' | translate }} - - - - {{ 'DOC_SOFTWARE' | translate}} - - - - {{'DOC_EXERCISES' | translate}} - - - - {{ 'IMPRINT' | translate }} - - - - - \ No newline at end of file + + + + + + {{ 'ABOUT' | translate }} + + + + {{ 'DOC_SOFTWARE' | translate}} + + + + {{'DOC_EXERCISES' | translate}} + + + + {{ 'IMPRINT' | translate }} + + + + + diff --git a/src/app/doc-voc-unit/doc-voc-unit.page.scss b/src/app/doc-voc-unit/doc-voc-unit.page.scss index e69de29..e08b1ad 100644 --- a/src/app/doc-voc-unit/doc-voc-unit.page.scss +++ b/src/app/doc-voc-unit/doc-voc-unit.page.scss @@ -0,0 +1,3 @@ +ion-grid { + text-align: left; +} diff --git a/src/app/doc-voc-unit/doc-voc-unit.page.ts b/src/app/doc-voc-unit/doc-voc-unit.page.ts index 62f2bc3..c106c30 100644 --- a/src/app/doc-voc-unit/doc-voc-unit.page.ts +++ b/src/app/doc-voc-unit/doc-voc-unit.page.ts @@ -1,24 +1,23 @@ -import { Component, OnInit } from '@angular/core'; +import {Component, OnInit} from '@angular/core'; import {HelperService} from 'src/app/helper.service'; import {NavController} from '@ionic/angular'; import {HttpClient} from '@angular/common/http'; import {TranslateService} from '@ngx-translate/core'; @Component({ - selector: 'app-doc-voc-unit', - templateUrl: './doc-voc-unit.page.html', - styleUrls: ['./doc-voc-unit.page.scss'], + selector: 'app-doc-voc-unit', + templateUrl: './doc-voc-unit.page.html', + styleUrls: ['./doc-voc-unit.page.scss'], }) export class DocVocUnitPage { - HelperService = HelperService; + HelperService = HelperService; + hypothesisIndices: number[] = [...Array(5).keys()]; + questionsIndices: number[] = [...Array(10).keys()]; + sequenceIndices: number[] = [...Array(6).keys()]; - constructor(public navCtrl: NavController, - public http: HttpClient, - public translate: TranslateService) { } - - goToHomePage() { - this.navCtrl.navigateForward('/home').then(); - } - -} \ No newline at end of file + constructor(public navCtrl: NavController, + public http: HttpClient, + public translate: TranslateService) { + } +} diff --git a/src/app/exercise-list/exercise-list.page.html b/src/app/exercise-list/exercise-list.page.html index 9aff081..85d9f8c 100644 --- a/src/app/exercise-list/exercise-list.page.html +++ b/src/app/exercise-list/exercise-list.page.html @@ -2,7 +2,7 @@ @@ -178,4 +178,4 @@

{{ 'NO_EXERCISES_FOUND' | translate }}

- \ No newline at end of file + diff --git a/src/app/exercise-parameters/exercise-parameters.page.html b/src/app/exercise-parameters/exercise-parameters.page.html index 04ab713..3a6539b 100644 --- a/src/app/exercise-parameters/exercise-parameters.page.html +++ b/src/app/exercise-parameters/exercise-parameters.page.html @@ -8,16 +8,13 @@ -
- - {{ 'EXERCISE_PARAMETERS' | translate }} - -
+ + {{ 'EXERCISE_PARAMETERS' | translate }} @@ -33,7 +30,7 @@ @@ -92,59 +89,83 @@ - - - - - - - - -
-

- {{ 'INSTRUCTIONS' | translate }} - + {{ 'EXERCISE_FEEDBACK' | translate }}

-
-
-
- -
-
- {{ 'EXERCISE_FEEDBACK' | translate }}:
- -
- -
- -
- -
- - - + + + +
+

+ {{ 'INSTRUCTIONS' | translate }} + + {{ 'EXERCISE_FEEDBACK' | translate }}

+
+ + + + + + + + + + + + + {{ 'EXERCISE_FEEDBACK' | translate }}: + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ 'PREVIEW' | translate }} @@ -152,8 +173,8 @@ - {{ 'BACK' | translate }} + {{ 'BACK' | translate }} - \ No newline at end of file + diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html index ef8f58c..0c6c270 100644 --- a/src/app/home/home.page.html +++ b/src/app/home/home.page.html @@ -86,7 +86,7 @@
- Skizze, wie die Software-Architektur aussehen soll

{{ 'DOCUMENTATION' | translate }}

{{'ABOUT' | translate }}
@@ -131,4 +131,4 @@ - \ No newline at end of file + diff --git a/src/app/imprint/imprint.page.html b/src/app/imprint/imprint.page.html index 2cbcba0..078f931 100644 --- a/src/app/imprint/imprint.page.html +++ b/src/app/imprint/imprint.page.html @@ -1,138 +1,134 @@ - -

-
- - {{ 'IMPRINT' | translate }} - -
- - - - + + +
+ + {{ 'IMPRINT' | translate }} + +
+ + + + - + - - - Angaben gemäß §5 TMG: - - - Humboldt-Universität zu Berlin
- Institut für deutsche Sprache und Linguistik
- Sprach- und literaturwissenschaftliche Fakultät
- Herr Konstantin Schulz
- Dorotheenstraße 24
- 10099 Berlin
- Tel.: +49 (30) 2093-9720
- E-Mail: sulzkons@hu-berlin.de
- Website: CALLIDUS-Projekt
- Unter Mitarbeit von:
- Frau Dr. Andrea Beyer (Layout und Texte)
- Institut für Klassische Philologie
- Unter den Linden 6
- 10099 Berlin
- - - - - Haftung für Inhalte - - - Als Diensteanbieter sind wir gemäß § 7 Abs.1 TMG für eigene Inhalte auf diesen Seiten - nach den allgemeinen Gesetzen verantwortlich. Nach §§ 8 bis 10 TMG sind wir als Diensteanbieter - jedoch nicht verpflichtet, übermittelte oder gespeicherte fremde Informationen zu überwachen - oder nach Umständen zu forschen, die auf eine rechtswidrige Tätigkeit hinweisen.
- Verpflichtungen zur Entfernung oder Sperrung der Nutzung von Informationen nach den allgemeinen - Gesetzen bleiben hiervon unberührt. Eine diesbezügliche Haftung ist jedoch erst ab dem Zeitpunkt - der Kenntnis einer konkreten Rechtsverletzung möglich. Bei Bekanntwerden von entsprechenden - Rechtsverletzungen werden wir diese Inhalte umgehend entfernen. - - - - - Haftung für Links - - - Unser Angebot enthält Links zu externen Webseiten Dritter, auf deren Inhalte wir keinen - Einfluss haben. Deshalb können wir für diese fremden Inhalte auch keine Gewähr übernehmen. - Für die Inhalte der verlinkten Seiten ist stets der jeweilige Anbieter oder Betreiber der - Seiten verantwortlich. Die verlinkten Seiten wurden zum Zeitpunkt der Verlinkung auf mögliche - Rechtsverstöße überprüft. Rechtswidrige Inhalte waren zum Zeitpunkt der Verlinkung nicht - erkennbar.
- Eine permanente inhaltliche Kontrolle der verlinkten Seiten ist jedoch ohne konkrete - Anhaltspunkte einer Rechtsverletzung nicht zumutbar. Bei Bekanntwerden von Rechtsverletzungen - werden wir derartige Links umgehend entfernen. - - - - - Urheberrecht - - - Die durch die Seitenbetreiber erstellten Inhalte und Werke auf diesen Seiten unterliegen - dem deutschen Urheberrecht. Die Vervielfältigung, Bearbeitung, Verbreitung und jede Art - der Verwertung außerhalb der Grenzen des Urheberrechtes bedürfen der schriftlichen - Zustimmung des jeweiligen Autors bzw. Erstellers. Downloads und Kopien dieser Seite - sind nur für den privaten, nicht kommerziellen Gebrauch gestattet.
- Soweit die Inhalte auf dieser Seite nicht vom Betreiber erstellt wurden, werden die - Urheberrechte Dritter beachtet. Insbesondere werden Inhalte Dritter als solche gekennzeichnet. - Sollten Sie trotzdem auf eine Urheberrechtsverletzung aufmerksam werden, bitten wir um - einen entsprechenden Hinweis. Bei Bekanntwerden von Rechtsverletzungen werden wir derartige - Inhalte umgehend entfernen.
- - - - -

Copyright Favicon / Logo

- - - - - - - -
Icon made by Freepik -
- from www.flaticon.com - is licensed by CC 3.0 BY
-
- - - - - + + + Angaben gemäß §5 TMG: + + + Humboldt-Universität zu Berlin
+ Institut für deutsche Sprache und Linguistik
+ Sprach- und literaturwissenschaftliche Fakultät
+ Herr Konstantin Schulz
+ Dorotheenstraße 24
+ 10099 Berlin
+ Tel.: +49 (30) 2093-9720
+ E-Mail: sulzkons@hu-berlin.de
+ Website: CALLIDUS-Projekt
+ Unter Mitarbeit von:
+ Frau Dr. Andrea Beyer (Layout und Texte)
+ Institut für Klassische Philologie
+ Unter den Linden 6
+ 10099 Berlin
+ + + + + Haftung für Inhalte + + + Als Diensteanbieter sind wir gemäß § 7 Abs.1 TMG für eigene Inhalte auf diesen Seiten + nach den allgemeinen Gesetzen verantwortlich. Nach §§ 8 bis 10 TMG sind wir als Diensteanbieter + jedoch nicht verpflichtet, übermittelte oder gespeicherte fremde Informationen zu überwachen + oder nach Umständen zu forschen, die auf eine rechtswidrige Tätigkeit hinweisen.
+ Verpflichtungen zur Entfernung oder Sperrung der Nutzung von Informationen nach den allgemeinen + Gesetzen bleiben hiervon unberührt. Eine diesbezügliche Haftung ist jedoch erst ab dem Zeitpunkt + der Kenntnis einer konkreten Rechtsverletzung möglich. Bei Bekanntwerden von entsprechenden + Rechtsverletzungen werden wir diese Inhalte umgehend entfernen. + + + + + Haftung für Links + + + Unser Angebot enthält Links zu externen Webseiten Dritter, auf deren Inhalte wir keinen + Einfluss haben. Deshalb können wir für diese fremden Inhalte auch keine Gewähr übernehmen. + Für die Inhalte der verlinkten Seiten ist stets der jeweilige Anbieter oder Betreiber der + Seiten verantwortlich. Die verlinkten Seiten wurden zum Zeitpunkt der Verlinkung auf mögliche + Rechtsverstöße überprüft. Rechtswidrige Inhalte waren zum Zeitpunkt der Verlinkung nicht + erkennbar.
+ Eine permanente inhaltliche Kontrolle der verlinkten Seiten ist jedoch ohne konkrete + Anhaltspunkte einer Rechtsverletzung nicht zumutbar. Bei Bekanntwerden von Rechtsverletzungen + werden wir derartige Links umgehend entfernen. + + + + + Urheberrecht + + + Die durch die Seitenbetreiber erstellten Inhalte und Werke auf diesen Seiten unterliegen + dem deutschen Urheberrecht. Die Vervielfältigung, Bearbeitung, Verbreitung und jede Art + der Verwertung außerhalb der Grenzen des Urheberrechtes bedürfen der schriftlichen + Zustimmung des jeweiligen Autors bzw. Erstellers. Downloads und Kopien dieser Seite + sind nur für den privaten, nicht kommerziellen Gebrauch gestattet.
+ Soweit die Inhalte auf dieser Seite nicht vom Betreiber erstellt wurden, werden die + Urheberrechte Dritter beachtet. Insbesondere werden Inhalte Dritter als solche gekennzeichnet. + Sollten Sie trotzdem auf eine Urheberrechtsverletzung aufmerksam werden, bitten wir um + einen entsprechenden Hinweis. Bei Bekanntwerden von Rechtsverletzungen werden wir derartige + Inhalte umgehend entfernen.
+ + + +

Copyright Favicon / Logo

+ + + + + +
Icon made by Freepik from www.flaticon.com + is licensed by CC 3.0 BY +
+ + + + + - - - - - - {{ 'ABOUT' | translate }} - - - - {{ 'DOC_SOFTWARE' | translate}} - - - - {{'DOC_EXERCISES' | translate}} - - - - {{'DOC_VOC_UNIT' | translate}} - - - - - \ No newline at end of file + + + + + + {{ 'ABOUT' | translate }} + + + + {{ 'DOC_SOFTWARE' | translate}} + + + + {{'DOC_EXERCISES' | translate}} + + + + {{'DOC_VOC_UNIT' | translate}} + + + + + diff --git a/src/app/imprint/imprint.page.scss b/src/app/imprint/imprint.page.scss index e69de29..e08b1ad 100644 --- a/src/app/imprint/imprint.page.scss +++ b/src/app/imprint/imprint.page.scss @@ -0,0 +1,3 @@ +ion-grid { + text-align: left; +} diff --git a/src/app/info/info.page.html b/src/app/info/info.page.html index 4e5fd22..cea611d 100644 --- a/src/app/info/info.page.html +++ b/src/app/info/info.page.html @@ -1,86 +1,97 @@ - - - -
- - {{ 'ABOUT' | translate }} - -
- - - - - + + + +
+ + {{ 'ABOUT' | translate }} + +
+ + + + + - -

CALLIDUS

- - Computer-Aided Language Learning: Lexikonerwerb im Lateinunterricht - durch korpusgestützte Methoden -
- (Vocabulary Acquisition in Latin using Corpus-based Methods)
- - {{'RESEARCH_PROJECT_DATA_FUNDED' | translate}} -
-
-

{{'RESEARCH_APPROACH_TITLE' | translate}}

- {{'RESEARCH_APPROACH_TEXT' | translate}} -
-
-

{{'RESEARCH_STUDIES_TITLE' | translate}}

- {{'RESEARCH_STUDIES_TEXT' | translate}}
-
    -
  • {{'RESEARCH_STUDIES_1' | translate}},
    • -
  • {{'RESEARCH_STUDIES_2' | translate}},
    • -
  • {{'RESEARCH_STUDIES_3' | translate}},
    • -
  • {{'RESEARCH_STUDIES_4' | translate}}.
    • -
-
- -

{{'RESEARCH_PUBL_TITLE' | translate}}

-
    -
  • {{'RESEARCH_PUBL_1' | translate}},
    • -
  • {{'RESEARCH_PUBL_2' | translate}},
    • -
  • {{'RESEARCH_PUBL_3' | translate}},
    • -
  • {{'RESEARCH_PUBL_4' | translate}}.
    • -
-
- -

{{'RESEARCH_PROJECT_DATA_TITLE' | translate}}

- {{'RESEARCH_PROJECT_DATA_TEXT' | translate}}
-
- - + + +

CALLIDUS

+ + + + Computer-Aided Language Learning: Lexikonerwerb im Lateinunterricht + durch korpusgestützte Methoden (Vocabulary Acquisition in Latin using Corpus-based + Methods) + + + + {{'RESEARCH_PROJECT_DATA_FUNDED' | translate}} + + +

{{'RESEARCH_APPROACH_TITLE' | translate}}

+ + + {{'RESEARCH_APPROACH_TEXT' | translate}} + + +

{{'RESEARCH_STUDIES_TITLE' | translate}}

+ + + {{'RESEARCH_STUDIES_TEXT' | translate}}
+ + +
    +
  • + {{ 'RESEARCH_STUDIES_' + (i + 1).toString() | translate }} +
    • +
+ + +

{{'RESEARCH_PUBL_TITLE' | translate}}

+ + +
    +
  • + {{ 'RESEARCH_PUBL_' + (i + 1).toString() | translate }} +
    • +
+ + +

{{'RESEARCH_PROJECT_DATA_TITLE' | translate}}

+ + + {{'RESEARCH_PROJECT_DATA_TEXT' | translate}}
+ + - - - - - - {{ 'DOC_SOFTWARE' | translate}} - - - - {{'DOC_EXERCISES' | translate}} - - - - {{'DOC_VOC_UNIT' | translate}} - - - - {{ 'IMPRINT' | translate }} - - - - - \ No newline at end of file + + + + + + {{ 'DOC_SOFTWARE' | translate}} + + + + {{'DOC_EXERCISES' | translate}} + + + + {{'DOC_VOC_UNIT' | translate}} + + + + {{ 'IMPRINT' | translate }} + + + + + diff --git a/src/app/info/info.page.scss b/src/app/info/info.page.scss index e69de29..e08b1ad 100644 --- a/src/app/info/info.page.scss +++ b/src/app/info/info.page.scss @@ -0,0 +1,3 @@ +ion-grid { + text-align: left; +} diff --git a/src/app/info/info.page.ts b/src/app/info/info.page.ts index e739d26..252316c 100644 --- a/src/app/info/info.page.ts +++ b/src/app/info/info.page.ts @@ -1,28 +1,21 @@ -import { Component, OnInit } from '@angular/core'; +import {Component, OnInit} from '@angular/core'; import {HelperService} from 'src/app/helper.service'; import {NavController} from '@ionic/angular'; import {HttpClient} from '@angular/common/http'; import {TranslateService} from '@ngx-translate/core'; @Component({ - selector: 'app-info', - templateUrl: './info.page.html', - styleUrls: ['./info.page.scss'], + selector: 'app-info', + templateUrl: './info.page.html', + styleUrls: ['./info.page.scss'], }) export class InfoPage { - HelperService = HelperService; - - constructor(public navCtrl: NavController, - public http: HttpClient, - public translate: TranslateService) { } - - goToAuthorPage() { - this.navCtrl.navigateForward('/author').then(); - } - - goToTestPage() { - this.navCtrl.navigateForward('/test').then(); - } + HelperService = HelperService; + studiesIndices: number[] = [...Array(4).keys()]; + constructor(public navCtrl: NavController, + public http: HttpClient, + public translate: TranslateService) { + } } diff --git a/src/app/kwic/kwic.page.html b/src/app/kwic/kwic.page.html index 64956bb..1f1ca6f 100644 --- a/src/app/kwic/kwic.page.html +++ b/src/app/kwic/kwic.page.html @@ -1,36 +1,36 @@ - - - -
- - {{ 'KWIC' | translate }} - -
- - - - - + + + +
+ + {{ 'KWIC' | translate }} + +
+ + + + + - - - - -
- - - - - {{ 'BACK' | translate }} - - - - - \ No newline at end of file + + + + +
+ + + + + {{ 'BACK' | translate }} + + + + + diff --git a/src/app/models/applicationState.ts b/src/app/models/applicationState.ts index b0b674b..3dbdeaf 100644 --- a/src/app/models/applicationState.ts +++ b/src/app/models/applicationState.ts @@ -1,9 +1,11 @@ import {CorpusMC} from 'src/app/models/corpusMC'; import {TextRange} from 'src/app/models/textRange'; import {AnnisResponse} from 'src/app/models/annisResponse'; +import {Author} from 'src/app/models/author'; export class ApplicationState { public annisResponse: AnnisResponse; + public currentAuthor: Author; public currentCorpus: CorpusMC; public currentTextRange: TextRange; public currentUrn: string; diff --git a/src/app/models/exerciseDocumentation.ts b/src/app/models/exerciseDocumentation.ts new file mode 100644 index 0000000..84e21a2 --- /dev/null +++ b/src/app/models/exerciseDocumentation.ts @@ -0,0 +1,10 @@ +export class ExerciseDocumentation { + public name: string; + public type: string; + public level: string; + public function: string; + + constructor(init?: Partial) { + Object.assign(this, init); + } +} diff --git a/src/app/preview/preview.page.html b/src/app/preview/preview.page.html index f6e8cde..8963587 100644 --- a/src/app/preview/preview.page.html +++ b/src/app/preview/preview.page.html @@ -2,7 +2,7 @@ @@ -59,8 +59,8 @@ beginning that it is going to be a download (instead of an ordinary link or clic
- - {{ 'BACK' | translate }} + + {{ 'BACK' | translate }} @@ -113,4 +113,4 @@ beginning that it is going to be a download (instead of an ordinary link or clic - \ No newline at end of file + diff --git a/src/app/ranking/ranking.page.html b/src/app/ranking/ranking.page.html index 37331f1..90a4012 100644 --- a/src/app/ranking/ranking.page.html +++ b/src/app/ranking/ranking.page.html @@ -2,7 +2,7 @@ @@ -49,7 +49,7 @@
- {{ 'BACK' | translate }} + {{ 'BACK' | translate }} @@ -57,4 +57,4 @@ - \ No newline at end of file + diff --git a/src/app/show-text/show-text.page.html b/src/app/show-text/show-text.page.html index 6dc5751..289d3c0 100644 --- a/src/app/show-text/show-text.page.html +++ b/src/app/show-text/show-text.page.html @@ -2,17 +2,15 @@ -
- - {{corpusService.currentCorpus?.title}} - {{corpusService.currentUrn?.split(":")[corpusService.currentUrn?.split(":").length - 1]}} - -
+ + + {{corpusService.currentCorpus?.title}} {{corpusService.currentUrn?.split(":")[corpusService.currentUrn?.split(":").length - 1]}} + @@ -28,7 +26,7 @@
@@ -39,43 +37,56 @@
{{node.annis_tok}}{{ getWhiteSpace(i) }} + [class.oov]="node.is_oov">{{node.annis_tok}}{{ getWhiteSpace(i) }}
{{corpusService.currentText}} - - - - -
-

{{ 'TEXT_COMPLEXITY' | translate }}

-
-
-
- -
-
-
- - {{ 'GENERATE_FILE_DOCX' | translate }} -
- - {{ 'GENERATE_FILE_PDF' | translate }} -
- - {{ 'VOCABULARY_CHECK' | translate }}
- - {{ "EXERCISE_SET_PARAMETERS" | translate}} + + + + + + +
+

{{ 'TEXT_COMPLEXITY' | translate }}

+
+ + +
+ +
+
+ + + + {{ 'GENERATE_FILE_DOCX' | translate }} + + + + + {{ 'GENERATE_FILE_PDF' | translate }} + + + + + {{ 'VOCABULARY_CHECK' | translate }} + + + + {{ "EXERCISE_SET_PARAMETERS" | translate}} + + @@ -90,15 +101,12 @@ - - {{ 'BACK' | translate }} + + {{ 'BACK' | translate }} - - - - \ No newline at end of file + diff --git a/src/app/text-range/text-range.page.html b/src/app/text-range/text-range.page.html index 3e1b045..fa73849 100644 --- a/src/app/text-range/text-range.page.html +++ b/src/app/text-range/text-range.page.html @@ -2,15 +2,13 @@ -
- - {{corpusService.currentCorpus?.title}} -
+ + {{corpusService.currentCorpus?.title}} @@ -20,7 +18,6 @@ -

{{'TEXT_RANGE' | translate}}

 @@ -30,35 +27,32 @@ + (ngModelChange)="showFurtherReferences(true).then()" + placeholder="{{ corpusService.currentCorpus?.citation_level_1 }}" (focus)="currentInputId = 1" + (blur)="resetCurrentInputId()"/> + [(ngModel)]="corpusService.currentTextRange.start[1]" id="input2" + (ngModelChange)="showFurtherReferences(true).then()" + placeholder="{{ corpusService.currentCorpus?.citation_level_2 }}" (focus)="currentInputId = 2" + (blur)="resetCurrentInputId()" + disabled="{{!corpusService.currentCorpus?.citations.hasOwnProperty(corpusService.currentTextRange.start[0])}}"/> + [(ngModel)]="corpusService.currentTextRange.start[2]" id="input3" + (ngModelChange)="showFurtherReferences(true).then()" + placeholder="{{ corpusService.currentCorpus?.citation_level_3 }}" (focus)="currentInputId = 3" + (blur)="resetCurrentInputId()" disabled="{{isInputDisabled(true)}}"/> - - - @@ -67,9 +61,9 @@ + *ngFor="let key of ObjectKeys(corpusService.currentCorpus.citations[corpusService.currentTextRange.start[0]].subcitations)"> @@ -78,9 +72,9 @@ + *ngFor="let key of ObjectKeys(corpusService.currentCorpus.citations[corpusService.currentTextRange.start[0]].subcitations[corpusService.currentTextRange.start[1]].subcitations)"> @@ -95,35 +89,32 @@ + (ngModelChange)="showFurtherReferences(false).then()" + placeholder="{{ corpusService.currentCorpus?.citation_level_1 }}" (focus)="currentInputId = 4" + (blur)="resetCurrentInputId()"/> + [(ngModel)]="corpusService.currentTextRange.end[1]" id="input5" + (ngModelChange)="showFurtherReferences(false).then()" + placeholder="{{ corpusService.currentCorpus?.citation_level_2 }}" (focus)="currentInputId = 5" + (blur)="resetCurrentInputId()" + disabled="{{!corpusService.currentCorpus?.citations.hasOwnProperty(corpusService.currentTextRange.start[0])}}"/> + [(ngModel)]="corpusService.currentTextRange.end[2]" id="input6" + (ngModelChange)="showFurtherReferences(false).then()" + placeholder="{{ corpusService.currentCorpus?.citation_level_3 }}" (focus)="currentInputId = 6" + (blur)="resetCurrentInputId()" disabled="{{isInputDisabled(false)}}"/> - - - @@ -132,9 +123,9 @@ + *ngFor="let key of ObjectKeys(corpusService.currentCorpus.citations[corpusService.currentTextRange.end[0]].subcitations)"> @@ -143,9 +134,9 @@ + *ngFor="let key of ObjectKeys(corpusService.currentCorpus.citations[corpusService.currentTextRange.end[0]].subcitations[corpusService.currentTextRange.end[1]].subcitations)"> @@ -154,7 +145,7 @@ - {{ 'BACK' | translate }} + {{ 'BACK' | translate }} {{ "SHOW_TEXT" | translate }} @@ -164,4 +155,4 @@ - \ No newline at end of file + diff --git a/src/app/vocabulary-check/vocabulary-check.page.html b/src/app/vocabulary-check/vocabulary-check.page.html index 8162dc4..3acac3e 100644 --- a/src/app/vocabulary-check/vocabulary-check.page.html +++ b/src/app/vocabulary-check/vocabulary-check.page.html @@ -2,16 +2,13 @@ -
- - {{ 'VOCABULARY_CHECK' | translate }} - -
+ + {{ 'VOCABULARY_CHECK' | translate }} @@ -35,7 +32,7 @@