diff --git a/src/PartKeepr/FrontendBundle/Resources/public/css/PartKeepr.css b/src/PartKeepr/FrontendBundle/Resources/public/css/PartKeepr.css index e2a91a0dd..0d1de9d7e 100644 --- a/src/PartKeepr/FrontendBundle/Resources/public/css/PartKeepr.css +++ b/src/PartKeepr/FrontendBundle/Resources/public/css/PartKeepr.css @@ -233,4 +233,4 @@ margin-left: -75px; border: 1px solid #b8daff; border-radius: .25rem; padding: .25rem .75rem; -} \ No newline at end of file +} diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Part/PartsGrid.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Part/PartsGrid.js index e790b69a2..82ce01d1e 100644 --- a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Part/PartsGrid.js +++ b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Part/PartsGrid.js @@ -408,10 +408,11 @@ Ext.define('PartKeepr.PartsGrid', { { if (siPrefix instanceof PartKeepr.SiPrefixBundle.Entity.SiPrefix) { var fractionValue = value * Math.pow(siPrefix.get("base"), siPrefix.get("exponent")); - + if (siPrefix.get("exponent") < 0) { - return fractionValue.toFixed(Math.abs(siPrefix.get("exponent"))); + return fractionValue.toFixed(15); // set to femto by default + //Math.abs(siPrefix.get("exponent"))); } else { return fractionValue; diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Project/ProjectReportGrid.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Project/ProjectReportGrid.js index 21b1f0d7a..e0b3a3b67 100644 --- a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Project/ProjectReportGrid.js +++ b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Project/ProjectReportGrid.js @@ -19,7 +19,7 @@ Ext.define('PartKeepr.Components.Project.ProjectReportGrid', { autoSync: false, remoteFilter: true, remoteSort: true, - pageSize: 10, + pageSize: 5, model: "PartKeepr.ProjectBundle.Entity.Report", filters: [{ property: "name", diff --git a/src/PartKeepr/PartBundle/Entity/Part.php b/src/PartKeepr/PartBundle/Entity/Part.php index d24be9f3f..375697038 100644 --- a/src/PartKeepr/PartBundle/Entity/Part.php +++ b/src/PartKeepr/PartBundle/Entity/Part.php @@ -162,7 +162,7 @@ class Part extends BaseEntity * * @var float */ - private $averagePrice = 0; + private $averagePrice = 0; /** * The stock level history. @@ -759,7 +759,8 @@ public function getAveragePrice() */ public function setAveragePrice($price) { - $this->averagePrice = $price; + if($price != 0) + $this->averagePrice = $price; } /** @@ -784,6 +785,10 @@ public function onPreUpdate() public function addStockLevel(StockEntry $stockEntry) { $stockEntry->setPart($this); + + if($this->getAveragePrice() != 0) + $stockEntry->setPrice($this->getAveragePrice()); + $this->stockLevels->add($stockEntry); } diff --git a/src/PartKeepr/StockBundle/Entity/StockEntry.php b/src/PartKeepr/StockBundle/Entity/StockEntry.php index aba8f4484..32d6d9df7 100644 --- a/src/PartKeepr/StockBundle/Entity/StockEntry.php +++ b/src/PartKeepr/StockBundle/Entity/StockEntry.php @@ -213,7 +213,7 @@ public function getUser() public function checkPrice() { if ($this->getStockLevel() < 0 && $this->getPrice() !== null) { - $this->setPrice(null); + //$this->setPrice(null); } }