Skip to content

Commit

Permalink
DDPB 4809 - New Summary page for Money In & Out (#1452)
Browse files Browse the repository at this point in the history 
* DDPB-4809 : New summary page for Money In

* DDPB-4809 - New summary page updates for Money In & Out

* DDPB-4809 - Update to condition to check for transactions

* DDPB-4809 - Updating translations and correcting money out conditions

* Removed unwanted annotation

* DDPB-4809 - Removed unwanted annotation
  • Loading branch information
@ndasmoj
ndasmoj authored Nov 15, 2023
1 parent 85b99b0 commit 63e5a25
Show file tree
Hide file tree
Showing 17 changed files with 1,289 additions and 66 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ redis-clear: ##@database Clears out all the data from redis (session related tok

cache-clear: ##@application Clear the cache of the application
docker-compose exec api-app sh -c "rm -rf var/cache/*" && \
docker-compose -f docker-compose.yml -f docker-compose.dev.yml exec api sh -c "rm -rf var/cache/*" && \
docker-compose -f docker-compose.yml -f docker-compose.dev.yml exec api-app sh -c "rm -rf var/cache/*" && \
docker-compose exec frontend-app sh -c "rm -rf var/cache/*" && \
docker-compose -f docker-compose.yml -f docker-compose.dev.yml exec frontend-app sh -c "rm -rf var/cache/*" && \
docker-compose exec admin-app sh -c "rm -rf var/cache/*" && \
Expand Down
49 changes: 49 additions & 0 deletions api/app/src/Entity/Report/Report.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\ORM\Mapping as ORM;
use JMS\Serializer\Annotation as JMS;
use phpDocumentor\Reflection\Types\This;

/**
* Reports.
Expand Down Expand Up @@ -1617,4 +1618,52 @@ public static function profPfaAndCombinedReportTypes(): array
self::PROF_PFA_LOW_ASSETS_TYPE, self::PROF_PFA_HIGH_ASSETS_TYPE, self::PROF_COMBINED_LOW_ASSETS_TYPE, self::PROF_COMBINED_HIGH_ASSETS_TYPE,
];
}

public function getMoneyInExists(): ?string
{
return $this->moneyInExists;
}

public function setMoneyInExists(?string $moneyInExists): self
{
$this->moneyInExists = $moneyInExists;

return $this;
}

public function getReasonForNoMoneyIn(): ?string
{
return $this->reasonForNoMoneyIn;
}

public function setReasonForNoMoneyIn(?string $reasonForNoMoneyIn): self
{
$this->reasonForNoMoneyIn = $reasonForNoMoneyIn;

return $this;
}

public function getMoneyOutExists(): ?string
{
return $this->moneyOutExists;
}

public function setMoneyOutExists(string $moneyOutExists): self
{
$this->moneyOutExists = $moneyOutExists;

return $this;
}

public function getReasonForNoMoneyOut(): ?string
{
return $this->reasonForNoMoneyOut;
}

public function setReasonForNoMoneyOut(?string $reasonForNoMoneyOut): self
{
$this->reasonForNoMoneyOut = $reasonForNoMoneyOut;

return $this;
}
}
35 changes: 24 additions & 11 deletions client/app/src/Controller/Report/MoneyInController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,8 @@ public function __construct(

/**
* @Route("/report/{reportId}/money-in", name="money_in")
* @Template("@App/Report/MoneyIn/start.html.twig")
*
* @param $reportId
* @Template("@App/Report/MoneyIn/start.html.twig")
*
* @return array|RedirectResponse
*/
Expand All @@ -67,10 +66,9 @@ public function startAction($reportId)

/**
* @Route("/report/{reportId}/money-in/step{step}/{transactionId}", name="money_in_step", requirements={"step":"\d+"})
*
* @Template("@App/Report/MoneyIn/step.html.twig")
*
* @param $reportId
* @param $step
* @param null $transactionId
*
* @return array|RedirectResponse
Expand Down Expand Up @@ -178,9 +176,8 @@ public function stepAction(Request $request, $reportId, $step, AuthorizationChec

/**
* @Route("/report/{reportId}/money-in/add_another", name="money_in_add_another")
* @Template("@App/Report/MoneyIn/addAnother.html.twig")
*
* @param $reportId
* @Template("@App/Report/MoneyIn/addAnother.html.twig")
*
* @return array|RedirectResponse
*/
Expand Down Expand Up @@ -208,9 +205,8 @@ public function addAnotherAction(Request $request, $reportId)

/**
* @Route("/report/{reportId}/money-in/summary", name="money_in_summary")
* @Template("@App/Report/MoneyIn/summary.html.twig")
*
* @param $reportId
* @Template("@App/Report/MoneyIn/summary.html.twig")
*
* @return array|RedirectResponse
*/
Expand All @@ -226,12 +222,29 @@ public function summaryAction($reportId)
];
}

