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

MOBILE-3833 forum: Remove duplicated due date message in 3.11+

main
Dani Palou 2022-04-12 09:34:52 +02:00
parent 0708081868
commit 1eab0204b0
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/addons/mod/forum/components/index/index.ts
View File

@ -345,8 +345,9 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
} }
const forum = this.forum; const forum = this.forum;
const showDueDateMessage = !CoreSites.getCurrentSite()?.isVersionGreaterEqualThan('3.11');
this.description = forum.intro || this.description; this.description = forum.intro || this.description;
this.availabilityMessage = AddonModForumHelper.getAvailabilityMessage(forum); this.availabilityMessage = AddonModForumHelper.getAvailabilityMessage(forum, showDueDateMessage);
this.descriptionNote = Translate.instant('addon.mod_forum.numdiscussions', { this.descriptionNote = Translate.instant('addon.mod_forum.numdiscussions', {
numdiscussions: forum.numdiscussions, numdiscussions: forum.numdiscussions,
}); });

19
src/addons/mod/forum/services/forum-helper.ts
View File

@ -278,23 +278,26 @@ export class AddonModForumHelperProvider {
* Returns the availability message of the given forum. * Returns the availability message of the given forum.
* *
* @param forum Forum instance. * @param forum Forum instance.
* @param getDueDateMessage Whether to get due date message. If false, only cutoff date message will be returned.
* @return Message or null if the forum has no cut-off or due date. * @return Message or null if the forum has no cut-off or due date.
*/ */
getAvailabilityMessage(forum: AddonModForumData): string | null { getAvailabilityMessage(forum: AddonModForumData, getDueDateMessage = true): string | null {
if (this.isCutoffDateReached(forum)) { if (this.isCutoffDateReached(forum)) {
return Translate.instant('addon.mod_forum.cutoffdatereached'); return Translate.instant('addon.mod_forum.cutoffdatereached');
} }
if (this.isDueDateReached(forum)) { if (getDueDateMessage) {
const dueDate = CoreTimeUtils.userDate(forum.duedate * 1000); if (this.isDueDateReached(forum)) {
const dueDate = CoreTimeUtils.userDate(forum.duedate * 1000);
return Translate.instant('addon.mod_forum.thisforumisdue', { $a: dueDate }); return Translate.instant('addon.mod_forum.thisforumisdue', { $a: dueDate });
} }
if ((forum.duedate ?? 0) > 0) { if (forum.duedate && forum.duedate > 0) {
const dueDate = CoreTimeUtils.userDate(forum.duedate! * 1000); const dueDate = CoreTimeUtils.userDate(forum.duedate * 1000);
return Translate.instant('addon.mod_forum.thisforumhasduedate', { $a: dueDate }); return Translate.instant('addon.mod_forum.thisforumhasduedate', { $a: dueDate });
}
} }
return null; return null;