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

Added export endpoint and solidtime import; Enhanced toggl import

Browse Source
This commit is contained in:
Constantin Graf
2024-08-22 17:50:04 +02:00
committed by Constantin Graf
parent 056a63e193
commit ee77de04ef
43 changed files with 1304 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Models/Member.php
View File

@@ -9,6 +9,7 @@ use Database\Factories\MemberFactory;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Support\Carbon;
use Laravel\Jetstream\Membership as JetstreamMembership;
/**
@@ -17,8 +18,8 @@ use Laravel\Jetstream\Membership as JetstreamMembership;
* @property int|null $billable_rate
* @property string $organization_id
* @property string $user_id
* @property string $created_at
* @property string $updated_at
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property-read Organization $organization
* @property-read User $user
*

3
app/Models/OrganizationInvitation.php
View File

@@ -8,6 +8,7 @@ use App\Models\Concerns\HasUuids;
use Database\Factories\OrganizationInvitationFactory;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Support\Carbon;
use Laravel\Jetstream\Jetstream;
use Laravel\Jetstream\TeamInvitation as JetstreamTeamInvitation;
@@ -16,6 +17,8 @@ use Laravel\Jetstream\TeamInvitation as JetstreamTeamInvitation;
* @property string $email
* @property string $role
* @property string $organization_id
* @property Carbon|null $updated_at
* @property Carbon|null $created_at
* @property-read Organization $organization
*
* @method static OrganizationInvitationFactory factory()

1
app/Models/Project.php
View File

@@ -22,6 +22,7 @@ use Illuminate\Support\Carbon;
* @property string $organization_id
* @property string $client_id
* @property int|null $billable_rate
* @property bool $is_public
* @property bool $is_billable
* @property-read bool $is_archived
* @property Carbon|null $archived_at

3
app/Models/ProjectMember.php
View File

@@ -10,6 +10,7 @@ use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Support\Carbon;
/**
* @property string $id
@@ -17,6 +18,8 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
* @property string $project_id Project ID
* @property string $member_id Member ID
* @property string $user_id User ID (legacy)
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property-read Project $project
* @property-read Member $member
* @property-read User $user

1
app/Models/Task.php
View File

@@ -42,6 +42,7 @@ class Task extends Model
*/
protected $casts = [
'name' => 'string',
'done_at' => 'datetime',
];
/**

4
app/Models/TimeEntry.php
View File

@@ -20,13 +20,15 @@ use Korridor\LaravelComputedAttributes\ComputedAttributes;
* @property string $description
* @property Carbon $start
* @property Carbon|null $end
* @property int $billable_rate Billable rate per hour in cents
* @property int|null $billable_rate Billable rate per hour in cents
* @property bool $billable
* @property array $tags
* @property string $user_id
* @property string $member_id
* @property bool $is_imported
* @property Carbon|null $still_active_email_sent_at
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property-read User $user
* @property-read Member $member
* @property string $organization_id