Skip to content

Commit 45fc267

Browse files
author
motorox
committed
event module ui changes
1 parent 242c95d commit 45fc267

File tree

6 files changed

+127
-13
lines changed

6 files changed

+127
-13
lines changed

‎HamEvent/ClientApp/src/app/event-card/event-card.component.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
matTooltipClass="multiline-tooltip mat-tooltip"
2121
[matTooltipShowDelay]="100"
2222
[matTooltipHideDelay]="2000">event_available</mat-icon>
23-
<!--<span class="material-icons orange600">face</span>
24-
<mat-icon class="float: right;" color="primary">archive</mat-icon>
25-
<mat-icon class="float: right;" color="accent">archive</mat-icon>
26-
<mat-icon class="float: right;" color="warn">archive</mat-icon>-->
23+
<!--<span class="material-icons orange600">face</span>-->
24+
<mat-icon *ngIf="event.hasTop" class="float: right;" color="primary" matTooltip="Has Ranking">analytics</mat-icon>
25+
<!--<mat-icon class="float: right;" color="accent">archive</mat-icon>-->
26+
<!--<mat-icon class="float: right;" color="warn">archive</mat-icon>-->
2727
</div>
2828
</mat-card-footer>
2929
</mat-card>

‎HamEvent/ClientApp/src/app/event-card/event-card.component.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { DatePipe } from '@angular/common';
1+
import { DatePipe, NgIf } from '@angular/common';
22
import { Component, Input } from '@angular/core';
33
import { MatButton } from '@angular/material/button';
44
import { MatCard, MatCardActions, MatCardAvatar, MatCardContent, MatCardFooter, MatCardHeader, MatCardImage, MatCardTitle, MatCardSubtitle } from '@angular/material/card';
@@ -25,7 +25,7 @@ export class TrimPipe implements PipeTransform {
2525
templateUrl: './event-card.component.html',
2626
styleUrls: ['./event-card.component.css'],
2727
standalone: true,
28-
imports: [MatCard, MatCardHeader, MatCardAvatar, MatCardTitle, MatCardSubtitle, MatCardImage, MatCardContent, MatCardActions, MatButton, MatCardFooter, MatIcon, MatTooltip, DatePipe, TranslateModule, TrimPipe]
28+
imports: [NgIf, MatCard, MatCardHeader, MatCardAvatar, MatCardTitle, MatCardSubtitle, MatCardImage, MatCardContent, MatCardActions, MatButton, MatCardFooter, MatIcon, MatTooltip, DatePipe, TranslateModule, TrimPipe]
2929
})
3030
export class EventCardComponent {
3131
@Input() event!: HamEvent;
@@ -40,6 +40,7 @@ export class EventCardComponent {
4040
return `Days: ${this.event.days}
4141
Start: ${this.event.startDate.toLocaleString()}
4242
End: ${this.event.endDate.toLocaleString()}
43-
Count: ${this.event.count}`;
43+
Count: ${this.event.count}
44+
Uniques: ${this.event.unique}`;
4445
}
4546
}

‎HamEvent/ClientApp/src/app/event/event.component.css‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,7 @@ mat-card-title {
3838
font-size: 1.5rem;
3939
font-weight: bold;
4040
}
41+
42+
.page-header {
43+
background-color: white;
44+
}

‎HamEvent/ClientApp/src/app/event/event.component.html‎

Lines changed: 110 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,22 @@
3232

3333
<mat-divider></mat-divider>
3434

35-
<p class="description">
36-
{{ event.description }}
37-
</p>
35+
<p class="description" [innerHTML]="event.description"></p>
3836

37+
<mat-divider></mat-divider>
38+
39+
<mat-expansion-panel [expanded]="true">
40+
<mat-expansion-panel-header>
41+
<mat-panel-title> QSO Information</mat-panel-title>
42+
<mat-panel-description> This is a summary of the contest </mat-panel-description>
43+
</mat-expansion-panel-header>
44+
<p class="description">
45+
{{'Count' | translate}}: {{event.count}}
46+
</p>
47+
<p class="description">
48+
{{'Unique' | translate}}: {{event.unique}}
49+
</p>
50+
</mat-expansion-panel>
3951
</mat-card-content>
4052

4153
<mat-card-actions>
@@ -75,7 +87,101 @@ <h5 class="card-title">{{'Download Diploma' | translate}}</h5>
7587

7688
<mat-tab label="{{ 'Rules' | translate}}">
7789
<ng-template mat-tab-label><mat-icon class="example-tab-icon">rule</mat-icon>{{ 'Rules' | translate}}</ng-template>
78-
{{ 'Rules' | translate}}
90+
<mat-expansion-panel [expanded]="true">
91+
<mat-expansion-panel-header>
92+
<mat-panel-title> Contest rules</mat-panel-title>
93+
<mat-panel-description> Those are the rules of the content </mat-panel-description>
94+
</mat-expansion-panel-header>
95+
<pre>Special award for celebrating 20 years of QSO BANAT Timisoara Ham Radio Association
96+
97+
Organizers:
98+
99+
QSO BANAT Ham Radio Association Timisoara
100+
101+
Purpose:
102+
103+
For celebrating 20 years of QSO BANAT Timisoara Ham Radio Association please contact our special call YP20KQT.
104+
105+
Who can participate?
106+
107+
Each and every ham radio with a valid license, who accepts the present set of rules.
108+
109+
Contest days:
110+
111+
1st of December 2023 - 31th of December 2023
112+
113+
Frequencies:
114+
115+
All radio amateur bands in the segments corresponding to the working mode.
116+
117+
Modes:
118+
119+
SSB /CW /Digi modes.
120+
121+
Valid QSOs:
122+
123+
Each callsign may be worked daily once per mode per band.
124+
125+
Scoring:
126+
127+
Total Points = Total number of QSO`s X Total number of Modes X Total number of Band`s.
128+
129+
Award`s
130+
131+
Awards can be downloaded from: www.hamevent.eu starting with 1st of January 2024!
132+
133+
During month of December, you can see Event Top here: EVENT TOP
134+
135+
Live Stream : ClubLog & Hamevent.eu
136+
137+
****************************************************************
138+
139+
140+
141+
YP20KQT
142+
143+
Eveniment special cu ocazia celebrării a 20 ani de existență a Asociației QSO BANAT Timișoara
144+
145+
146+
147+
Organizator:
148+
149+
Asociația QSO Banat Timișoara – Radioclubul YO2KQT
150+
151+
Cine poate participa?
152+
153+
Orice radioamator cu autorizație validă, care acceptă regulile evenimentului.
154+
155+
Perioada de desfășurare:
156+
157+
1 Decembrie 2023 - 31 Decembrie 2023
158+
159+
Frecvențe:
160+
161+
Toate benzile de radioamatori în segmentele corespunzătoare modului de lucru
162+
163+
Mod:
164+
165+
SSB / CW / Digitale
166+
167+
QSO-uri :
168+
169+
Se puncteaza QSO-urile cu indicativul YP20KQT.
170+
171+
Se poate lucra în fiecare zi o singură dată pe fiecare combinație de bandă/mod.
172+
173+
Punctaj:
174+
175+
Scor Total = Nr total de QSO-uri X Nr total de moduri X Nr total de benzi
176+
177+
Diplome
178+
179+
Diplomele pot fi descărcate de la adresa : www.hamevent.eu începând cu data de 1 ianuarie 2024
180+
181+
Pe toată durata evenimentului clasamentul poate fi urmărit aici: LINK
182+
183+
Live Stream : ClubLog & Hamevent.eu</pre>
184+
</mat-expansion-panel>
79185
</mat-tab>
80186
<mat-tab label="{{ 'Logs' | translate}}">
81187
<ng-template mat-tab-label><mat-icon class="example-tab-icon">notes</mat-icon>{{ 'Logs' | translate}}</ng-template>

‎HamEvent/ClientApp/src/app/event/event.component.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,15 @@ import { QSO, QSOsService } from '../qsos.service';
1717
import { MatTableModule, MatTable, MatColumnDef, MatHeaderCellDef, MatHeaderCell, MatCellDef, MatCell, MatHeaderRowDef, MatHeaderRow, MatRowDef, MatRow, MatTableDataSource } from '@angular/material/table';
1818
import { MatPaginator, MatPaginatorModule } from '@angular/material/paginator';
1919
import { MatCardModule } from '@angular/material/card';
20+
import { MatExpansionModule } from '@angular/material/expansion';
2021

2122

2223
@Component({
2324
selector: 'app-event',
2425
templateUrl: './event.component.html',
2526
styleUrls: ['./event.component.css'],
2627
standalone: true,
27-
imports: [MatCardModule, MatTableModule, NgIf, ResponsiveToolbarComponent, MatTable, MatColumnDef, MatHeaderCellDef, MatHeaderCell, MatCellDef, MatCell, MatHeaderRowDef, MatHeaderRow, MatRowDef, MatRow, DatePipe, TranslateModule, MatPaginatorModule, NgIf, ResponsiveToolbarComponent, RouterLink, MatIconModule, MatDivider, DatePipe, MatTabsModule, MatProgressBarModule, MatTable, TranslateModule]
28+
imports: [MatExpansionModule, MatCardModule, MatTableModule, NgIf, ResponsiveToolbarComponent, MatTable, MatColumnDef, MatHeaderCellDef, MatHeaderCell, MatCellDef, MatCell, MatHeaderRowDef, MatHeaderRow, MatRowDef, MatRow, DatePipe, TranslateModule, MatPaginatorModule, NgIf, ResponsiveToolbarComponent, RouterLink, MatIconModule, MatDivider, DatePipe, MatTabsModule, MatProgressBarModule, MatTable, TranslateModule]
2829
})
2930
export class EventComponent implements OnInit {
3031

‎HamEvent/ClientApp/src/app/event/event.module.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import { MatMenuModule } from '@angular/material/menu';
2121
import { MatButtonModule } from '@angular/material/button';
2222
import { MatDividerModule } from '@angular/material/divider';
2323
import { FlexLayoutModule } from '@angular/flex-layout';
24+
import { MatExpansionModule } from '@angular/material/expansion';
2425

2526
export function createTranslateLoader(http: HttpClient) {
2627
return new TranslateHttpLoader(http, './assets/i18n/', '.json');
@@ -35,7 +36,8 @@ export function createTranslateLoader(http: HttpClient) {
3536
MatToolbarModule,
3637
MatIconModule,
3738
MatMenuModule,
38-
MatButtonModule,
39+
MatButtonModule,
40+
MatExpansionModule,
3941
MatDividerModule, DashboardComponent, QSOsComponent, EventTopComponent], // ResponsiveToolbarComponent],
4042
exports: [],
4143
})

0 commit comments

Comments
 (0)