diff --git a/app/Resources/relations/part_model.yml b/app/Resources/relations/part_model.yml index 2c68647..32e6af6 100644 --- a/app/Resources/relations/part_model.yml +++ b/app/Resources/relations/part_model.yml @@ -153,3 +153,4 @@ wheel2a: 568c01 11895pr0001c01: 11895 92456pr0021c01: 92241p03c01 +15672: 92946 \ No newline at end of file diff --git a/app/Resources/views/rebrickable/part/show.html.twig b/app/Resources/views/rebrickable/part/detail.html.twig similarity index 100% rename from app/Resources/views/rebrickable/part/show.html.twig rename to app/Resources/views/rebrickable/part/detail.html.twig diff --git a/app/Resources/views/rebrickable/set/detail.html.twig b/app/Resources/views/rebrickable/set/detail.html.twig index b72d5b6..153eea9 100644 --- a/app/Resources/views/rebrickable/set/detail.html.twig +++ b/app/Resources/views/rebrickable/set/detail.html.twig @@ -1,15 +1,18 @@ {% extends 'base.html.twig' %} {% block content %} - - {{ dump(set) }} - - {{ brset ? dump(brset) }} - - {#

{{brset ? brset.name }}

#} - {##} - {% if set is not null %} +
+
number:
{{ set.number }}
+
year:
{{ set.year }}
+
name:
{{ set.name }}
+
theme:
{{ set.theme.name }}
+
count of parts:
{{ set.partCount }}
+
+ + + +

Parts {{ inventoryParts|length }}

@@ -21,7 +24,7 @@ {{ inventoryPart.quantity }} -
{{ inventoryPart.part.number }}
+
{{ inventoryPart.part.number }}
{{ inventoryPart.isSpare ? 'Spare' : 'Regular' }}
 @@ -36,10 +39,10 @@
{% for part in parts %}
-
+
-
{{ part.number }}
+
{{ part.number }}
@@ -49,4 +52,7 @@ {% endif %} + {{ brset ? dump(brset) }} + + {% endblock %} \ No newline at end of file diff --git a/src/AppBundle/Controller/Rebrickable/PartController.php b/src/AppBundle/Controller/Rebrickable/PartController.php index 2274064..189d329 100644 --- a/src/AppBundle/Controller/Rebrickable/PartController.php +++ b/src/AppBundle/Controller/Rebrickable/PartController.php @@ -39,7 +39,7 @@ class PartController extends Controller $sets = $part != null ? $em->getRepository(Set::class)->findAllByPartNumber($part->getNumber()) : null; - return $this->render('rebrickable/part/show.html.twig', [ + return $this->render('rebrickable/part/detail.html.twig', [ 'part' => $part, 'apiPart' => $apiPart, 'sets' => $sets, diff --git a/src/AppBundle/Controller/Rebrickable/SetController.php b/src/AppBundle/Controller/Rebrickable/SetController.php index f35b58a..9cca944 100644 --- a/src/AppBundle/Controller/Rebrickable/SetController.php +++ b/src/AppBundle/Controller/Rebrickable/SetController.php @@ -57,6 +57,7 @@ class SetController extends Controller $set = $this->getDoctrine()->getManager()->getRepository(Set::class)->find($number); + $rbset = $this->get('api.manager.rebrickable')->getSet($number); $em = $this->getDoctrine()->getManager(); $em->getRepository(Color::class)->findAll(); @@ -65,6 +66,7 @@ class SetController extends Controller return $this->render('rebrickable/set/detail.html.twig', [ 'set' => $set, 'brset' => $brset, + 'rbset' => $rbset, 'parts' => $em->getRepository(Model::class)->findAllBySetNumber($number), 'inventoryParts' => $em->getRepository(Inventory_Part::class)->findAllBySetNumber($number), ]); diff --git a/src/AppBundle/Entity/Rebrickable/Inventory_Part.php b/src/AppBundle/Entity/Rebrickable/Inventory_Part.php index c172daf..47c3ac8 100644 --- a/src/AppBundle/Entity/Rebrickable/Inventory_Part.php +++ b/src/AppBundle/Entity/Rebrickable/Inventory_Part.php @@ -31,7 +31,7 @@ class Inventory_Part * * @ORM\Column(type="boolean") */ - protected $isSpare; + protected $spare; /** * @var Part @@ -102,9 +102,9 @@ class Inventory_Part * * @return Inventory_Part */ - public function setIsSpare($isSpare) + public function setSpare($spare) { - $this->isSpare = $isSpare; + $this->spare = $spare; return $this; } @@ -116,7 +116,7 @@ class Inventory_Part */ public function isSpare() { - return $this->isSpare(); + return $this->spare; } /** @@ -140,7 +140,7 @@ class Inventory_Part } /** - * @return Set + * @return Inventory */ public function getInventory() { diff --git a/src/AppBundle/Service/Loader/RebrickableLoaderService.php b/src/AppBundle/Service/Loader/RebrickableLoaderService.php index bfbcb2e..5f80c85 100644 --- a/src/AppBundle/Service/Loader/RebrickableLoaderService.php +++ b/src/AppBundle/Service/Loader/RebrickableLoaderService.php @@ -4,7 +4,7 @@ namespace AppBundle\Service\Loader; use AppBundle\Entity\Rebrickable\Set; -//TODO Refactor +//TODO Refactor + validate csv files class RebrickableLoaderService extends BaseLoaderService { private $rebrickable_url; @@ -79,7 +79,7 @@ class RebrickableLoaderService extends BaseLoaderService { $file = $this->downloadFile($this->rebrickable_url.'inventory_parts.csv'); - return $this->loadCsvFile($file, 'rebrickable_inventory_parts', '(`inventory_id`,`part_id`,`color_id`,`quantity`, @var) SET is_spare = IF(@var=\'t\',1,0)'); + return $this->loadCsvFile($file, 'rebrickable_inventory_parts', '(`inventory_id`,`part_id`,`color_id`,`quantity`, @var) SET spare = IF(@var=\'t\',1,0)'); } private function loadSetTable()