Skip to content
Snippets Groups Projects
Commit 7520e954 authored by Samuel Eickelberg's avatar Samuel Eickelberg
Browse files

Bugfixes / translations

parent 8f762750
No related branches found
No related tags found
No related merge requests found
Showing
with 281 additions and 30 deletions
......@@ -3,5 +3,5 @@
<p *ngIf="currentUrl">
<b>{{'not-found.thePage' | translate}} {{ currentUrl }} {{'not-found.isUnknown' | translate}}</b>
</p>
<button [routerLink]="['/dashboard']" color="primary" mat-raised-button>{{'button.toDashboard' | translate}}</button>
<button [routerLink]="['/dcc/create']" color="primary" mat-raised-button>{{'button.toStartPage' | translate}}</button>
</div>
import { Component, OnInit } from '@angular/core';
import { Router } from '@angular/router';
import { NGXLogger } from 'ngx-logger';
@Component({
selector: 'app-page-not-found',
......@@ -11,15 +10,10 @@ export class PageNotFoundComponent implements OnInit {
public currentUrl: String | undefined;
constructor( private router: Router,
private logger: NGXLogger
) {
// find out current URL
this.currentUrl = router.getCurrentNavigation()?.finalUrl?.toString();
this.logger.warn("Got 404 on "+this.currentUrl);
constructor(router: Router) {
this.currentUrl = router.getCurrentNavigation()?.finalUrl?.toString();
}
ngOnInit(): void {
}
}
<app-dcc-localised-string [isRequired]="true" [placeholder]="'dcc.name' | translate"
[strings]="contact.name!"></app-dcc-localised-string>
<div class="row">
<div class="dcc-row">
<div class="label-container">
<label for="phoneNumber">{{'dcc.phone' | translate}}</label>
</div>
......@@ -8,7 +8,7 @@
<input [(ngModel)]=contact.phoneNumber id="phoneNumber" matInput name="phoneNumber">
</mat-form-field>
</div>
<div class="row">
<div class="dcc-row">
<div class="label-container">
<label for="emailAddress">{{'dcc.eMail' | translate}}</label>
</div>
......@@ -18,58 +18,58 @@
</div>
<mat-divider></mat-divider>
<h4>{{'dcc.contact.address' | translate}}</h4>
<div class="row">
<div class="dcc-row">
<div class="label-container">
<label for="city">{{'dcc.city' | translate}}<span class="asterix">*</span></label>
<label for="city">{{'dcc.location.city' | translate}}<span class="asterix">*</span></label>
</div>
<mat-form-field appearance="fill">
<input [(ngModel)]=contact.location!.city [required]="strict" id="city" matInput name="city">
</mat-form-field>
</div>
<div class="row">
<div class="dcc-row">
<div class="label-container">
<label for="countryCode">{{'dcc.countryCode' | translate}}<span class="asterix">*</span></label>
<label for="countryCode">{{'dcc.location.countryCode' | translate}}<span class="asterix">*</span></label>
</div>
<mat-form-field appearance="fill">
<input [(ngModel)]=contact.location!.countryCode [required]="strict" id="countryCode" matInput name="countryCode"
oninput="this.value = this.value.toUpperCase()">
</mat-form-field>
</div>
<div class="row">
<div class="dcc-row">
<div class="label-container">
<label for="postalCode">{{'dcc.postalCode' | translate}}<span class="asterix">*</span></label>
<label for="postalCode">{{'dcc.location.postalCode' | translate}}<span class="asterix">*</span></label>
</div>
<mat-form-field appearance="fill">
<input [(ngModel)]=contact.location!.postalCode [required]="strict" id="postalCode" matInput name="postalCode">
</mat-form-field>
</div>
<div class="row">
<div class="dcc-row">
<div class="label-container">
<label for="stateCode">{{'dcc.state' | translate}} <span class="asterix">*</span> </label>
<label for="stateCode">{{'dcc.location.stateCode' | translate}} <span class="asterix">*</span> </label>
</div>
<mat-form-field appearance="fill">
<input [(ngModel)]=contact.location!.stateCode [required]="strict" id="stateCode" matInput name="stateCode">
</mat-form-field>
</div>
<div class="row">
<div class="dcc-row">
<div class="label-container">
<label for="street">{{'dcc.street' | translate}}<span class="asterix">*</span></label>
<label for="street">{{'dcc.location.street' | translate}}<span class="asterix">*</span></label>
</div>
<mat-form-field appearance="fill">
<input [(ngModel)]=contact.location!.street [required]="strict" id="street" matInput name="street">
</mat-form-field>
</div>
<div class="row">
<div class="dcc-row">
<div class="label-container">
<label for="houseNumber">{{'dcc.streetNumber' | translate}}<span class="asterix">*</span></label>
<label for="houseNumber">{{'dcc.location.houseNumber' | translate}}<span class="asterix">*</span></label>
</div>
<mat-form-field appearance="fill">
<input [(ngModel)]=contact.location!.houseNumber [required]="strict" id="houseNumber" matInput name="houseNumber">
</mat-form-field>
</div>
<div class="row">
<div class="dcc-row">
<div class="label-container">
<label for="poBox">{{'dcc.poBox' | translate}}</label>
<label for="poBox">{{'dcc.location.poBox' | translate}}</label>
</div>
<mat-form-field appearance="fill">
<input [(ngModel)]=contact.location!.poBox id="poBox" matInput name="poBox">
......
......@@ -15,7 +15,7 @@ export class DccContactComponent implements OnInit {
@Output() fileSelected = new EventEmitter<ByteDataDto>();
constructor(initializationService: InitializationService) {
this.strict = true;
this.strict = false;
this.contact = initializationService.getEmptyContactDto();
}
......
<div *ngFor="let item of strings.content; let i = index" class="row">
<div *ngFor="let item of strings.content; let i = index" class="dcc-row">
<ng-container *ngIf="getOrSetLang(item)">
<div class="label-container">
<label [for]="placeholder.toLowerCase()">{{placeholder}}<span class="asterix">*</span>
......
......@@ -56,16 +56,16 @@ export class ErrorService {
} else if (error instanceof Error) {
stack = message.stack;
} else {
this.logger.warn("Got unexpected error of type "+typeof(error)+" with structure "+JSON.stringify(error, null, 3));
this.logger.warn("Got unexpected error of type " + typeof(error) + " with structure " + JSON.stringify(error, null, 3));
}
this.logErrorDetails(message,status,stack);
}
logErrorDetails(message: string, status?: number, stack?: string): void {
if (message != undefined || status != undefined) {
this.logger.warn("Got error "+message+" with status "+status+" and stack "+stack);
this.logger.warn("Got error " + message + " with status " + status + " and stack " + stack);
} else {
this.logger.warn("Got (invisible) error "+message+" with status "+status+" and stack "+stack);
this.logger.warn("Got (invisible) error " + message + " with status " + status + " and stack " + stack);
}
}
}
......@@ -203,6 +203,7 @@ export class InitializationService {
result.id = '';
result.countryCode = 'DE';
result.street = '';
result.houseNumber = '';
result.city = '';
result.additionalInformation = this.getEmptyRichContentDto();
return result;
......
......@@ -4,6 +4,7 @@
"button.nextStep": "Nächster Schritt",
"button.previousStep": "Vorheriger Schritt",
"button.toDashboard": "Zum Dashboard",
"button.toStartPage": "Zur Startseite",
"dcc.addStatements": "Statements hinzufügen",
"dcc.administrativeData": "Administrative Daten",
"dcc.applyTemplate": "Vorlage anwenden",
......@@ -57,6 +58,13 @@
"dcc.installedSoftware": "Installierte Software",
"dcc.label": "Benennung",
"dcc.location": "Standort",
"dcc.location.city": "Ort",
"dcc.location.countryCode": "Ländercode",
"dcc.location.houseNumber": "Hausnummer",
"dcc.location.poBox": "Postfach",
"dcc.location.postalCode": "Postleitzahl",
"dcc.location.stateCode": "Bundesland",
"dcc.location.street": "Straße",
"dcc.manufacturer": "Hersteller",
"dcc.measurementResult": "Messergebnis",
"dcc.measurementResults": "Messergebnisse",
......
......@@ -4,6 +4,7 @@
"button.nextStep": "Next step",
"button.previousStep": "Previous step",
"button.toDashboard": "To the dashboard",
"button.toStartPage": "To the homepage",
"dcc.addStatements": "Add statements",
"dcc.administrativeData": "Administrative data",
"dcc.applyTemplate": "Apply template",
......@@ -57,6 +58,13 @@
"dcc.installedSoftware": "Installed software",
"dcc.label": "Label",
"dcc.location": "Location",
"dcc.location.city": "Place",
"dcc.location.countryCode": "Country code",
"dcc.location.houseNumber": "House number",
"dcc.location.poBox": "P.O. Box",
"dcc.location.postalCode": "Postcode",
"dcc.location.stateCode": "State",
"dcc.location.street": "Street",
"dcc.manufacturer": "Manufacturer",
"dcc.measurementResult": "Measurement result",
"dcc.measurementResults": "Measurement results",
......
......@@ -4,6 +4,7 @@
"button.nextStep": "Siguiente paso",
"button.previousStep": "Paso anterior",
"button.toDashboard": "Al salpicadero",
"button.toStartPage": "A la página de inicio",
"dcc.addStatements": "Añadir declaraciones",
"dcc.administrativeData": "Datos administrativos",
"dcc.applyTemplate": "Aplicar plantilla",
......@@ -57,6 +58,13 @@
"dcc.installedSoftware": "Software instalado",
"dcc.label": "Nombrar",
"dcc.location": "Ubicación",
"dcc.location.city": "Lugar",
"dcc.location.countryCode": "Código del país",
"dcc.location.houseNumber": "Número de casa",
"dcc.location.poBox": "Apartado de correos",
"dcc.location.postalCode": "Código postal",
"dcc.location.stateCode": "Estado",
"dcc.location.street": "Calle",
"dcc.manufacturer": "Fabricante",
"dcc.measurementResult": "Resultado de la medición",
"dcc.measurementResults": "Resultados de las mediciones",
......
......@@ -4,6 +4,7 @@
"button.nextStep": "Prochaine étape",
"button.previousStep": "Étape précédente",
"button.toDashboard": "Vers le tableau de bord",
"button.toStartPage": "Vers la page d'accueil",
"dcc.addStatements": "Ajouter des déclarations",
"dcc.administrativeData": "Données administratives",
"dcc.applyTemplate": "Appliquer le modèle",
......@@ -57,6 +58,13 @@
"dcc.installedSoftware": "Logiciels installés",
"dcc.label": "Désignation",
"dcc.location": "Site",
"dcc.location.city": "Lieu",
"dcc.location.countryCode": "Code du pays",
"dcc.location.houseNumber": "Numéro de maison",
"dcc.location.poBox": "Boîte postale",
"dcc.location.postalCode": "Code Postal",
"dcc.location.stateCode": "Département",
"dcc.location.street": "Rue",
"dcc.manufacturer": "Fabricant",
"dcc.measurementResult": "Résultat de la mesure",
"dcc.measurementResults": "Résultats des mesures",
......
......@@ -4,6 +4,7 @@
"button.nextStep": "Próxima etapa",
"button.previousStep": "Etapa anterior",
"button.toDashboard": "Para o painel de controle",
"button.toStartPage": "Para a página inicial",
"dcc.addStatements": "Adicionar declarações",
"dcc.administrativeData": "Dados administrativos",
"dcc.applyTemplate": "Aplicar modelo",
......@@ -57,6 +58,13 @@
"dcc.installedSoftware": "Software instalado",
"dcc.label": "Nomeação",
"dcc.location": "Localização",
"dcc.location.city": "Local",
"dcc.location.countryCode": "Código do país",
"dcc.location.houseNumber": "Número da casa",
"dcc.location.poBox": "Caixa postal",
"dcc.location.postalCode": "Código postal",
"dcc.location.stateCode": "Estado",
"dcc.location.street": "Rua",
"dcc.manufacturer": "Fabricante",
"dcc.measurementResult": "Resultado da medição",
"dcc.measurementResults": "Resultados da medição",
......
......@@ -154,6 +154,33 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>button.toStartPage</name>
<description/>
<comment/>
<translations>
<translation>
<language>de-DE</language>
<approved>false</approved>
</translation>
<translation>
<language>en-GB</language>
<approved>false</approved>
</translation>
<translation>
<language>es-ES</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-FR</language>
<approved>false</approved>
</translation>
<translation>
<language>pt-BR</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>dcc.addStatements</name>
<description/>
......@@ -1585,6 +1612,195 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>dcc.location.city</name>
<description/>
<comment/>
<translations>
<translation>
<language>de-DE</language>
<approved>false</approved>
</translation>
<translation>
<language>en-GB</language>
<approved>false</approved>
</translation>
<translation>
<language>es-ES</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-FR</language>
<approved>false</approved>
</translation>
<translation>
<language>pt-BR</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>dcc.location.countryCode</name>
<description/>
<comment/>
<translations>
<translation>
<language>de-DE</language>
<approved>false</approved>
</translation>
<translation>
<language>en-GB</language>
<approved>false</approved>
</translation>
<translation>
<language>es-ES</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-FR</language>
<approved>false</approved>
</translation>
<translation>
<language>pt-BR</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>dcc.location.houseNumber</name>
<description/>
<comment/>
<translations>
<translation>
<language>de-DE</language>
<approved>false</approved>
</translation>
<translation>
<language>en-GB</language>
<approved>false</approved>
</translation>
<translation>
<language>es-ES</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-FR</language>
<approved>false</approved>
</translation>
<translation>
<language>pt-BR</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>dcc.location.poBox</name>
<description/>
<comment/>
<translations>
<translation>
<language>de-DE</language>
<approved>false</approved>
</translation>
<translation>
<language>en-GB</language>
<approved>false</approved>
</translation>
<translation>
<language>es-ES</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-FR</language>
<approved>false</approved>
</translation>
<translation>
<language>pt-BR</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>dcc.location.postalCode</name>
<description/>
<comment/>
<translations>
<translation>
<language>de-DE</language>
<approved>false</approved>
</translation>
<translation>
<language>en-GB</language>
<approved>false</approved>
</translation>
<translation>
<language>es-ES</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-FR</language>
<approved>false</approved>
</translation>
<translation>
<language>pt-BR</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>dcc.location.stateCode</name>
<description/>
<comment/>
<translations>
<translation>
<language>de-DE</language>
<approved>false</approved>
</translation>
<translation>
<language>en-GB</language>
<approved>false</approved>
</translation>
<translation>
<language>es-ES</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-FR</language>
<approved>false</approved>
</translation>
<translation>
<language>pt-BR</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>dcc.location.street</name>
<description/>
<comment/>
<translations>
<translation>
<language>de-DE</language>
<approved>false</approved>
</translation>
<translation>
<language>en-GB</language>
<approved>false</approved>
</translation>
<translation>
<language>es-ES</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-FR</language>
<approved>false</approved>
</translation>
<translation>
<language>pt-BR</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>dcc.manufacturer</name>
<description/>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment