Commit bf36c5db authored by beyeranq's avatar beyeranq
Browse files

show-text, author layout changes (buttons, alignment), json text complexity explanation simplified

parent 37c91a0f
...@@ -19,9 +19,8 @@ ...@@ -19,9 +19,8 @@
<ion-grid> <ion-grid>
<ion-row> <ion-row>
<ion-col> <ion-col>
<b>{{ 'MOST_RECENT_SETUP' | translate }}:</b> <b style="padding: 0.5em;">{{ 'MOST_RECENT_SETUP' | translate }}:</b>
<br>
<br>
</ion-col> </ion-col>
</ion-row> </ion-row>
<ion-row *ngIf="HelperService.mostRecentSetup?.currentCorpus && HelperService.mostRecentSetup?.currentUrn"> <ion-row *ngIf="HelperService.mostRecentSetup?.currentCorpus && HelperService.mostRecentSetup?.currentUrn">
...@@ -34,7 +33,7 @@ ...@@ -34,7 +33,7 @@
<ion-row> <ion-row>
<ion-col> <ion-col>
<label> <label>
<input type="checkbox" [(ngModel)]="showOnlyTreebanks" (change)="toggleTreebankAuthors()"/> <input type="checkbox" [(ngModel)]="showOnlyTreebanks" (change)="toggleTreebankAuthors()" />
<span class="checkbox">{{ 'AUTHOR_SHOW_ONLY_TREEBANKS' | translate}}</span> <span class="checkbox">{{ 'AUTHOR_SHOW_ONLY_TREEBANKS' | translate}}</span>
</label> </label>
</ion-col> </ion-col>
...@@ -44,14 +43,15 @@ ...@@ -44,14 +43,15 @@
<label> <label>
<ion-icon name="search" class="search"></ion-icon> <ion-icon name="search" class="search"></ion-icon>
<input type="search" (ngModelChange)="getAuthors($event.toString())" <input type="search" (ngModelChange)="getAuthors($event.toString())"
placeholder="{{ 'AUTHOR_SEARCH' | translate }}" [(ngModel)]="currentSearchValue"/> placeholder="{{ 'AUTHOR_SEARCH' | translate }}" [(ngModel)]="currentSearchValue" />
</label> </label>
</ion-col> </ion-col>
</ion-row> </ion-row>
<ion-row> <ion-row>
<ion-col> <ion-col style="display: inline-grid">
<h2>{{'AUTHOR' | translate}}</h2> <h2>{{'AUTHOR' | translate}}</h2>
<ion-grid *ngIf="corpusService.availableAuthors.length > 0; else loading" class="author"> <ion-grid *ngIf="corpusService.availableAuthors.length > 0; else loading" class="author"
style="text-align: left">
<ion-row *ngFor="let author of authorsDisplayed"> <ion-row *ngFor="let author of authorsDisplayed">
<ion-col> <ion-col>
<a href="javascript:" (click)="showCorpora(author)">{{author.name}}</a> <a href="javascript:" (click)="showCorpora(author)">{{author.name}}</a>
...@@ -64,4 +64,4 @@ ...@@ -64,4 +64,4 @@
</ion-col> </ion-col>
</ion-row> </ion-row>
</ion-grid> </ion-grid>
</ion-content> </ion-content>
\ No newline at end of file
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
</ion-buttons> </ion-buttons>
<ion-spinner *ngIf="HelperService.isLoading"></ion-spinner> <ion-spinner *ngIf="HelperService.isLoading"></ion-spinner>
<ion-title> <ion-title>
{{corpusService.currentCorpus?.title}} {{corpusService.currentUrn?.split(":")[corpusService.currentUrn?.split(":").length - 1]}} {{corpusService.currentCorpus?.title}}
{{corpusService.currentUrn?.split(":")[corpusService.currentUrn?.split(":").length - 1]}}
</ion-title> </ion-title>
<ion-buttons slot="end"> <ion-buttons slot="end">
<ion-menu-button autoHide="false"></ion-menu-button> <ion-menu-button autoHide="false"></ion-menu-button>
...@@ -26,7 +27,7 @@ ...@@ -26,7 +27,7 @@
<ion-row *ngIf="HelperService.isVocabularyCheck"> <ion-row *ngIf="HelperService.isVocabularyCheck">
<ion-col style="text-align:left; padding-left:10px;"> <ion-col style="text-align:left; padding-left:10px;">
<label> <label>
<input type="checkbox" [(ngModel)]="highlightOOV"/> <input type="checkbox" [(ngModel)]="highlightOOV" />
<span class="checkbox">{{ "TEXT_SHOW_OOV" | translate}}</span> <span class="checkbox">{{ "TEXT_SHOW_OOV" | translate}}</span>
</label> </label>
<br> <br>
...@@ -37,7 +38,7 @@ ...@@ -37,7 +38,7 @@
<div *ngIf="highlightOOV; else noOOV"> <div *ngIf="highlightOOV; else noOOV">
<!-- do not add whitespace/newline etc. between the span elements! --> <!-- do not add whitespace/newline etc. between the span elements! -->
<span *ngFor="let node of corpusService.annisResponse.nodes; index as i"><span class="tok" <span *ngFor="let node of corpusService.annisResponse.nodes; index as i"><span class="tok"
[class.oov]="node.is_oov">{{node.annis_tok}}</span>{{ getWhiteSpace(i) }}</span> [class.oov]="node.is_oov">{{node.annis_tok}}</span>{{ getWhiteSpace(i) }}</span>
</div> </div>
<ng-template #noOOV> <ng-template #noOOV>
<span class="tok">{{corpusService.currentText}}</span> <span class="tok">{{corpusService.currentText}}</span>
...@@ -46,8 +47,9 @@ ...@@ -46,8 +47,9 @@
<ion-col class="toggle-menu" style="text-align:left" padding> <ion-col class="toggle-menu" style="text-align:left" padding>
<ion-grid> <ion-grid>
<ion-row> <ion-row>
<button *ngIf="showTextComplexity; else dropright" <button *ngIf="showTextComplexity; else dropright"
(click)="showTextComplexity = !showTextComplexity"> (click)="showTextComplexity = !showTextComplexity">
<ion-icon name="arrow-dropdown"></ion-icon> <ion-icon name="arrow-dropdown"></ion-icon>
</button> </button>
<ng-template #dropright> <ng-template #dropright>
...@@ -56,9 +58,10 @@ ...@@ -56,9 +58,10 @@
</button> </button>
</ng-template> </ng-template>
<div> <div>
<h2 (click)="showTextComplexity = !showTextComplexity">{{ 'TEXT_COMPLEXITY' | translate }}</h2> <h2 (click)="showTextComplexity = !showTextComplexity" style="padding:0.2em;">
{{ 'TEXT_COMPLEXITY' | translate }}</h2>
</div> </div>
<button (click)="showTextComplexityDoc = !showTextComplexityDoc"> <button (click)="showTextComplexityDoc = !showTextComplexityDoc" style="padding:0.2em;">
<ion-icon name="help-circle"></ion-icon> <ion-icon name="help-circle"></ion-icon>
</button> </button>
</ion-row> </ion-row>
...@@ -76,23 +79,15 @@ ...@@ -76,23 +79,15 @@
{{ 'TEXT_COMPLEXITY_DOCUMENTATION' | translate }} {{ 'TEXT_COMPLEXITY_DOCUMENTATION' | translate }}
</ion-row> </ion-row>
<ion-row> <ion-row>
<a (click)="generateDownloadLink(FileType[FileType.docx])"> <a (click)="generateDownloadLink(FileType[FileType.docx])" style="padding:0.5em;">
{{ 'GENERATE_FILE_DOCX' | translate }} {{ 'GENERATE_FILE_DOCX' | translate }}
</a> </a>
</ion-row> </ion-row>
<ion-row> <ion-row>
<a (click)="generateDownloadLink(FileType[FileType.pdf])"> <a (click)="generateDownloadLink(FileType[FileType.pdf])" style="padding:0.5em;">
{{ 'GENERATE_FILE_PDF' | translate }} {{ 'GENERATE_FILE_PDF' | translate }}
</a> </a>
</ion-row> </ion-row>
<ion-row>
<a (click)="HelperService.goToVocabularyCheckPage(navCtrl)">
{{ 'VOCABULARY_CHECK' | translate }}</a>
</ion-row>
<ion-row>
<a (click)="HelperService.goToExerciseParametersPage(navCtrl).then()">
{{ "EXERCISE_SET_PARAMETERS" | translate}}</a>
</ion-row>
</ion-grid> </ion-grid>
</ion-col> </ion-col>
</ion-row> </ion-row>
...@@ -111,9 +106,17 @@ ...@@ -111,9 +106,17 @@
<ion-col> <ion-col>
<ion-button (click)="navCtrl.pop()">{{ 'BACK' | translate }}</ion-button> <ion-button (click)="navCtrl.pop()">{{ 'BACK' | translate }}</ion-button>
</ion-col> </ion-col>
<ion-col>
<ion-button (click)="HelperService.goToVocabularyCheckPage(navCtrl)">
{{ 'VOCABULARY_CHECK' | translate }}</ion-button>
</ion-col>
<ion-col>
<ion-button (click)="HelperService.goToExerciseParametersPage(navCtrl).then()">
{{ "EXERCISE_SET_PARAMETERS" | translate}}</ion-button>
</ion-col>
</ion-row> </ion-row>
</ion-grid> </ion-grid>
<ng-template #loading> <ng-template #loading>
<ion-spinner></ion-spinner> <ion-spinner></ion-spinner>
</ng-template> </ng-template>
</ion-content> </ion-content>
\ No newline at end of file
...@@ -307,10 +307,10 @@ ...@@ -307,10 +307,10 @@
"TEXT_COMPLEXITY_AVERAGE_SENTENCE_LENGTH": "Wörter pro Satz (Ø)", "TEXT_COMPLEXITY_AVERAGE_SENTENCE_LENGTH": "Wörter pro Satz (Ø)",
"TEXT_COMPLEXITY_AVERAGE_WORD_LENGTH": "Wortlänge (Ø)", "TEXT_COMPLEXITY_AVERAGE_WORD_LENGTH": "Wortlänge (Ø)",
"TEXT_COMPLEXITY_CLAUSE_COUNT": "Anzahl der Hauptsätze", "TEXT_COMPLEXITY_CLAUSE_COUNT": "Anzahl der Hauptsätze",
"TEXT_COMPLEXITY_DOCUMENTATION": "Das Gesamtmaß berücksichtigt alle hier gezeigten Einzelwerte gleichermaßen. Die Anzahl der Wörter und Sätze wird jeweils in vorher definierte Intervalle mit 9 Schritten (0-10, 10-50 etc.) eingeordnet. Die Vokabeldichte berechnet sich aus dem Verhältnis der einzigartigen Inhaltswörter zur Gesamtlänge des Textes.", "TEXT_COMPLEXITY_DOCUMENTATION": "Das Gesamtmaß berücksichtigt alle hier gezeigten Einzelwerte gleichermaßen. Die lexikalische Dichte berechnet sich aus dem Verhältnis der Anzahl der differenten Inhaltswörter (z.B. rex) zur Gesamtlänge des Textes.",
"TEXT_COMPLEXITY_GERUND_COUNT": "Anzahl der Gerundien", "TEXT_COMPLEXITY_GERUND_COUNT": "Anzahl der Gerundien",
"TEXT_COMPLEXITY_INFINITIVE_COUNT": "Anzahl der Infinitive", "TEXT_COMPLEXITY_INFINITIVE_COUNT": "Anzahl der Infinitive",
"TEXT_COMPLEXITY_LEXICAL_DENSITY": "Vokabeldichte", "TEXT_COMPLEXITY_LEXICAL_DENSITY": "Lexikalische Dichte",
"TEXT_COMPLEXITY_PART_OF_SPEECH_COUNT": "Anzahl verschiedener Wortarten", "TEXT_COMPLEXITY_PART_OF_SPEECH_COUNT": "Anzahl verschiedener Wortarten",
"TEXT_COMPLEXITY_PARTICIPLE_COUNT": "Anzahl der Partizipien", "TEXT_COMPLEXITY_PARTICIPLE_COUNT": "Anzahl der Partizipien",
"TEXT_COMPLEXITY_PUNCTUATION_COUNT": "Anzahl der Satzzeichen", "TEXT_COMPLEXITY_PUNCTUATION_COUNT": "Anzahl der Satzzeichen",
......
...@@ -307,10 +307,10 @@ ...@@ -307,10 +307,10 @@
"TEXT_COMPLEXITY_AVERAGE_SENTENCE_LENGTH": "Words per sentence (Ø)", "TEXT_COMPLEXITY_AVERAGE_SENTENCE_LENGTH": "Words per sentence (Ø)",
"TEXT_COMPLEXITY_AVERAGE_WORD_LENGTH": "Word length (Ø)", "TEXT_COMPLEXITY_AVERAGE_WORD_LENGTH": "Word length (Ø)",
"TEXT_COMPLEXITY_CLAUSE_COUNT": "Main clause count", "TEXT_COMPLEXITY_CLAUSE_COUNT": "Main clause count",
"TEXT_COMPLEXITY_DOCUMENTATION": "The overall measure for text complexity takes into account all the single values presented here in equal proportions. Word and sentence counts are used with predefined ranges of 9 steps (0 to 10, 10 to 50 etc.). Vocabulary density is measured by comparing the number of unique content words to the overall length of the text.", "TEXT_COMPLEXITY_DOCUMENTATION": "The overall measure for text complexity takes into account all the single values presented here in equal proportions. Word and sentence counts are used with predefined ranges of 9 steps (0 to 10, 10 to 50 etc.). Lexical density is measured by comparing the number of unique content words to the overall length of the text.",
"TEXT_COMPLEXITY_GERUND_COUNT": "Gerund count", "TEXT_COMPLEXITY_GERUND_COUNT": "Gerund count",
"TEXT_COMPLEXITY_INFINITIVE_COUNT": "Infinitive count", "TEXT_COMPLEXITY_INFINITIVE_COUNT": "Infinitive count",
"TEXT_COMPLEXITY_LEXICAL_DENSITY": "Vocabulary density", "TEXT_COMPLEXITY_LEXICAL_DENSITY": "Lexical density",
"TEXT_COMPLEXITY_PART_OF_SPEECH_COUNT": "Number of different parts of speech", "TEXT_COMPLEXITY_PART_OF_SPEECH_COUNT": "Number of different parts of speech",
"TEXT_COMPLEXITY_PARTICIPLE_COUNT": "Participle count", "TEXT_COMPLEXITY_PARTICIPLE_COUNT": "Participle count",
"TEXT_COMPLEXITY_PUNCTUATION_COUNT": "Punctuation mark count", "TEXT_COMPLEXITY_PUNCTUATION_COUNT": "Punctuation mark count",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment