Skip to content

Commit d7f5a41

Browse files
committed
better truncation to ensure sheet names stay <= 31 characters, even for scvceps
1 parent 5ab8178 commit d7f5a41

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

app/Modules/Group/Actions/SubgroupMembersMakeExcel.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
namespace App\Modules\Group\Actions;
33

44
use Carbon\Carbon;
5+
use Illuminate\Support\Str;
56
use App\Modules\Group\Models\Group;
67
use Lorisleiva\Actions\ActionRequest;
78
use OpenSpout\Common\Entity\Row;
@@ -93,9 +94,9 @@ private function writeAllSheet($writer, $group)
9394

9495
private function writeGroupSheet($writer, $group) {
9596
$sheet = $writer->addNewSheetAndMakeItCurrent();
96-
$sheetName = $group->name.' '.$group->type->display_name;
97-
if (strlen($group->name) > 26) {
98-
$sheetName = substr($group->name, 0, 23).'... '. $group->type->display_name;
97+
$sheetName = $group->name.' '.Str::upper($group->type->name);
98+
if (strlen($group->name) > 25) {
99+
$sheetName = substr($group->name, 0, 22).'... '. Str::upper($group->type->name);
99100
}
100101
$sheet->setName(preg_replace('/[\/\?\*\[\]\\\:]/', '', $sheetName));
101102

0 commit comments

Comments
 (0)