Merge pull request #3086 from dpalou/MOBILE-3909

Mobile 3909
main
Pau Ferrer Ocaña 2022-02-01 11:18:27 +01:00 committed by GitHub
commit 8ced85f696
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions

View File

@ -140,7 +140,7 @@
<p>{{ reminder.label }}</p>
</ion-label>
<ion-button fill="clear" (click)="cancelNotification(reminder.id, $event)" [attr.aria-label]="'core.delete' | translate"
slot="end" *ngIf="reminder.timestamp > currentTime">
slot="end">
<ion-icon name="fas-trash" color="danger" slot="icon-only" aria-hidden="true"></ion-icon>
</ion-button>
</ion-item>

View File

@ -248,7 +248,8 @@ export const CALENDAR_SITE_SCHEMA: CoreSiteSchema = {
return;
} else {
record.time = events[record.eventid].timestart - record.time;
// Remove seconds from the old reminder, it could include seconds by mistake.
record.time = events[record.eventid].timestart - Math.floor(record.time / 60) * 60;
}
return db.insertRecord(REMINDERS_TABLE, record);