small fixes
This commit is contained in:
parent
44be83b6f6
commit
75b1dbe9f1
105
js/dir_app.js
105
js/dir_app.js
|
|
@ -1337,7 +1337,6 @@ const ActivityList = Vue.component('activitylist', {
|
|||
{{ mmyy }} {{ get_day_title(mmyy) }}
|
||||
<button
|
||||
:id="get_day_index(mmyy) + '-toggle'"
|
||||
@click="toggleDay(get_day_index(mmyy))"
|
||||
class="text-sm text-blue-600 hover:underline font-normal"
|
||||
>
|
||||
Collapse Day
|
||||
|
|
@ -1973,58 +1972,54 @@ const ActivityInfoReport2 = Vue.component('activityinforeport2', {
|
|||
computed: {
|
||||
},
|
||||
watch: { },
|
||||
template: `<div class="report">
|
||||
<div class="pure-g pure-form">
|
||||
<div class="pure-u-7-24 marginbottom">
|
||||
Title:
|
||||
</div>
|
||||
<div class="pure-u-17-24 marginbottom">
|
||||
<b>{{a.title}}</b>
|
||||
</div>
|
||||
|
||||
<div class="pure-u-7-24 marginbottom">
|
||||
Date:
|
||||
</div>
|
||||
<div class="pure-u-17-24 marginbottom">
|
||||
{{ $root.$dj(a.starttime).format('YYYY MMM DD dd h:mma') }}
|
||||
</div>
|
||||
|
||||
<div class="pure-u-7-24 marginbottom">
|
||||
Mode / Location:
|
||||
</div>
|
||||
<div class="pure-u-17-24 marginbottom">
|
||||
{{mode_string(a)}} <span v-if="a.location"><br />{{ a.location }}</span> <span v-if="a.location_irl"><br />{{ a.location_irl }}</span>
|
||||
</div>
|
||||
|
||||
<div class="pure-u-7-24 marginbottom">
|
||||
Description:
|
||||
</div>
|
||||
<div class="pure-u-17-24 marginbottom" v-html="a.desc">
|
||||
</div>
|
||||
|
||||
<div class="pure-u-7-24 marginbottom">
|
||||
Hosts:
|
||||
</div>
|
||||
<div class="pure-u-17-24 marginbottom">
|
||||
{{host}}
|
||||
</div>
|
||||
|
||||
<div class="pure-u-7-24 marginbottom">
|
||||
Attendees:
|
||||
</div>
|
||||
<div class="pure-u-17-24 marginbottom">
|
||||
{{user}}
|
||||
</div>
|
||||
|
||||
<div class="pure-u-7-24 marginbottom4">
|
||||
Survey Results:
|
||||
</div>
|
||||
<div class="pure-u-17-24 marginbottom" v-html="survey">
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>` })
|
||||
template: `<div class="bg-white rounded-md shadow-md p-6 text-sm text-gray-800 space-y-4">
|
||||
<!-- Title -->
|
||||
<div class="grid grid-cols-5 gap-4">
|
||||
<div class="font-medium col-span-1">Title:</div>
|
||||
<div class="col-span-4 font-semibold">{{ a.title }}</div>
|
||||
</div>
|
||||
|
||||
<!-- Date -->
|
||||
<div class="grid grid-cols-5 gap-4">
|
||||
<div class="font-medium col-span-1">Date:</div>
|
||||
<div class="col-span-4">{{ $root.$dj(a.starttime).format('YYYY MMM DD dd h:mma') }}</div>
|
||||
</div>
|
||||
|
||||
<!-- Mode / Location -->
|
||||
<div class="grid grid-cols-5 gap-4">
|
||||
<div class="font-medium col-span-1">Mode / Location:</div>
|
||||
<div class="col-span-4">
|
||||
{{ mode_string(a) }}
|
||||
<div v-if="a.location" class="text-gray-600">{{ a.location }}</div>
|
||||
<div v-if="a.location_irl" class="text-gray-600">{{ a.location_irl }}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Description -->
|
||||
<div class="grid grid-cols-5 gap-4">
|
||||
<div class="font-medium col-span-1">Description:</div>
|
||||
<div class="col-span-4" v-html="a.desc"></div>
|
||||
</div>
|
||||
|
||||
<!-- Hosts -->
|
||||
<div class="grid grid-cols-5 gap-4">
|
||||
<div class="font-medium col-span-1">Hosts:</div>
|
||||
<div class="col-span-4">{{ host }}</div>
|
||||
</div>
|
||||
|
||||
<!-- Attendees -->
|
||||
<div class="grid grid-cols-5 gap-4">
|
||||
<div class="font-medium col-span-1">Attendees:</div>
|
||||
<div class="col-span-4">{{ user }}</div>
|
||||
</div>
|
||||
|
||||
<!-- Survey Results -->
|
||||
<div class="grid grid-cols-5 gap-4">
|
||||
<div class="font-medium col-span-1">Survey Results:</div>
|
||||
<div class="col-span-4" v-html="survey"></div>
|
||||
</div>
|
||||
</div>
|
||||
` })
|
||||
|
||||
|
||||
|
||||
|
|
@ -2063,8 +2058,8 @@ const ActivityReport = Vue.component('activityreport', {
|
|||
this_time = dayjs(item.starttime)
|
||||
return this_time.isBefore(end) && start.isBefore(this_time) } )
|
||||
}
|
||||
|
||||
if (self.which.match( /^\d+$/ )) { self.activities = self.activities.filter( function(item,index) {
|
||||
if (self.which && String(self.which).match( /^\d+$/ )) {
|
||||
self.activities = self.activities.filter( function(item,index) {
|
||||
return item.id == self.which } )
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue