Merge branch 'master' of https://git.wmi.amu.edu.pl/s416178/Punktonerzy
This commit is contained in:
commit
4de7f29290
@ -22,7 +22,7 @@
|
|||||||
Poprzednia odpowiedź była niepoprawna.
|
Poprzednia odpowiedź była niepoprawna.
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div *ngIf="!isStarted && (test['permission'] !== 'GROUP' || (test['permission'] === 'GROUP' && !test['attempted']))">
|
<div *ngIf="!isStarted && (test['permission'] !== 'GROUP' || (test['permission'] === 'GROUP' && !test['attempted'] && ((test['dateStart'] < now && test['dateEnd'] < now) || (test['isGroupOwner']))))">
|
||||||
<br /><br />
|
<br /><br />
|
||||||
<button class="button" (click)="start()"> <i class="far fa-play-circle"></i> Rozpocznij test</button>
|
<button class="button" (click)="start()"> <i class="far fa-play-circle"></i> Rozpocznij test</button>
|
||||||
</div>
|
</div>
|
||||||
@ -30,6 +30,10 @@
|
|||||||
<br /><br />
|
<br /><br />
|
||||||
<h3>Test już został wcześniej rozwiązany!</h3>
|
<h3>Test już został wcześniej rozwiązany!</h3>
|
||||||
</div>
|
</div>
|
||||||
|
<div *ngIf="!isStarted && test['permission']==='GROUP' && !test['attempted'] && !((test['dateStart'] < now && test['dateEnd'] < now) || (test['isGroupOwner']))">
|
||||||
|
<br /><br />
|
||||||
|
<h3>Test jest nieaktywny!</h3>
|
||||||
|
</div>
|
||||||
<div *ngIf="isStarted && !isEnded">
|
<div *ngIf="isStarted && !isEnded">
|
||||||
|
|
||||||
|
|
||||||
|
@ -28,6 +28,7 @@ export class TestDetailsComponent implements OnInit, OnDestroy {
|
|||||||
getResultSubscription: ISubscription;
|
getResultSubscription: ISubscription;
|
||||||
getTestWithoutAnswersSubscription: ISubscription;
|
getTestWithoutAnswersSubscription: ISubscription;
|
||||||
display = false;
|
display = false;
|
||||||
|
now = Date.now();
|
||||||
|
|
||||||
constructor(private route: ActivatedRoute, private router: Router, private testService: TestsService,
|
constructor(private route: ActivatedRoute, private router: Router, private testService: TestsService,
|
||||||
private routingState: RoutingStateService) { }
|
private routingState: RoutingStateService) { }
|
||||||
|
Loading…
Reference in New Issue
Block a user