From c86133231d51256ff27e1bb97dc1cc0540bcea4b Mon Sep 17 00:00:00 2001
From: David Weinholz <david-weinholz@web.de>
Date: Wed, 12 Dec 2018 13:49:02 +0100
Subject: [PATCH 1/6] fix(filter):now really an or

---
 src/app/shared_modules/baseClass/filter-base-class.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/app/shared_modules/baseClass/filter-base-class.ts b/src/app/shared_modules/baseClass/filter-base-class.ts
index abd05068f4..0c5801af18 100644
--- a/src/app/shared_modules/baseClass/filter-base-class.ts
+++ b/src/app/shared_modules/baseClass/filter-base-class.ts
@@ -83,6 +83,7 @@ export abstract class FilterBaseClass extends AbstractBaseClasse {
 
     isFilterProjectStatus(status_number: number, lifetime_reached: number): boolean {
         let status: string;
+        let lifetime_status: string;
         switch (status_number) {
             case this.project_statuses.ACTIVE:
                 status = this.project_statuses[this.project_statuses.ACTIVE];
@@ -93,14 +94,14 @@ export abstract class FilterBaseClass extends AbstractBaseClasse {
         }
         switch (lifetime_reached) {
             case this.lifetime_statuses.EXPIRED:
-                status = this.lifetime_statuses[this.lifetime_statuses.EXPIRED];
+                lifetime_status = this.lifetime_statuses[this.lifetime_statuses.EXPIRED];
                 break;
             case this.lifetime_statuses.EXPIRES_SOON:
-                status = this.lifetime_statuses[this.lifetime_statuses.EXPIRES_SOON];
+                lifetime_status = this.lifetime_statuses[this.lifetime_statuses.EXPIRES_SOON];
         }
 
 
-        if (this.filterstatus_list[status]
+        if (this.filterstatus_list[status] || this.filterstatus_list[lifetime_status]
         ) {
 
             return true

From ceb408d93a294632940bbb6ed101628831e84537 Mon Sep 17 00:00:00 2001
From: David Weinholz <david-weinholz@web.de>
Date: Wed, 12 Dec 2018 13:50:47 +0100
Subject: [PATCH 2/6] added a break

---
 src/app/shared_modules/baseClass/filter-base-class.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared_modules/baseClass/filter-base-class.ts b/src/app/shared_modules/baseClass/filter-base-class.ts
index 0c5801af18..b5466cc526 100644
--- a/src/app/shared_modules/baseClass/filter-base-class.ts
+++ b/src/app/shared_modules/baseClass/filter-base-class.ts
@@ -97,7 +97,7 @@ export abstract class FilterBaseClass extends AbstractBaseClasse {
                 lifetime_status = this.lifetime_statuses[this.lifetime_statuses.EXPIRED];
                 break;
             case this.lifetime_statuses.EXPIRES_SOON:
-                lifetime_status = this.lifetime_statuses[this.lifetime_statuses.EXPIRES_SOON];
+                lifetime_status = this.lifetime_statuses[this.lifetime_statuses.EXPIRES_SOON];break;
         }
 
 

From d3bb571df333ab8488e3dba43bd71ef18dce87dc Mon Sep 17 00:00:00 2001
From: David Weinholz <david-weinholz@web.de>
Date: Wed, 12 Dec 2018 14:28:14 +0100
Subject: [PATCH 3/6] feat(Application):vo can approve without facility

---
 src/app/applications/applications.component.html | 4 ++--
 src/app/applications/applications.component.ts   | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/app/applications/applications.component.html b/src/app/applications/applications.component.html
index cc14711585..c088719c35 100644
--- a/src/app/applications/applications.component.html
+++ b/src/app/applications/applications.component.html
@@ -259,7 +259,7 @@ <h1>Applications Overview</h1>
                                                     class="form-control"
                                                     #selectedComputeCenter>
 
-                                                <!--option value="undefined" selected> no center</option-->
+                                                <option value="undefined" selected> no center</option>
                                                 <option *ngFor="let computeCenter of computeCenters"
                                                         value="{{computeCenter.FacilityId}}">
                                                     {{computeCenter.Name}}
@@ -279,7 +279,7 @@ <h1>Applications Overview</h1>
                                                     type="button"
                                                     class="btn btn-secondary">
                                                 <i class="fa fa-check"></i>&nbsp;
-                                                Approve
+                                                Assign
                                             </button>
                                             <button
                                                     *ngIf="application.Status == 6 && application.ComputeCenter?.FacilityId"
diff --git a/src/app/applications/applications.component.ts b/src/app/applications/applications.component.ts
index 58d1b06f31..850111bff8 100644
--- a/src/app/applications/applications.component.ts
+++ b/src/app/applications/applications.component.ts
@@ -879,6 +879,9 @@ export class ApplicationsComponent extends AbstractBaseClasse {
                     this.updateNotificationModal("Failed", "Project could not be created!", true, "danger");
                 });
         }
+        else{
+             this.updateNotificationModal("Failed", "You need to select an compute center!", true, "danger");
+        }
 
     }
 

From 443ff6340cf902ccce43d37dbc82bc1372e23059 Mon Sep 17 00:00:00 2001
From: David Weinholz <david-weinholz@web.de>
Date: Wed, 12 Dec 2018 14:33:11 +0100
Subject: [PATCH 4/6] fix(Application):fixed ram gb

---
 src/app/applications/applications.component.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/app/applications/applications.component.html b/src/app/applications/applications.component.html
index c088719c35..e4b0c705b6 100644
--- a/src/app/applications/applications.component.html
+++ b/src/app/applications/applications.component.html
@@ -130,13 +130,13 @@ <h1>Applications Overview</h1>
                                                         <td>RAM</td>
                                                         <td>{{
                                                             application.RamPerVM
-                                                            }}
+                                                            }} GB
                                                         </td>
                                                     </tr>
                                                     <tr *ngIf="application.OpenStackProject && application.TotalRam != 0">
                                                         <td>RAM</td>
                                                         <td>{{
-                                                            application.TotalRam}}
+                                                            application.TotalRam}} GB
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -472,14 +472,14 @@ <h1>Applications Overview</h1>
                                                         <tr *ngIf="application.OpenStackProject && application.TotalRam == 0">
                                                             <td>RAM</td>
                                                             <td>{{
-                                                                application.RamPerVM
-                                                                }}
+                                                                application.RamPerVM 
+                                                                }} GB
                                                             </td>
                                                         </tr>
                                                         <tr *ngIf="application.OpenStackProject && application.TotalRam != 0">
                                                             <td>RAM</td>
                                                             <td>{{
-                                                                application.TotalRam}}
+                                                                application.TotalRam}} GB
                                                             </td>
                                                         </tr>
                                                         <tr>
