Skip to content

Commit 4a60c1e

Browse files
committed
fix live table order; fix import button style; reduce live timing config
1 parent e132e93 commit 4a60c1e

File tree

5 files changed

+12
-10
lines changed

5 files changed

+12
-10
lines changed

src/app/content/import/import-view/import-tool/import-tool.component.html

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,14 @@
6868
</div>
6969

7070
<div class="import-controls">
71-
<sr-btn [loading]="runningImport" (btnClick)="onImport()">
72-
<mat-icon>cloud_upload</mat-icon>
73-
Import
74-
</sr-btn>
71+
<button (click)="onImport()">
72+
@if (runningImport) {
73+
<sr-spinner [style]="'material'" spinnerSize="btn"></sr-spinner>
74+
} @else {
75+
<mat-icon>cloud_upload</mat-icon>
76+
}
77+
<span>Import</span>
78+
</button>
7579
<input type="text"
7680
class="filter-input"
7781
[(ngModel)]="importExclude"

src/app/content/live-timing/live-timing-old-view/live-timing-old-view.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ <h4>SwimResults</h4>
6262
<label for="sr_server">{{'SETTINGS.LIVE_TIMING.SERVER' | translate}}:</label>
6363
<input [disabled]="liveTimingActive" id="sr_server" type="text" [(ngModel)]="importConfig.apiUrl">
6464
</div>
65-
<div class="form-field">
65+
<!--div class="form-field">
6666
<label for="sr_password">{{'SETTINGS.LIVE_TIMING.PASSWORD' | translate}}:</label>
6767
<input [disabled]="liveTimingActive" id="sr_password" type="password" [(ngModel)]="importConfig.password">
68-
</div>
68+
</div-->
6969

7070
<button [disabled]="liveTimingActive" class="save-btn" (click)="saveConfig()">{{'SETTINGS.LIVE_TIMING.SAVE_BUTTON' | translate}}</button>
7171
</div>

src/app/content/live-timing/live-timing-old-view/live-timing-old-view.component.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@
9191
grid-template-columns: 150px 1fr;
9292
gap: 12px;
9393
align-items: center;
94-
margin-bottom: 12px;
9594

9695
label {
9796
font-size: 13px;
@@ -173,7 +172,6 @@
173172
max-height: 200px;
174173
overflow-y: auto;
175174
margin: 0;
176-
padding-left: 24px;
177175
font-size: 12px;
178176
font-family: monospace;
179177
background: white;

src/app/core/function/live-timing.functions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export function getAvailableMeters(heat: CurrentHeatModel): number[] {
3333
return Array.from(c.splits.keys());
3434
}).reduce((acc, curr) => {
3535
return acc.concat(curr);
36-
}))).sort();
36+
}))).sort((a, b) => a - b);
3737
}
3838

3939
export function getCompetitorsSorted(heat: CurrentHeatModel): Competitor[] {

src/app/core/service/file-watcher.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ export class FileWatcherService implements OnDestroy {
203203
this.appendToLog('Automatischer Import gestartet');
204204

205205
await firstValueFrom(this.importFileService.importFile(request, file));
206-
this.appendToLog('Automatischer Import abgeschlossen');
206+
//this.appendToLog('Automatischer Import abgeschlossen');
207207
} catch (error) {
208208
console.error('Auto import failed', error);
209209
this.appendToLog('Automatischer Import fehlgeschlagen; siehe Konsole für Details');

0 commit comments

Comments
 (0)