Commit e3083e2d authored by Thodoris Nestoridis's avatar Thodoris Nestoridis

angular working version 0.2

parent 68e6abca
...@@ -37,7 +37,7 @@ export class AddBoilerplateComponent implements OnInit { ...@@ -37,7 +37,7 @@ export class AddBoilerplateComponent implements OnInit {
this.boilerplatelService.create(data) this.boilerplatelService.create(data)
.subscribe( .subscribe(
response => { response => {
console.log(response); this.notifier.notify("success",(JSON.stringify(response)));
this.submitted = true; this.submitted = true;
this.router.navigate(['/boilerplates']); this.router.navigate(['/boilerplates']);
}, },
......
...@@ -52,6 +52,7 @@ export class MainDetailsComponent implements OnInit { ...@@ -52,6 +52,7 @@ export class MainDetailsComponent implements OnInit {
public static id: any [] = []; public static id: any [] = [];
private readonly notifier: NotifierService; private readonly notifier: NotifierService;
mains?: Main[];
currentmain: Main = { currentmain: Main = {
sys_fun_inter: "", sys_fun_inter: "",
...@@ -113,10 +114,7 @@ export class MainDetailsComponent implements OnInit { ...@@ -113,10 +114,7 @@ export class MainDetailsComponent implements OnInit {
ngOnInit(): void { ngOnInit(): void {
this.getchoices(); this.getchoices();
for (let i=0; i<MainDetailsComponent.id.length; i++) this.getAllMain(this.route.snapshot.params.id);
{
this.getMain(this.route.snapshot.params.id, MainDetailsComponent.id[i]);
};
} }
...@@ -125,7 +123,21 @@ export class MainDetailsComponent implements OnInit { ...@@ -125,7 +123,21 @@ export class MainDetailsComponent implements OnInit {
return data.filter(option => option.toLowerCase().indexOf(filterValue) === 0); return data.filter(option => option.toLowerCase().indexOf(filterValue) === 0);
} }
getAllMain(id: string): void {
this.mainService.getAll(id)
.subscribe(
data => {
MainDetailsComponent.id.length =0;
this.mains = data;
for (var val of data) {
MainDetailsComponent.id.push(val.id);
this.getMain(id, val.id);
}
},
error => {
console.log(error);
});
}
getMain(main: any, id: string): void { getMain(main: any, id: string): void {
//PrefixDetailsComponent.id = id; //PrefixDetailsComponent.id = id;
this.mainService.get(main, id) this.mainService.get(main, id)
......
...@@ -2,12 +2,10 @@ import { Component, OnInit } from '@angular/core'; ...@@ -2,12 +2,10 @@ import { Component, OnInit } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router'; import { ActivatedRoute, Router } from '@angular/router';
import { Main } from 'src/app/models/main.model'; import { Main } from 'src/app/models/main.model';
import { MainService } from 'src/app/services/main.service'; import { MainService } from 'src/app/services/main.service';
import { MainDetailsComponent} from 'src/app/components/main-details/main-details.component';
@Component({ @Component({
selector: 'app-main-list', selector: 'app-main-list',
providers: [MainDetailsComponent],
templateUrl: './main-list.component.html', templateUrl: './main-list.component.html',
styleUrls: ['./main-list.component.scss'] styleUrls: ['./main-list.component.scss']
}) })
...@@ -16,29 +14,10 @@ export class MainListComponent implements OnInit { ...@@ -16,29 +14,10 @@ export class MainListComponent implements OnInit {
constructor( constructor(
private mainService: MainService, private mainService: MainService,
private mainDetails: MainDetailsComponent,
private route: ActivatedRoute, private route: ActivatedRoute,
private router: Router) { } private router: Router) { }
ngOnInit(): void { ngOnInit(): void {
this.getAllMain(this.route.snapshot.params.id);
}
getAllMain(id: string): void {
this.mainService.getAll(id)
.subscribe(
data => {
MainDetailsComponent.id.length =0;
this.mains = data;
for (var val of data) {
//this.mainDetails.getMain(id, val.id);
MainDetailsComponent.id.push(val.id);
}
},
error => {
console.log(error);
});
} }
} }
...@@ -38,6 +38,7 @@ export class PrefixDetailsComponent implements OnInit { ...@@ -38,6 +38,7 @@ export class PrefixDetailsComponent implements OnInit {
public static id: any [] = []; public static id: any [] = [];
private readonly notifier: NotifierService; private readonly notifier: NotifierService;
prefixs?: Prefix[];
//for the moment only one prefix can showed/updates //for the moment only one prefix can showed/updates
currentprefix: Prefix = { currentprefix: Prefix = {
...@@ -78,10 +79,8 @@ export class PrefixDetailsComponent implements OnInit { ...@@ -78,10 +79,8 @@ export class PrefixDetailsComponent implements OnInit {
ngOnInit(): void { ngOnInit(): void {
this.getchoices(); this.getchoices();
for (let i=0; i<PrefixDetailsComponent.id.length; i++) this.getAllPrefix(this.route.snapshot.params.id);
{
this.getPrefix(this.route.snapshot.params.id, PrefixDetailsComponent.id[i]);
};
} }
private _filter(data:string[], value: string): string[] { private _filter(data:string[], value: string): string[] {
...@@ -89,6 +88,22 @@ export class PrefixDetailsComponent implements OnInit { ...@@ -89,6 +88,22 @@ export class PrefixDetailsComponent implements OnInit {
return data.filter(option => option.toLowerCase().indexOf(filterValue) === 0); return data.filter(option => option.toLowerCase().indexOf(filterValue) === 0);
} }
getAllPrefix(id: string): void {
this.prefixService.getAll(id)
.subscribe(
data => {
PrefixDetailsComponent.id.length =0;
this.prefixs = data;
//console.log(data);
for (var val of data) {
this.getPrefix(id, val.id);
PrefixDetailsComponent.id.push(val.id);
}
},
error => {
console.log(error);
});
}
getPrefix(prefix: any, id: string): void { getPrefix(prefix: any, id: string): void {
//PrefixDetailsComponent.id = id; //PrefixDetailsComponent.id = id;
...@@ -96,7 +111,7 @@ export class PrefixDetailsComponent implements OnInit { ...@@ -96,7 +111,7 @@ export class PrefixDetailsComponent implements OnInit {
.subscribe( .subscribe(
data => { data => {
this.currentprefix = data; this.currentprefix = data;
console.log(data) //console.log(data)
this.simpleprefixControl.setValue(this.currentprefix.prefix); this.simpleprefixControl.setValue(this.currentprefix.prefix);
this.subjectsControl.setValue(this.currentprefix.system_fun_item); this.subjectsControl.setValue(this.currentprefix.system_fun_item);
this.verbsControl.setValue(this.currentprefix.state_or_verb); this.verbsControl.setValue(this.currentprefix.state_or_verb);
......
...@@ -2,45 +2,25 @@ import { Component, OnInit } from '@angular/core'; ...@@ -2,45 +2,25 @@ import { Component, OnInit } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router'; import { ActivatedRoute, Router } from '@angular/router';
import { Prefix } from 'src/app/models/prefix.model'; import { Prefix } from 'src/app/models/prefix.model';
import { PrefixService } from 'src/app/services/prefix.service'; import { PrefixService } from 'src/app/services/prefix.service';
import { PrefixDetailsComponent} from 'src/app/components/prefix-details/prefix-details.component';
@Component({ @Component({
selector: 'app-prefix-list', selector: 'app-prefix-list',
providers: [PrefixDetailsComponent],
templateUrl: './prefix-list.component.html', templateUrl: './prefix-list.component.html',
styleUrls: ['./prefix-list.component.scss'] styleUrls: ['./prefix-list.component.scss']
}) })
export class PrefixListComponent implements OnInit { export class PrefixListComponent implements OnInit {
prefixs?: Prefix[];
constructor( constructor(
private prefixService: PrefixService, private prefixService: PrefixService,
private prefixDetails: PrefixDetailsComponent,
private route: ActivatedRoute, private route: ActivatedRoute,
private router: Router) { } private router: Router) { }
ngOnInit(): void { ngOnInit(): void {
this.getAllPrefix(this.route.snapshot.params.id);
//console.log("The boilerplate", this.route.snapshot.params.id);
} }
getAllPrefix(id: string): void {
this.prefixService.getAll(id)
.subscribe(
data => {
PrefixDetailsComponent.id.length =0;
this.prefixs = data;
//console.log(data);
for (var val of data) {
//this.prefixDetails.getPrefix(id, val.id);
PrefixDetailsComponent.id.push(val.id);
}
},
error => {
console.log(error);
});
}
} }
...@@ -29,6 +29,7 @@ export class SuffixDetailsComponent implements OnInit { ...@@ -29,6 +29,7 @@ export class SuffixDetailsComponent implements OnInit {
public static id: any [] = []; public static id: any [] = [];
private readonly notifier: NotifierService; private readonly notifier: NotifierService;
suffixs?:Suffix[];
currentsuffix: Suffix = { currentsuffix: Suffix = {
s_choices: "", s_choices: "",
...@@ -61,10 +62,7 @@ export class SuffixDetailsComponent implements OnInit { ...@@ -61,10 +62,7 @@ export class SuffixDetailsComponent implements OnInit {
ngOnInit(): void { ngOnInit(): void {
this.getchoices(); this.getchoices();
for (let i=0; i<SuffixDetailsComponent.id.length; i++) this.getAllSuffix(this.route.snapshot.params.id);
{
this.getSuffix(this.route.snapshot.params.id, SuffixDetailsComponent.id[i]);
};
} }
private _filter(data:string[], value: string): string[] { private _filter(data:string[], value: string): string[] {
...@@ -73,6 +71,23 @@ export class SuffixDetailsComponent implements OnInit { ...@@ -73,6 +71,23 @@ export class SuffixDetailsComponent implements OnInit {
} }
getAllSuffix(id: string): void {
this.suffixService.getAll(id)
.subscribe(
data => {
SuffixDetailsComponent.id.length = 0;
this.suffixs = data;
console.log(data)
for (var val of data) {
this.getSuffix(id, val.id);
SuffixDetailsComponent.id.push(val.id);
}
},
error => {
console.log(error);
});
}
getSuffix(main: any, id: string): void { getSuffix(main: any, id: string): void {
//PrefixDetailsComponent.id = id; //PrefixDetailsComponent.id = id;
this.suffixService.get(main, id) this.suffixService.get(main, id)
......
...@@ -2,43 +2,25 @@ import { Component, OnInit } from '@angular/core'; ...@@ -2,43 +2,25 @@ import { Component, OnInit } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router'; import { ActivatedRoute, Router } from '@angular/router';
import { Suffix } from 'src/app/models/suffix.model'; import { Suffix } from 'src/app/models/suffix.model';
import { SuffixService } from 'src/app/services/suffix.service'; import { SuffixService } from 'src/app/services/suffix.service';
import { SuffixDetailsComponent} from 'src/app/components/suffix-details/suffix-details.component';
import { PrefixDetailsComponent } from '../prefix-details/prefix-details.component';
@Component({ @Component({
selector: 'app-suffix-list', selector: 'app-suffix-list',
providers: [SuffixDetailsComponent],
templateUrl: './suffix-list.component.html', templateUrl: './suffix-list.component.html',
styleUrls: ['./suffix-list.component.scss'] styleUrls: ['./suffix-list.component.scss']
}) })
export class SuffixListComponent implements OnInit { export class SuffixListComponent implements OnInit {
suffixs?:Suffix[];
constructor( constructor(
private suffixService: SuffixService, private suffixService: SuffixService,
private suffixDetails: SuffixDetailsComponent,
private route: ActivatedRoute, private route: ActivatedRoute,
private router: Router) { } private router: Router) { }
ngOnInit(): void { ngOnInit(): void {
this.getAllSuffix(this.route.snapshot.params.id);
} }
getAllSuffix(id: string): void {
this.suffixService.getAll(id)
.subscribe(
data => {
SuffixDetailsComponent.id.length =0;
this.suffixs = data;
for (var val of data) {
//this.mainDetails.getMain(id, val.id);
SuffixDetailsComponent.id.push(val.id);
}
},
error => {
console.log(error);
});
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment