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

MOBILE-4379 chat: Remove legacy chat time message

main
Pau Ferrer Ocaña 2023-07-19 12:55:47 +02:00
parent 6f5b68be64
commit a4edff16bb
5 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/langindex.json
View File

@ -496,7 +496,7 @@
"addon.mod_chat.nosessionsfound": "local_moodlemobileapp", "addon.mod_chat.nosessionsfound": "local_moodlemobileapp",
"addon.mod_chat.saidto": "chat", "addon.mod_chat.saidto": "chat",
"addon.mod_chat.send": "chat", "addon.mod_chat.send": "chat",
"addon.mod_chat.sessionstart": "chat", "addon.mod_chat.sessionstartsin": "chat",
"addon.mod_chat.showincompletesessions": "local_moodlemobileapp", "addon.mod_chat.showincompletesessions": "local_moodlemobileapp",
"addon.mod_chat.talk": "chat", "addon.mod_chat.talk": "chat",
"addon.mod_chat.viewreport": "chat", "addon.mod_chat.viewreport": "chat",

2
scripts/update_lang_functions.sh
View File

@ -22,7 +22,7 @@ function copy_lang {
lang=$1 lang=$1
index_keys=$(jq -r 'to_entries[] | "\"\(.key)\","' langindex.json) index_keys=$(jq -r 'to_entries[] | "\"\(.key)\","' langindex.json)
index_keys=${index_keys:0:-1} index_keys=${index_keys:0:${#index_keys}-1}
hyphenlang=${lang/_/-} hyphenlang=${lang/_/-}
langfilepath=$LANG_PATH/$hyphenlang.json langfilepath=$LANG_PATH/$hyphenlang.json

4
src/addons/mod/chat/components/index/addon-mod-chat-index.html
View File

@ -13,10 +13,10 @@
[courseId]="courseId" (completionChanged)="onCompletionChange()"> [courseId]="courseId" (completionChanged)="onCompletionChange()">
</core-course-module-info> </core-course-module-info>
<ion-card *ngIf="chatInfo" class="core-info-card"> <ion-card *ngIf="chatTime" class="core-info-card">
<ion-item> <ion-item>
<ion-icon name="fas-clock" slot="start" aria-hidden="true"></ion-icon> <ion-icon name="fas-clock" slot="start" aria-hidden="true"></ion-icon>
<ion-label>{{ 'addon.mod_chat.sessionstart' | translate:{$a: chatInfo} }}</ion-label> <ion-label>{{ 'addon.mod_chat.sessionstartsin' | translate:{$a: chatTime} }}</ion-label>
</ion-item> </ion-item>
</ion-card> </ion-card>

19
src/addons/mod/chat/components/index/index.ts
View File

@ -34,10 +34,7 @@ export class AddonModChatIndexComponent extends CoreCourseModuleMainActivityComp
component = AddonModChatProvider.COMPONENT; component = AddonModChatProvider.COMPONENT;
pluginName = 'chat'; pluginName = 'chat';
chat?: AddonModChatChat; chat?: AddonModChatChat;
chatInfo?: { chatTime?: string;
date: string;
fromnow: string;
};
constructor( constructor(
protected content?: IonContent, protected content?: IonContent,
@ -62,17 +59,11 @@ export class AddonModChatIndexComponent extends CoreCourseModuleMainActivityComp
this.chat = await AddonModChat.getChat(this.courseId, this.module.id); this.chat = await AddonModChat.getChat(this.courseId, this.module.id);
this.description = this.chat.intro; this.description = this.chat.intro;
const now = CoreTimeUtils.timestamp(); const chatTimeSeconds = (this.chat.chattime || 0) - CoreTimeUtils.timestamp();
const span = (this.chat.chattime || 0) - now;
if (this.chat.chattime && this.chat.schedule && span > 0) { this.chatTime = this.chat.schedule && chatTimeSeconds > 0
this.chatInfo = { ? CoreTime.formatTime(chatTimeSeconds)
date: CoreTimeUtils.userDate(this.chat.chattime * 1000), : undefined;
fromnow: CoreTime.formatTime(span),
};
} else {
this.chatInfo = undefined;
}
this.dataRetrieved.emit(this.chat); this.dataRetrieved.emit(this.chat);
} }

2
src/addons/mod/chat/lang.json
View File

@ -22,7 +22,7 @@
"nosessionsfound": "No sessions found", "nosessionsfound": "No sessions found",
"saidto": "said to", "saidto": "said to",
"send": "Send", "send": "Send",
"sessionstart": "The next chat session will start on {{$a.date}}, ({{$a.fromnow}} from now)", "sessionstartsin": "The next chat session will start {{$a}} from now.",
"showincompletesessions": "Show incomplete sessions", "showincompletesessions": "Show incomplete sessions",
"talk": "Talk", "talk": "Talk",
"viewreport": "Past sessions" "viewreport": "Past sessions"