Merge pull request #11 in ~VLE2FE/definma-ui from development to master

* commit '620104f65ed115a87cd0f07e560524f3ff8fc3c5':
  added presentation
This commit is contained in:
Veit Lukas (PEA4-Fe) 2020-08-07 15:25:48 +02:00
commit 9f47e511e4
4 changed files with 22 additions and 3 deletions

View File

@ -32,7 +32,7 @@
<rb-icon-button icon="mail" mode="primary" (mouseup)="closeBugReport(close)">Send report</rb-icon-button>
</a>
</ng-template>
<span class="dev-label" *ngIf="devMode">DEVELOPMENT</span>
<!-- <span class="dev-label" *ngIf="devMode">DEVELOPMENT</span>-->
DeFinMa
</div>
</rb-full-header>

View File

@ -4,6 +4,22 @@
Find the API documentation here:
<a href="https://definma-api.apps.de1.bosch-iot-cloud.com/api-doc/">
https://definma-api.apps.de1.bosch-iot-cloud.com/api-doc/
</a><br>
Code repository UI
<a href="https://sourcecode.socialcoding.bosch.com/users/vle2fe/repos/definma-ui">
https://sourcecode.socialcoding.bosch.com/users/vle2fe/repos/definma-ui
</a><br>
Code repository API
<a href="https://sourcecode.socialcoding.bosch.com/users/vle2fe/repos/definma-api">
https://sourcecode.socialcoding.bosch.com/users/vle2fe/repos/definma-api
</a><br>
</p>
<h4>Introduction</h4>
<p>
<a [href]="api.hostName + '/static/intro-presentation'">
View the presentation explaining the main functions
</a>
</p>

View File

@ -1,4 +1,5 @@
import { Component, OnInit } from '@angular/core';
import {ApiService} from '../services/api.service';
@Component({
selector: 'app-documentation',
@ -7,7 +8,9 @@ import { Component, OnInit } from '@angular/core';
})
export class DocumentationComponent implements OnInit {
constructor() { }
constructor(
public api: ApiService
) { }
ngOnInit(): void {
}

View File

@ -135,7 +135,7 @@
<div *ngIf="generatedSamples.length && !loading">
<div *ngIf="!editSampleBase">
<h3 *ngIf="new">Successfully added samples:</h3>
<span class="rb-ic rb-ic-edit clickable" (click)="checkFormAfterInit = editSampleBase = true"></span>
<span *ngIf="!new" class="rb-ic rb-ic-edit clickable" (click)="checkFormAfterInit = editSampleBase = true"></span>
<rb-table id="response-data">
<tr><td>Material</td><td>{{generatedSamples[0].material.name}}</td></tr>
<tr><td>Type</td><td>{{generatedSamples[0].type}}</td></tr>