tykayn
/
caisse-bliss
mirror of https://forge.chapril.org/tykayn/caisse-bliss.git
1
0
Fork 0
Code Issues Releases Activity

🐛 fix entities relations

This commit is contained in:
ty kayn 2019-07-04 17:51:14 +02:00
parent faa67ecabd
commit e03a8d4305
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/Resources/views/logged/dashboard.html.twig
View File

@ -6,6 +6,16 @@
ng-app="caisse" ng-app="caisse"
ng-controller="CaisseCtrl as MainCtrl" ng-controller="CaisseCtrl as MainCtrl"
> >
<!--états de sauvegarde-->
<div class="selling-ok alert-success alert block" ng-if="sellingOk" ng-click="sellingOk = false">
<i class="fa fa-save"></i>
Sauvegardé!
</div>
<div class="selling-ok alert-error alert block" ng-if="sellingError" ng-click="sellingError = false">
<i class="fa fa-warning"></i>
Problème de sauvegarde (pas de réseau ?)
</div>
<!-- options-->
<div class="row marged-v" ng-if="simpleDisplay"> <div class="row marged-v" ng-if="simpleDisplay">
<button class="btn btn-success" ng-click="toggleSimpleDisplay()"> <button class="btn btn-success" ng-click="toggleSimpleDisplay()">
<i class="fa fa-bars"></i> Affichage simple <i class="fa fa-check-circle"></i> <i class="fa fa-bars"></i> Affichage simple <i class="fa fa-check-circle"></i>
@ -89,15 +99,7 @@
</div> </div>
</div> </div>
</div> </div>
<!--états de sauvegarde-->
<div class="selling-ok alert-success alert block" ng-if="sellingOk" ng-click="sellingOk = false">
<i class="fa fa-save"></i>
Sauvegardé!
</div>
<div class="selling-ok alert-error alert block" ng-if="sellingError" ng-click="sellingError = false">
<i class="fa fa-warning"></i>
Problème de sauvegarde (pas de réseau ?)
</div>
{% endverbatim %} {% endverbatim %}
<div class="row"> <div class="row">

2
src/AppBundle/Entity/ExpenseKind.php
View File

@ -57,7 +57,7 @@ class ExpenseKind
private $amount; private $amount;
/** /**
* @ORM\ManyToOne(targetEntity="AppBundle\Entity\User", inversedBy="festivals") * @ORM\ManyToOne(targetEntity="AppBundle\Entity\User", inversedBy="expenses")
*/ */
private $user; private $user;

2
src/AppBundle/Entity/SerieFestival.php
View File

@ -44,7 +44,7 @@ class SerieFestival {
private $dateCreation; private $dateCreation;
/** /**
* @ORM\ManyToOne(targetEntity="AppBundle\Entity\User", inversedBy="festivals") * @ORM\ManyToOne(targetEntity="AppBundle\Entity\User", inversedBy="seriesFestivals")
*/ */
private $user; private $user;