Skip to content

Commit 21a7e0d

Browse files
committed
feat(page-task): show warning after deadline
1 parent 5fe18c6 commit 21a7e0d

File tree

3 files changed

+13
-1
lines changed

3 files changed

+13
-1
lines changed

src/app/components/tasks/page-task/page-task.component.html

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ <h2 class="task-title" [innerHTML]="task.head.title"></h2>
99
<span class="deadline">{{'tasks.deadline' | translate}}: {{task.head.time_deadline | ksiDate}} 23:59, {{task.head.max_score | translatePoints}}</span>
1010
</div>
1111

12+
<div *ngIf="deadlinePassed$ | async" class="alert alert-warning">
13+
{{'tasks.deadline-passed'|translate}}
14+
</div>
15+
1216
<div *ngIf="(subpage$ | async) !== templateBodyAssigment" class="back" >
1317
<a routerLink="." [fragment]="undefined">
1418
{{icon.BACK}} {{'tasks.back-to-assigment' | translate}}
@@ -63,12 +67,15 @@ <h4>{{'tasks.assessment.comment'|translate}}</h4>
6367
</a>
6468

6569
<a *ngIf="task.detail.taskDetails.best_scores.length > 0" class='results' routerLink="." [fragment]="routes.routes.tasks.results">
66-
{{'tasks.results' | translate}} ({{task.detail.userScores.length}})
70+
{{'tasks.results' | translate}} ({{task.detail.userScores.length + (task.detail.userScores.length >= 100 ? '+' : '')}})
6771
</a>
6872
</div>
6973
</div>
7074

7175
<div class="modules">
76+
<div *ngIf="deadlinePassed$ | async" class="alert alert-warning">
77+
{{'tasks.deadline-passed'|translate}}
78+
</div>
7279
<ksi-task-module class="module" *ngFor="let module of task.detail.modules" [module]="module">
7380
</ksi-task-module>
7481
</div>
@@ -87,6 +94,7 @@ <h4>{{'tasks.assessment.comment'|translate}}</h4>
8794

8895
<ng-template #bodyResults>
8996
<ng-container *ngIf="(task$ | async) as task">
97+
<ksi-spinner [source]="userScores$"></ksi-spinner>
9098
<table class="table table-striped results-table table-responsive-md" ksiTheme>
9199
<thead>
92100
<tr>

src/app/components/tasks/page-task/page-task.component.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import {UserScore} from '../../../../api/backend';
2424
})
2525
export class PageTaskComponent implements OnInit, OnDestroy {
2626
task$: Observable<TaskFullInfo | null>;
27+
deadlinePassed$: Observable<boolean>;
2728
authors$: Observable<number[]>;
2829
subpage$: Observable<TemplateRef<unknown>>;
2930

@@ -189,6 +190,8 @@ export class PageTaskComponent implements OnInit, OnDestroy {
189190
return userScores;
190191
})
191192
);
193+
194+
this.deadlinePassed$ = this.task$.pipe(map((task) => task?.head && new Date(task.head.time_deadline) < new Date() || false));
192195
}
193196

194197
ngOnDestroy(): void {

src/assets/i18n/cs.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@
236236
"comment-none": "K tvému odevzdání nebyl přidán žádný komentář opravujícího"
237237
},
238238
"deadline": "Datum ukončení",
239+
"deadline-passed": "Termín odevzdání úlohy již uplynul, úloha nepříjmá nové odpovědi",
239240
"feedback": {
240241
"send": "Odeslat zpětnou vazbu",
241242
"sent": "Máme to, díky!",

0 commit comments

Comments
 (0)