Merge pull request #39 in ~VLE2FE/definma-ui from b/ui-fixes to master

* commit 'ad52baf30af53c5a1ae7868bd47f5862774b1327':
  Display sample number in sample editor
  Remove non-existent image reference, fix HTML escapes
This commit is contained in:
Kai S. K. Engelbart 2020-12-03 14:01:36 +01:00
commit 94649011f3
3 changed files with 3 additions and 5 deletions

View File

@ -1,6 +1,3 @@
<img src="/assets/imgs/architecture.svg" alt="architecture" class="space-below">
<p>
Bosch IoT Cloud space where all applications are hosted:
<a href="https://apps.sys.de1.bosch-iot-cloud.com/organizations/b28baba5-f95f-4ce5-bc9c-3f45acd1dfb2">

View File

@ -22,7 +22,7 @@ Every time:
<li>cf ssh -L 1120:st0cvm200118.internal-mongodb.de1.bosch-iot-cloud.com:30000 definma-api</li>
<li>
Login into your application with localhost:1120 and use credentials and Authentication Database from the BIC
(Data can be found at Home>DeFinMa>production>definma-api>Services>dots on the right of definmadb>View Credentials)
(Data can be found at Home&gt;DeFinMa&gt;production&gt;definma-api&gt;Services&gt;dots on the right of definmadb&gt;View Credentials)
</li>
</ul>

View File

@ -165,9 +165,10 @@
<span class="rb-ic rb-ic-edit clickable" (click)="checkFormAfterInit = view.base = true; view.baseSum = false">
</span>
<rb-table id="response-data">
<tr><td>Sample Number</td><td>{{baseSample.number}}</td></tr>
<tr><td>Material</td><td>{{material.name}}</td></tr>
<tr><td>Type</td><td>{{baseSample.type}}</td></tr>
<tr><td>color</td><td>{{baseSample.color}}</td></tr>
<tr><td>Color</td><td>{{baseSample.color}}</td></tr>
<tr><td>Batch</td><td>{{baseSample.batch}}</td></tr>
<tr><td>Comment</td><td>{{baseSample.notes | exists:'comment'}}</td></tr>
<tr *ngFor="let reference of sampleReferences.slice(0, -1)">