Skip to content

fix double scroll #677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TheoLechemia wants to merge 1 commit into
base: sqla2
Choose a base branch
from
+79 −93
Open

fix double scroll #677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 18 additions & 22 deletions frontend/app/components/monitoring-form/monitoring-form.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
padding: 0;
}

:host ::ng-deep .full-wrapper {
padding-bottom: 2rem!important;
}

.hide-spinner {
display: none;
Expand All @@ -17,12 +14,6 @@
}


.float-left {
margin-right: 10px;
float: left;
}


form:invalid {
outline: none;
}
Expand All @@ -31,27 +22,32 @@ form.ng-invalid {
border: 0px !important;
}

.form-scroll-info-geom {
overflow-y: auto;
max-height: 60vh;
.sticky-toggle {
position: sticky;
top: 0;
z-index: 2000
}

.form-scroll {
overflow-y: auto;
max-height: 70vh;
#toggle-btn {
display: inline-block;
padding: 0.5em;
background-color: rgb(190, 190, 190);
border-radius: 20%;
}

.btn-child {
border: 0px solid #202020;
display: flex;
justify-content: flex-end;
align-items: center;
padding-top: 2px;
padding-bottom: auto;
-webkit-box-shadow: 0px -2px 2px rgba(50, 50, 50, 0.3);
-moz-box-shadow: 0px -2px 2px rgba(50, 50, 50, 0.3);
box-shadow: 0px -2px 2px rgba(50, 50, 50, 0.3);
overflow: hidden;
height: fit-content;
z-index: 1000;
padding-bottom: 30px;
gap: 0.8em
}




button:disabled {
cursor: not-allowed;
pointer-events: all !important;
Expand Down
132 changes: 61 additions & 71 deletions frontend/app/components/monitoring-form/monitoring-form.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ <h2>{{ 'Monitoring.DeletingPopup.Warning' | translate }}</h2>

<div>
<div id="properties-form" class="cadre" *ngIf="obj.bIsInitialized && objFormsDefinition">
<div style="height: 25px;">
<div class="sticky-toggle" style="height: 25px;">
<span
*ngIf="!obj.id && obj.config['chained']"
id="toggle-btn"
class="float-right"
matTooltip="Enchainer les saisies"
matTooltipPosition="left"
>
<i class="fa fa-repeat" aria-hidden="true"></i>
<i class="fa fa-repeat mr-2" aria-hidden="true"></i>
<mat-slide-toggle
color="primary"
[(ngModel)]="bChainInput"
Expand All @@ -37,20 +37,19 @@ <h2>{{ 'Monitoring.DeletingPopup.Warning' | translate }}</h2>
</span>
</div>

<form [formGroup]="objForm">
<p
class="alert alert-warning"
style="display: inline-block"
*ngIf="
obj.config['geometry_type'] && !objForm.value.geometry && obj.objectType != 'sites_group'
"
>
<span>{{ 'Monitoring.Form.PickGeom' | translate }}</span>
</p>
<p
class="alert alert-warning"
style="display: inline-block; padding: 4px"
*ngIf="
<p
class="alert alert-warning"
style="display: inline-block"
*ngIf="
obj.config['geometry_type'] && !objForm.value.geometry && obj.objectType != 'sites_group'
"
>
<span>{{ 'Monitoring.Form.PickGeom' | translate }}</span>
</p>
<p
class="alert alert-warning"
style="display: inline-block; padding: 4px"
*ngIf="
obj.config['geometry_type'] &&
!objForm.value.geometry &&
obj.objectType == 'sites_group' &&
Expand All @@ -61,54 +60,61 @@ <h2>{{ 'Monitoring.DeletingPopup.Warning' | translate }}</h2>
{{ 'Monitoring.Form.GrpSiteGeom' | translate }}
</span>
</p>

<!-- composant choix de site select + filtre -->
<div
[ngClass]="{
'form-scroll-info-geom': obj.config['geometry_type'] && !objForm.value.geometry,
'form-scroll': !(obj.config['geometry_type'] && !objForm.value.geometry)
}"
>
<pnx-dynamic-form-generator
class="obj-form"
#dynamicForm
[autoGenerated]="true"
[myFormGroup]="objForm"
[formsDefinition]="objFormsDefinition"
(myFormGroupChange)="initForm()"
(change)="onObjFormValueChange($event)"
></pnx-dynamic-form-generator>
<ng-container *ngIf="hasDynamicGroups">
<ng-container *ngFor="let item of objFormsDynamic | keyvalue">
<!-- affiche le bloc que si le type de site a des champs additionnels -->
<ng-container
*ngIf="(typesSiteConfig[item.key] | keyvalue)?.length > 0">
<p style="font-weight: bold;">{{ 'Monitoring.Form.AssignedFields' | translate }}{{obj.config['types_site'][item.key].name}}</p>
<pnx-dynamic-form-generator
class="obj-form"
[autoGenerated]="true"
#dynamicForm
[myFormGroup]="item.value"
[formsDefinition]="objFormsDefinitionDynamic[item.key]"
(myFormGroupChange)="initFormDynamic(item.key)"
(change)="onObjFormValueChangeDynamic($event, item.key)"
></pnx-dynamic-form-generator>

<form [formGroup]="objForm">
<!-- composant choix de site select + filtre -->
<pnx-dynamic-form-generator
class="obj-form"
#dynamicForm
[autoGenerated]="true"
[myFormGroup]="objForm"
[formsDefinition]="objFormsDefinition"
(myFormGroupChange)="initForm()"
(change)="onObjFormValueChange($event)"
></pnx-dynamic-form-generator>
<ng-container *ngIf="hasDynamicGroups">
<ng-container *ngFor="let item of objFormsDynamic | keyvalue">
<!-- affiche le bloc que si le type de site a des champs additionnels -->
<ng-container
*ngIf="(typesSiteConfig[item.key] | keyvalue)?.length > 0">
<p style="font-weight: bold;">{{ 'Monitoring.Form.AssignedFields' | translate }}{{obj.config['types_site'][item.key].name}}</p>
<pnx-dynamic-form-generator
class="obj-form"
[autoGenerated]="true"
#dynamicForm
[myFormGroup]="item.value"
[formsDefinition]="objFormsDefinitionDynamic[item.key]"
(myFormGroupChange)="initFormDynamic(item.key)"
(change)="onObjFormValueChangeDynamic($event, item.key)"
></pnx-dynamic-form-generator>
</ng-container>
</ng-container>
</ng-container>
</ng-container>
</div>
<div class="btn-child">
<div class="btn-child pb-2">
<button mat-raised-button color="warn" (click)="onCancelEdit()">
{{ 'Monitoring.Form.Cancel' | translate }}
</button>
<button
mat-raised-button
[matTooltip]="canDelete ? null : toolTipNotAllowed"
[disabled]="!canDelete"
color="warn"
(click)="canDelete ? (bDeleteModal = true) : null"
*ngIf="obj.id"
>
{{ 'Monitoring.Form.Delete' | translate }}
</button>
<button
mat-raised-button
color="primary"
*ngIf="!bChainInput && !obj.id && obj.uniqueChildrenName() && addChildren"
class="btn btn-success float-right mr-1"
class="btn btn-success"
(click)="canUpdate ? onSubmit(true) : notAllowedMessage()"
[disabled]="!objForm.valid"
>
<span
[ngClass]="{ 'hide-spinner': !bSaveAndAddChildrenSpinner }"
class="spinner-border spinner-border-sm float-right"
class="spinner-border spinner-border-sm"
role="status"
aria-hidden="true"
></span>
Expand All @@ -119,37 +125,21 @@ <h2>{{ 'Monitoring.DeletingPopup.Warning' | translate }}</h2>
<button
mat-raised-button
color="primary"
class="float-right mr-1"
(click)="canUpdate ? onSubmit() : notAllowedMessage()"
[disabled]="!objForm.valid"
>
<span
[ngClass]="{ 'hide-spinner': !bSaveSpinner }"
class="spinner-border spinner-border-sm float-right"
class="spinner-border spinner-border-sm"
role="status"
aria-hidden="true"
></span>

<span *ngIf="bChainInput && !obj.id">{{ 'Monitoring.Form.ValidateChain' | translate }}</span>
<span *ngIf="!bChainInput || obj.id">{{ 'Monitoring.Form.Validate' | translate }}</span>
</button>

<button mat-raised-button color="warn" class="float-left" (click)="onCancelEdit()">
{{ 'Monitoring.Form.Cancel' | translate }}
</button>
<button
mat-raised-button
[matTooltip]="canDelete ? null : toolTipNotAllowed"
[disabled]="!canDelete"
color="warn"
class="float-left"
(click)="canDelete ? (bDeleteModal = true) : null"
*ngIf="obj.id"
>
{{ 'Monitoring.Form.Delete' | translate }}
</button>
</div>
<div class="btn-height"></div>
<!-- <div class="btn-height"></div> -->
</form>
</div>
</div>
Loading