Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

[#64541] fixed split view resizer and content for BIM

Eric Schubertdde8e20ee0f9
diff --git a/frontend/src/app/features/bim/ifc_models/bcf/list/bcf-list.component.html b/frontend/src/app/features/bim/ifc_models/bcf/list/bcf-list.component.html
index f102ceb53d1..08c7186ccaf 100644
--- a/frontend/src/app/features/bim/ifc_models/bcf/list/bcf-list.component.html
+++ b/frontend/src/app/features/bim/ifc_models/bcf/list/bcf-list.component.html
@@ -3,12 +3,8 @@
<!-- TABLE representation of the WP -->
<div class="op-bcf-list--work-packages-split-view--tabletimeline-container"
- [ngClass]="{ '_with-resizer': showResizerInCardView() }"
+ [ngClass]="{ '_with-resizer': showResizer }"
*ngIf="tableInformationLoaded && showTableView">
- <wp-resizer *ngIf="showResizer"
- elementClass="work-packages-partitioned-page--content-right"
- localStorageKey="openProject-splitViewFlexBasis">
- </wp-resizer>
<wp-table [projectIdentifier]="CurrentProject.identifier"
[configuration]="wpTableConfiguration"
@@ -18,16 +14,19 @@
</wp-table>
</div>
+<wp-resizer *ngIf="showResizer"
+ elementClass="work-packages-partitioned-page--content-right"
+ localStorageKey="openProject-splitViewFlexBasis">
+</wp-resizer>
+
<!-- GRID representation of the WP -->
<div *ngIf="!showTableView"
class="op-bcf-list--work-packages--card-view-container"
- [ngClass]="{ '_with-resizer': showResizerInCardView() }">
+ [ngClass]="{ '_with-resizer': showResizer }">
<wp-grid [configuration]="wpTableConfiguration"
- [showResizer]="showResizerInCardView()"
+ [showResizer]="false"
(itemClicked)="handleWorkPackageClicked($event)"
- (stateLinkClicked)="openStateLink($event)"
- resizerClass="work-packages-partitioned-page--content-right"
- resizerStorageKey="openProject-splitViewFlexBasis">
+ (stateLinkClicked)="openStateLink($event)">
</wp-grid>
</div>
@@ -35,4 +34,4 @@
<div class="work-packages-split-view--tabletimeline-footer hide-when-print"
*ngIf="tableInformationLoaded">
<wp-table-pagination></wp-table-pagination>
-</div>
\ No newline at end of file
+</div>
diff --git a/frontend/src/app/features/bim/ifc_models/bcf/list/bcf-list.component.sass b/frontend/src/app/features/bim/ifc_models/bcf/list/bcf-list.component.sass
index edb6730591b..33c35366670 100644
--- a/frontend/src/app/features/bim/ifc_models/bcf/list/bcf-list.component.sass
+++ b/frontend/src/app/features/bim/ifc_models/bcf/list/bcf-list.component.sass
@@ -9,7 +9,7 @@
&--work-packages--card-view-container
width: 100%
overflow: auto
- padding-bottom: 5px
+ padding: 5px
@include styled-scroll-bar
@media screen and (min-width: 679px)
diff --git a/frontend/src/app/features/bim/ifc_models/bcf/list/bcf-list.component.ts b/frontend/src/app/features/bim/ifc_models/bcf/list/bcf-list.component.ts
index ff7c6445f2e..6bf67e4f807 100644
--- a/frontend/src/app/features/bim/ifc_models/bcf/list/bcf-list.component.ts
+++ b/frontend/src/app/features/bim/ifc_models/bcf/list/bcf-list.component.ts
@@ -98,15 +98,6 @@ export class BcfListComponent extends WorkPackageListViewComponent implements Un
&& (viewerState === 'table' || viewerState === 'splitTable');
}
- public showResizerInCardView():boolean {
- if (this.noResults && this.ifcModelsService.models.length === 0) {
- return false;
- }
-
- return this.bcfView.currentViewerState() === 'splitCards'
- || this.bcfView.currentViewerState() === 'splitTable';
- }
-
handleWorkPackageClicked(event:{ workPackageId:string; double:boolean }):void {
const { workPackageId, double } = event;
diff --git a/frontend/src/app/features/bim/ifc_models/pages/viewer/ifc-viewer-page.component.ts b/frontend/src/app/features/bim/ifc_models/pages/viewer/ifc-viewer-page.component.ts
index b0d76df9b5a..08fed4a195d 100644
--- a/frontend/src/app/features/bim/ifc_models/pages/viewer/ifc-viewer-page.component.ts
+++ b/frontend/src/app/features/bim/ifc_models/pages/viewer/ifc-viewer-page.component.ts
@@ -44,9 +44,12 @@ import {
ZenModeButtonComponent,
} from 'core-app/features/work-packages/components/wp-buttons/zen-mode-toggle-button/zen-mode-toggle-button.component';
import {
+ bcfCardsViewIdentifier,
bcfSplitViewCardsIdentifier,
+ bcfTableViewIdentifier,
bcfViewerViewIdentifier,
BcfViewService,
+ BcfViewState,
} from 'core-app/features/bim/ifc_models/pages/viewer/bcf-view.service';
import {
BcfViewToggleButtonComponent,
@@ -173,16 +176,32 @@ export class IFCViewerPageComponent extends PartitionedQuerySpacePageComponent i
.subscribe((query) => {
const dr = query.displayRepresentation || bcfSplitViewCardsIdentifier;
this.filterAllowed = dr !== bcfViewerViewIdentifier;
+ this.hideSplitScreen(dr as BcfViewState);
this.cdRef.detectChanges();
});
+
+ this.$transitions.onSuccess({}, (transition):void => {
+ const toState = transition.to();
+
+ if (toState.name === 'bim.partitioned.list') {
+ const dr = this.querySpace.query.value?.displayRepresentation;
+ this.hideSplitScreen((dr || bcfTableViewIdentifier) as BcfViewState);
+ }
+ });
}
breadcrumbItems() {
return [
{ href: this.pathHelperService.homePath(), text: this.titleService.appTitle },
- { href: this.pathHelperService.projectPath(this.currentProject.identifier as string), text: (this.currentProject.name) },
- { href: this.pathHelperService.projectBCFPath(this.currentProject.identifier as string), text: this.I18n.t('js.bcf.label_bcf') },
- this.selectedTitle?? '',
+ {
+ href: this.pathHelperService.projectPath(this.currentProject.identifier as string),
+ text: (this.currentProject.name),
+ },
+ {
+ href: this.pathHelperService.projectBCFPath(this.currentProject.identifier as string),
+ text: this.I18n.t('js.bcf.label_bcf'),
+ },
+ this.selectedTitle ?? '',
];
}
@@ -196,4 +215,10 @@ export class IFCViewerPageComponent extends PartitionedQuerySpacePageComponent i
return query;
});
}
+
+ private hideSplitScreen(dr:BcfViewState):void {
+ if ([bcfViewerViewIdentifier, bcfCardsViewIdentifier, bcfTableViewIdentifier].includes(dr)) {
+ document.documentElement.style.setProperty('--split-screen-width', '0');
+ }
+ }
}
diff --git a/frontend/src/global_styles/content/modules/_bim.sass b/frontend/src/global_styles/content/modules/_bim.sass
index 7bb4543aada..c2029eda899 100644
--- a/frontend/src/global_styles/content/modules/_bim.sass
+++ b/frontend/src/global_styles/content/modules/_bim.sass
@@ -1,3 +1,7 @@
+body.router--bim
+ .work-packages-partitioned-page--content-right
+ flex-basis: var(--split-screen-width)
+
.bcf--issues
display: flex
flex-direction: row