Skip to content

Commit

Permalink
improve reporting chart, fix project table with long client name, fix…
Browse files Browse the repository at this point in the history
…es ST-414
  • Loading branch information
Onatcer committed Sep 6, 2024
1 parent b3d1015 commit dd79916
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 20 deletions.
2 changes: 1 addition & 1 deletion resources/js/Components/Common/Project/ProjectTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const { clients } = storeToRefs(useClientsStore());
<div
data-testid="project_table"
class="grid min-w-full"
style="grid-template-columns: 1fr 150px 150px 150px 80px">
style="grid-template-columns: 1fr 1fr 1fr 150px 80px">
<ProjectTableHeading></ProjectTableHeading>
<div
class="col-span-5 py-24 text-center"
Expand Down
25 changes: 7 additions & 18 deletions resources/js/Components/Common/Reporting/ReportingPieChart.vue
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,8 @@ const seriesData = computed(() => {
...el,
...{
itemStyle: {
color: new LinearGradient(0, 0, 0, 1, [
{
offset: 0,
color: hexToRGBA(el.color, 0.8),
},
{
offset: 1,
color: hexToRGBA(el.color, 0.4),
},
]),
color: el.color

Check warning on line 76 in resources/js/Components/Common/Reporting/ReportingPieChart.vue

View workflow job for this annotation

GitHub Actions / build

Replace `⏎` with `,`
},
},
};
Expand All @@ -93,7 +85,8 @@ const option = ref({
trigger: 'item',
},
legend: {
top: 'bottom',
show: true,
top: '250px'

Check warning on line 89 in resources/js/Components/Common/Reporting/ReportingPieChart.vue

View workflow job for this annotation

GitHub Actions / build

Insert `,`
},
backgroundColor: 'transparent',
series: [
Expand All @@ -107,21 +100,17 @@ const option = ref({
},
},
data: seriesData,
radius: ['30%', '65%'],
radius: ['30%', '60%'],
top: '-50%',
type: 'pie',
top: '-10%',
},
],
});
</script>

<template>
<v-chart class="chart" :autoresize="true" :option="option" />
<v-chart class="background-transparent h-[450px]" :autoresize="true" :option="option" />

Check warning on line 112 in resources/js/Components/Common/Reporting/ReportingPieChart.vue

View workflow job for this annotation

GitHub Actions / build

Replace `·class="background-transparent·h-[450px]"·:autoresize="true"` with `⏎········class="background-transparent·h-[450px]"⏎········:autoresize="true"⏎·······`
</template>

<style scoped>

Check warning on line 115 in resources/js/Components/Common/Reporting/ReportingPieChart.vue

View workflow job for this annotation

GitHub Actions / build

Delete `⏎`
.chart {
height: 300px;
background: transparent;
}
</style>
2 changes: 1 addition & 1 deletion resources/js/Pages/Reporting.vue
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ async function createTag(tag: string) {
</script>

<template>
<AppLayout title="Reporting" data-testid="reporting_view">
<AppLayout title="Reporting" data-testid="reporting_view" class="overflow-hidden">

Check warning on line 149 in resources/js/Pages/Reporting.vue

View workflow job for this annotation

GitHub Actions / build

Replace `·title="Reporting"·data-testid="reporting_view"` with `⏎········title="Reporting"⏎········data-testid="reporting_view"⏎·······`
<MainContainer
class="py-3 sm:py-5 border-b border-default-background-separator flex justify-between items-center">
<div class="flex items-center space-x-3 sm:space-x-6">
Expand Down

0 comments on commit dd79916

Please sign in to comment.