diff --git a/app/Abstracts/Report.php b/app/Abstracts/Report.php
index aa94530ff..a4a8d0064 100644
--- a/app/Abstracts/Report.php
+++ b/app/Abstracts/Report.php
@@ -67,6 +67,9 @@ abstract class Report
'datasets' => [],
];
+ public $column_width = 'report-column';
+ public $head_column_width = 'head_report_column';
+
public function __construct(Model $model = null, $load_data = true)
{
$this->setGroups();
@@ -76,6 +79,8 @@ abstract class Report
}
$this->model = $model;
+ $this->setHeadColumnWidth();
+ $this->setDataColumnWidth();
if (!$load_data) {
return;
@@ -198,6 +203,46 @@ abstract class Report
return \Excel::download(new Export($this->views['content'], $this), \Str::filename($this->model->name) . '.xlsx');
}
+ public function setHeadColumnWidth()
+ {
+ if (empty($this->model->settings->period)) {
+ return;
+ }
+
+ $head_width = 'head_report_column';
+
+ switch ($this->model->settings->period) {
+ case 'quarterly':
+ $head_width = 'col-sm-2';
+ break;
+ case 'yearly':
+ $head_width = 'col-sm-4';
+ break;
+ }
+
+ $this->head_column_width = $head_width;
+ }
+
+ public function setDataColumnWidth()
+ {
+ if (empty($this->model->settings->period)) {
+ return;
+ }
+
+ $width = 'report-column';
+
+ switch ($this->model->settings->period) {
+ case 'quarterly':
+ $width = 'col-sm-2';
+ break;
+ case 'yearly':
+ $width = 'col-sm-4';
+ break;
+ }
+
+ $this->column_width = $width;
+ }
+
public function setYear()
{
$this->year = request('year', Date::now()->year);
diff --git a/public/css/akaunting-color.css b/public/css/akaunting-color.css
index f0b33e61d..514b7edaa 100644
--- a/public/css/akaunting-color.css
+++ b/public/css/akaunting-color.css
@@ -2087,6 +2087,11 @@ div.required .form-control-label:not(span):after, td.required:after
box-shadow: rgba(248, 248, 255) 0 0 0 1px, rgba(248, 248, 255) 0 4px 16px;
}
+.btn-icon-clipboard:focus
+{
+ outline: none;
+}
+
/*--Settings Board Icon Color--*/
.btn-icon-clipboard i
{
@@ -2323,7 +2328,7 @@ option:focus
/*--------Login Card Background Color Finish--------*/
-/*--------General Progress Bar Color--------*/
+/*--General Progress Bar Color---*/
#nprogress .bar
{
background: #3f3c72 !important;
@@ -2340,10 +2345,10 @@ option:focus
{
box-shadow: 0 0 10px #3f3c72, 0 0 5px #3f3c72 !important;
}
-/*--------General Progress Bar Color Finish--------*/
+/*--General Progress Bar Color Finish---*/
-/*--------List Group Item Active-------*/
+/*--List Group Item Active---*/
.list-group-item.active
{
z-index: 2;
@@ -2351,7 +2356,7 @@ option:focus
background-color: #3c3f72 !important;
border-color: #3c3f72 !important;
}
-/*--------List Group Item Active Finish-------*/
+/*--List Group Item Active Finish---*/
/*--Wizard Delete Button Text--*/
diff --git a/public/css/custom.css b/public/css/custom.css
index b4d5d9c4b..98f8ec13e 100644
--- a/public/css/custom.css
+++ b/public/css/custom.css
@@ -526,7 +526,6 @@ button:focus
box-shadow: none !important;
}
/*--------Shadow None Focus Finish--------*/
-
/*--------Settings Index Page Finish--------*/
@@ -637,8 +636,19 @@ table .align-items-center td span.badge
/*--------Report Column--------*/
.report-column
{
- max-width: 100px;
- width: 160px !important;
+ -webkit-box-flex: 0;
+ -ms-flex: 0 0 6.66%;
+ flex: 0 0 6.66%;
+ max-width: 6.66%;
+}
+
+.head_report_column
+{
+ -webkit-box-flex: 0;
+ -ms-flex: 0 0 10%;
+ flex: 0 0 10%;
+ width: 10%;
+ max-width: 10%;
}
/*--------Report Column Finish--------*/
diff --git a/public/css/print.css b/public/css/print.css
index f507e508f..2114b3308 100644
--- a/public/css/print.css
+++ b/public/css/print.css
@@ -141,6 +141,11 @@ th, td
float: right !important;
}
+.font-size-unset
+{
+ font-size: unset;
+}
+
.text
{
color: #3c3f72;
diff --git a/resources/views/partials/reports/table/footer.blade.php b/resources/views/partials/reports/table/footer.blade.php
index 32c99027a..80a92d73b 100644
--- a/resources/views/partials/reports/table/footer.blade.php
+++ b/resources/views/partials/reports/table/footer.blade.php
@@ -1,11 +1,11 @@
-
- {{ trans_choice('general.totals', 1) }} |
+
+ {{ trans_choice('general.totals', 1) }} |
@php $grand_total = 0; @endphp
@foreach($class->footer_totals[$table] as $total)
@php $grand_total += $total; @endphp
- @money($total, setting('default.currency'), true) |
+ @money($total, setting('default.currency'), true) |
@endforeach
- @money($grand_total, setting('default.currency'), true) |
+ @money($grand_total, setting('default.currency'), true) |
diff --git a/resources/views/partials/reports/table/header.blade.php b/resources/views/partials/reports/table/header.blade.php
index e56d91cae..f3d447ac0 100644
--- a/resources/views/partials/reports/table/header.blade.php
+++ b/resources/views/partials/reports/table/header.blade.php
@@ -1,13 +1,13 @@
-
+
@if (($table == 'default') && !empty($class->groups))
- {{ $class->groups[$class->model->settings->group] }} |
+ {{ $class->groups[$class->model->settings->group] }} |
@else
- {{ $table }} |
+ {{ $table }} |
@endif
@foreach($class->dates as $date)
- {{ $date }} |
+ {{ $date }} |
@endforeach
- {{ trans_choice('general.totals', 1) }} |
+ {{ trans_choice('general.totals', 1) }} |
diff --git a/resources/views/partials/reports/table/rows.blade.php b/resources/views/partials/reports/table/rows.blade.php
index 68ac59682..0b869bcc3 100644
--- a/resources/views/partials/reports/table/rows.blade.php
+++ b/resources/views/partials/reports/table/rows.blade.php
@@ -1,9 +1,9 @@
@php $row_total = 0; @endphp
-
- {{ $class->row_names[$table][$id] }} |
+
+ {{ $class->row_names[$table][$id] }} |
@foreach($rows as $row)
@php $row_total += $row; @endphp
- @money($row, setting('default.currency'), true) |
+ @money($row, setting('default.currency'), true) |
@endforeach
- @money($row_total, setting('default.currency'), true) |
+ @money($row_total, setting('default.currency'), true) |
diff --git a/resources/views/reports/profit_loss/content/footer.blade.php b/resources/views/reports/profit_loss/content/footer.blade.php
index 713c2f314..73371afab 100644
--- a/resources/views/reports/profit_loss/content/footer.blade.php
+++ b/resources/views/reports/profit_loss/content/footer.blade.php
@@ -1,12 +1,12 @@
-
- {{ trans('reports.net_profit') }} |
+
+ {{ trans('reports.net_profit') }} |
@foreach($class->net_profit as $profit)
- @money($profit, setting('default.currency'), true) |
+ @money($profit, setting('default.currency'), true) |
@endforeach
-
+ |
@money(array_sum($class->net_profit), setting('default.currency'), true)
|
diff --git a/resources/views/reports/profit_loss/content/header.blade.php b/resources/views/reports/profit_loss/content/header.blade.php
index 8b700c307..e4318f3cf 100644
--- a/resources/views/reports/profit_loss/content/header.blade.php
+++ b/resources/views/reports/profit_loss/content/header.blade.php
@@ -1,12 +1,12 @@
-
- |
+
+ |
@foreach($class->dates as $date)
- {{ $date }} |
+ {{ $date }} |
@endforeach
-
+ |
{{ trans_choice('general.totals', 1) }}
|
diff --git a/resources/views/reports/profit_loss/table/footer.blade.php b/resources/views/reports/profit_loss/table/footer.blade.php
index 7d3b1e01c..261cda330 100644
--- a/resources/views/reports/profit_loss/table/footer.blade.php
+++ b/resources/views/reports/profit_loss/table/footer.blade.php
@@ -1,11 +1,11 @@
-
- {{ trans_choice('general.totals', 1) }} |
+
+ {{ trans_choice('general.totals', 1) }} |
@php $grand_total = 0; @endphp
@foreach($class->footer_totals[$table] as $date => $total)
@php $grand_total += $total; @endphp
- @money($total, setting('default.currency'), true) |
+ @money($total, setting('default.currency'), true) |
@endforeach
- @money($grand_total, setting('default.currency'), true) |
+ @money($grand_total, setting('default.currency'), true) |