fix select (#133)
All checks were successful
Backend Build and Test / build (push) Successful in 3m9s
Backend Deploy / build (push) Successful in 20s

closes #117

Reviewed-on: #133
This commit is contained in:
Huffle 2025-05-28 11:47:11 +02:00
parent 604b92b3b3
commit 9cbb8756d1
10 changed files with 52 additions and 13 deletions

View File

@ -18,6 +18,16 @@ form,
align-items: center; align-items: center;
} }
input {
border: 1px solid var(--ion-color-primary);
border-radius: 5px;
width: 250px;
height: 40px;
padding-inline: 10px;
display: flex;
align-items: center;
}
label { label {
color: var(--ion-color-primary); color: var(--ion-color-primary);
margin-top: 25px; margin-top: 25px;

View File

@ -8,6 +8,7 @@ import { EditAllowancePageRoutingModule } from './edit-allowance-routing.module'
import { EditAllowancePage } from './edit-allowance.page'; import { EditAllowancePage } from './edit-allowance.page';
import { MatIconModule } from '@angular/material/icon'; import { MatIconModule } from '@angular/material/icon';
import { MatSelectModule } from '@angular/material/select';
@NgModule({ @NgModule({
imports: [ imports: [
@ -16,7 +17,8 @@ import { MatIconModule } from '@angular/material/icon';
IonicModule, IonicModule,
EditAllowancePageRoutingModule, EditAllowancePageRoutingModule,
ReactiveFormsModule, ReactiveFormsModule,
MatIconModule MatIconModule,
MatSelectModule
], ],
declarations: [EditAllowancePage] declarations: [EditAllowancePage]
}) })

View File

@ -28,9 +28,9 @@
<div class="item" *ngIf="isAddMode || goalId != 0"> <div class="item" *ngIf="isAddMode || goalId != 0">
<label>Colour</label> <label>Colour</label>
<select formControlName="color"> <mat-select [(value)]="selectedColor" formControlName="color" [style.--color]="selectedColor">
<option *ngFor="let color of possibleColors" [value]="color" [style.--background]="color">{{color}}</option> <mat-option *ngFor="let color of possibleColors" [value]="color" [style.--background]="color">{{color}}</mat-option>
</select> </mat-select>
</div> </div>
<button type="button" [disabled]="!form.valid" (click)="submit()"> <button type="button" [disabled]="!form.valid" (click)="submit()">

View File

@ -26,17 +26,23 @@ label {
} }
input, input,
select { mat-select {
--color: black;
color: var(--color);
border: 1px solid var(--ion-color-primary); border: 1px solid var(--ion-color-primary);
border-radius: 5px; border-radius: 5px;
width: 250px; width: 250px;
height: 40px;
padding-inline: 10px;
display: flex;
align-items: center;
font-family: (--ion-font-family);
} }
option { mat-option {
--background: white; --background: white;
background-color: var(--background);
color: var(--background); color: var(--background);
font-family: var(--ion-font-family); font-family: (--ion-font-family);
} }
button { button {

View File

@ -15,6 +15,7 @@ export class EditAllowancePage implements OnInit {
public goalId: number; public goalId: number;
public userId: number; public userId: number;
public isAddMode: boolean; public isAddMode: boolean;
public selectedColor: string = '';
public possibleColors: Array<string> = [ public possibleColors: Array<string> = [
'#6199D9', '#6199D9',
'#D98B61', '#D98B61',
@ -73,6 +74,7 @@ export class EditAllowancePage implements OnInit {
weight: allowance.weight, weight: allowance.weight,
color: allowance.colour color: allowance.colour
}); });
this.selectedColor = this.form.value.color;
} }
}); });
} }

View File

@ -8,6 +8,7 @@ import { EditTaskPageRoutingModule } from './edit-task-routing.module';
import { EditTaskPage } from './edit-task.page'; import { EditTaskPage } from './edit-task.page';
import { MatIconModule } from '@angular/material/icon'; import { MatIconModule } from '@angular/material/icon';
import { MatSelectModule } from '@angular/material/select';
@NgModule({ @NgModule({
imports: [ imports: [
@ -16,7 +17,8 @@ import { MatIconModule } from '@angular/material/icon';
IonicModule, IonicModule,
EditTaskPageRoutingModule, EditTaskPageRoutingModule,
ReactiveFormsModule, ReactiveFormsModule,
MatIconModule MatIconModule,
MatSelectModule
], ],
declarations: [EditTaskPage] declarations: [EditTaskPage]
}) })

View File

@ -19,9 +19,9 @@
<input id="reward" type="number" placeholder="0.00" name="price" min="0" value="0" step="0.01" formControlName="reward"/> <input id="reward" type="number" placeholder="0.00" name="price" min="0" value="0" step="0.01" formControlName="reward"/>
<label>Assigned</label> <label>Assigned</label>
<select formControlName="assigned"> <mat-select formControlName="assigned">
<option *ngFor="let user of users" [value]="user.id">{{ user.name }}</option> <mat-option *ngFor="let user of users" [value]="user.id">{{ user.name }}</mat-option>
</select> </mat-select>
<button type="button" [disabled]="!form.valid" (click)="submit()"> <button type="button" [disabled]="!form.valid" (click)="submit()">
<span *ngIf="isAddMode">Add Task</span> <span *ngIf="isAddMode">Add Task</span>

View File

@ -22,10 +22,15 @@ label {
} }
input, input,
select { mat-select {
border: 1px solid var(--ion-color-primary); border: 1px solid var(--ion-color-primary);
border-radius: 5px; border-radius: 5px;
width: 250px; width: 250px;
height: 40px;
padding-inline: 10px;
display: flex;
align-items: center;
font-family: (--ion-font-family);
} }
button { button {

View File

@ -58,4 +58,14 @@ ion-header.md {
label { label {
font-size: 18px; font-size: 18px;
}
ion-alert .alert-wrapper.sc-ion-alert-md {
background-color: var(--ion-background-color) !important;
--background: unset !important;
box-shadow: unset;
}
ion-alert .alert-tappable.sc-ion-alert-md {
background-color: var(--test-color);
} }

View File

@ -11,6 +11,8 @@
--line-color: #CACACA; --line-color: #CACACA;
--ion-font-family: 'Myfont'; --ion-font-family: 'Myfont';
--test-color: red;
} }
@font-face { @font-face {