diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts
index 8ca0c13..7f3693d 100644
--- a/src/common/shared_vuejs.ts
+++ b/src/common/shared_vuejs.ts
@@ -6,8 +6,13 @@ export const shared_consts = {
Manager: 2,
},
+ MessageOptions: {
+ Notify_ByEmail: 2,
+ Notify_ByPushNotification: 4
+ },
+
fieldsUserToChange() {
- return ['username', 'email', 'name', 'surname', 'perm', 'date_reg', 'verified_email', 'img', 'ipaddr']
+ return ['username', 'email', 'name', 'surname', 'perm', 'date_reg', 'verified_email', 'img', 'ipaddr', 'lasttimeonline']
}
}
diff --git a/src/components/CEventsCalendar/CEventsCalendar.ts b/src/components/CEventsCalendar/CEventsCalendar.ts
index 92f32d9..c7621e0 100644
--- a/src/components/CEventsCalendar/CEventsCalendar.ts
+++ b/src/components/CEventsCalendar/CEventsCalendar.ts
@@ -28,10 +28,12 @@ import router from '@router'
import { static_data } from '@src/db/static_data'
import translate from '@src/globalroutines/util'
import { lists } from '../../store/Modules/lists'
-import { GlobalStore } from '../../store/Modules'
-import { IMessagePage, IMessage, IIdentity } from '../../model'
+import { GlobalStore, MessageStore } from '../../store/Modules'
+import { IMessagePage, IMessage, IIdentity, MsgDefault } from '../../model'
+import MixinUsers from '../../mixins/mixin-users'
@Component({
+ mixins: [MixinUsers],
name: 'CEventsCalendar',
components: { Logo, Footer, CTitle, CImgText, QDateTimeScroller, QDateScroller, CMySelect, CMyEditor }
})
@@ -370,10 +372,6 @@ export default class CEventsCalendar extends Vue {
}
}
- get mythis() {
- return this
- }
-
public $refs: {
calendar: any
}
@@ -666,26 +664,17 @@ export default class CEventsCalendar extends Vue {
const data: IMessage = {
source: {
- page: '',
event_id: myevent._id,
infoevent: tools.gettextevent(this, myevent)
},
- idapp: process.env.APP_ID,
- origin: {
- idapp: process.env.APP_ID,
- username: UserStore.state.username
- },
dest: {
idapp: process.env.APP_ID,
username: myevent.teacher
},
- read: false,
- deleted: false,
- message: this.askInfoForm.message,
- datemsg: tools.getDateNow()
+ message: this.askInfoForm.message
}
- this.SendMsgEvent(data).then((ris) => {
+ MessageStore.actions.SendMsgEvent(data).then((ris) => {
self.contextDay = null
if (ris)
tools.showPositiveNotif(self.$q, self.$t('cal.sendmsg_sent'))
@@ -841,10 +830,6 @@ export default class CEventsCalendar extends Vue {
return await CalendarStore.actions.BookEvent(eventparam)
}
- public async SendMsgEvent(param: IMessage) {
- return await UserStore.actions.SendMsgEvent(param)
- }
-
public isAlreadyBooked(eventparam: IEvents) {
return CalendarStore.getters.findEventBooked(eventparam, true)
}
@@ -880,7 +865,7 @@ export default class CEventsCalendar extends Vue {
public createContribType(value) {
console.log('createContribType', value)
tools.createNewRecord(this, 'contribtype', { label: value }).then((myrec) => {
- console.log('myrec')
+ // console.log('myrec')
CalendarStore.state.contribtype.push(myrec)
})
}
@@ -901,10 +886,6 @@ export default class CEventsCalendar extends Vue {
return myprice
}
- public getTeacherName(teacherusername) {
- return CalendarStore.getters.getTeacherName(teacherusername)
- }
-
public getWhereIcon(where) {
const whererec = CalendarStore.getters.getWhereRec(where)
return (whererec) ? whererec.whereicon : ''
@@ -915,11 +896,6 @@ export default class CEventsCalendar extends Vue {
return (whererec) ? whererec.placename : ''
}
- public getTeacherImg(teacherusername) {
- const teacher = CalendarStore.getters.getTeacher(teacherusername)
- return (teacher) ? teacher.img : ''
- }
-
public badgeClasses(eventparam, type) {
const cssColor = tools.isCssColor(eventparam.bgcolor)
const isHeader = type === 'header'
diff --git a/src/components/CEventsCalendar/CEventsCalendar.vue b/src/components/CEventsCalendar/CEventsCalendar.vue
index 84e40f4..c432b6e 100644
--- a/src/components/CEventsCalendar/CEventsCalendar.vue
+++ b/src/components/CEventsCalendar/CEventsCalendar.vue
@@ -39,17 +39,17 @@
- ![]()
+ ![]()
- {{getTeacherName(myevent.teacher)}}
+ {{getUserByUsername(myevent.teacher)}}
-
-
+
- ![]()
+ ![]()
- {{getTeacherName(myevent.teacher2)}}
+ {{getUserByUsername(myevent.teacher2)}}
@@ -75,7 +75,7 @@
{{$t('cal.when')}}:
-
+
@@ -294,7 +294,7 @@
{{$t('cal.when')}}:
-
+
@@ -334,7 +334,7 @@
+ @click="tools.CancelBookingEvent(mythis(), myevent, bookEventForm._id, true)">
{{$t('cal.when')}}:
-
+
@@ -560,7 +560,7 @@
-
+
@@ -600,16 +600,16 @@
- ![]()
+ ![]()
- {{getTeacherName(event.teacher)}}
+ {{getUserByUsername(event.teacher)}}
-
-
+
+
- ![]()
+ ![]()
- {{getTeacherName(event.teacher2)}}
+ {{getUserByUsername(event.teacher2)}}
diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue
index 5dbaaa4..5e11dd2 100644
--- a/src/components/CGridTableRec/CGridTableRec.vue
+++ b/src/components/CGridTableRec/CGridTableRec.vue
@@ -39,7 +39,7 @@
:label="$t('grid.editvalues')">
-
@@ -77,7 +77,7 @@
-
+
diff --git a/src/components/CMySelect/CMySelect.ts b/src/components/CMySelect/CMySelect.ts
index 1edd9ae..cb3765f 100644
--- a/src/components/CMySelect/CMySelect.ts
+++ b/src/components/CMySelect/CMySelect.ts
@@ -39,7 +39,7 @@ export default class CMySelect extends Vue {
public mounted() {
const rec = this.options.find((myrec) => myrec[`${this.optval}`] === this.value)
- console.log('rec', rec)
+ // console.log('rec', rec)
if (!this.useinput) {
this.myvalue = this.value
} else {
@@ -49,7 +49,7 @@ export default class CMySelect extends Vue {
else
this.myvalue = rec[`${this.optlab}`]
- console.log('this.myvalue', this.myvalue, 'this.optval', this.optval, 'rec', rec[`${this.optval}`])
+ // console.log('this.myvalue', this.myvalue, 'this.optval', this.optval, 'rec', rec[`${this.optval}`])
}
}
}
diff --git a/src/components/projects/SingleProject/SingleProject.vue b/src/components/projects/SingleProject/SingleProject.vue
index 6dae3ff..654e83e 100644
--- a/src/components/projects/SingleProject/SingleProject.vue
+++ b/src/components/projects/SingleProject/SingleProject.vue
@@ -9,6 +9,7 @@
v-model.trim="precDescr"
autogrow
borderless
+ debounce="1000"
:label="getlabeltext"
dense
@focus="getFocus($event)"
diff --git a/src/components/todos/CTodo/CTodo.vue b/src/components/todos/CTodo/CTodo.vue
index 6f9c3db..eddfee8 100644
--- a/src/components/todos/CTodo/CTodo.vue
+++ b/src/components/todos/CTodo/CTodo.vue
@@ -54,6 +54,7 @@
@@ -116,9 +117,12 @@
+ v-on:keyup.enter="dbInsert(false)">
+
+
diff --git a/src/components/todos/SingleTodo/SingleTodo.vue b/src/components/todos/SingleTodo/SingleTodo.vue
index 69ccb5d..404abb2 100644
--- a/src/components/todos/SingleTodo/SingleTodo.vue
+++ b/src/components/todos/SingleTodo/SingleTodo.vue
@@ -13,6 +13,7 @@
- {{getNumMsgUnread}}
+ {{getNumMsgUnread}}
{{$t('msgs.messages')}}
@@ -19,14 +19,14 @@
- ![]()
+ ![]()
- {{getUserByUsername(msg.dest.username)}}
+ {{getUsernameChatByMsg(msg)}}
- {{msg.message}}
+ {{getMsgText(msg, false)}}
diff --git a/src/mixins/mixin-users.ts b/src/mixins/mixin-users.ts
index 04d2921..bc76c28 100644
--- a/src/mixins/mixin-users.ts
+++ b/src/mixins/mixin-users.ts
@@ -5,6 +5,7 @@ import { GlobalStore, UserStore, MessageStore } from '../store/Modules'
import Component from 'vue-class-component'
import { func_tools } from '../store/Modules/toolsext'
import { tools } from '../store/Modules/tools'
+import { IMessage } from '@src/model'
// You can declare a mixin as the same style as components.
@Component
@@ -12,43 +13,71 @@ export default class MixinUsers extends Vue {
public mythis() {
return this
}
+
get func_tools() {
return func_tools
}
+
get tools() {
return tools
}
+
public getUserByUsername(username) {
return UserStore.getters.getNameSurnameByUsername(username)
}
+
public getImgByUsername(username) {
return `statics/` + UserStore.getters.getImgByUsername(username)
}
+
public getMyUsername() {
return UserStore.state.my.username
}
+
+ public getUsernameChatByMsg(msg: IMessage) {
+ if (msg) {
+ if (msg.dest.username !== this.getMyUsername())
+ return msg.dest.username
+ else
+ return msg.origin.username
+ } else {
+ return ''
+ }
+ }
+
+ public getImgByMsg(msg: IMessage) {
+ return `statics/` + UserStore.getters.getImgByUsername(this.getUsernameChatByMsg(msg))
+ }
+
get getMyImg() {
return 'statics/' + UserStore.getters.getImgByUsername(UserStore.state.my.username)
}
+
get MenuCollapse() {
return GlobalStore.state.menuCollapse
// return true
}
+
get Username() {
return UserStore.state.my.username
}
+
get myName() {
return UserStore.state.my.name
}
+
get mySurname() {
return UserStore.state.my.surname
}
+
get Verificato() {
return UserStore.state.my.verified_email
}
+
get Email() {
return UserStore.state.my.email
}
+
get getNumMsg() {
return MessageStore.getters.getlasts_messages().length
}
@@ -58,4 +87,17 @@ export default class MixinUsers extends Vue {
return MessageStore.getters.getnumMsgUnread()
}
+ public getMsgText(msg: IMessage, inarray: boolean) {
+ let add = ''
+ if (msg.origin.username === this.getMyUsername())
+ add = 'Tu: '
+
+ const ris = add + msg.message
+ if (inarray)
+ return [ris]
+ else
+ return ris
+ }
+
+
}
diff --git a/src/model/Calendar.ts b/src/model/Calendar.ts
index 872f42f..103e567 100644
--- a/src/model/Calendar.ts
+++ b/src/model/Calendar.ts
@@ -43,9 +43,6 @@ export interface IBookedEvent {
export interface IOperators {
username: string
- name: string
- surname: string
- email: string
cell: string
webpage?: string
img: string
diff --git a/src/model/UserStore.ts b/src/model/UserStore.ts
index 6715d6e..bdbc3dd 100644
--- a/src/model/UserStore.ts
+++ b/src/model/UserStore.ts
@@ -20,6 +20,7 @@ export interface IUserFields {
img?: string
verified_email?: boolean
tokens?: IToken[]
+ lasttimeonline?: Date
}
/*
diff --git a/src/statics/i18n.js b/src/statics/i18n.js
index e0d16c7..874c64a 100644
--- a/src/statics/i18n.js
+++ b/src/statics/i18n.js
@@ -4,6 +4,7 @@ const msgglobal = {
it: {
grid: {
editvalues: 'Modifica Valori',
+ addrecord: 'Aggiungi Riga',
showprevedit: 'Mostra Eventi Passati',
columns: 'Colonne',
tableslist: 'Tabelle',
@@ -289,6 +290,7 @@ const msgglobal = {
es: {
grid: {
editvalues: 'Cambiar valores',
+ addrecord: 'Agregar fila',
showprevedit: 'Mostrar eventos pasados',
columns: 'Columnas',
tableslist: 'Tablas'
@@ -565,6 +567,7 @@ const msgglobal = {
fr: {
grid: {
editvalues: 'Changer les valeurs',
+ addrecord: 'Ajouter une ligne',
showprevedit: 'Afficher les événements passés',
columns: 'Colonnes',
tableslist: 'Tables',
@@ -840,6 +843,7 @@ const msgglobal = {
enUs: {
grid: {
editvalues: 'Edit Values',
+ addrecord: 'Add Row',
showprevedit: 'Show Past Events',
columns: 'Columns',
tableslist: 'Tables',
@@ -1114,6 +1118,7 @@ const msgglobal = {
de: {
grid: {
editvalues: 'Edit Values',
+ addrecord: 'Add Row',
showprevedit: 'Show Past Events',
columns: 'Columns',
tableslist: 'Tables',
diff --git a/src/store/Modules/Store/calendar/CalendarStore.ts b/src/store/Modules/Store/calendar/CalendarStore.ts
index 030f0f8..d3bc490 100644
--- a/src/store/Modules/Store/calendar/CalendarStore.ts
+++ b/src/store/Modules/Store/calendar/CalendarStore.ts
@@ -65,18 +65,6 @@ namespace Getters {
return mystate.bookedevent.filter((bookedevent) => (bookedevent.id_bookedevent === idevent) && (bookedevent.booked) && (showall || (!showall && bookedevent.userId === UserStore.state.my._id) ))
}, 'getEventsBookedByIdEvent')
- const getTeacherName = b.read((mystate: ICalendarState) => (teacherusername) => {
- const op = mystate.operators.find((myop) => myop.username === teacherusername)
- return (op) ? `${op.name} ${op.surname}` : ''
-
- }, 'getTeacherName')
-
- const getTeacher = b.read((mystate: ICalendarState) => (teacherusername) => {
- const op = mystate.operators.find((myop) => myop.username === teacherusername)
- return (op)
-
- }, 'getTeacher')
-
const getWhereRec = b.read((mystate: ICalendarState) => (wherecode) => {
const whererec = mystate.wheres.find((mywhere) => mywhere.code === wherecode)
return (whererec)
@@ -110,9 +98,6 @@ namespace Getters {
get getEventsBookedByIdEvent() {
return getEventsBookedByIdEvent()
},
- get getTeacher() {
- return getTeacher()
- },
get getWhereRec() {
return getWhereRec()
},
@@ -124,12 +109,8 @@ namespace Getters {
},
get getContribtypeRecByLabel() {
return getContribtypeRecByLabel()
- },
- get getTeacherName() {
- return getTeacherName()
}
}
-
}
namespace Mutations {
diff --git a/src/store/Modules/UserStore.ts b/src/store/Modules/UserStore.ts
index 49cf5a8..8c0ed01 100644
--- a/src/store/Modules/UserStore.ts
+++ b/src/store/Modules/UserStore.ts
@@ -138,9 +138,11 @@ namespace Getters {
}, 'getUserByUsername')
const getImgByUsername = b.read((mystate: IUserState) => (username): string => {
+ if (username === '')
+ return 'images/avatar/avatar3_small.png'
// Check if is this User!
const myrec = UserStore.getters.getUserByUsername(username)
- if (myrec && !!myrec.img) {
+ if (myrec && !!myrec.img && myrec.img !== '' && myrec.img !== 'undefined') {
return myrec.img
} else {
return 'images/avatar/avatar3_small.png'
diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts
index 0e03529..85ed71b 100644
--- a/src/store/Modules/tools.ts
+++ b/src/store/Modules/tools.ts
@@ -27,6 +27,7 @@ import { serv_constants } from '@src/store/Modules/serv_constants'
import { shared_consts } from '@src/common/shared_vuejs'
import { dom } from 'quasar'
+
const { height, width } = dom
export interface INotify {
@@ -2470,12 +2471,41 @@ export const tools = {
// return height()
return mythis.$q.screen.height
},
+ getwidth(mythis) {
+ // return height()
+ return mythis.$q.screen.width
+ },
+
+ isIsoDate(str) {
+ if (!/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z/.test(str)) return false
+ const d = new Date(str)
+ return d.toISOString() === str
+ },
+
getLastDateReadReset() {
return new Date(1999, 1, 1, 0, 0, 0)
},
isBitActive(bit, whattofind) {
return ((bit & whattofind) === whattofind)
+ },
+
+ SetBit(myval, bit) {
+ myval = myval | bit
+ return myval
+ },
+ getUnique(arr, comp) {
+
+ const unique = arr
+ .map(e => e[comp])
+
+ // store the keys of the unique objects
+ .map((e, i, final) => final.indexOf(e) === i && i)
+
+ // eliminate the dead keys & store unique objects
+ .filter(e => arr[e]).map(e => arr[e])
+
+ return unique
}
// getLocale() {
diff --git a/src/views/messages/messages.scss b/src/views/messages/messages.scss
index 5fca5c7..169b5d5 100644
--- a/src/views/messages/messages.scss
+++ b/src/views/messages/messages.scss
@@ -25,9 +25,23 @@
}
.chat_dest{
-
+ display: flex;
+ flex: 1;
+ justify-content: flex-start;
}
.chat_my{
-
+ display: flex;
+ flex: 1;
+ justify-content: flex-end;
+}
+
+.bottomfixed {
+ // right: 0;
+ // position: fixed;
+ z-index: 9999;
+ // box-sizing: border-box;
+ margin-right: 0;
+ margin-left: auto;
+ // bottom: 0;
}
diff --git a/src/views/messages/messages.ts b/src/views/messages/messages.ts
index 61f7d86..d157a4d 100644
--- a/src/views/messages/messages.ts
+++ b/src/views/messages/messages.ts
@@ -4,10 +4,15 @@ import { toolsext } from '../../store/Modules/toolsext'
import { MessageStore, UserStore } from '../../store/Modules'
import globalroutines from '../../globalroutines/index'
import { tools } from '../../store/Modules/tools'
-import MixinUsers from '../../mixins/mixin-users'
-import { IChat, IMessage, IUserState } from '../../model'
+
+import { IChat, IMessage, IUserState, MsgDefault, StatusMessage } from '../../model'
import { Getter } from 'vuex-class'
import { IMsgUsers } from '../../model/MessageStore'
+import MixinUsers from '../../mixins/mixin-users'
+
+import { scroll } from 'quasar'
+
+const { getScrollTarget, setScrollPosition } = scroll
// import {Loading, QSpinnerFacebook, QSpinnerGears} from 'quasar'
@@ -16,7 +21,7 @@ const namespace = 'MessageModule'
@Component({
name: 'Messages',
mixins: [MixinUsers],
- components: { }
+ components: {}
})
export default class Messages extends Vue {
@@ -24,18 +29,97 @@ export default class Messages extends Vue {
public $q
public mydrawer = true
public miniState = false
+ public usernameloading: string = ''
+ public widthdrawer = 300
public chatsel: IChat = {
username: '',
lasttimeActive: new Date()
}
+ public mytexttosend: string = ''
+ public loading: boolean = false
+
+ // public users_msg_saved: IMsgUsers[] = []
@Getter('getlasts_messages', { namespace })
public lasts_messages: (state: IUserState) => IMessage[]
+ @Watch('$route.params.un')
+ public changeusername() {
+ if (this.$route.params.un === undefined || this.$route.params.un === ':un') {
+ this.usernameloading = this.getLastUserChatted()
+ } else {
+ this.usernameloading = this.$route.params.un
+ }
+
+ if (!this.miniState && tools.isMobile()) {
+ this.miniState = true
+ }
+
+ if (this.usernameloading) {
+ // Retrieve last msgs data from the server
+ this.refreshdata(this.usernameloading)
+ }
+ }
+
+ get styletextbar() {
+
+ let mystr = ''
+
+ if (this.mydrawer) {
+ if (!this.miniState)
+ mystr = `left: ${this.widthdrawer}px;`
+ else
+ mystr = `left: 57px;`
+ } else {
+ mystr = 'left: 0;'
+ }
+
+ // console.log('tools.getwidth', tools.getwidth)
+
+ mystr += ` width: ${tools.getwidth(this) - this.widthdrawer - 40 - 300}px; `
+
+ return mystr
+ }
+
+ public scrollToElement(el) {
+ const target = getScrollTarget(el)
+ const offset = el.offsetTop
+ const duration = 1000
+ // console.log('target', target, 'offset', offset, 'duration', duration)
+ setScrollPosition(target, offset, duration)
+ }
+
+ public refreshdata(username: string) {
+ this.loading = true
+
+ this.chatsel.username = ''
+
+ return MessageStore.actions.updateMsgDataFromServer({
+ username,
+ lastdataread: this.getlastdataread(username)
+ }).then((ris) => {
+ this.usernameloading = username
+ this.chatsel.username = username
+ this.loading = false
+
+ const element = document.getElementById('last')
+ this.scrollToElement(element)
+
+ // this.changemsgs('', '')
+
+ }).catch((err) => {
+ this.loading = false
+ })
+ }
+
public showNotif(msgcode) {
tools.showNotif(this.$q, this.$t(msgcode))
}
+ public getMyUsername() {
+ return UserStore.state.my.username
+ }
+
public drawerClick(e) {
// if in "mini" state and user
// click on drawer, we switch it to "normal" mode
@@ -58,41 +142,106 @@ export default class Messages extends Vue {
return this.chatsel.username === username
}
- @Watch('$route.params.un')
- public changeusername() {
- this.chatsel.username = this.$route.params.un
- if (!this.miniState && tools.isMobile()) {
- this.miniState = true
+ public getLastUserChatted() {
+ const lastmsg: IMessage = MessageStore.getters.getlasts_messages().slice(-1)[0]
+ console.log('lastmsg', lastmsg)
+ if (lastmsg) {
+ return (lastmsg.origin.username !== this.getMyUsername()) ? lastmsg.origin.username : lastmsg.origin.username
+ } else {
+ return ''
}
-
- // Retrieve last msgs data from the server
- MessageStore.actions.updateMsgDataFromServer({username: this.chatsel.username, lastdataread: this.getlastdataread() } )
}
public selChat(mymsg: IMessage) {
- this.$router.replace('/messages/' + mymsg.dest.username)
+ if (this.chatsel.username !== mymsg.dest.username)
+ this.$router.replace('/messages/' + mymsg.dest.username)
+ else {
+ // refresh
+
+ this.refreshdata(this.chatsel.username)
+ }
}
- public msgchat(): IMsgUsers {
+ // @Watch('MessageStore.state.users_msg', { immediate: false, deep: true })
+ // public changemsgs(value: string, oldValue: string) {
+ // console.log('changemsgs')
+ //
+ // const myrec = MessageStore.state.users_msg.find((rec) => rec.username === this.usernameloading)
+ //
+ // console.log('myrec', myrec)
+ //
+ // if (this.users_msg_saved.length < 0)
+ // this.users_msg_saved = []
+ //
+ // this.users_msg_saved[this.usernameloading] = {...myrec}
+ // console.log('this.users_msg_saved', this.users_msg_saved[this.usernameloading])
+ // }
+
+ public msgchat(username): IMsgUsers {
// Get msg for this chat
- return MessageStore.state.users_msg.find((rec) => rec.username === this.chatsel.username)
+ return MessageStore.state.users_msg.find((rec) => rec.username === username)
+ // return this.users_msg_saved[username]
}
public msgchat_records(): IMessage[] {
- const myrec = this.msgchat()
- console.log('myrec', myrec)
+ const myrec = this.msgchat(this.chatsel.username)
+ // console.log('msgchat_records', myrec)
// Get msg for this chat
return (myrec) ? myrec.msgs : []
}
- public getlastdataread(): Date {
- const myrec = this.msgchat()
+ public getlastdataread(username): any {
+ const myrec = this.msgchat(username)
// Get msg for this chat
- return (myrec) ? tools.gettimestampByDate(myrec.lastdataread) : tools.getLastDateReadReset()
+ const lastdata = (myrec) ? myrec.lastdataread : tools.getLastDateReadReset()
+ console.table(myrec)
+ let mydate = ''
+ if (!tools.isIsoDate(lastdata))
+ mydate = lastdata.toISOString()
+ else
+ return lastdata
+
+ // console.log('getlastdataread', mydate)
+ return mydate
}
- public getMsgText(msg: IMessage) {
- return [msg.message]
+ public sendMsg() {
+ const self = this
+
+ const data: IMessage = {
+ dest: {
+ idapp: process.env.APP_ID,
+ username: this.chatsel.username
+ },
+ message: this.mytexttosend
+ }
+ data.dest.username = this.chatsel.username
+ data.message = this.mytexttosend
+
+ this.mytexttosend = ''
+
+ MessageStore.actions.SendMsgEvent(data).then((ris) => {
+ data.status = StatusMessage.Sending
+
+ const element = document.getElementById('last')
+ this.scrollToElement(element)
+
+ if (!ris)
+ tools.showNegativeNotif(self.$q, self.$t('cal.sendmsg_error'))
+
+ // tools.showPositiveNotif(self.$q, self.$t('cal.sendmsg_sent'))
+ // else
+ })
+ }
+
+ public loadMorePosts() {
+ console.log('loadMorePosts')
+ }
+
+ public myonScroll({ target: { scrollTop, clientHeight, scrollHeight }}) {
+ if (scrollTop + clientHeight >= scrollHeight) {
+ this.loadMorePosts()
+ }
}
public created() {
diff --git a/src/views/messages/messages.vue b/src/views/messages/messages.vue
index 2082d30..31948a4 100644
--- a/src/views/messages/messages.vue
+++ b/src/views/messages/messages.vue
@@ -1,5 +1,5 @@
-
+
@@ -36,14 +36,14 @@
- ![]()
+ ![]()
- {{getUserByUsername(msg.dest.username)}}
+ {{getUsernameChatByMsg(msg)}}
- {{msg.message}}
+ {{getMsgText(msg, false)}}
@@ -68,62 +68,102 @@
-
-
-
-
+
+
+
+
+
+
-
-
- ![]()
-
-
-
-
- {{getUserByUsername(chatsel.username)}}
-
- {{func_tools.getDateTimeShortStr(chatsel.lasttimeActive)}}
-
-
-
-
-
-
-
-
-
- ![]()
+
+
+ ![]()
-
-
-
-
-
-
- ![]()
-
-
+
-
+
+ {{getUserByUsername(chatsel.username)}}
+
+ {{func_tools.getDateTimeShortStr(chatsel.lasttimeActive)}}
+
+
+
+
-
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+