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

* commit '424111faf0e8b22b9e80c516f9f1c723bd206dbe':
  flattened result
  flattened result
This commit is contained in:
Veit Lukas (PEA4-Fe) 2020-08-10 12:39:15 +02:00
commit 4ff7d9eeae
7 changed files with 65 additions and 16 deletions

View File

@ -42,7 +42,7 @@
label="material number" appValidate="string" [name]="'materialNumber-' + item.i"
[ngModel]="item.value"></rb-form-input>
</rb-array-input>
<rb-form-select name="conditionSelect" label="Condition"
<rb-form-select name="conditionSelect" label="Type"
[(ngModel)]="material.properties.material_template">
<option *ngFor="let m of d.arr.materialTemplates" [value]="m._id">{{m.name}}</option>
</rb-form-select>
@ -247,7 +247,7 @@
Delete sample
</rb-icon-button>
<ng-template #modalDeleteConfirm>
<rb-alert alertTitle="Are you sure" type="danger" okBtnLabel="Delete sample" cancelBtnLabel="Cancel">
<rb-alert alertTitle="Are you sure?" type="danger" okBtnLabel="Delete sample" cancelBtnLabel="Cancel">
Do you really want to delete {{sample.number}}?
</rb-alert>
</ng-template>

View File

@ -104,13 +104,18 @@
JSON download link
</rb-icon-button>
<ng-template #linkModal>
<label for="jsonUrl">URL for JSON download</label>
<textarea class="linkmodal" id="jsonUrl" #linkarea [value]="sampleUrl({export: true, host: true})"
(keydown)="preventDefault($event)"></textarea>
<rb-form-checkbox class="space-below" name="download-csv" [(ngModel)]="downloadCsv">
add spectra
</rb-form-checkbox>
<rb-icon-button icon="clipboard" mode="secondary" (click)="clipboard()">Copy to clipboard</rb-icon-button>
<div class="link-dialog">
<label for="jsonUrl">URL for JSON download</label>
<textarea class="linkmodal" id="jsonUrl" #linkarea [value]="sampleUrl({export: true, host: true})"
(keydown)="preventDefault($event)"></textarea>
<rb-form-checkbox class="space-right" name="download-spectra" [(ngModel)]="downloadSpectra">
add spectra
</rb-form-checkbox>
<rb-form-checkbox name="download-flatten" [(ngModel)]="downloadFlatten">
flatten object
</rb-form-checkbox>
<rb-icon-button icon="clipboard" mode="secondary" (click)="clipboard()">Copy to clipboard</rb-icon-button>
</div>
</ng-template>
<a [href]="csvUrl" download="samples.csv">
<rb-icon-button icon="download" mode="secondary" (mousedown)="csvUrl = sampleUrl({csv: true, export: true})">

View File

@ -210,3 +210,13 @@ textarea.linkmodal {
padding-top: 0;
margin-top: -4.5px;
}
.link-dialog {
rb-form-checkbox {
display: inline-block;
}
rb-icon-button {
float: right;
}
}

View File

@ -34,7 +34,8 @@ export class SamplesComponent implements OnInit {
@ViewChild('pageSizeSelection') pageSizeSelection: ElementRef<HTMLElement>;
@ViewChild('linkarea') linkarea: ElementRef<HTMLTextAreaElement>;
downloadCsv = false;
downloadSpectra = false;
downloadFlatten = true;
samples: SampleModel[] = [];
totalSamples = 0; // total number of samples
csvUrl = ''; // store url separate so it only has to be generated when clicking the download button
@ -94,8 +95,6 @@ export class SamplesComponent implements OnInit {
this.calcFieldSelectKeys();
this.d.load('materials', () => {
this.filters.filters.find(e => e.field === 'material.name').autocomplete = this.d.arr.materials.map(e => e.name);
this.filters.filters.find(e => e.field === 'color').autocomplete =
[...new Set(this.d.arr.materials.reduce((s, e) => {s.push(...e.numbers.map(el => el.color)); return s; }, []))];
this.loadSamples();
});
this.d.load('materialSuppliers', () => {
@ -200,7 +199,7 @@ export class SamplesComponent implements OnInit {
}
query.push('sort=' + this.filters.sort);
if (options.csv) {
query.push('csv=true');
query.push('output=csv');
}
if (options.export) {
query.push('key=' + this.d.d.userKey.key);
@ -230,8 +229,13 @@ export class SamplesComponent implements OnInit {
}
});
}
else if (this.downloadCsv) {
query.push('fields[]=measurements.spectrum.dpt');
else {
if (this.downloadFlatten) {
query.push('output=flatten');
}
if (this.downloadSpectra) {
query.push('fields[]=measurements.spectrum.dpt');
}
}
return (options.host && isDevMode() ? window.location.host : '') +
(options.export ? this.api.hostName : '') +

View File

@ -94,6 +94,15 @@
</rb-array-input>
</td>
<td>
<rb-icon-button icon="delete" mode="danger" class="space-below"
(click)="deleteConfirm(modalDeleteConfirm, user.name)">
Delete
</rb-icon-button>
<ng-template #modalDeleteConfirm>
<rb-alert alertTitle="Are you sure?" type="danger" okBtnLabel="Delete user" cancelBtnLabel="Cancel">
Do you really want to delete this user?
</rb-alert>
</ng-template>
<rb-icon-button icon="save" mode="primary" (click)="saveUser(user)"
[disabled]="nameInput.invalid || emailInput.invalid || locationInput.invalid">
Save

View File

@ -1,3 +1,12 @@
::ng-deep td .error-messages {
position: absolute;
}
td:last-child rb-icon-button {
width: 100px;
float: left;
::ng-deep button {
width: 100%;
}
}

View File

@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
import {ApiService} from '../services/api.service';
import {UserModel} from '../models/user.model';
import {LoginService} from '../services/login.service';
import {ModalService} from '@inst-iot/bosch-angular-ui-components';
@Component({
@ -17,7 +18,8 @@ export class UsersComponent implements OnInit {
constructor(
private api: ApiService,
public login: LoginService
public login: LoginService,
private modal: ModalService
) { }
ngOnInit(): void {
@ -45,4 +47,14 @@ export class UsersComponent implements OnInit {
this.newUser = this.newUser ? null : new UserModel();
}
deleteConfirm(modal, username) {
this.modal.open(modal).then(result => {
if (result) {
this.api.delete('/user/' + username, () => {
this.users.splice(this.users.findIndex(e => e.name === username), 1);
});
}
});
}
}