EVOgeek
/
Vmeda.Online
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3458 from crazyserver/MOBILE-3936 

MOBILE-3936 reminders: Fix workshop reminders and custom position
main
Dani Palou 2022-11-22 15:33:15 +01:00 committed by GitHub
parent 0788664be6 e7e0ea6b04
commit 6bd7bc644c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/addons/mod/workshop/components/index/addon-mod-workshop-index.html
View File

@ -9,7 +9,8 @@
<core-loading [hideUntil]="!showLoading">
<!-- Activity info. -->
<core-course-module-info [module]="module" [hasDataToSync]="hasOffline" (completionChanged)="onCompletionChange()">
<core-course-module-info [module]="module" [component]="component" [componentId]="componentId" [courseId]="courseId"
[hasDataToSync]="hasOffline" (completionChanged)="onCompletionChange()">
</core-course-module-info>
<ion-card *ngIf="phases">

4
src/core/features/reminders/components/set-reminder-menu/set-reminder-menu.ts
View File

@ -152,6 +152,9 @@ export class CoreRemindersSetReminderMenuComponent implements OnInit {
* @param ev Click event.
*/
async setCustom(ev: Event): Promise<void> {
ev.stopPropagation();
ev.preventDefault();
const reminderTime = await CoreDomUtils.openPopover<CoreReminderValueAndUnit>({
component: CoreRemindersSetReminderCustomComponent,
componentProps: {
@ -159,7 +162,6 @@ export class CoreRemindersSetReminderMenuComponent implements OnInit {
customUnits: this.customUnits,
},
waitForDismissCompleted: true, // To be able to close parent popup.
event: ev,
});
if (reminderTime === undefined) {