fix:layout issues

This commit is contained in:
Pranav Deshmukh
2025-05-24 23:47:53 +05:30
parent 19a14e5b5b
commit 09d08efb5f
5 changed files with 36 additions and 17 deletions
@@ -1,14 +1,16 @@
<div class="layout-row-wrap gap-2px responsive-column"> <div class="layout-row-wrap gap-2px responsive-column">
<h4 class="mat-h4 flex-23"> <div class="add-option">
{{ 'labels.inputs.Market Price Period' | translate }} <h4 class="mat-h4">
<i class="fas fa-question" matTooltip="{{ 'tooltips.Add future share value with date range' | translate }}"></i> {{ 'labels.inputs.Market Price Period' | translate }}
</h4> <i class="fas fa-question" matTooltip="{{ 'tooltips.Add future share value with date range' | translate }}"></i>
</h4>
<div class="flex-73"> <div class="">
<button type="button" mat-raised-button color="primary" (click)="addMarketPricePeriod()"> <button type="button" mat-raised-button color="primary" (click)="addMarketPricePeriod()">
<fa-icon icon="plus" class="m-r-10"></fa-icon> <fa-icon icon="plus" class="m-r-10"></fa-icon>
{{ 'labels.buttons.Add' | translate }} {{ 'labels.buttons.Add' | translate }}
</button> </button>
</div>
</div> </div>
<table <table
@@ -14,3 +14,10 @@ h4 {
.margin-t { .margin-t {
margin-top: 1em; margin-top: 1em;
} }
.add-option {
display: flex;
justify-content: center;
align-items: center;
gap: 1.5rem;
}
@@ -1,10 +1,10 @@
<div class="container input"> <div class="container input">
<mat-card *ngIf="!isCollapsed"> <mat-card *ngIf="!isCollapsed">
<form [formGroup]="reportForm"> <form [formGroup]="reportForm">
<mat-card-content class="layout-column"> <mat-card-content class="form-grid">
<ng-container *ngFor="let param of paramData" [ngSwitch]="param.displayType"> <ng-container *ngFor="let param of paramData" [ngSwitch]="param.displayType">
<ng-container *ngIf="reportForm.contains(param.name)"> <ng-container class="test" *ngIf="reportForm.contains(param.name)">
<mat-form-field class="flex-fill" *ngSwitchCase="'text'"> <mat-form-field class="form-field" *ngSwitchCase="'text'">
<mat-label>{{ param.label }}</mat-label> <mat-label>{{ param.label }}</mat-label>
<input matInput required [formControlName]="param.name" /> <input matInput required [formControlName]="param.name" />
<mat-error *ngIf="reportForm.controls[param.name].hasError('required')"> <mat-error *ngIf="reportForm.controls[param.name].hasError('required')">
@@ -13,7 +13,7 @@
</mat-error> </mat-error>
</mat-form-field> </mat-form-field>
<mat-form-field class="flex-fill" *ngSwitchCase="'date'" (click)="runReportDatePicker.open()"> <mat-form-field class="form-field" *ngSwitchCase="'date'" (click)="runReportDatePicker.open()">
<mat-label>{{ param.label }}</mat-label> <mat-label>{{ param.label }}</mat-label>
<input <input
matInput matInput
@@ -31,7 +31,7 @@
</mat-error> </mat-error>
</mat-form-field> </mat-form-field>
<mat-form-field class="flex-fill" *ngSwitchCase="'select'"> <mat-form-field class="form-field" *ngSwitchCase="'select'">
<mat-label>{{ param.label }}</mat-label> <mat-label>{{ param.label }}</mat-label>
<mat-select required [formControlName]="param.name"> <mat-select required [formControlName]="param.name">
<mat-option *ngFor="let option of param.selectOptions" [value]="option"> <mat-option *ngFor="let option of param.selectOptions" [value]="option">
@@ -46,7 +46,7 @@
</ng-container> </ng-container>
</ng-container> </ng-container>
<mat-form-field class="flex-fill"> <mat-form-field class="form-field">
<mat-label>{{ 'labels.inputs.Decimal Places' | translate }}</mat-label> <mat-label>{{ 'labels.inputs.Decimal Places' | translate }}</mat-label>
<mat-select [formControl]="decimalChoice"> <mat-select [formControl]="decimalChoice">
<mat-option value="0">0</mat-option> <mat-option value="0">0</mat-option>
@@ -57,7 +57,7 @@
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field class="flex-fill" *ngIf="isPentahoReport()"> <mat-form-field class="form-field" *ngIf="isPentahoReport()">
<mat-label>{{ 'labels.inputs.Output Type' | translate }}</mat-label> <mat-label>{{ 'labels.inputs.Output Type' | translate }}</mat-label>
<mat-select required formControlName="outputType"> <mat-select required formControlName="outputType">
<mat-option *ngFor="let option of outputTypeOptions" [value]="option.value"> <mat-option *ngFor="let option of outputTypeOptions" [value]="option.value">
@@ -77,7 +77,7 @@
</div> </div>
</mat-card-content> </mat-card-content>
<mat-card-actions class="layout-row align-center gap-5px responsive-column"> <mat-card-actions class="layout-row align-between gap-5px responsive-column">
<button type="button" mat-raised-button [routerLink]="['/reports']"> <button type="button" mat-raised-button [routerLink]="['/reports']">
{{ 'labels.buttons.Cancel' | translate }} {{ 'labels.buttons.Cancel' | translate }}
</button> </button>
@@ -1,3 +1,12 @@
.input { .input {
max-width: 37rem; max-width: 37rem;
} }
.form-grid {
display: flex;
flex-direction: column;
}
.form-field {
width: 100%;
}
+1
View File
@@ -305,6 +305,7 @@
.flex-50 { .flex-50 {
flex: 0 0 50%; flex: 0 0 50%;
margin-bottom: 1rem;
} }
.flex-53 { .flex-53 {