bug button, data service, user level adjustments, multiple sample support for edit dialog, validation functionality
This commit is contained in:
VLE2FE
@ -2,32 +2,33 @@
|
||||
|
||||
<rb-loading-spinner *ngIf="loading"></rb-loading-spinner>
|
||||
|
||||
<form #sampleForm="ngForm" *ngIf="!responseData && !loading">
|
||||
<!--<form #sampleForm="ngForm">-->
|
||||
<form #sampleForm="ngForm" *ngIf="(!generatedSamples.length || editSampleBase) && !loading">
|
||||
<div class="sample">
|
||||
<div>
|
||||
<rb-form-input name="materialname" label="material name" [rbDebounceTime]="0" [rbInitialOpen]="true"
|
||||
[rbFormInputAutocomplete]="autocomplete.bind(this, ac.materialNames)" appValidate="stringOf"
|
||||
[rbFormInputAutocomplete]="autocomplete.bind(this, materialNames)" appValidate="stringOf"
|
||||
(keydown)="preventDefault($event)" (ngModelChange)="findMaterial($event)" ngModel
|
||||
[appValidateArgs]="[ac.materialName]" required [(ngModel)]="material.name" [autofocus]="true">
|
||||
[appValidateArgs]="[materialNames]" required [(ngModel)]="material.name" [autofocus]="true">
|
||||
<ng-template rbFormValidationMessage="required">Cannot be empty</ng-template>
|
||||
<ng-template rbFormValidationMessage="failure">Unknown material, add properties for new material</ng-template>
|
||||
</rb-form-input>
|
||||
<rb-icon-button icon="add" mode="secondary" (click)="setNewMaterial(!newMaterial)">New material</rb-icon-button>
|
||||
<rb-icon-button class="set-new-material space-below" icon="add" mode="secondary"
|
||||
(click)="setNewMaterial(!newMaterial)">New material</rb-icon-button>
|
||||
</div>
|
||||
|
||||
<div class="material shaded-container" *ngIf="newMaterial" [@inOut]>
|
||||
<h4>Material properties</h4>
|
||||
<rb-form-input name="supplier" label="supplier" [rbFormInputAutocomplete]="autocomplete.bind(this, ac.supplier)"
|
||||
<rb-form-input name="supplier" label="supplier"
|
||||
[rbFormInputAutocomplete]="autocomplete.bind(this, d.arr.materialSupplier)"
|
||||
[rbDebounceTime]="0" [rbInitialOpen]="true" appValidate="string" required
|
||||
[(ngModel)]="material.supplier" #supplierInput="ngModel"
|
||||
(focusout)="checkTypo('supplier', modalWarning)">
|
||||
(focusout)="checkTypo('materialSuppliers', 'supplier', modalWarning)">
|
||||
<ng-template rbFormValidationMessage="failure">{{supplierInput.errors.failure}}</ng-template>
|
||||
</rb-form-input>
|
||||
<rb-form-input name="group" label="group" [rbFormInputAutocomplete]="autocomplete.bind(this, ac.mgroup)"
|
||||
<rb-form-input name="group" label="group" [rbFormInputAutocomplete]="autocomplete.bind(this, d.arr.materialGroup)"
|
||||
[rbDebounceTime]="0" [rbInitialOpen]="true" appValidate="string" required
|
||||
[(ngModel)]="material.group" #groupInput="ngModel"
|
||||
(focusout)="checkTypo('mgroup', modalWarning)">
|
||||
(focusout)="checkTypo('materialGroups', 'group', modalWarning)">
|
||||
<ng-template rbFormValidationMessage="failure">{{groupInput.errors.failure}}</ng-template>
|
||||
</rb-form-input>
|
||||
<ng-template #modalWarning>
|
||||
@ -41,11 +42,12 @@
|
||||
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" (ngModelChange)="selectMaterialTemplate($event)"
|
||||
[ngModel]="material.properties.material_template">
|
||||
<option *ngFor="let m of materialTemplates" [value]="m._id">{{m.name}}</option>
|
||||
<rb-form-select name="conditionSelect" label="Condition"
|
||||
[(ngModel)]="material.properties.material_template">
|
||||
<option *ngFor="let m of d.arr.materialTemplates" [value]="m._id">{{m.name}}</option>
|
||||
</rb-form-select>
|
||||
<rb-form-input *ngFor="let parameter of materialTemplate.parameters; index as i" [name]="'materialParameter' + i"
|
||||
<rb-form-input *ngFor="let parameter of d.id.materialTemplates[material.properties.material_template].parameters;
|
||||
index as i" [name]="'materialParameter' + i"
|
||||
[label]="parameter.name" appValidate="string" required
|
||||
[(ngModel)]="material.properties[parameter.name]" #parameterInput="ngModel">
|
||||
<ng-template rbFormValidationMessage="failure">{{parameterInput.errors.failure}}</ng-template>
|
||||
@ -53,15 +55,14 @@
|
||||
</rb-form-input>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div>
|
||||
<rb-form-input name="type" label="type" appValidate="string" required [(ngModel)]="sample.type"
|
||||
#typeInput="ngModel">
|
||||
<ng-template rbFormValidationMessage="failure">{{typeInput.errors.failure}}</ng-template>
|
||||
<rb-form-select name="type" label="type" required [(ngModel)]="sample.type" ngModel>
|
||||
<option value="granulate">granulate</option>
|
||||
<option value="part">part</option>
|
||||
<option value="tension rod">tension rod</option>
|
||||
<ng-template rbFormValidationMessage="required">Cannot be empty</ng-template>
|
||||
</rb-form-input>
|
||||
<rb-form-input name="color" label="color" appValidate="string" required [(ngModel)]="sample.color"
|
||||
</rb-form-select>
|
||||
<rb-form-input name="color" label="color" appValidate="string" [(ngModel)]="sample.color"
|
||||
#colorInput="ngModel">
|
||||
<ng-template rbFormValidationMessage="failure">{{colorInput.errors.failure}}</ng-template>
|
||||
<ng-template rbFormValidationMessage="required">Cannot be empty</ng-template>
|
||||
@ -112,99 +113,125 @@
|
||||
</rb-array-input>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div class="conditions shaded-container">
|
||||
<h4>
|
||||
Condition
|
||||
<button class="rb-btn rb-secondary condition-set" type="button" (click)="toggleCondition()"
|
||||
[disabled]="!conditionTemplates">{{condition ? 'Do not set condition' : 'Set condition'}}</button>
|
||||
</h4>
|
||||
<div *ngIf="condition" [@inOut]>
|
||||
<rb-form-select name="conditionSelect" label="Condition" (ngModelChange)="selectCondition($event)"
|
||||
[ngModel]="condition._id">
|
||||
<option *ngFor="let c of conditionTemplates" [value]="c._id">{{c.name}}</option>
|
||||
</rb-form-select>
|
||||
|
||||
<rb-form-input *ngFor="let parameter of condition.parameters; index as i" [name]="'conditionParameter' + i"
|
||||
[label]="parameter.name" appValidate="string" required
|
||||
[(ngModel)]="sample.condition[parameter.name]" #parameterInput="ngModel">
|
||||
<ng-template rbFormValidationMessage="failure">{{parameterInput.errors.failure}}</ng-template>
|
||||
<ng-template rbFormValidationMessage="required">Cannot be empty</ng-template>
|
||||
</rb-form-input>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div class="measurements shaded-container">
|
||||
<h4>Measurements</h4>
|
||||
<div *ngFor="let measurement of sample.measurements; index as mIndex" [@inOut]>
|
||||
<rb-form-select name="measurementTemplateSelect" label="Template" [(ngModel)]="measurement.measurement_template"
|
||||
(ngModelChange)="clearChart(mIndex)">
|
||||
<option *ngFor="let m of measurementTemplates" [value]="m._id">{{m.name}}</option>
|
||||
</rb-form-select>
|
||||
|
||||
<div *ngFor="let parameter of getMeasurementTemplate(measurement.measurement_template).parameters;
|
||||
index as pIndex">
|
||||
<rb-form-input *ngIf="!parameter.range.type" [name]="'measurementParameter' + mIndex + '-' + pIndex"
|
||||
[label]="parameter.name" appValidate="string" [(ngModel)]="measurement.values[parameter.name]"
|
||||
#parameterInput="ngModel">
|
||||
<ng-template rbFormValidationMessage="failure">{{parameterInput.errors.failure}}</ng-template>
|
||||
<ng-template rbFormValidationMessage="required">Cannot be empty</ng-template>
|
||||
</rb-form-input>
|
||||
<rb-form-file *ngIf="parameter.range.type" [name]="'measurementParameter' + mIndex + '-' + pIndex"
|
||||
[label]="parameter.name" maxSize="10000000" multiple
|
||||
(ngModelChange)="fileToArray($event, mIndex, parameter.name)"
|
||||
placeholder="Select file or drag and drop" dragDrop required ngModel>
|
||||
<ng-template rbFormValidationMessage="required">Cannot be empty</ng-template>
|
||||
</rb-form-file>
|
||||
<canvas baseChart *ngIf="parameter.range.type && charts[mIndex][0].data.length > 0" class="dpt-chart" [@inOut]
|
||||
[datasets]="charts[mIndex]"
|
||||
[labels]="[]"
|
||||
[options]="chartOptions"
|
||||
[legend]="false"
|
||||
chartType="scatter">
|
||||
</canvas>
|
||||
</div>
|
||||
<rb-icon-button icon="delete" mode="danger" (click)="removeMeasurement(mIndex)"
|
||||
[disabled]="!measurementTemplates">
|
||||
Delete measurement
|
||||
</rb-icon-button>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div>
|
||||
<rb-icon-button icon="add" mode="secondary" (click)="addMeasurement()" [disabled]="!measurementTemplates">
|
||||
New measurement
|
||||
</rb-icon-button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div>
|
||||
<div *ngIf="editSampleBase; else generateSamples" class="space-below">
|
||||
<button class="rb-btn rb-primary" type="submit" (click)="saveSample()" [disabled]="!sampleForm.form.valid">
|
||||
Save sample
|
||||
</button>
|
||||
</div>
|
||||
<ng-template #generateSamples>
|
||||
<rb-form-input type="number" name="sample-count" label="number of samples" pattern="^\d+?$" required
|
||||
rbNumberConverter rbMin="1" [(ngModel)]="sampleCount" class="sample-count">
|
||||
<ng-template rbFormValidationMessage="required">Cannot be empty</ng-template>
|
||||
<ng-template rbFormValidationMessage="rbMin">Must be at least 1</ng-template>
|
||||
</rb-form-input>
|
||||
<button class="rb-btn rb-primary space-below" type="submit" (click)="saveSample()"
|
||||
[disabled]="!sampleForm.form.valid">
|
||||
Generate sample{{sampleCount > 1 ? 's' : ''}}
|
||||
</button>
|
||||
</ng-template>
|
||||
</form>
|
||||
|
||||
<div *ngIf="responseData">
|
||||
<h3>Successfully added sample:</h3>
|
||||
<rb-table id="response-data">
|
||||
<tr><td>Sample number</td><td>{{responseData.number}}</td></tr>
|
||||
<tr><td>Type</td><td>{{responseData.type}}</td></tr>
|
||||
<tr><td>color</td><td>{{responseData.color}}</td></tr>
|
||||
<tr><td>Batch</td><td>{{responseData.batch}}</td></tr>
|
||||
<tr><td>Material</td><td>{{material.name}}</td></tr>
|
||||
</rb-table>
|
||||
|
||||
|
||||
|
||||
<div>
|
||||
<a routerLink="/samples">
|
||||
<button class="rb-btn rb-primary" type="button">Return to samples</button>
|
||||
</a>
|
||||
<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>
|
||||
<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>
|
||||
<tr><td>color</td><td>{{generatedSamples[0].color}}</td></tr>
|
||||
<tr><td>Batch</td><td>{{generatedSamples[0].batch}}</td></tr>
|
||||
</rb-table>
|
||||
</div>
|
||||
|
||||
<form #cmForm="ngForm">
|
||||
<div *ngFor="let gSample of generatedSamples; index as gIndex">
|
||||
<h4 *ngIf="new">{{gSample.number}}</h4>
|
||||
<div class="conditions shaded-container space-below">
|
||||
<h5>
|
||||
Condition
|
||||
<button class="rb-btn rb-secondary condition-set" type="button" (click)="toggleCondition(gSample)">
|
||||
{{gSample.condition.condition_template ? 'Do not set condition' : 'Set condition'}}
|
||||
</button>
|
||||
</h5>
|
||||
<div *ngIf="gSample.condition.condition_template" [@inOut]>
|
||||
<rb-form-select name="conditionSelect" label="Condition"
|
||||
[(ngModel)]="gSample.condition.condition_template">
|
||||
<option *ngFor="let c of d.arr.conditionTemplates" [value]="c._id">{{c.name}}</option>
|
||||
</rb-form-select>
|
||||
|
||||
<rb-form-input *ngFor="let parameter of
|
||||
d.id.conditionTemplates[gSample.condition.condition_template].parameters; index as i"
|
||||
[name]="'conditionParameter-' + gIndex + '-' + i"
|
||||
[label]="parameter.name" appValidate="string" required
|
||||
[(ngModel)]="gSample.condition[parameter.name]" #parameterInput="ngModel">
|
||||
<ng-template rbFormValidationMessage="failure">{{parameterInput.errors.failure}}</ng-template>
|
||||
<ng-template rbFormValidationMessage="required">Cannot be empty</ng-template>
|
||||
</rb-form-input>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="measurements shaded-container space-below">
|
||||
<h5>Measurements</h5>
|
||||
<div *ngFor="let measurement of gSample.measurements; index as mIndex" [@inOut]>
|
||||
<rb-form-select [name]="'measurementTemplateSelect-' + gIndex + '-' + mIndex" label="Template"
|
||||
[(ngModel)]="measurement.measurement_template"
|
||||
(ngModelChange)="clearMeasurement(gIndex, mIndex)">
|
||||
<option *ngFor="let m of d.arr.measurementTemplates" [value]="m._id">{{m.name}}</option>
|
||||
</rb-form-select>
|
||||
|
||||
<div *ngFor="let parameter of d.id.measurementTemplates[measurement.measurement_template].parameters;
|
||||
index as pIndex">
|
||||
<rb-form-input *ngIf="!parameter.range.type"
|
||||
[name]="'measurementParameter-' + gIndex + '-' + mIndex + '-' + pIndex"
|
||||
[label]="parameter.name" appValidate="string"
|
||||
[(ngModel)]="measurement.values[parameter.name]" #parameterInput="ngModel">
|
||||
<ng-template rbFormValidationMessage="failure">{{parameterInput.errors.failure}}</ng-template>
|
||||
<ng-template rbFormValidationMessage="required">Cannot be empty</ng-template>
|
||||
</rb-form-input>
|
||||
<rb-form-file *ngIf="parameter.range.type"
|
||||
[name]="'measurementParameter-' + gIndex + '-' + mIndex + '-' + pIndex"
|
||||
[label]="parameter.name" maxSize="10000000" multiple
|
||||
[required]="measurement.values[parameter.name] && !measurement.values[parameter.name].length"
|
||||
(ngModelChange)="fileToArray($event, gIndex, mIndex, parameter.name)"
|
||||
placeholder="Select file or drag and drop" dragDrop ngModel>
|
||||
<ng-template rbFormValidationMessage="required">Cannot be empty</ng-template>
|
||||
</rb-form-file>
|
||||
<canvas baseChart *ngIf="parameter.range.type && charts[gIndex][mIndex][0].data.length > 0"
|
||||
class="dpt-chart"
|
||||
[@inOut]
|
||||
[datasets]="charts[gIndex][mIndex]"
|
||||
[labels]="[]"
|
||||
[options]="chartOptions"
|
||||
[legend]="false"
|
||||
chartType="scatter">
|
||||
</canvas>
|
||||
</div>
|
||||
<rb-icon-button icon="delete" mode="danger" (click)="removeMeasurement(gIndex, mIndex)">
|
||||
Delete measurement
|
||||
</rb-icon-button>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div>
|
||||
<rb-icon-button icon="add" mode="secondary" (click)="addMeasurement(gIndex)">
|
||||
New measurement
|
||||
</rb-icon-button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<rb-icon-button icon="save" mode="primary" type="submit" (click)="cmSave()" [disabled]="!cmForm.form.valid">
|
||||
Save sample{{generatedSamples.length > 1 ? 's' : ''}}
|
||||
</rb-icon-button>
|
||||
<rb-icon-button class="delete-sample" icon="delete" mode="danger" *ngIf="!new"
|
||||
(click)="deleteConfirm(modalDeleteConfirm)">
|
||||
Delete sample
|
||||
</rb-icon-button>
|
||||
<ng-template #modalDeleteConfirm>
|
||||
<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>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user