From: Bastian Dehn Date: Sat, 18 Jun 2022 08:22:22 +0000 (+0200) Subject: add: missing variable types X-Git-Tag: v1.0.4^2~2 X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=aed7698ca773fb640671ac67edee0da0d1465119;p=speisekarten-editor.git add: missing variable types --- diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 29da96d..07226bc 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,5 +1,6 @@ import { Component, ViewChild, AfterViewChecked } from '@angular/core'; import { SafeUrl } from '@angular/platform-browser'; +import { Observable } from 'rxjs'; import { ITitle } from './ititle'; import { ISubtitle } from './isubtitle'; import { IFood } from './ifood'; @@ -26,7 +27,7 @@ export class AppComponent implements AfterViewChecked public exportJson(): void { - let observ = this.jsonFileService.exportJson(this.foodcard); + let observ: Observable = this.jsonFileService.exportJson(this.foodcard); observ.subscribe((next) => { this.downloadJsonHref = next; }); @@ -34,7 +35,7 @@ export class AppComponent implements AfterViewChecked public exportHtml(): void { - let observ = this.htmlExportService.exportHtml(this.foodcard); + let observ: Observable = this.htmlExportService.exportHtml(this.foodcard); observ.subscribe((next) => { this.downloadHtmlHref = next; }); @@ -42,7 +43,7 @@ export class AppComponent implements AfterViewChecked public fileEvent(event: any): void { - let importobserv = this.jsonFileService.importJson(event); + let importobserv: Observable = this.jsonFileService.importJson(event); importobserv.subscribe((next) => { this.foodcard = next; }); @@ -53,16 +54,16 @@ export class AppComponent implements AfterViewChecked this.foodcard.Titles.push({ Title: "", Subtitles: [] }); } - public ngAfterViewChecked() + public ngAfterViewChecked(): void { if (this.downloadJsonHref !== "") { - let link = document.getElementById("exportJsonLink"); + let link: HTMLElement | null = document.getElementById("exportJsonLink"); link?.click(); Promise.resolve().then(() => this.downloadJsonHref = ""); } if (this.downloadHtmlHref !== "") { - let link = document.getElementById("exportHtmlLink"); + let link: HTMLElement | null = document.getElementById("exportHtmlLink"); link?.click(); Promise.resolve().then(() => this.downloadHtmlHref = ""); } diff --git a/src/app/foodcard/foodcard.component.ts b/src/app/foodcard/foodcard.component.ts index fffd03e..077f488 100644 --- a/src/app/foodcard/foodcard.component.ts +++ b/src/app/foodcard/foodcard.component.ts @@ -1,5 +1,6 @@ import { Component, Input } from '@angular/core'; import { IFoodCard } from '../ifood-card'; +import { ITitle } from '../ititle'; @Component({ selector: 'app-foodcard', @@ -26,7 +27,7 @@ export class FoodcardComponent public addNewSubtitle(index: number): void { - let title = this.foodcard.Titles[index]; + let title: ITitle = this.foodcard.Titles[index]; title.Subtitles.splice(index, 0, { Subtitle: "", Foods: [] }); } diff --git a/src/app/html-export.service.ts b/src/app/html-export.service.ts index ee34936..cd33a6f 100644 --- a/src/app/html-export.service.ts +++ b/src/app/html-export.service.ts @@ -19,7 +19,7 @@ export class HtmlExportService constructor(private sanitizer: DomSanitizer, private httpclient: HttpClient) { - let loadcss = this.loadCssFile("assets/htmlexport.css"); + let loadcss: Observable = this.loadCssFile("assets/htmlexport.css"); loadcss.subscribe((content: any) => { this.cssExportContent = content as string; }); loadcss = this.loadCssFile("assets/htmlprintexport.css"); @@ -29,13 +29,13 @@ export class HtmlExportService public exportHtml(foodcard: IFoodCard): Observable { - let observ = new Observable((observ) => { - let doctype = ""; - let doc = document.implementation.createHTMLDocument(); + let observ: Observable = new Observable((observ) => { + let doctype: string = ""; + let doc: HTMLDocument = document.implementation.createHTMLDocument(); doc.documentElement.lang = "de"; doc.title = "Speisekarte"; - let element = document.createElement("meta"); + let element: HTMLMetaElement = document.createElement("meta"); element.setAttribute("charset", "utf-8"); doc.head.appendChild(element); @@ -44,7 +44,7 @@ export class HtmlExportService element.setAttribute("content", "width=device-width, initial-scale=1"); doc.head.appendChild(element); - let styleElement = document.createElement("style"); + let styleElement: HTMLStyleElement = document.createElement("style"); styleElement.setAttribute("type", "text/css"); styleElement.setAttribute("media", "screen"); styleElement.innerHTML = this.cssExportContent; @@ -56,16 +56,16 @@ export class HtmlExportService styleElement.innerHTML = this.cssPrintExportContent; doc.head.appendChild(styleElement); - let divElement = document.createElement("div"); + let divElement: HTMLDivElement = document.createElement("div"); divElement.classList.add("foodcard"); divElement.appendChild(this.createHtmlTitles(foodcard.Titles)); doc.body.appendChild(divElement); - let pElement = document.createElement("p"); + let pElement: HTMLElement = document.createElement("p"); pElement.innerText = "Fragen zu Allergenen beantwortet Ihnen gerne unser Servicepersonal"; doc.body.appendChild(pElement); - let result = this.sanitizer.bypassSecurityTrustUrl("data:text/html;charset=UTF-8," + doctype + doc.documentElement.outerHTML); + let result: SafeUrl = this.sanitizer.bypassSecurityTrustUrl("data:text/html;charset=UTF-8," + doctype + doc.documentElement.outerHTML); observ.next(result); }); @@ -87,10 +87,10 @@ export class HtmlExportService private createHtmlTitles(titles: ITitle[]): HTMLDivElement { - let divElement = document.createElement("div"); + let divElement: HTMLDivElement = document.createElement("div"); divElement.classList.add("title"); - let element = document.createElement("h1"); + let element: HTMLDivElement = document.createElement("h1"); for (let i = 0; i < titles.length; i++) { element = document.createElement("h1"); element.innerText = titles[i].Title; @@ -103,10 +103,10 @@ export class HtmlExportService private createHtmlSubtitles(subtitles: ISubtitle[]): HTMLDivElement { - let divElement = document.createElement("div"); + let divElement: HTMLDivElement = document.createElement("div"); divElement.classList.add("subtitle"); - let element = document.createElement("h2"); + let element: HTMLElement = document.createElement("h2"); for (let i = 0; i < subtitles.length; i++) { element = document.createElement("h2"); element.innerText = subtitles[i].Subtitle; @@ -119,11 +119,11 @@ export class HtmlExportService private createHtmlFoods(foods: IFood[]): HTMLDivElement { - let divElement = document.createElement("div"); + let divElement: HTMLDivElement = document.createElement("div"); divElement.classList.add("foods"); - let divSubElement = document.createElement("div"); - let divFoodElement = document.createElement("div"); + let divSubElement: HTMLDivElement = document.createElement("div"); + let divFoodElement: HTMLDivElement = document.createElement("div"); for (let i = 0; i < foods.length; i++) { divSubElement = document.createElement("div"); divSubElement.classList.add("grid"); diff --git a/src/app/json-file.service.ts b/src/app/json-file.service.ts index 63cb8bc..32415c2 100644 --- a/src/app/json-file.service.ts +++ b/src/app/json-file.service.ts @@ -13,9 +13,9 @@ export class JsonFileService public exportJson(foodcard: IFoodCard): Observable { - let observ = new Observable((observ) => { - let json = JSON.stringify(foodcard); - let result = this.sanitizer.bypassSecurityTrustUrl("data:text/json;charset=UTF-8," + json); + let observ: Observable = new Observable((observ) => { + let json: string = JSON.stringify(foodcard); + let result: SafeUrl = this.sanitizer.bypassSecurityTrustUrl("data:text/json;charset=UTF-8," + json); observ.next(result); }); @@ -24,10 +24,10 @@ export class JsonFileService public importJson(event: any): Observable { - let observ = new Observable((observ) => { + let observ: Observable = new Observable((observ) => { let foodcard: IFoodCard = { Titles: [] }; - const reader = new FileReader(); + const reader: FileReader = new FileReader(); reader.onload = (e: any) => { observ.next(JSON.parse(e.target.result)); } diff --git a/src/app/title/title.component.ts b/src/app/title/title.component.ts index 0b841d7..6cb8b6c 100644 --- a/src/app/title/title.component.ts +++ b/src/app/title/title.component.ts @@ -42,7 +42,7 @@ export class TitleComponent implements OnInit { Subtitle: "", Foods: [] }); } - public removeSubSection(index: number) + public removeSubSection(index: number): void { this.title.Subtitles.splice(index, 1); }