-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(Templating): Adjusted tables to bootstrap 5
- Loading branch information
Showing
48 changed files
with
1,164 additions
and
999 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 8 additions & 10 deletions
18
src/app/applications/application-detail/adjustment-detail/adjustment-detail.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,10 @@ | ||
| <table class="table table-striped" style="table-layout: fixed"> | ||
|
|
||
| <tr> | ||
| <td>Comment by reviewer: | ||
| </td> | ||
| <td> | ||
|
|
||
| {{application?.project_application_manager_comment}} | ||
|
|
||
| </td> | ||
| </tr> | ||
| <tbody> | ||
| <tr> | ||
| <td>Comment by reviewer:</td> | ||
| <td> | ||
| {{ application?.project_application_manager_comment }} | ||
| </td> | ||
| </tr> | ||
| </tbody> | ||
| </table> |
68 changes: 31 additions & 37 deletions
68
...tions/application-detail/credits-extension-detail/credits-extension-detail.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,39 +1,33 @@ | ||
| <table class="table table-striped" style="table-layout: fixed"> | ||
|
|
||
| <tr> | ||
| <td>Credits Extension Requested from: | ||
| </td> | ||
|
|
||
| <td> | ||
|
|
||
| {{application?.project_credit_request?.user?.username}} | ||
| ( {{application?.project_credit_request?.user?.email}} | ||
| | {{application?.project_credit_request?.user?.elixir_id}} | ||
| ) | ||
| </td> | ||
|
|
||
|
|
||
| </tr> | ||
| <tr> | ||
| <td>Comment</td> | ||
| <td>{{ | ||
| application?.project_credit_request?.comment | ||
| }} | ||
| </td> | ||
|
|
||
| </tr> | ||
| <tr> | ||
| <td>Extra Credits</td> | ||
|
|
||
| <td> | ||
| {{application?.project_credit_request?.extra_credits}} (Total: {{application?.totalCreditsExtensionCredits}}) | ||
| </td> | ||
| </tr> | ||
| <tr> | ||
| <td>Date Submitted</td> | ||
|
|
||
| <td> | ||
| {{application?.project_credit_request?.date_submitted}} | ||
| </td> | ||
| </tr> | ||
| <tbody> | ||
| <tr> | ||
| <td>Credits Extension Requested from:</td> | ||
|
|
||
| <td> | ||
| {{ application?.project_credit_request?.user?.username }} | ||
| ( {{ application?.project_credit_request?.user?.email }} | | ||
| {{ application?.project_credit_request?.user?.elixir_id }} | ||
| ) | ||
| </td> | ||
| </tr> | ||
| <tr> | ||
| <td>Comment</td> | ||
| <td>{{ application?.project_credit_request?.comment }}</td> | ||
| </tr> | ||
| <tr> | ||
| <td>Extra Credits</td> | ||
|
|
||
| <td> | ||
| {{ application?.project_credit_request?.extra_credits }} (Total: | ||
| {{ application?.totalCreditsExtensionCredits }}) | ||
| </td> | ||
| </tr> | ||
| <tr> | ||
| <td>Date Submitted</td> | ||
|
|
||
| <td> | ||
| {{ application?.project_credit_request?.date_submitted }} | ||
| </td> | ||
| </tr> | ||
| </tbody> | ||
| </table> |
83 changes: 44 additions & 39 deletions
83
...ons/application-detail/lifetime-extension-detail/lifetime-extension-detail.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,46 +1,51 @@ | ||
| <table class="table table-striped" style="table-layout: fixed"> | ||
| <tr> | ||
| <td>Lifetime Extension Requested from:</td> | ||
| <tbody> | ||
| <tr> | ||
| <td>Lifetime Extension Requested from:</td> | ||
|
|
||
| <td> | ||
| {{ application?.project_lifetime_request?.user?.username }} | ||
| <td> | ||
| {{ application?.project_lifetime_request?.user?.username }} | ||
|
|
||
| ( {{ application?.project_lifetime_request?.user?.email }} | | ||
| {{ application?.project_lifetime_request?.user?.elixir_id }} | ||
| ) | ||
| </td> | ||
| </tr> | ||
| <tr> | ||
| <td>Comment</td> | ||
| <td>{{ application?.project_lifetime_request?.comment }}</td> | ||
| </tr> | ||
| <tr *ngIf="application?.project_lifetime_request?.manager_comment?.length > 0"> | ||
| <td><strong>Comment by Cloud Governance</strong></td> | ||
| <td>{{ application?.project_lifetime_request?.manager_comment }}</td> | ||
| </tr> | ||
| <tr> | ||
| <td>Extra Lifetime</td> | ||
| ( {{ application?.project_lifetime_request?.user?.email }} | | ||
| {{ application?.project_lifetime_request?.user?.elixir_id }} | ||
| ) | ||
| </td> | ||
| </tr> | ||
| <tr> | ||
| <td>Comment</td> | ||
| <td>{{ application?.project_lifetime_request?.comment }}</td> | ||
| </tr> | ||
| <tr *ngIf="application?.project_lifetime_request?.manager_comment?.length > 0"> | ||
| <td><strong>Comment by Cloud Governance</strong></td> | ||
| <td>{{ application?.project_lifetime_request?.manager_comment }}</td> | ||
| </tr> | ||
| <tr> | ||
| <td>Extra Lifetime</td> | ||
|
|
||
| <td> | ||
| {{ application?.project_lifetime_request?.extra_lifetime }} month(s) - ending | ||
| {{ application?.project_lifetime_request?.new_end_date.length > 11 ? '' : 'on' }} | ||
| {{ application?.project_lifetime_request?.new_end_date }} instead of | ||
| {{ application?.project_lifetime_request?.old_end_date }} | ||
| </td> | ||
| </tr> | ||
| <tr> | ||
| <td>Extra Credits</td> | ||
| <td> | ||
| {{ application?.project_lifetime_request?.extra_lifetime }} | ||
| month(s) - ending | ||
| {{ application?.project_lifetime_request?.new_end_date.length > 11 ? '' : 'on' }} | ||
| {{ application?.project_lifetime_request?.new_end_date }} | ||
| instead of | ||
| {{ application?.project_lifetime_request?.old_end_date }} | ||
| </td> | ||
| </tr> | ||
| <tr> | ||
| <td>Extra Credits</td> | ||
|
|
||
| <td> | ||
| {{ application?.project_lifetime_request?.extra_credits }} (Total: | ||
| {{ application?.totalLifetimeExtensionCredits }}) | ||
| </td> | ||
| </tr> | ||
| <tr> | ||
| <td>Date Submitted</td> | ||
| <td> | ||
| {{ application?.project_lifetime_request?.extra_credits }} | ||
| (Total: | ||
| {{ application?.totalLifetimeExtensionCredits }}) | ||
| </td> | ||
| </tr> | ||
| <tr> | ||
| <td>Date Submitted</td> | ||
|
|
||
| <td> | ||
| {{ application?.project_lifetime_request?.date_submitted }} | ||
| </td> | ||
| </tr> | ||
| <td> | ||
| {{ application?.project_lifetime_request?.date_submitted }} | ||
| </td> | ||
| </tr> | ||
| </tbody> | ||
| </table> |
189 changes: 88 additions & 101 deletions
189
...pp/applications/application-detail/modification-detail/modification-detail.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,111 +1,98 @@ | ||
| <table class="table table-striped" style="table-layout: fixed"> | ||
| <tbody> | ||
| <tr> | ||
| <td>Modification Requested from:</td> | ||
|
|
||
| <tr> | ||
| <td>Modification Requested from: | ||
| </td> | ||
| <td> | ||
| {{ application?.project_modification_request?.user?.username }} | ||
| ( {{ application?.project_modification_request?.user?.email }} | | ||
| {{ application?.project_modification_request?.user?.elixir_id }}) | ||
| </td> | ||
| </tr> | ||
| <tr> | ||
| <td>Comment</td> | ||
| <td>{{ application?.project_modification_request?.comment }}</td> | ||
| </tr> | ||
| <tr *ngIf="application?.project_application_openstack_project && application?.project_application_cloud_service"> | ||
| <td>Service status</td> | ||
| <td> | ||
| <span *ngIf="application?.project_modification_request?.cloud_service_develop" class="badge bg-success" | ||
| >In development</span | ||
| > | ||
| <span *ngIf="!application?.project_modification_request?.cloud_service_develop" class="badge bg-danger" | ||
| >Existing</span | ||
| > | ||
| </td> | ||
| </tr> | ||
| <tr> | ||
| <td>VMs</td> | ||
| <td> | ||
| Requested: | ||
| {{ application?.project_modification_request?.vms_requested }} | ||
| </td> | ||
| </tr> | ||
| <ng-container *ngFor="let flavor of application?.project_modification_request?.flavors"> | ||
| <tr *ngIf="flavor.counter > 0"> | ||
| <td>Flavor: {{ flavor.name }}</td> | ||
| <td>{{ application?.project_modification_request | flavorCounter: flavor }}</td> | ||
| </tr> | ||
| </ng-container> | ||
| <tr> | ||
| <td>Total Cores</td> | ||
|
|
||
| <td> | ||
| {{application?.project_modification_request?.user?.username}} | ||
| ( {{application?.project_modification_request?.user?.email}} | | ||
| {{application?.project_modification_request?.user?.elixir_id}}) | ||
| <td> | ||
| {{ application?.project_modification_request?.total_cores }} | ||
| </td> | ||
| </tr> | ||
| <tr> | ||
| <td>Total RAM</td> | ||
| <td>{{ application?.project_modification_request?.total_ram }} GB</td> | ||
| </tr> | ||
| <tr> | ||
| <td>Total GPUs</td> | ||
| <td> | ||
| {{ application?.project_modification_request?.total_gpu }} | ||
| </td> | ||
| </tr> | ||
|
|
||
| </td> | ||
| <tr *ngIf="is_vo_admin"> | ||
| <td>Extra Credits</td> | ||
|
|
||
| <td> | ||
| {{ application?.project_modification_request?.extra_credits }} | ||
| (Total: {{ application?.totalModificationRequestCredits }}) | ||
| </td> | ||
| </tr> | ||
|
|
||
| </tr> | ||
| <tr> | ||
| <td>Comment</td> | ||
| <td>{{ | ||
| application?.project_modification_request?.comment | ||
| }} | ||
| </td> | ||
| <tr> | ||
| <td>Storage Limit</td> | ||
|
|
||
| </tr> | ||
| <tr *ngIf="application?.project_application_openstack_project && application?.project_application_cloud_service"> | ||
| <td>Service status</td> | ||
| <td> | ||
| <span *ngIf="application?.project_modification_request?.cloud_service_develop" | ||
| class="badge bg-success">In development</span> | ||
| <span *ngIf="!application?.project_modification_request?.cloud_service_develop" | ||
| class="badge bg-danger">Existing</span> | ||
| </td> | ||
| </tr> | ||
| <tr> | ||
| <td>VMs | ||
| </td> | ||
| <td> | ||
| Requested: | ||
| {{application?.project_modification_request?.vms_requested}} | ||
| </td> | ||
| <td> | ||
| {{ application?.project_modification_request?.volume_limit }} | ||
| GB | ||
| </td> | ||
| </tr> | ||
| <tr> | ||
| <td>Volume Counter</td> | ||
|
|
||
| </tr> | ||
| <ng-container | ||
| *ngFor="let flavor of application?.project_modification_request?.flavors "> | ||
| <tr *ngIf="flavor.counter > 0"> | ||
| <td>Flavor: {{flavor.name}}</td> | ||
| <td>{{application?.project_modification_request | flavorCounter:flavor}}</td> | ||
| </tr> | ||
| </ng-container> | ||
| <tr> | ||
| <td>Total Cores</td> | ||
| <td> | ||
| {{ application?.project_modification_request?.volume_counter }} | ||
| volumes | ||
| </td> | ||
| </tr> | ||
| <tr *ngIf="application?.project_application_openstack_project"> | ||
| <td>ObjectStorage</td> | ||
| <td> | ||
| {{ application?.project_modification_request?.object_storage }} | ||
| GB | ||
| </td> | ||
| </tr> | ||
| <tr> | ||
| <td>Date Submitted</td> | ||
|
|
||
| <td> | ||
| {{application?.project_modification_request?.total_cores}} | ||
| </td> | ||
| </tr> | ||
| <tr> | ||
| <td>Total RAM</td> | ||
| <td> | ||
| {{application?.project_modification_request?.total_ram}} GB | ||
| </td> | ||
| </tr> | ||
| <tr> | ||
| <td>Total GPUs</td> | ||
| <td> | ||
| {{application?.project_modification_request?.total_gpu}} | ||
| </td> | ||
| </tr> | ||
|
|
||
| <tr *ngIf="is_vo_admin"> | ||
| <td>Extra Credits</td> | ||
|
|
||
| <td> | ||
| {{application?.project_modification_request?.extra_credits}} | ||
| (Total: {{application?.totalModificationRequestCredits}}) | ||
| </td> | ||
| </tr> | ||
|
|
||
| <tr> | ||
| <td>Storage Limit | ||
| </td> | ||
|
|
||
| <td> | ||
| {{application?.project_modification_request?.volume_limit}} | ||
| GB | ||
| </td> | ||
| </tr> | ||
| <tr> | ||
| <td>Volume | ||
| Counter | ||
| </td> | ||
|
|
||
| <td> | ||
| {{application?.project_modification_request?.volume_counter}} volumes | ||
| </td> | ||
| </tr> | ||
| <tr *ngIf="application?.project_application_openstack_project"> | ||
| <td>ObjectStorage | ||
| </td> | ||
| <td> | ||
| {{application?.project_modification_request?.object_storage}} | ||
| GB | ||
| </td> | ||
| </tr> | ||
| <tr> | ||
| <td>Date Submitted</td> | ||
|
|
||
| <td> | ||
| {{application?.project_modification_request?.date_submitted}} | ||
| </td> | ||
| </tr> | ||
| <td> | ||
| {{ application?.project_modification_request?.date_submitted }} | ||
| </td> | ||
| </tr> | ||
| </tbody> | ||
| </table> |
Oops, something went wrong.