/**
* @Route("/report/{reportId}/money-in/new_summary", name="money_in_new_summary")
*
* @Template("@App/Report/MoneyIn/new_summary.html.twig")
*
* @return array|RedirectResponse
*/
public function newSummaryAction($reportId)
{
$report = $this->reportApi->getReportIfNotSubmitted($reportId, self::$jmsGroups);
if (Status::STATE_NOT_STARTED == $report->getStatus()->getMoneyInState()['state']) {
return $this->redirectToRoute('money_in', ['reportId' => $reportId]);
}

return [
'report' => $report,
];
}

/**
* @Route("/report/{reportId}/money-in/{transactionId}/delete", name="money_in_delete")
* @Template("@App/Common/confirmDelete.html.twig")
*
* @param $reportId
* @param $transactionId
* @Template("@App/Common/confirmDelete.html.twig")
*
* @return array|RedirectResponse
*/
Expand Down
51 changes: 32 additions & 19 deletions client/app/src/Controller/Report/MoneyInShortController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,8 @@ public function __construct(

/**
* @Route("/report/{reportId}/money-in-short", name="money_in_short")
* @Template("@App/Report/MoneyInShort/start.html.twig")
*
* @param $reportId
* @Template("@App/Report/MoneyInShort/start.html.twig")
*
* @return array|RedirectResponse
*/
Expand All @@ -59,9 +58,8 @@ public function startAction(Request $request, $reportId)

/**
* @Route("/report/{reportId}/money-in-short/category", name="money_in_short_category")
* @Template("@App/Report/MoneyInShort/category.html.twig")
*
* @param $reportId
* @Template("@App/Report/MoneyInShort/category.html.twig")
*
* @return array|RedirectResponse
*/
Expand Down Expand Up @@ -99,9 +97,8 @@ public function categoryAction(Request $request, $reportId)

/**
* @Route("/report/{reportId}/money-in-short/exist", name="money_in_short_exist")
* @Template("@App/Report/MoneyInShort/exist.html.twig")
*
* @param $reportId
* @Template("@App/Report/MoneyInShort/exist.html.twig")
*
* @return array|RedirectResponse
*/
Expand Down Expand Up @@ -129,17 +126,16 @@ public function existAction(Request $request, $reportId)
}

return [
'backLink' => $this->generateUrl($fromSummaryPage ? 'money_in_short_summary' : 'money_in_short_category', ['reportId' => $reportId]), //FIX when from summary
'backLink' => $this->generateUrl($fromSummaryPage ? 'money_in_short_summary' : 'money_in_short_category', ['reportId' => $reportId]), // FIX when from summary
'form' => $form->createView(),
'report' => $report,
];
}

/**
* @Route("/report/{reportId}/money-in-short/add", name="money_in_short_add")
* @Template("@App/Report/MoneyInShort/add.html.twig")
*
* @param $reportId
* @Template("@App/Report/MoneyInShort/add.html.twig")
*
* @return array|RedirectResponse
*/
Expand Down Expand Up @@ -179,9 +175,8 @@ public function addAction(Request $request, $reportId)

/**
* @Route("/report/{reportId}/money-in-short/add_another", name="money_in_short_add_another")
* @Template("@App/Report/MoneyInShort/addAnother.html.twig")
*
* @param $reportId
* @Template("@App/Report/MoneyInShort/addAnother.html.twig")
*
* @return array|RedirectResponse
*/
Expand Down Expand Up @@ -209,10 +204,8 @@ public function addAnotherAction(Request $request, $reportId)

/**
* @Route("/report/{reportId}/money-in-short/edit/{transactionId}", name="money_in_short_edit")
* @Template("@App/Report/MoneyInShort/edit.html.twig")
*
* @param $reportId
* @param $transactionId
* @Template("@App/Report/MoneyInShort/edit.html.twig")
*
* @return array|RedirectResponse
*/
Expand Down Expand Up @@ -242,10 +235,8 @@ public function editAction(Request $request, $reportId, $transactionId)

