adalal/solidtime
1
0
Fork 0
mirror of https://github.com/solidtime-io/solidtime.git synced 2026-08-08 08:12:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Prevent and remove zero values for billable rates

Browse Source
This commit is contained in:
Constantin Graf
2024-06-10 19:19:51 +02:00
committed by Constantin Graf
parent 92dde6a701
commit bd9cede081
20 changed files with 343 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Filament/Resources/OrganizationResource.php
View File

@@ -65,6 +65,11 @@ class OrganizationResource extends Resource
Forms\Components\TextInput::make('billable_rate')
->label('Billable rate (in Cents)')
->nullable()
->rules([
'nullable',
'integer',
'gt:0',
])
->numeric(),
Forms\Components\DateTimePicker::make('created_at')
->label('Created At')

91
app/Filament/Resources/ProjectMemberResource.php Normal file
View File

@@ -0,0 +1,91 @@
<?php
declare(strict_types=1);
namespace App\Filament\Resources;
use App\Filament\Resources\ProjectMemberResource\Pages;
use App\Models\ProjectMember;
use Filament\Forms;
use Filament\Forms\Form;
use Filament\Resources\Resource;
use Filament\Tables;
use Filament\Tables\Table;
class ProjectMemberResource extends Resource
{
protected static ?string $model = ProjectMember::class;
protected static bool $shouldRegisterNavigation = false;
public static function form(Form $form): Form
{
return $form
->schema([
Forms\Components\TextInput::make('billable_rate')
->label('Billable rate (in Cents)')
->nullable()
->rules([
'nullable',
'integer',
'gt:0',
])
->numeric(),
Forms\Components\Select::make('user_id')
->relationship('user', 'name')
->required(),
Forms\Components\Select::make('member_id')
->relationship('member', 'id')
->required(),
]);
}
public static function table(Table $table): Table
{
return $table
->columns([
Tables\Columns\TextColumn::make('id')
->label('ID'),
Tables\Columns\TextColumn::make('billable_rate')
->numeric()
->sortable(),
Tables\Columns\TextColumn::make('project.name'),
Tables\Columns\TextColumn::make('user.name'),
Tables\Columns\TextColumn::make('created_at')
->dateTime()
->sortable(),
Tables\Columns\TextColumn::make('updated_at')
->dateTime()
->sortable()
->toggleable(isToggledHiddenByDefault: true),
])
->filters([
//
])
->actions([
Tables\Actions\EditAction::make(),
])
->bulkActions([
Tables\Actions\BulkActionGroup::make([
Tables\Actions\DeleteBulkAction::make(),
]),
]);
}
public static function getRelations(): array
{
return [
//
];
}
public static function getPages(): array
{
return [
'index' => Pages\ListProjectMembers::route('/'),
'create' => Pages\CreateProjectMember::route('/create'),
'edit' => Pages\EditProjectMember::route('/{record}/edit'),
'view' => Pages\ViewProjectMembers::route('/{record}'),
];
}
}

13
app/Filament/Resources/ProjectMemberResource/Pages/CreateProjectMember.php Normal file
View File

@@ -0,0 +1,13 @@
<?php
declare(strict_types=1);
namespace App\Filament\Resources\ProjectMemberResource\Pages;
use App\Filament\Resources\ProjectMemberResource;
use Filament\Resources\Pages\CreateRecord;
class CreateProjectMember extends CreateRecord
{
protected static string $resource = ProjectMemberResource::class;
}

21
app/Filament/Resources/ProjectMemberResource/Pages/EditProjectMember.php Normal file
View File

@@ -0,0 +1,21 @@
<?php
declare(strict_types=1);
namespace App\Filament\Resources\ProjectMemberResource\Pages;
use App\Filament\Resources\ProjectMemberResource;
use Filament\Actions;
use Filament\Resources\Pages\EditRecord;
class EditProjectMember extends EditRecord
{
protected static string $resource = ProjectMemberResource::class;
protected function getHeaderActions(): array
{
return [
Actions\DeleteAction::make(),
];
}
}

21
app/Filament/Resources/ProjectMemberResource/Pages/ListProjectMembers.php Normal file
View File

@@ -0,0 +1,21 @@
<?php
declare(strict_types=1);
namespace App\Filament\Resources\ProjectMemberResource\Pages;
use App\Filament\Resources\ProjectMemberResource;
use Filament\Actions;
use Filament\Resources\Pages\ListRecords;
class ListProjectMembers extends ListRecords
{
protected static string $resource = ProjectMemberResource::class;
protected function getHeaderActions(): array
{
return [
Actions\CreateAction::make(),
];
}
}

22
app/Filament/Resources/ProjectMemberResource/Pages/ViewProjectMembers.php Normal file
View File

@@ -0,0 +1,22 @@
<?php
declare(strict_types=1);
namespace App\Filament\Resources\ProjectMemberResource\Pages;
use App\Filament\Resources\ProjectMemberResource;
use Filament\Actions\EditAction;
use Filament\Resources\Pages\ViewRecord;
class ViewProjectMembers extends ViewRecord
{
protected static string $resource = ProjectMemberResource::class;
protected function getHeaderActions(): array
{
return [
EditAction::make('edit')
->icon('heroicon-s-pencil'),
];
}
}

