IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-20 11:48:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Improvements upon the import routine.

Browse Source
This commit is contained in:
James Cole 2014-09-14 21:06:48 +02:00
parent 62ba40b687
commit 19402b9022
3 changed files with 416 additions and 529 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/database/migrations/2014_08_31_153322_create_importmaps_table.php
View File

@ -18,6 +18,8 @@ class CreateImportmapsTable extends Migration {
$table->timestamps(); $table->timestamps();
$table->integer('user_id')->unsigned(); $table->integer('user_id')->unsigned();
$table->string('file',500); $table->string('file',500);
$table->integer('totaljobs')->unsigned();
$table->integer('jobsdone')->unsigned();
// connect maps to users // connect maps to users
$table->foreign('user_id') $table->foreign('user_id')

908
app/lib/Firefly/Queue/Import.php
View File

File diff suppressed because it is too large Load Diff

35
app/models/Importmap.php
View File

@ -1,22 +1,36 @@
<?php <?php
use Illuminate\Database\Eloquent\Model as Eloquent; use LaravelBook\Ardent\Ardent as Ardent;
/** /**
* Class Importmap * Class Importmap
* *
* @property-read \User $user * @property-read \User $user
* @property integer $id * @property integer $id
* @property \Carbon\Carbon $created_at * @property \Carbon\Carbon $created_at
* @property \Carbon\Carbon $updated_at * @property \Carbon\Carbon $updated_at
* @property integer $user_id * @property integer $user_id
* @property string $file * @property string $file
* @method static \Illuminate\Database\Query\Builder|\Importmap whereId($value) * @method static \Illuminate\Database\Query\Builder|\Importmap whereId($value)
* @method static \Illuminate\Database\Query\Builder|\Importmap whereCreatedAt($value) * @method static \Illuminate\Database\Query\Builder|\Importmap whereCreatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\Importmap whereUpdatedAt($value) * @method static \Illuminate\Database\Query\Builder|\Importmap whereUpdatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\Importmap whereUserId($value) * @method static \Illuminate\Database\Query\Builder|\Importmap whereUserId($value)
* @method static \Illuminate\Database\Query\Builder|\Importmap whereFile($value) * @method static \Illuminate\Database\Query\Builder|\Importmap whereFile($value)
* @property integer $totaljobs
* @property integer $jobsdone
* @method static \Illuminate\Database\Query\Builder|\Importmap whereTotaljobs($value)
* @method static \Illuminate\Database\Query\Builder|\Importmap whereJobsdone($value)
*/ */
class Importmap extends Eloquent class Importmap extends Ardent
{ {
public static $rules
= [
'user_id' => 'required|exists:users,id',
'file' => 'required',
'totaljobs' => 'numeric|required|min:0',
'jobsdone' => 'numeric|required|min:0',
];
/** /**
* User * User
* *
@ -26,4 +40,13 @@ class Importmap extends Eloquent
{ {
return $this->belongsTo('User'); return $this->belongsTo('User');
} }
public function pct()
{
if ($this->jobsdone == 0 || $this->totaljobs == 0) {
return 0;
} else {
return round((($this->jobsdone / $this->totaljobs) * 100), 1);
}
}
} }