Merge pull request #38 from maielgendy/master

small changes in home screen and project list
AMOSTeam1 · May 23, 2018 · 70a572a · 70a572a
2 parents 3cf11f9 + 33f1634
commit 70a572a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/nfafrontend/src/app/current-project/project-list/project-list.component.ts b/nfafrontend/src/app/current-project/project-list/project-list.component.ts
@@ -21,7 +21,7 @@ enum STATUS {
 
 export class ProjectListComponent implements OnInit {
 
-  status = STATUS.ALL;
+  status = STATUS.ON_PROCESS;
   projects: Project[];
   subscription: Subscription;
 
@@ -32,7 +32,7 @@ export class ProjectListComponent implements OnInit {
 
 
   ngOnInit() {
-    this.dataStorageService.getCurrentProjects()
+    this.dataStorageService.getProjectByName(this.status,"")
       .subscribe(
         (response: Response) => {
                    const projects: Project[] = response.json();
@@ -66,7 +66,7 @@ export class ProjectListComponent implements OnInit {
       }
     );
   }
-
+  
   onNewProject(){
     this.router.navigate(['new'], {relativeTo: this.route});
   }
@@ -88,8 +88,8 @@ export class ProjectListComponent implements OnInit {
         }
       );
   }
+
   onProcess(frominput: HTMLInputElement) {
-
     if(STATUS.ON_PROCESS != this.status) {
       this.router.navigate([this.route.snapshot.routeConfig.path]);
       this.status = STATUS.ON_PROCESS;

diff --git a/nfafrontend/src/assets/i18n/de.json b/nfafrontend/src/assets/i18n/de.json
@@ -3,7 +3,7 @@
     "nfa-title": "NFA-Tool",
     "home": {
       "welcome": "Hallo zum {{name}}",
-      "current-projects": "Aktuelle Projekte ansehen"
+      "current-projects": "Projekte ansehen"
     },
     "new-project" : {
       "create-nfa-project" : "Erstelle NFA-Projekt",

diff --git a/nfafrontend/src/assets/i18n/en.json b/nfafrontend/src/assets/i18n/en.json
@@ -3,7 +3,7 @@
     "nfa-title": "NFA-Tool",
     "home": {
       "welcome": "Welcome to {{name}}",
-      "current-projects": "View Current Projects"
+      "current-projects": "View Projects"
     },
     "new-project" : {
       "create-nfa-project" : "Create NFA-Project",