Skip to content

Commit

Permalink
Recommended challenge upgrades
Browse files Browse the repository at this point in the history
  • Loading branch information
Mutugiii committed Nov 15, 2024
1 parent 69bbc48 commit 4ffbb5e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
9 changes: 4 additions & 5 deletions src/app/shared/dialogs/dialogs-announcement.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
class="thermometer-label"
[ngClass]="{ outside: getGoalPercentage() < 8 }"
>
({{ "$" + getTotalMoneyEarned() }})
{{ "$" + getTotalMoneyEarned() }}
</div>
</div>
</div>
Expand All @@ -32,7 +32,6 @@
<span>Únete al curso Reto noviembre.</span>
<a *ngIf="!getStatus('joinedCourse')" mat-button mat-raised-button color="primary" type="button" (click)="joinCourse()">
Unirse

</a>
</div>

Expand All @@ -50,9 +49,9 @@
<mat-icon color="primary">
{{ getStatus('hasPost') ? 'check_circle' : 'radio_button_unchecked' }}
</mat-icon>
<span>Comparte tu opinión en Nuestras Voces. <span> - {{getStatus('amountEarned')}}</span> </span>
<a *ngIf="getStatus('joinedCourse') && getStatus('surveyComplete') && !getStatus('hasPost')" mat-button mat-raised-button color="primary" type="button" (click)="postVoice()">
Voces
<span>Comparte tu opinión en Nuestras Voces. <br><span>{{getStatus('amountEarned')}} de 5 voz diaria</span> </span>
<a *ngIf="getStatus('joinedCourse') && getStatus('surveyComplete') && !getStatus('hasPost')" mat-button mat-raised-button color="primary" type="button" (click)="chatNShare()">
Chatea y comparte
</a>
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions src/app/shared/dialogs/dialogs-announcement.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ export class DialogsAnnouncementComponent implements OnInit, OnDestroy {
joinCourse() {
const courseTitle = this.coursesService.getCourseNameFromId(this.courseId);
this.coursesService.courseResignAdmission(this.courseId, 'admission', courseTitle).subscribe((res) => {
this.router.navigate([ '/courses/view', this.courseId ]);
this.router.navigate([ `/courses/view/${this.courseId}/step/1` ]);
}, (error) => ((error)));
this.dialogRef.close();
}
Expand All @@ -116,8 +116,8 @@ export class DialogsAnnouncementComponent implements OnInit, OnDestroy {
this.dialogRef.close();
}

postVoice() {
this.router.navigate([ '/' ]);
chatNShare() {
this.router.navigate([ '/chat' ]);
this.dialogRef.close();
}

Expand All @@ -134,7 +134,7 @@ export class DialogsAnnouncementComponent implements OnInit, OnDestroy {
post.doc.user.name === userName &&
post.doc.time > this.startDate &&
post.doc.time < this.endDate &&
post.doc.time > userSubmission?.time &&
// post.doc.time > userSubmission?.time &&
userSubmission?.status === 'complete' &&
!post.doc.replyTo
) {
Expand Down

0 comments on commit 4ffbb5e

Please sign in to comment.