diff --git a/src/app/facility_manager/facilitymanager.module.ts b/src/app/facility_manager/facilitymanager.module.ts index 7097df402b..3ff7a9f8d8 100644 --- a/src/app/facility_manager/facilitymanager.module.ts +++ b/src/app/facility_manager/facilitymanager.module.ts @@ -6,7 +6,9 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { BsDatepickerModule } from 'ngx-bootstrap/datepicker'; import { NgbPaginationModule, NgbTypeaheadModule } from '@ng-bootstrap/ng-bootstrap'; import { NgSelectModule } from '@ng-select/ng-select'; -import { AlertComponent, BadgeComponent } from '@coreui/angular'; +import { + AlertComponent, BadgeComponent, ButtonDirective, InputGroupComponent, +} from '@coreui/angular'; import { TooltipModule } from 'ngx-bootstrap/tooltip'; import { FacilityProjectsOverviewComponent } from '../facility_manager/facilityprojectsoverview.component'; import { ImageTagComponent } from '../facility_manager/imagetags.component'; @@ -48,6 +50,8 @@ import { SharedModuleModule } from '../shared/shared_modules/shared-module.modul AlertComponent, BadgeComponent, TooltipModule, + InputGroupComponent, + ButtonDirective, ], declarations: [ FacilityProjectsOverviewComponent, diff --git a/src/app/facility_manager/facilityprojectsoverview.component.html b/src/app/facility_manager/facilityprojectsoverview.component.html index 4145c0989c..cd9cc581dd 100644 --- a/src/app/facility_manager/facilityprojectsoverview.component.html +++ b/src/app/facility_manager/facilityprojectsoverview.component.html @@ -1,766 +1,755 @@
Select | -Type | + [checked]="sortProjectService.filterStatusList | inList: application_states.WAIT_FOR_TERMINATION_FM" + /> + {{ + application_states[application_states.WAIT_FOR_TERMINATION_FM] + }} + + + +
---|
Select | +Type | -- Project ID - | -- Project Name - | -Long - Name - | +Project ID | +Project Name | +Long Name | -Status | -- Ram - | -- Cores - | -- GPUs - | +Status | +Ram | +Cores | +GPUs | -Description | -Actions | -|
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
- - | -
- |
+ Description | +Actions | +|||||||||||||||
+ + | +
+ |
-
- |
-
- |
-
- |
- + |
+ |
+
+ |
+
+ |
+ {{ project_states[project_states.ACTIVE] }} + *ngIf="project | hasstatusinlist: project_states.ACTIVE" + style="margin-left: 5px" + class="badge bg-success" + >{{ project_states[project_states.ACTIVE] }} - {{ lifetime_states[lifetime_states.EXPIRED] }} + style="margin-left: 5px" + class="badge bg-danger" + >{{ lifetime_states[lifetime_states.EXPIRED] }} - {{ lifetime_states[lifetime_states.EXPIRES_SOON] }} + {{ lifetime_states[lifetime_states.EXPIRES_SOON] }} - WAIT FOR CONFIRMATION + WAIT FOR CONFIRMATION - WAIT FOR TERMINATION BY FM + WAIT FOR TERMINATION BY FM - | -
- |
-
- |
-
- |
- - - | + +
+ |
+
+ |
+
+ |
+ + + | -- - | -
- - | -
{{ selectedProject?.project_application_description }}
-{{ selectedProject?.project_application_description }}
+- Support e-mail address(es) of {{ selectedFacility['Facility'] }}: -
-Description | -Date created (d/m/y) | -Expiration Date (d/m/y) | -Days running | -Lifetime in Days | - - -
- |
+
---|
Description | +Date created (d/m/y) | +Expiration Date (d/m/y) | +Days running | +Lifetime in Days | + + +
+ |
- {{ selectedProject?.project_application_date_approved }} | -{{ selectedProject?.date_end }} | -{{ selectedProject?.DaysRunning }} | -{{ selectedProject?.lifetime_days }} | -- - |
---|
Select | -Type | +Facility | + {{ + application_states[application_states.WAIT_FOR_CONFIRMATION] + }} +
---|
Select | +Type | -Project ID - | -Project Name - | -Details | -Status | -Ram - | -Cores - | -GPUs - | +Facility | -Credits - | -Actions | -Project ID | ++ Project Name + | +Details | +Status | +Ram | +Cores | +GPUs | -
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
- - | -
- |
-
- |
-
- |
-
- |
+ + Credits + | +Actions | +||||||||||||
+ + | +
+ |
+
+ |
+
+ |
+
+ |
-
- |
- - {{ project_states[project_states.ACTIVE] }} - - {{ application_states[application_states.DISABLED] }} - - {{ lifetime_states[lifetime_states.EXPIRED] }} - - {{ lifetime_states[lifetime_states.EXPIRES_SOON] }} - {{ project_states[project_states.SUSPENDED] }} - - WAIT FOR CONFIRMATION - - TERMINATION REQUESTED - - WAIT FOR TERMINATION BY FM - - PROTECTED - - | -
- |
-
- |
-
- |
+
+ |
+ + {{ project_states[project_states.ACTIVE] }} + + {{ application_states[application_states.DISABLED] }} + + {{ lifetime_states[lifetime_states.EXPIRED] }} + + {{ lifetime_states[lifetime_states.EXPIRES_SOON] }} + {{ project_states[project_states.SUSPENDED] }} + + WAIT FOR CONFIRMATION + + TERMINATION REQUESTED + + WAIT FOR TERMINATION BY FM + + PROTECTED + + | +
+ |
+
+ |
+
+ |
-
- |
+
+ |
-
-
-
+ |
-
+
- |
- - | -
{{ selectedProject?.project_application_description }}
-{{ selectedProject?.project_application_description }}
+Description | -Date created (d/m/y) | -Expiration Date (d/m/y) | -Days running | -Lifetime in Days | - - -
- |
+
---|
Description | +Date created (d/m/y) | +Expiration Date (d/m/y) | +Days running | +Lifetime in Days | + + +
+ |
- - {{ - selectedProject?.project_application_date_approved - }} - No creation date available - | -- {{ selectedProject?.date_end }} - No end date available - | -- {{ selectedProject?.DaysRunning }} - No runtime available - | ++ {{ + selectedProject?.project_application_date_approved + }} + No creation date available + | ++ {{ selectedProject?.date_end }} + No end date available + | ++ {{ selectedProject?.DaysRunning }} + No runtime available + | -- {{ selectedProject?.lifetime_days }} - No lifetime available - | - -
---|