gh-mirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-10 12:24:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix drag/drop + sort

Browse Source
This commit is contained in:
James Cole
2020-06-09 17:16:21 +02:00
parent 6a08f52fa5
commit ccc82858ad
8 changed files with 72 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/PiggyBank/EditController.php
View File

@@ -71,6 +71,7 @@ class EditController extends Controller
'targetamount' => $piggyBank->targetamount,
'targetdate' => $targetDate,
'startdate' => $startDate,
'object_group' => $piggyBank->objectGroups->first() ? $piggyBank->objectGroups->first()->title : '',
'notes' => null === $note ? '' : $note->text,
];
session()->flash('preFilled', $preFilled);

9
app/Http/Controllers/PiggyBank/IndexController.php
View File

@@ -132,8 +132,15 @@ class IndexController extends Controller
*/
public function setOrder(Request $request, PiggyBank $piggyBank): JsonResponse
{
$newOrder = (int) $request->get('order');
$objectGroupTitle = $request->get('objectGroupTitle');
$newOrder = (int) $request->get('order');
$this->piggyRepos->setOrder($piggyBank, $newOrder);
if ('' !== $objectGroupTitle) {
$this->piggyRepos->setObjectGroup($piggyBank, $objectGroupTitle);
}
if ('' === $objectGroupTitle) {
$this->piggyRepos->removeObjectGroup($piggyBank);
}
return response()->json(['data' => 'OK']);
}

27
app/Repositories/PiggyBank/ModifiesPiggyBanks.php
View File

@@ -63,6 +63,17 @@ trait ModifiesPiggyBanks
return true;
}
/**
* @inheritDoc
*/
public function removeObjectGroup(PiggyBank $piggyBank): PiggyBank
{
$piggyBank->objectGroups()->sync([]);
return $piggyBank;
}
/**
* @param PiggyBankRepetition $repetition
* @param string $amount
@@ -250,6 +261,22 @@ trait ModifiesPiggyBanks
return true;
}
/**
* @inheritDoc
*/
public function setObjectGroup(PiggyBank $piggyBank, string $objectGroupTitle): PiggyBank
{
$objectGroup = $this->findOrCreateObjectGroup($objectGroupTitle);
if (null !== $objectGroup) {
$piggyBank->objectGroups()->sync([$objectGroup->id]);
}
return $piggyBank;
}
/**
* @param array $data
*

2
app/Repositories/PiggyBank/PiggyBankRepository.php
View File

@@ -393,4 +393,6 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
return $set;
}
}

15
app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php
View File

@@ -36,6 +36,21 @@ use Illuminate\Support\Collection;
*/
interface PiggyBankRepositoryInterface
{
/**
* @param PiggyBank $piggyBank
* @param string $objectGroupTitle
*
* @return PiggyBank
*/
public function setObjectGroup(PiggyBank $piggyBank, string $objectGroupTitle): PiggyBank;
/**
* @param PiggyBank $piggyBank
*
* @return PiggyBank
*/
public function removeObjectGroup(PiggyBank $piggyBank): PiggyBank;
/**
* @param PiggyBank $piggyBank
* @param string $amount