@@ -690,13 +690,13 @@ <h1>Applications Overview</h1>
                                                             <td>RAM</td>
                                                             <td>{{
                                                                 application.RamPerVM
-                                                                }}
+                                                                }} GB
                                                             </td>
                                                         </tr>
                                                         <tr *ngIf="application.OpenStackProject && application.TotalRam != 0">
                                                             <td>RAM</td>
                                                             <td>{{
-                                                                application.TotalRam}}
+                                                                application.TotalRam}} GB
                                                             </td>
                                                         </tr>
                                                         <tr>

From 6fa7ab2a9727ead4269f2dd543f801afef4c8790 Mon Sep 17 00:00:00 2001
From: David Weinholz <david-weinholz@web.de>
Date: Thu, 13 Dec 2018 15:35:01 +0100
Subject: [PATCH 5/6] feat(Application):if without faciltiy approve

---
 .../applications/applications.component.ts    | 73 ++++++++++++++-----
 1 file changed, 53 insertions(+), 20 deletions(-)

diff --git a/src/app/applications/applications.component.ts b/src/app/applications/applications.component.ts
index 850111bff8..2cb914dc53 100644
--- a/src/app/applications/applications.component.ts
+++ b/src/app/applications/applications.component.ts
@@ -738,32 +738,65 @@ export class ApplicationsComponent extends AbstractBaseClasse {
                     this.groupservice.addAdmin(new_group_id, manager_member_user_id, compute_center).subscribe(res => {
                         this.groupservice.setPerunGroupAttributes(application_id, new_group_id).subscribe(res => {
                             this.groupservice.assignGroupToResource(new_group_id.toString(), compute_center).subscribe(res => {
-                                this.applicationstatusservice.setApplicationStatus(application_id, this.application_statuses.WAIT_FOR_CONFIRMATION, compute_center).subscribe(result => {
-                                        if (result['Error']) {
-                                            this.updateNotificationModal("Failed", result['Error'], true, "danger");
+                                if (compute_center != 'undefined') {
 
-                                        }
-                                        else {
-                                            this.updateNotificationModal("Success", "The new project was created", true, "success");
-                                        }
-                                        for (let app of this.user_applications) {
-                                            if (app.Id == application_id) {
-                                                this.getUserApplication(app);
-                                                break;
+                                    this.applicationstatusservice.setApplicationStatus(application_id, this.application_statuses.WAIT_FOR_CONFIRMATION, compute_center).subscribe(result => {
+                                            if (result['Error']) {
+                                                this.updateNotificationModal("Failed", result['Error'], true, "danger");
 
                                             }
+                                            else {
+                                                this.updateNotificationModal("Success", "The new project was created", true, "success");
+                                            }
+                                            for (let app of this.user_applications) {
+                                                if (app.Id == application_id) {
+                                                    this.getUserApplication(app);
+                                                    break;
 
+                                                }
 
-                                        }
-                                        for (let app of this.all_applications) {
-                                            if (app.Id == application_id) {
-                                                this.getApplication(app);
-                                                break;
 
                                             }
+                                            for (let app of this.all_applications) {
+                                                if (app.Id == application_id) {
+                                                    this.getApplication(app);
+                                                    break;
+
+                                                }
+                                            }
                                         }
-                                    }
-                                )
+                                    )
+                                } else {
+                                    this.groupservice.setPerunGroupStatus(new_group_id, this.application_statuses.APPROVED).subscribe(res => {
+                                        this.applicationstatusservice.setApplicationStatus(application_id, this.application_statuses.APPROVED, compute_center).subscribe(result => {
+                                            if (result['Error']) {
+                                                this.updateNotificationModal("Failed", result['Error'], true, "danger");
+
+                                            }
+                                            else {
+                                                this.updateNotificationModal("Success", "The new project was created", true, "success");
+                                            }
+                                            for (let app of this.user_applications) {
+                                                if (app.Id == application_id) {
+                                                    this.getUserApplication(app);
+                                                    break;
+
+                                                }
+
+
+                                            }
+                                            for (let app of this.all_applications) {
+                                                if (app.Id == application_id) {
+                                                    this.getApplication(app);
+                                                    break;
+
+                                                }
+                                            }
+                                        })
+
+                                    })
+
+                                }
                             });
                         })
 
@@ -879,8 +912,8 @@ export class ApplicationsComponent extends AbstractBaseClasse {
                     this.updateNotificationModal("Failed", "Project could not be created!", true, "danger");
                 });
         }
-        else{
-             this.updateNotificationModal("Failed", "You need to select an compute center!", true, "danger");
+        else {
+            this.updateNotificationModal("Failed", "You need to select an compute center!", true, "danger");
         }
 
     }

From cc24531babaa974f9b7193ed233eb3c2a5947111 Mon Sep 17 00:00:00 2001
From: David Weinholz <david-weinholz@web.de>
Date: Fri, 14 Dec 2018 09:32:35 +0100
Subject: [PATCH 6/6] updaeted changelog

---
 CHANGELOG.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a9c7a7100..8f7f7f1ed6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,17 @@
 
+
+#### Bug Fixes
+
+* **Application:** fixed ram gb 
+
+#### Features
+
+* **Application:**
+  * if without faciltiy approve 
+  * vo can approve without facility 
+
+
+------
 #### Bug Fixes
 * **volume:** fixed volume bug
 * **development:**  remove nvmrc file