Skip to content

Commit 692012c

Browse files
karpikplkarpikpl
authored
Merge pull request #136 from github-copilot-resources/feature/seats-30-days
Seats not active in 30 days
2 parents 4c2b2a4 + 80b6125 commit 692012c

File tree

1 file changed

+117
-87
lines changed

1 file changed

+117
-87
lines changed

‎src/components/SeatsAnalysisViewer.vue

Lines changed: 117 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<template>
2-
<div class="tiles-container">
3-
<v-card elevation="4" color="white" variant="elevated" class="mx-auto my-3" style="width: 300px; height: 175px;">
2+
<div class="tiles-container">
3+
<v-card elevation="4" color="white" variant="elevated" class="mx-auto my-4"
4+
style="width: 330px; height: 175px;">
45
<v-card-item class="d-flex justify-center align-center">
56
<div class="tiles-text">
67
<div class="text-overline mb-1" style="visibility: hidden;">filler</div>
7-
<div class="text-h6 mb-1">Total Assigned </div>
8+
<div class="text-h6 mb-1">Total Assigned </div>
89
<div class="text-caption">
910
Currently assigned seats
1011
</div>
@@ -13,60 +14,73 @@
1314
</v-card-item>
1415
</v-card>
1516

16-
<v-card elevation="4" color="white" variant="elevated" class="mx-auto my-3" style="width: 300px; height: 175px;">
17+
<v-card elevation="4" color="white" variant="elevated" class="mx-auto my-3"
18+
style="width: 300px; height: 175px;">
1719
<v-card-item class="d-flex justify-center align-center">
1820
<div class="tiles-text">
1921
<div class="text-overline mb-1" style="visibility: hidden;">filler</div>
2022
<div class="text-h6 mb-1">Assigned But Never Used</div>
2123
<div class="text-caption">
2224
No show seats
2325
</div>
24-
<p class="text-h4">{{ NoshowSeats.length }}</p>
26+
<p class="text-h4">{{ noshowSeats }}</p>
2527
</div>
2628
</v-card-item>
2729
</v-card>
28-
<v-card elevation="4" color="white" variant="elevated" class="mx-auto my-3" style="width: 300px; height: 175px;">
30+
<v-card elevation="4" color="white" variant="elevated" class="mx-auto my-4" style="width: 330px; height: 175px;">
2931
<v-card-item class="d-flex justify-center align-center">
3032
<div class="tiles-text">
3133
<div class="text-overline mb-1" style="visibility: hidden;">filler</div>
3234
<div class="text-h6 mb-1">No Activity in the Last 7 days </div>
3335
<div class="text-caption">
3436
No use in the last 7 days
3537
</div>
36-
<p class="text-h4">{{ unusedSeats.length }}</p>
38+
<p class="text-h4">{{ unusedSeatsInSevenDays }}</p>
39+
</div>
40+
</v-card-item>
41+
</v-card>
42+
<v-card elevation="4" color="white" variant="elevated" class="mx-auto my-4" style="width: 330px; height: 175px;">
43+
<v-card-item class="d-flex justify-center align-center">
44+
<div class="tiles-text">
45+
<div class="text-overline mb-1" style="visibility: hidden;">filler</div>
46+
<div class="text-h6 mb-1">No Activity in the Last 30 days </div>
47+
<div class="text-caption">
48+
No use in the last 30 days
49+
</div>
50+
<p class="text-h4">{{ unusedSeatsInThirtyDays }}</p>
3751
</div>
3852
</v-card-item>
3953
</v-card>
4054
</div>
41-
55+
4256
<div>
4357
<v-main class="p-1" style="min-height: 300px;">
4458
<v-container style="min-height: 300px;" class="px-4 elevation-2">
4559
<br>
4660
<h2>All assigned seats </h2>
4761
<br>
48-
<v-data-table :headers="headers" :items="totalSeats" :items-per-page="10" class="elevation-2">
49-
<template v-slot:item="{ item, index }">
50-
<tr>
51-
<td>{{ index + 1 }}</td>
52-
<td>{{ item.login }}</td>
53-
<td>{{ item.id }}</td>
54-
<td>{{ item.team }}</td>
55-
<td>{{ item.created_at }}</td>
56-
<td>{{ item.last_activity_at }}</td>
57-
<td>{{ item.last_activity_editor }}</td>
58-
</tr>
59-
</template>
62+
<v-data-table :headers="headers" :items="totalSeats" :items-per-page="10" class="elevation-2">
63+
<template v-slot:item="{ item, index }">
64+
<tr>
65+
<td>{{ index + 1 }}</td>
66+
<td>{{ item.login }}</td>
67+
<td>{{ item.id }}</td>
68+
<td>{{ item.team }}</td>
69+
<td>{{ item.created_at }}</td>
70+
<td>{{ item.last_activity_at }}</td>
71+
<td>{{ item.last_activity_editor }}</td>
72+
</tr>
73+
</template>
6074
</v-data-table>
6175
</v-container>
6276
</v-main>
6377
</div>
6478
</template>
65-
79+
6680
<script lang="ts">
67-
import { defineComponent, ref, toRef , watchEffect } from 'vue';
68-
import { Seat } from '../model/Seat';
69-
import {
81+
import { defineComponent, ref, watchEffect } from 'vue';
82+
import { Seat } from '../model/Seat';
83+
import {
7084
Chart as ChartJS,
7185
ArcElement,
7286
CategoryScale,
@@ -77,86 +91,102 @@
7791
Title,
7892
Tooltip,
7993
Legend
80-
} from 'chart.js'
94+
} from 'chart.js'
8195
8296
ChartJS.register(
83-
ArcElement,
84-
CategoryScale,
85-
LinearScale,
86-
BarElement,
87-
PointElement,
88-
LineElement,
89-
Title,
90-
Tooltip,
91-
Legend
97+
ArcElement,
98+
CategoryScale,
99+
LinearScale,
100+
BarElement,
101+
PointElement,
102+
LineElement,
103+
Title,
104+
Tooltip,
105+
Legend
92106
)
93107
94108
export default defineComponent({
95-
name: 'SeatsAnalysisViewer',
96-
props: {
109+
name: 'SeatsAnalysisViewer',
110+
props: {
97111
seats: {
98112
type: Array as () => Seat[],
99113
required: true,
100-
default: () => []
114+
default: () => []
101115
}
102116
},
103-
data() {
104-
return {
105-
headers: [
106-
{ title: 'S.No', key: 'serialNumber'},
107-
{ title: 'Login', key: 'login' },
108-
{ title: 'GitHub ID', key: 'id' },
109-
{ title: 'Assigning team', key: 'team' },
110-
{ title: 'Assigned time', key: 'created_at' },
111-
{ title: 'Last Activity At', key: 'last_activity_at' },
112-
{ title: 'Last Activity Editor', key: 'last_activity_editor' },
113-
],
114-
};
115-
},
116-
setup(props) {
117-
let totalSeats = ref<Seat[]>([]);
118-
let NoshowSeats = ref<Seat[]>([]);
119-
const unusedSeats = ref<Seat[]>([]);
117+
data() {
118+
return {
119+
headers: [
120+
{ title: 'S.No', key: 'serialNumber' },
121+
{ title: 'Login', key: 'login' },
122+
{ title: 'GitHub ID', key: 'id' },
123+
{ title: 'Assigning team', key: 'team' },
124+
{ title: 'Assigned time', key: 'created_at' },
125+
{ title: 'Last Activity At', key: 'last_activity_at' },
126+
{ title: 'Last Activity Editor', key: 'last_activity_editor' },
127+
],
128+
};
129+
},
130+
setup(props) {
131+
let totalSeats = ref<Seat[]>([]);
132+
const noshowSeats = ref<number>(0);
133+
const unusedSeatsInSevenDays = ref<number>(0);
134+
const unusedSeatsInThirtyDays = ref<number>(0);
120135
121-
watchEffect(() => {
122-
if (props.seats && Array.isArray(props.seats)) {
123-
totalSeats.value = props.seats;
136+
let noshowCount = 0;
137+
let unusedIn7Count = 0;
138+
let unusedIn30Count = 0;
124139
125-
const oneWeekAgo = new Date();
126-
oneWeekAgo.setDate(oneWeekAgo.getDate() - 7);
140+
watchEffect(() => {
141+
if (props.seats && Array.isArray(props.seats)) {
142+
totalSeats.value = props.seats;
127143
128-
NoshowSeats.value = props.seats.filter(seat => seat.last_activity_at == null);
144+
const oneWeekAgo = new Date();
145+
const thirtyDaysAgo = new Date();
146+
oneWeekAgo.setDate(oneWeekAgo.getDate() - 7);
147+
thirtyDaysAgo.setDate(thirtyDaysAgo.getDate() - 30);
129148
130-
unusedSeats.value = totalSeats.value.filter(seat => {
131-
if (seat.last_activity_at === null) {
132-
return true; // consider to include the last activity date is null to the unused seats
133-
}
149+
props.seats.forEach(seat => {
150+
if (seat.last_activity_at === null) {
151+
noshowCount++;
152+
} else {
153+
const lastActivityDate = new Date(seat.last_activity_at);
154+
if (lastActivityDate < oneWeekAgo) {
155+
unusedIn7Count++;
156+
}
157+
if (lastActivityDate < thirtyDaysAgo) {
158+
unusedIn30Count++;
159+
}
160+
}
161+
});
134162
135-
const lastActivityDate = new Date(seat.last_activity_at);
136-
return lastActivityDate < oneWeekAgo;
137-
});
138-
// to sort unusedSeats by last_activity_at
139-
unusedSeats.value.sort((a, b) => {
140-
if (a.last_activity_at === null) {
141-
return -1;
142-
}
143-
if (b.last_activity_at === null) {
144-
return 1;
145-
}
146-
return new Date(a.last_activity_at) > new Date(b.last_activity_at) ? 1 : -1;
147-
});
148-
} else {
149-
throw new Error('Invalid number of seats');
150-
}
163+
// to sort totalSeats by last_activity_at
164+
totalSeats.value.sort((a, b) => {
165+
if (a.last_activity_at === null) {
166+
return -1;
167+
}
168+
if (b.last_activity_at === null) {
169+
return 1;
170+
}
171+
return new Date(a.last_activity_at) > new Date(b.last_activity_at) ? 1 : -1;
172+
});
173+
} else {
174+
throw new Error('Invalid number of seats');
175+
}
151176
152-
});
177+
});
153178
154-
return {
155-
totalSeats,
156-
NoshowSeats,
157-
unusedSeats
179+
noshowSeats.value = noshowCount;
180+
unusedSeatsInSevenDays.value = unusedIn7Count;
181+
unusedSeatsInThirtyDays.value = unusedIn30Count;
182+
183+
return {
184+
totalSeats,
185+
noshowSeats: noshowSeats,
186+
unusedSeatsInSevenDays: unusedSeatsInSevenDays,
187+
unusedSeatsInThirtyDays: unusedSeatsInThirtyDays
188+
}
158189
}
159-
}
160-
190+
161191
});
162192
</script>

0 commit comments

Comments
 (0)