ソースを参照

formatting

master
Florian Eisenmenger 2年前
コミット
993292b3a9
8個のファイルの変更48行の追加34行の削除
  1. +5
    -3
      matsen-tool/src/app/app.component.html
  2. +0
    -2
      matsen-tool/src/app/app.component.ts
  3. +2
    -1
      matsen-tool/src/app/documents/documents.component.html
  4. +0
    -1
      matsen-tool/src/app/documents/documents.component.ts
  5. +12
    -8
      matsen-tool/src/app/home/home.component.html
  6. +27
    -17
      matsen-tool/src/app/partners/partners-detail/partners-detail.component.html
  7. +2
    -1
      matsen-tool/src/app/products/products.component.html
  8. +0
    -1
      matsen-tool/src/app/products/products.component.ts

+ 5
- 3
matsen-tool/src/app/app.component.html ファイルの表示

@@ -2,8 +2,10 @@
<nav class="navbar navbar-expand navbar-primary bg-primary px-3" *ngIf="user"> <nav class="navbar navbar-expand navbar-primary bg-primary px-3" *ngIf="user">
<div class="container-fluid"> <div class="container-fluid">
<div class="navbar-nav"> <div class="navbar-nav">
<a class="nav-item nav-link" routerLink="/" routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}">
<img src="./assets/images/specific/matsen_logo.svg" width="247" height="94" alt="{{'basic.company-name' | translate}}" />
<a class="nav-item nav-link" routerLink="/" routerLinkActive="active"
[routerLinkActiveOptions]="{exact: true}">
<img src="./assets/images/specific/matsen_logo.svg" width="247" height="94"
alt="{{'basic.company-name' | translate}}"/>
</a> </a>
</div> </div>
<div class="navbar-nav align-items-center"> <div class="navbar-nav align-items-center">
@@ -19,7 +21,7 @@
<li><a class="dropdown-item" href="#">Peter Matusik: Christian hat einen Kommentar verfasst</a></li> <li><a class="dropdown-item" href="#">Peter Matusik: Christian hat einen Kommentar verfasst</a></li>
</ul> </ul>
</div> </div>
<button class="btn btn-link nav-item nav-link" (click)="logout()">{{'basic.logout' | translate}}</button>
<button class="btn btn-link nav-item nav-link" (click)="logout()">{{ 'basic.logout' | translate }}</button>
</div> </div>
</div> </div>
</nav> </nav>


+ 0
- 2
matsen-tool/src/app/app.component.ts ファイルの表示

@@ -1,7 +1,6 @@
import {Component, OnInit} from '@angular/core'; import {Component, OnInit} from '@angular/core';
import {AccountService} from './_services'; import {AccountService} from './_services';
import {User} from './_models'; import {User} from './_models';
import {PostService} from "@app/core/api/v1";
import {TranslateService} from "@ngx-translate/core"; import {TranslateService} from "@ngx-translate/core";
import {environment} from "@environments/environment"; import {environment} from "@environments/environment";


@@ -15,7 +14,6 @@ export class AppComponent implements OnInit {
protected user?: User | null; protected user?: User | null;


constructor( constructor(
private postService: PostService,
private accountService: AccountService, private accountService: AccountService,
translate: TranslateService translate: TranslateService
) { ) {


+ 2
- 1
matsen-tool/src/app/documents/documents.component.html ファイルの表示

@@ -18,7 +18,8 @@
<th mat-header-cell *matHeaderCellDef mat-sort-header sortActionDescription="Nach Dokument sortieren"> <th mat-header-cell *matHeaderCellDef mat-sort-header sortActionDescription="Nach Dokument sortieren">
Dokument Dokument
</th> </th>
<td mat-cell *matCellDef="let element"><span (click)="navigateToDocumentFile(element)">{{ element.name }}</span></td>
<td mat-cell *matCellDef="let element"><span (click)="navigateToDocumentFile(element)">{{ element.name }}</span>
</td>
</ng-container> </ng-container>


<ng-container matColumnDef="type"> <ng-container matColumnDef="type">


+ 0
- 1
matsen-tool/src/app/documents/documents.component.ts ファイルの表示

@@ -8,7 +8,6 @@ import {MatTableDataSource, MatTableModule} from "@angular/material/table";
import {OrderFilter} from "@app/_models/orderFilter"; import {OrderFilter} from "@app/_models/orderFilter";
import {NgIf} from "@angular/common"; import {NgIf} from "@angular/common";
import {ModalComponent} from "@app/_components/modal/modal.component"; import {ModalComponent} from "@app/_components/modal/modal.component";
import {NewPartnerComponent} from "@app/partners/new-partner/new-partner.component";
import {NgbModal} from "@ng-bootstrap/ng-bootstrap"; import {NgbModal} from "@ng-bootstrap/ng-bootstrap";
import {NewDocumentComponent} from "@app/documents/new-document/new-document.component"; import {NewDocumentComponent} from "@app/documents/new-document/new-document.component";




+ 12
- 8
matsen-tool/src/app/home/home.component.html ファイルの表示

@@ -63,7 +63,8 @@
<h2>Meine Aufgaben</h2> <h2>Meine Aufgaben</h2>


<div class="card mb-3 p-3"> <div class="card mb-3 p-3">
<div class="position-relative" data-bs-toggle="collapse" data-bs-target="#collapseExample" aria-expanded="false" aria-controls="collapseExample">
<div class="position-relative" data-bs-toggle="collapse" data-bs-target="#collapseExample"
aria-expanded="false" aria-controls="collapseExample">
<h3 class="m-0">Matsen AG</h3> <h3 class="m-0">Matsen AG</h3>
<span class="info d-flex position-absolute"> <span class="info d-flex position-absolute">
<span class="due-date">01.10.2023</span> <span class="due-date">01.10.2023</span>
@@ -73,14 +74,16 @@
</div> </div>
<div class="collapse" id="collapseExample"> <div class="collapse" id="collapseExample">
<div class="pt-3 pe-5 position-relative"> <div class="pt-3 pe-5 position-relative">
<p class="m-0">Some placeholder content for the collapse component. This panel is hidden by default but revealed when the user activates the relevant trigger.</p>
<p class="m-0">Some placeholder content for the collapse component. This panel is hidden by default
but revealed when the user activates the relevant trigger.</p>
<span class="position-absolute bi bi-pencil" data-type="user-tool" data-action="edit"></span> <span class="position-absolute bi bi-pencil" data-type="user-tool" data-action="edit"></span>
</div> </div>
</div> </div>
</div> </div>


<div class="card mb-3 p-3"> <div class="card mb-3 p-3">
<div class="position-relative" data-bs-toggle="collapse" data-bs-target="#collapseExample2" aria-expanded="false" aria-controls="collapseExample2">
<div class="position-relative" data-bs-toggle="collapse" data-bs-target="#collapseExample2"
aria-expanded="false" aria-controls="collapseExample2">
<h3 class="m-0">Matsen AG</h3> <h3 class="m-0">Matsen AG</h3>
<span class="info d-flex position-absolute"> <span class="info d-flex position-absolute">
<span class="due-date">01.10.2023</span> <span class="due-date">01.10.2023</span>
@@ -90,7 +93,8 @@
</div> </div>
<div class="collapse" id="collapseExample2"> <div class="collapse" id="collapseExample2">
<div class="pt-3 pe-5 position-relative"> <div class="pt-3 pe-5 position-relative">
<p class="m-0">Some placeholder content for the collapse component. This panel is hidden by default but revealed when the user activates the relevant trigger.</p>
<p class="m-0">Some placeholder content for the collapse component. This panel is hidden by default
but revealed when the user activates the relevant trigger.</p>
<span class="position-absolute bi bi-pencil" data-type="user-tool" data-action="edit"></span> <span class="position-absolute bi bi-pencil" data-type="user-tool" data-action="edit"></span>
</div> </div>
</div> </div>
@@ -101,13 +105,13 @@
</div> </div>
<ul> <ul>
<li *ngFor="let user of users"> <li *ngFor="let user of users">
<h2>{{user.id}} - {{user.lastName}}</h2>
<p>{{user.email}}</p>
<h2>{{ user.id }} - {{ user.lastName }}</h2>
<p>{{ user.email }}</p>
</li> </li>
</ul> </ul>
<ul> <ul>
<li *ngFor="let post of posts"> <li *ngFor="let post of posts">
<h2>{{post.id}} - {{post.owner}}</h2>
<p>{{post.message}}</p>
<h2>{{ post.id }} - {{ post.owner }}</h2>
<p>{{ post.message }}</p>
</li> </li>
</ul> </ul>

+ 27
- 17
matsen-tool/src/app/partners/partners-detail/partners-detail.component.html ファイルの表示

@@ -1,10 +1,10 @@
<div class="card"> <div class="card">
<div class="card-body row"> <div class="card-body row">
<div class="col-4"> <div class="col-4">
<h1>{{partner.name}}</h1>
<p>{{partner.street}} {{partner.streetNo}}<br/>
{{partner.zip}} {{partner.city}}<br/>
{{partner.country}}</p>
<h1>{{ partner.name }}</h1>
<p>{{ partner.street }} {{ partner.streetNo }}<br/>
{{ partner.zip }} {{ partner.city }}<br/>
{{ partner.country }}</p>
<p>Sprache: Deutsch</p> <p>Sprache: Deutsch</p>
</div> </div>
<div class="col-4"> <div class="col-4">
@@ -13,7 +13,7 @@
<dt>Telefon:</dt> <dt>Telefon:</dt>
<dd>0177 289 23 02</dd> <dd>0177 289 23 02</dd>
<dt>Website:</dt> <dt>Website:</dt>
<dd><a href="{{partner.website}}" target="_blank">{{partner.website}}</a></dd>
<dd><a href="{{partner.website}}" target="_blank">{{ partner.website }}</a></dd>
<dt>Streckenpunkt:</dt> <dt>Streckenpunkt:</dt>
<dd>AT-Salzburg</dd> <dd>AT-Salzburg</dd>
<dt>Geschäftsbuchungsgruppe:</dt> <dt>Geschäftsbuchungsgruppe:</dt>
@@ -25,8 +25,8 @@
</dl> </dl>
</div> </div>
<div class="col-4"> <div class="col-4">
<img *ngIf="partner.logoUrl !== null" src="{{environment.basePath}}{{partner.logoUrl}}" width="247" height="94"
alt="{{partner.name}}" title="{{partner.name}}" />
<img *ngIf="partner.logoUrl !== null" src="{{environment.basePath}}{{partner.logoUrl}}" width="247"
height="94" alt="{{partner.name}}" title="{{partner.name}}"/>
</div> </div>
</div> </div>
</div> </div>
@@ -40,14 +40,15 @@
<div class="card"> <div class="card">
<div class="card-body row"> <div class="card-body row">
<div class="col-8"> <div class="col-8">
<h2>{{contact.firstName}} {{contact.lastName}}</h2>
<p><a href="mailto:{{contact.email}}">{{contact.email}}</a><br/>
{{contact.phone}}<br/>
{{contact.position}}</p>
<h2>{{ contact.firstName }} {{ contact.lastName }}</h2>
<p><a href="mailto:{{contact.email}}">{{ contact.email }}</a><br/>
{{ contact.phone }}<br/>
{{ contact.position }}</p>
</div> </div>
<div class="col-4"> <div class="col-4">
<img src="{{environment.basePath}}{{contact.imageUrl}}" width="247" height="94" <img src="{{environment.basePath}}{{contact.imageUrl}}" width="247" height="94"
alt="{{contact.firstName}} {{contact.lastName}}" title="{{contact.firstName}} {{contact.lastName}}" />
alt="{{contact.firstName}} {{contact.lastName}}"
title="{{contact.firstName}} {{contact.lastName}}"/>
</div> </div>
</div> </div>
</div> </div>
@@ -74,7 +75,12 @@
<div class="card-body"> <div class="card-body">
<div> <div>
<h3>Viel Platz für Freitext</h3> <h3>Viel Platz für Freitext</h3>
<p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.</p>
<p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut
labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores
et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut
labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores
et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.</p>
</div> </div>
</div> </div>
</div> </div>
@@ -86,7 +92,8 @@
<button (click)="openModalNewTask()">Neue Aufgabe</button> <button (click)="openModalNewTask()">Neue Aufgabe</button>
</div> </div>
<div class="card mb-3 p-3"> <div class="card mb-3 p-3">
<div class="position-relative" data-bs-toggle="collapse" data-bs-target="#collapseExample" aria-expanded="false" aria-controls="collapseExample">
<div class="position-relative" data-bs-toggle="collapse" data-bs-target="#collapseExample" aria-expanded="false"
aria-controls="collapseExample">
<h3 class="m-0">Matsen AG</h3> <h3 class="m-0">Matsen AG</h3>
<span class="info d-flex position-absolute"> <span class="info d-flex position-absolute">
<span class="due-date">01.10.2023</span> <span class="due-date">01.10.2023</span>
@@ -96,13 +103,15 @@
</div> </div>
<div class="collapse" id="collapseExample"> <div class="collapse" id="collapseExample">
<div class="pt-3 pe-5 position-relative"> <div class="pt-3 pe-5 position-relative">
<p class="m-0">Some placeholder content for the collapse component. This panel is hidden by default but revealed when the user activates the relevant trigger.</p>
<p class="m-0">Some placeholder content for the collapse component. This panel is hidden by default but
revealed when the user activates the relevant trigger.</p>
<span class="position-absolute bi bi-pencil" data-type="user-tool" data-action="edit"></span> <span class="position-absolute bi bi-pencil" data-type="user-tool" data-action="edit"></span>
</div> </div>
</div> </div>
</div> </div>
<div class="card mb-3 p-3"> <div class="card mb-3 p-3">
<div class="position-relative" data-bs-toggle="collapse" data-bs-target="#collapseExample2" aria-expanded="false" aria-controls="collapseExample2">
<div class="position-relative" data-bs-toggle="collapse" data-bs-target="#collapseExample2"
aria-expanded="false" aria-controls="collapseExample2">
<h3 class="m-0">Matsen AG</h3> <h3 class="m-0">Matsen AG</h3>
<span class="info d-flex position-absolute"> <span class="info d-flex position-absolute">
<span class="due-date">01.10.2023</span> <span class="due-date">01.10.2023</span>
@@ -112,7 +121,8 @@
</div> </div>
<div class="collapse" id="collapseExample2"> <div class="collapse" id="collapseExample2">
<div class="pt-3 pe-5 position-relative"> <div class="pt-3 pe-5 position-relative">
<p class="m-0">Some placeholder content for the collapse component. This panel is hidden by default but revealed when the user activates the relevant trigger.</p>
<p class="m-0">Some placeholder content for the collapse component. This panel is hidden by default but
revealed when the user activates the relevant trigger.</p>
<span class="position-absolute bi bi-pencil" data-type="user-tool" data-action="edit"></span> <span class="position-absolute bi bi-pencil" data-type="user-tool" data-action="edit"></span>
</div> </div>
</div> </div>


+ 2
- 1
matsen-tool/src/app/products/products.component.html ファイルの表示

@@ -18,7 +18,8 @@
<th mat-header-cell *matHeaderCellDef mat-sort-header sortActionDescription="Nach Produktname sortieren"> <th mat-header-cell *matHeaderCellDef mat-sort-header sortActionDescription="Nach Produktname sortieren">
Produktname Produktname
</th> </th>
<td mat-cell *matCellDef="let element"><span (click)="navigateToProductDetails(element)">{{ element.name }}</span></td>
<td mat-cell *matCellDef="let element"><span
(click)="navigateToProductDetails(element)">{{ element.name }}</span></td>
</ng-container> </ng-container>


<ng-container matColumnDef="storage"> <ng-container matColumnDef="storage">


+ 0
- 1
matsen-tool/src/app/products/products.component.ts ファイルの表示

@@ -9,7 +9,6 @@ import {Router, RouterLink, RouterLinkActive} from "@angular/router";
import {NgIf} from "@angular/common"; import {NgIf} from "@angular/common";
import {Subscription} from "rxjs"; import {Subscription} from "rxjs";
import {ModalComponent} from "@app/_components/modal/modal.component"; import {ModalComponent} from "@app/_components/modal/modal.component";
import {NewTaskComponent} from "@app/tasks/new-task/new-task.component";
import {NgbModal} from "@ng-bootstrap/ng-bootstrap"; import {NgbModal} from "@ng-bootstrap/ng-bootstrap";
import {NewProductComponent} from "@app/products/new-product/new-product.component"; import {NewProductComponent} from "@app/products/new-product/new-product.component";




読み込み中…
キャンセル
保存