12
app/Filament/Resources/ProjectResource.php
View File

@@ -5,6 +5,7 @@ declare(strict_types=1);
namespace App\Filament\Resources;
use App\Filament\Resources\ProjectResource\Pages;
use App\Filament\Resources\ProjectResource\RelationManagers\ProjectMembersRelationManager;
use App\Models\Project;
use Filament\Forms;
use Filament\Forms\Components\ColorPicker;
@@ -37,6 +38,15 @@ class ProjectResource extends Resource
ColorPicker::make('color')
->label('Color')
->required(),
Forms\Components\TextInput::make('billable_rate')
->label('Billable rate (in Cents)')
->nullable()
->rules([
'nullable',
'integer',
'gt:0',
])
->numeric(),
Forms\Components\Select::make('organization_id')
->relationship(name: 'organization', titleAttribute: 'name')
->searchable(['name'])
@@ -78,7 +88,7 @@ class ProjectResource extends Resource
public static function getRelations(): array
{
return [
//
ProjectMembersRelationManager::make(),
];
}

60
app/Filament/Resources/ProjectResource/RelationManagers/ProjectMembersRelationManager.php Normal file
View File

@@ -0,0 +1,60 @@
<?php
declare(strict_types=1);
namespace App\Filament\Resources\ProjectResource\RelationManagers;
use App\Filament\Resources\ProjectMemberResource;
use App\Models\ProjectMember;
use Filament\Forms\Form;
use Filament\Resources\RelationManagers\RelationManager;
use Filament\Tables;
use Filament\Tables\Actions\Action;
use Filament\Tables\Table;
class ProjectMembersRelationManager extends RelationManager
{
protected static ?string $title = 'Project Members';
protected static string $relationship = 'members';
public function form(Form $form): Form
{
return $form
->schema([
]);
}
public function table(Table $table): Table
{
return $table
->recordTitleAttribute('name')
->columns([
Tables\Columns\TextColumn::make('user.name'),
Tables\Columns\TextColumn::make('billable_rate')
->numeric()
->sortable(),
])
->filters([
//
])
->headerActions([
])
->actions([
Action::make('view')
->icon('heroicon-o-eye')
->color('gray')
->url(fn (ProjectMember $record): string => ProjectMemberResource::getUrl('view', [
'record' => $record->getKey(),
])),
Action::make('edit')
->icon('heroicon-o-pencil')
->url(fn (ProjectMember $record): string => ProjectMemberResource::getUrl('edit', [
'record' => $record->getKey(),
]))
->openUrlInNewTab(),
])
->bulkActions([
]);
}
}

2
app/Http/Controllers/Api/V1/OrganizationController.php
View File

@@ -37,7 +37,7 @@ class OrganizationController extends Controller
$this->checkPermission($organization, 'organizations:update');
$organization->name = $request->input('name');
$organization->billable_rate = $request->input('billable_rate');
$organization->billable_rate = $request->getBillableRate();
$organization->save();
return new OrganizationResource($organization);

4
app/Http/Controllers/Api/V1/ProjectController.php
View File

@@ -86,7 +86,7 @@ class ProjectController extends Controller
$project->name = $request->input('name');
$project->color = $request->input('color');
$project->is_billable = (bool) $request->input('is_billable');
$project->billable_rate = $request->input('billable_rate');
$project->billable_rate = $request->getBillableRate();
$project->client_id = $request->input('client_id');
$project->organization()->associate($organization);
$project->save();
@@ -107,7 +107,7 @@ class ProjectController extends Controller
$project->name = $request->input('name');
$project->color = $request->input('color');
$project->is_billable = (bool) $request->input('is_billable');
$project->billable_rate = $request->input('billable_rate');
$project->billable_rate = $request->getBillableRate();
$project->client_id = $request->input('client_id');
$project->save();

4
app/Http/Controllers/Api/V1/ProjectMemberController.php
View File

@@ -71,7 +71,7 @@ class ProjectMemberController extends Controller
}
$projectMember = new ProjectMember();
$projectMember->billable_rate = $request->input('billable_rate');
$projectMember->billable_rate = $request->getBillableRate();
$projectMember->member()->associate($member);
$projectMember->user()->associate($member->user);
$projectMember->project()->associate($project);
@@ -90,7 +90,7 @@ class ProjectMemberController extends Controller
public function update(Organization $organization, ProjectMember $projectMember, ProjectMemberUpdateRequest $request): JsonResource
{
$this->checkPermission($organization, 'project-members:update', projectMember: $projectMember);
$projectMember->billable_rate = $request->input('billable_rate');
$projectMember->billable_rate = $request->getBillableRate();
$projectMember->save();
return new ProjectMemberResource($projectMember);

7
app/Http/Requests/V1/Member/MemberUpdateRequest.php
View File

@@ -36,4 +36,11 @@ class MemberUpdateRequest extends FormRequest
],
];
}
public function getBillableRate(): ?int
{
$input = $this->input('billable_rate');
return $input !== null && $input !== 0 ? (int) $this->input('billable_rate') : null;
}
}

7
app/Http/Requests/V1/Organization/OrganizationUpdateRequest.php
View File

@@ -33,4 +33,11 @@ class OrganizationUpdateRequest extends FormRequest
],
];
}
public function getBillableRate(): ?int
{
$input = $this->input('billable_rate');
return $input !== null && $input !== 0 ? (int) $this->input('billable_rate') : null;
}
}

7
app/Http/Requests/V1/Project/ProjectStoreRequest.php
View File

@@ -56,4 +56,11 @@ class ProjectStoreRequest extends FormRequest
],
];
}
public function getBillableRate(): ?int
{
$input = $this->input('billable_rate');
return $input !== null && $input !== 0 ? (int) $this->input('billable_rate') : null;
}
}

7
app/Http/Requests/V1/Project/ProjectUpdateRequest.php
View File

@@ -55,4 +55,11 @@ class ProjectUpdateRequest extends FormRequest
],
];
}
public function getBillableRate(): ?int
{
$input = $this->input('billable_rate');
return $input !== null && $input !== 0 ? (int) $this->input('billable_rate') : null;
}
}

7
app/Http/Requests/V1/ProjectMember/ProjectMemberStoreRequest.php
View File

@@ -39,4 +39,11 @@ class ProjectMemberStoreRequest extends FormRequest
],
];
}
public function getBillableRate(): ?int
{
$input = $this->input('billable_rate');
return $input !== null && $input !== 0 ? (int) $this->input('billable_rate') : null;
}
}

7
app/Http/Requests/V1/ProjectMember/ProjectMemberUpdateRequest.php
View File

@@ -28,4 +28,11 @@ class ProjectMemberUpdateRequest extends FormRequest
],
];
}
public function getBillableRate(): ?int
{
$input = $this->input('billable_rate');
return $input !== null && $input !== 0 ? (int) $this->input('billable_rate') : null;
}
}

8
app/Service/Import/ImportDatabaseHelper.php
View File

@@ -58,12 +58,14 @@ class ImportDatabaseHelper
*/
private array $validate;
private ?Closure $beforeSave;
/**
* @param class-string<TModel> $model
* @param array<string> $identifiers
* @param array<string, array<int, string>> $validate
*/
public function __construct(string $model, array $identifiers, bool $attachToExisting = false, ?Closure $queryModifier = null, ?Closure $afterCreate = null, array $validate = [])
public function __construct(string $model, array $identifiers, bool $attachToExisting = false, ?Closure $queryModifier = null, ?Closure $afterCreate = null, array $validate = [], ?Closure $beforeSave = null)
{
$this->model = $model;
$this->identifiers = $identifiers;
@@ -72,6 +74,7 @@ class ImportDatabaseHelper
$this->afterCreate = $afterCreate;
$this->createdCount = 0;
$this->validate = $validate;
$this->beforeSave = $beforeSave;
}
/**
@@ -99,6 +102,9 @@ class ImportDatabaseHelper
foreach ($data as $key => $value) {
$model->{$key} = $value;
}
if ($this->beforeSave !== null) {
($this->beforeSave)($model);
}
$model->save();
if ($this->afterCreate !== null) {

12
app/Service/Import/Importers/DefaultImporter.php
View File

@@ -107,7 +107,11 @@ abstract class DefaultImporter implements ImporterContract
'nullable',
'integer',
],
]);
], beforeSave: function (Project $project) {
if ($project->billable_rate === 0) {
$project->billable_rate = null;
}
});
$this->projectMemberImportHelper = new ImportDatabaseHelper(ProjectMember::class, ['project_id', 'member_id'], true, function (Builder $builder) {
/** @var Builder<ProjectMember> $builder */
return $builder->whereBelongsToOrganization($this->organization);
@@ -116,7 +120,11 @@ abstract class DefaultImporter implements ImporterContract
'nullable',
'integer',
],
]);
], beforeSave: function (ProjectMember $projectMember) {
if ($projectMember->billable_rate === 0) {
$projectMember->billable_rate = null;
}
});
$this->tagImportHelper = new ImportDatabaseHelper(Tag::class, ['name', 'organization_id'], true, function (Builder $builder) {
return $builder->where('organization_id', $this->organization->id);
}, validate: [

35
database/migrations/2024_06_10_161831_reset_billable_rates_with_zero_as_value.php Normal file
View File

@@ -0,0 +1,35 @@
<?php
declare(strict_types=1);
use Illuminate\Database\Migrations\Migration;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
DB::table('organizations')
->where('billable_rate', '=', 0)
->update(['billable_rate' => null]);
DB::table('project_members')
->where('billable_rate', '=', 0)
->update(['billable_rate' => null]);
DB::table('projects')
->where('billable_rate', '=', 0)
->update(['billable_rate' => null]);
DB::table('members')
->where('billable_rate', '=', 0)
->update(['billable_rate' => null]);
}
/**
* Reverse the migrations.
*/
public function down(): void
{
//
}
};