surya/freeplanet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Step 2: Creating page Messages: userlist last messages + a page for all the messages received and sent.

Browse Source
This commit is contained in:
Paolo Arena
2019-10-27 00:37:00 +02:00
parent 878ae96813
commit 4f895bdbe2
19 changed files with 407 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/components/CEventsCalendar/CEventsCalendar.vue
View File

@@ -39,17 +39,17 @@
<span class="cal__teacher-content">
<q-chip>
<q-avatar>
<img :src="`../../statics/images/` + getTeacherImg(myevent.teacher)">
<img :src="`../../statics/images/` + getImgByUsername(myevent.teacher)">
</q-avatar>
<span class="cal__teacher-content">{{getTeacherName(myevent.teacher)}}</span>
<span class="cal__teacher-content">{{getUserByUsername(myevent.teacher)}}</span>
</q-chip>
<span v-if="getTeacherImg(myevent.teacher2) && myevent.teacher2"
<span v-if="getImgByUsername(myevent.teacher2) && myevent.teacher2"
class="margin_avatar2"></span>
<q-chip v-if="getTeacherImg(myevent.teacher2) && myevent.teacher2">
<q-chip v-if="getImgByUsername(myevent.teacher2) && myevent.teacher2">
<q-avatar>
<img :src="`../../statics/images/` + getTeacherImg(myevent.teacher2)">
<img :src="`../../statics/images/` + getImgByUsername(myevent.teacher2)">
</q-avatar>
<span class="cal__teacher-content">{{getTeacherName(myevent.teacher2)}}</span>
<span class="cal__teacher-content">{{getUserByUsername(myevent.teacher2)}}</span>
</q-chip>
</span>
</div>
@@ -75,7 +75,7 @@
</div>
<div v-if="myevent.dateTimeStart" class="cal__when">
<span class="cal__where-title">{{$t('cal.when')}}:
<span v-html="tools.getstrDateTimeEvent(mythis, myevent, true)"></span>
<span v-html="tools.getstrDateTimeEvent(mythis(), myevent, true)"></span>
</span>
</div>
<p v-if="myevent.linkpdf" style="margin-top: 10px; text-align: center">
@@ -294,7 +294,7 @@
</q-chip>
<div v-if="myevent.dateTimeStart" class="cal__when">
<span class="cal__where-title">{{$t('cal.when')}}:
<span v-html="tools.getstrDateTimeEvent(mythis, myevent, true)"></span>
<span v-html="tools.getstrDateTimeEvent(mythis(), myevent, true)"></span>
</span>
</div>
<div class="q-pa-xs">
@@ -334,7 +334,7 @@
<q-card-actions align="right">
<q-btn v-if="bookEventpage.state === EState.Modifying" flat :label="$t('cal.cancelbooking')"
color="negative"
@click="tools.CancelBookingEvent(mythis, myevent, bookEventForm._id, true)"></q-btn>
@click="tools.CancelBookingEvent(mythis(), myevent, bookEventForm._id, true)"></q-btn>
<q-btn v-if="checkseinviaMsg" flat :label="$t('dialog.sendonlymsg')" color="primary"
@click="sendMsg(myevent)"></q-btn>
<q-btn v-else flat :label="getTitleBtnBooking" color="primary" @click="saveBookEvent(myevent)"
@@ -370,7 +370,7 @@
</q-chip>
<div v-if="myevent.dateTimeStart" class="cal__when">
<span class="cal__where-title">{{$t('cal.when')}}:
<span v-html="tools.getstrDateTimeEvent(mythis, myevent, true)"></span>
<span v-html="tools.getstrDateTimeEvent(mythis(), myevent, true)"></span>
</span>
</div>
<div class="q-pa-xs">
@@ -560,7 +560,7 @@
</p>
<div class="listaev__date listaev__align_center_mobile">
<span v-html="tools.getstrDateTimeEvent(mythis, event, true)"></span>
<span v-html="tools.getstrDateTimeEvent(mythis(), event, true)"></span>
</div>
<div class="listaev__align_center_mobile">
@@ -600,16 +600,16 @@
<q-chip>
<q-avatar>
<img :src="`../../statics/images/` + getTeacherImg(event.teacher)">
<img :src="`../../statics/images/` + getImgByUsername(event.teacher)">
</q-avatar>
<span class="cal__teacher-content">{{getTeacherName(event.teacher)}}</span>
<span class="cal__teacher-content">{{getUserByUsername(event.teacher)}}</span>
</q-chip>
<span v-if="getTeacherImg(event.teacher2)" class="margin_avatar2"></span>
<q-chip v-if="getTeacherImg(event.teacher2) && event.teacher2">
<span v-if="getImgByUsername(event.teacher2)" class="margin_avatar2"></span>
<q-chip v-if="getImgByUsername(event.teacher2) && event.teacher2">
<q-avatar>
<img :src="`../../statics/images/` + getTeacherImg(event.teacher2)">
<img :src="`../../statics/images/` + getImgByUsername(event.teacher2)">
</q-avatar>
<span class="cal__teacher-content">{{getTeacherName(event.teacher2)}}</span>
<span class="cal__teacher-content">{{getUserByUsername(event.teacher2)}}</span>
</q-chip>
<span v-if="event.wherecode" class="">