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

- Finish to fix IOperators

Browse Source 
- Fixit Date not change correctly
This commit is contained in:
Paolo Arena
2019-11-01 15:52:58 +01:00
parent 2c62c27e64
commit cdfc32c620
23 changed files with 365 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,7 @@
@click="deleteEvent(myevent)"></q-btn>
<q-btn v-if="editable" flat round color="white" icon="edit" v-close-popup
@click="editEvent(myevent)"></q-btn>
<q-btn flat round color="white" icon="cancel" v-close-popup></q-btn>
<q-btn flat round color="white" icon="cancel" v-close-popup @click="myevent = null; displayEvent = false"></q-btn>
</q-toolbar>
<q-card-section class="inset-shadow">
<q-img :src="getImgEvent(myevent)"
@@ -41,17 +41,17 @@
<span class="cal__teacher-content">
<q-chip>
<q-avatar>
<img :src="getImgByUsername(myevent.teacher)">
<img :src="getImgTeacherByUsername(myevent.teacher)">
</q-avatar>
<span class="cal__teacher-content">{{getUserByUsername(myevent.teacher)}}</span>
<span class="cal__teacher-content">{{getTeacherByUsername(myevent.teacher)}}</span>
</q-chip>
<span v-if="getImgByUsername(myevent.teacher2) && isValidUsername(myevent.teacher2)"
<span v-if="getImgTeacherByUsername(myevent.teacher2) && isValidUsername(myevent.teacher2)"
class="margin_avatar2"></span>
<q-chip v-if="getImgByUsername(myevent.teacher2) && isValidUsername(myevent.teacher2)">
<q-chip v-if="getImgTeacherByUsername(myevent.teacher2) && isValidUsername(myevent.teacher2)">
<q-avatar>
<img :src="getImgByUsername(myevent.teacher2)">
<img :src="getImgTeacherByUsername(myevent.teacher2)">
</q-avatar>
<span class="cal__teacher-content">{{getUserByUsername(myevent.teacher2)}}</span>
<span class="cal__teacher-content">{{getTeacherByUsername(myevent.teacher2)}}</span>
</q-chip>
</span>
</div>
@@ -114,7 +114,7 @@
<q-input color="grey-1" v-model="eventForm.short_tit" autofocus
:input-style="`background-color: ${eventForm.bgcolor} !important; color: white !important; font-weight: bold; `"
borderless rounded dense :label="$t('event.short_tit')"
></q-input>
></q-input>
<q-input color="grey-1" v-model="eventForm.title" autofocus
:input-style="`background-color: ${eventForm.bgcolor} !important; color: white !important; font-weight: bold; `"
@@ -281,7 +281,8 @@
</div>
<q-input v-model="bookEventForm.msgbooking" :label="$t('cal.msgbooking')+':'"
autogrow>
type="textarea" debounce="500"
>
</q-input>
</q-card-section>
</q-card>
@@ -342,7 +343,7 @@
<q-card class="text-white windowcol">
<q-card-section>
<q-input v-model="askInfoForm.message" :label="$t('cal.msgbooking')+':'"
autogrow>
autofocus debounce="500" type="textarea">
</q-input>
</q-card-section>
</q-card>
@@ -432,7 +433,6 @@
<q-badge
:key="index"
style="width: 100%; cursor: pointer;"
class=""
:class="badgeClasses(event, 'day')"
:style="badgeStyles(event, 'day')"
@click.stop.prevent="showEvent(event)"
@@ -446,7 +446,7 @@
<span class="">{{ getTitleEv(event) }}</span>
</q-badge>
<div class="text-center"><img :src="getImgEvent(event)"
class="text-center listaev__tdimg_small">
class="text-center listaev__tdimg_small">
</div>
</template>
</template>
@@ -512,21 +512,33 @@
<tbody>
<tr v-for="(event, index) in getEventList()" class="listaev listaev__table">
<td :class="clEvent(event)">
<p class="listaev__align_chips">
<div class="listaev__align_chips">
<img :src="getImgEvent(event)"
class="text-left padding_cell listaev__tdimg listaev__img">
@click="selectEvent(event)"
class="text-left padding_cell listaev__tdimg listaev__img cursor-pointer"
:style="getStyleByEvent(event)">
<q-chip dense v-if="isAlreadyBooked(event)" class="cltexth4 chipbooked shadow-5 q-mb-md"
color="green" text-color="white"
icon="event_available">{{$t('cal.booked')}}
</q-chip>
<q-chip v-if="event === myevent && !displayEvent && editable" class="text-center shadow-5 glossy bg-blue chipmodif">
<q-btn v-if="editable" flat round color="white" icon="fas fa-copy"
@click="duplicateEvent(myevent)"></q-btn>
<q-btn v-if="editable" flat round color="white" icon="delete"
@click="deleteEvent(myevent)"></q-btn>
<q-btn v-if="editable" flat round color="white" icon="edit"
@click="editEvent(myevent)"></q-btn>
<q-btn flat round color="white" icon="cancel" @click="selectEvent(null)"></q-btn>
</q-chip>
<q-chip v-if="event.news" class="cltexth4 chipnews shadow-5 glossy text-right" color="red"
text-color="white" icon-right="star" icon="star" dense
style="">
{{$t('event.news')}}
</q-chip>
</p>
</div>
<div class="listaev__date listaev__align_center_mobile">
<span v-html="tools.getstrDateTimeEvent(mythis(), event, true)"></span>
</div>
@@ -568,16 +580,17 @@
<q-chip>
<q-avatar>
<img :src="getImgByUsername(event.teacher)">
<img :src="getImgTeacherByUsername(event.teacher)">
</q-avatar>
<span class="cal__teacher-content">{{getUserByUsername(event.teacher)}}</span>
<span class="cal__teacher-content">{{getTeacherByUsername(event.teacher)}}</span>
</q-chip>
<span v-if="getImgByUsername(event.teacher2) && isValidUsername(event.teacher2)" class="margin_avatar2"></span>
<q-chip v-if="getImgByUsername(event.teacher2) && isValidUsername(event.teacher2)">
<span v-if="getImgTeacherByUsername(event.teacher2) && isValidUsername(event.teacher2)"
class="margin_avatar2"></span>
<q-chip v-if="getImgTeacherByUsername(event.teacher2) && isValidUsername(event.teacher2)">
<q-avatar>
<img :src="getImgByUsername(event.teacher2)">
<img :src="getImgTeacherByUsername(event.teacher2)">
</q-avatar>
<span class="cal__teacher-content">{{getUserByUsername(event.teacher2)}}</span>
<span class="cal__teacher-content">{{getTeacherByUsername(event.teacher2)}}</span>
</q-chip>
<span v-if="event.wherecode" class="">