code improvements

This commit is contained in:
VLE2FE
2020-09-03 15:51:53 +02:00
parent 1440e9a6fc
commit c38d0be457
73 changed files with 276 additions and 1686 deletions

View File

@ -1,4 +1,3 @@
<rb-icon-button icon="add" mode="primary" (click)="newModel = !newModel; oldModelGroup = ''" class="space-below">
New model
</rb-icon-button>

View File

@ -1,25 +1,5 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ModelTemplatesComponent } from './model-templates.component';
describe('ModelTemplatesComponent', () => {
let component: ModelTemplatesComponent;
let fixture: ComponentFixture<ModelTemplatesComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ ModelTemplatesComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(ModelTemplatesComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@ -13,12 +13,12 @@ import omit from 'lodash/omit';
})
export class ModelTemplatesComponent implements OnInit {
newModel = false;
modelGroup = '';
oldModelGroup = '';
oldModelName = '';
model = new ModelItemModel().models[0];
groups = [];
newModel = false; // display new model dialog
modelGroup = ''; // group of the edited model
oldModelGroup = ''; // group of the edited model before editing started
oldModelName = ''; // name of the edited model before editing started
model = new ModelItemModel().models[0]; // edited model
groups = []; // all model group names
constructor(
private api: ApiService,
@ -40,13 +40,12 @@ export class ModelTemplatesComponent implements OnInit {
}
saveModel() {
console.log(this.modelGroup);
console.log(this.oldModelGroup);
if (this.oldModelGroup !== '' && this.modelGroup !== this.oldModelGroup) { // group was changed, delete model in old group
// group was changed, delete model in old group
if (this.oldModelGroup !== '' && this.modelGroup !== this.oldModelGroup) {
this.delete(null, this.oldModelName, this.oldModelGroup);
}
this.api.post('/model/' + this.modelGroup, omit(this.model, '_id'), () => {
this.newModel = false;
this.newModel = false; // reset model edit parameters
this.loadGroups();
this.modelGroup = '';
this.oldModelGroup = '';
@ -57,7 +56,7 @@ export class ModelTemplatesComponent implements OnInit {
delete(modal, name, group = null) {
new Promise(resolve => {
if (modal) {
if (modal) { // if modal was given, wait for result
this.modal.open(modal).then(result => {
resolve(result);
});
@ -67,12 +66,12 @@ export class ModelTemplatesComponent implements OnInit {
}
}).then(res => {
if (res) {
if (group) { // delete group
if (group) { // delete model group if given
this.api.delete(`/model/${group}/${name}`, () => {
this.loadGroups();
});
}
else { // delete file
else { // delete model file
this.api.delete(`/model/file/${name}`, () => {
this.d.arr.modelFiles.splice(this.d.arr.modelFiles.findIndex(e => e.name === name), 1);
});