/**
* @Route("/report/{reportId}/money-in-short/{transactionId}/delete", name="money_in_short_delete")
* @Template("@App/Common/confirmDelete.html.twig")
*
* @param $reportId
* @param $transactionId
* @Template("@App/Common/confirmDelete.html.twig")
*
* @return array|RedirectResponse
*/
Expand Down Expand Up @@ -284,9 +275,8 @@ public function deleteAction(Request $request, $reportId, $transactionId)

/**
* @Route("/report/{reportId}/money-in-short/summary", name="money_in_short_summary")
* @Template("@App/Report/MoneyInShort/summary.html.twig")
*
* @param $reportId
* @Template("@App/Report/MoneyInShort/summary.html.twig")
*
* @return array|RedirectResponse
*/
Expand All @@ -306,6 +296,29 @@ public function summaryAction(Request $request, $reportId)
];
}

/**
* @Route("/report/{reportId}/money-in-short/new_summary", name="money_in_short_new_summary")
*
* @Template("@App/Report/MoneyInShort/new_summary.html.twig")
*
* @return array|RedirectResponse
*/
public function newSummaryAction(Request $request, $reportId)
{
$fromPage = $request->get('from');
$report = $this->reportApi->getReportIfNotSubmitted($reportId, self::$jmsGroups);

if (EntityDir\Report\Status::STATE_NOT_STARTED == $report->getStatus()->getMoneyInShortState()['state'] && 'skip-step' != $fromPage) {
return $this->redirectToRoute('money_in_short', ['reportId' => $reportId]);
}

return [
'comingFromLastStep' => 'skip-step' == $fromPage || 'last-step' == $fromPage,
'report' => $report,
'status' => $report->getStatus(),
];
}

/**
* @return string
*/
Expand Down
35 changes: 24 additions & 11 deletions client/app/src/Controller/Report/MoneyOutController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,8 @@ public function __construct(

/**
* @Route("/report/{reportId}/money-out", name="money_out")
* @Template("@App/Report/MoneyOut/start.html.twig")
*
* @param $reportId
* @Template("@App/Report/MoneyOut/start.html.twig")
*
* @return array|RedirectResponse
*/
Expand All @@ -67,10 +66,9 @@ public function startAction(Request $request, $reportId)

/**
* @Route("/report/{reportId}/money-out/step{step}/{transactionId}", name="money_out_step", requirements={"step":"\d+"})
*
* @Template("@App/Report/MoneyOut/step.html.twig")
*
* @param $reportId
* @param $step
* @param null $transactionId
*
* @return array|RedirectResponse
Expand Down Expand Up @@ -178,9 +176,8 @@ public function stepAction(Request $request, $reportId, $step, AuthorizationChec

/**
* @Route("/report/{reportId}/money-out/add_another", name="money_out_add_another")
* @Template("@App/Report/MoneyOut/addAnother.html.twig")
*
* @param $reportId
* @Template("@App/Report/MoneyOut/addAnother.html.twig")
*
* @return array|RedirectResponse
*/
Expand Down Expand Up @@ -208,9 +205,8 @@ public function addAnotherAction(Request $request, $reportId)

/**
* @Route("/report/{reportId}/money-out/summary", name="money_out_summary")
* @Template("@App/Report/MoneyOut/summary.html.twig")
*
* @param $reportId
* @Template("@App/Report/MoneyOut/summary.html.twig")
*
* @return array|RedirectResponse
*/
Expand All @@ -226,12 +222,29 @@ public function summaryAction($reportId)
];
}

/**
* @Route("/report/{reportId}/money-out/new_summary", name="money_out_new_summary")
*
* @Template("@App/Report/MoneyOut/new_summary.html.twig")
*
* @return array|RedirectResponse
*/
public function newSummaryAction($reportId)
{
$report = $this->reportApi->getReportIfNotSubmitted($reportId, self::$jmsGroups);
if (Status::STATE_NOT_STARTED == $report->getStatus()->getMoneyOutState()['state']) {
return $this->redirectToRoute('money_out', ['reportId' => $reportId]);
}

return [
'report' => $report,
];
}

/**
* @Route("/report/{reportId}/money-out/{transactionId}/delete", name="money_out_delete")
* @Template("@App/Common/confirmDelete.html.twig")
*
* @param $reportId
* @param $transactionId
* @Template("@App/Common/confirmDelete.html.twig")
*
* @return array|RedirectResponse
*/
Expand Down
Loading

0 comments on commit 63e5a25

Please sign in to comment.