commit fb105fb1f3404cb2bbd88bf7164844b2848b0c91
parent 2f22499e6b051b5a75f33ce729a2067c43d86dd0
Author: Timo A. Hummel <felicitus@felicitus.org>
Date: Sat, 25 Feb 2017 02:23:15 +0100
Merge branch 'master' of github.com:partkeepr/PartKeepr
Diffstat:
8 files changed, 85 insertions(+), 1 deletion(-)
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,18 @@
+[comment]: # (Hi and thanks for an issue. In order to help you best, please fill out the following information.)
+
+# System Information
+
+* PartKeepr Version:
+* Reproducible on the demo system: Yes/No.
+* [JavaScript errors](http://wiki.partkeepr.org/wiki/Issues/Opening_the_JavaScript_Console):
+
+Please attach files, for example, screenshots to describe your issue. If you can, create a screenshot ob View->System Information.
+
+# How to reproduce
+
+Fill in any steps to reproduce the issue. A good description of an issue would be:
+
+* When I click the button "Add Part" in the "Parts List", then I expect the "Add Part" window to be opened. Instead, I receive an error on the JavaScript console.
+
+A bad description would be:
+* Adding parts do not work
diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Project/ProjectPartGrid.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Project/ProjectPartGrid.js
@@ -82,6 +82,12 @@ Ext.define('PartKeepr.ProjectPartGrid', {
editor: {
xtype: 'textfield'
}
+ }, {
+ header: i18n("Lot Number"), dataIndex: 'lotNumber',
+ flex: 1,
+ editor: {
+ xtype: 'textfield'
+ }
}
],
diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Project/ProjectReport.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Project/ProjectReport.js
@@ -476,9 +476,11 @@ Ext.define('PartKeepr.ProjectReportView', {
part: item.getPart().getId(),
amount: item.get("quantity"),
comment: item.get("projectNames"),
+ lotNumber: item.get("lotNumber"),
projects: item.get("projects")
});
}
+ console.log(removals);
PartKeepr.PartBundle.Entity.Part.callPostCollectionAction("massRemoveStock",
{"removals": Ext.encode(removals), "projects": Ext.encode(this.reportedProjects)});
diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/ProjectRun/ProjectRunEditor.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/ProjectRun/ProjectRunEditor.js
@@ -58,7 +58,11 @@ Ext.define('PartKeepr.ProjectRunEditor', {
}, {
header: i18n("Qty"),
dataIndex: 'quantity'
+ }, {
+ header: i18n("Lot Number"),
+ dataIndex: 'lotNumber'
}
+
],
store: this.store,
});
diff --git a/src/PartKeepr/PartBundle/Controller/PartController.php b/src/PartKeepr/PartBundle/Controller/PartController.php
@@ -84,6 +84,7 @@ class PartController extends FOSRestController
$part->addStockLevel($stock);
$projectRunPart = new ProjectRunPart();
+ $projectRunPart->setLotNumber($removal->lotNumber);
$projectRunPart->setPart($part);
$projectRunPart->setQuantity($removal->amount);
diff --git a/src/PartKeepr/ProjectBundle/Controller/ProjectReportController.php b/src/PartKeepr/ProjectBundle/Controller/ProjectReportController.php
@@ -61,7 +61,7 @@ class ProjectReportController extends FOSRestController
$aPartResults = [];
foreach ($projects as $report) {
- $dql = 'SELECT pp.quantity, pro.name AS projectname, pp.overage, pp.overageType, pp.remarks, p.id FROM ';
+ $dql = 'SELECT pp.quantity, pro.name AS projectname, pp.overage, pp.overageType, pp.remarks, pp.lotNumber, p.id FROM ';
$dql .= 'PartKeepr\\ProjectBundle\\Entity\\ProjectPart pp JOIN pp.part p ';
$dql .= 'JOIN pp.project pro WHERE pp.project = :project';
@@ -127,6 +127,7 @@ class ProjectReportController extends FOSRestController
'subParts' => $subParts,
'metaPart' => $part->isMetaPart(),
'productionRemarks' => $part->getProductionRemarks(),
+ 'lotNumber' => $result['lotNumber'],
'remarks' => [],
];
diff --git a/src/PartKeepr/ProjectBundle/Entity/ProjectPart.php b/src/PartKeepr/ProjectBundle/Entity/ProjectPart.php
@@ -87,6 +87,16 @@ class ProjectPart extends BaseEntity
*/
private $overage;
+ /**
+ * Specifies the lot number.
+ *
+ * @ORM\Column(type="text")
+ * @Groups({"default"})
+ *
+ * @var string
+ */
+ private $lotNumber;
+
public function __construct()
{
$this->setOverageType(self::OVERAGE_TYPE_ABSOLUTE);
@@ -96,6 +106,22 @@ class ProjectPart extends BaseEntity
/**
* @return string
*/
+ public function getLotNumber()
+ {
+ return $this->lotNumber;
+ }
+
+ /**
+ * @param string $lotNumber
+ */
+ public function setLotNumber($lotNumber)
+ {
+ $this->lotNumber = $lotNumber;
+ }
+
+ /**
+ * @return string
+ */
public function getOverageType()
{
if (!in_array($this->overageType, self::OVERAGE_TYPES)) {
diff --git a/src/PartKeepr/ProjectBundle/Entity/ProjectRunPart.php b/src/PartKeepr/ProjectBundle/Entity/ProjectRunPart.php
@@ -45,6 +45,32 @@ class ProjectRunPart extends BaseEntity
private $quantity;
/**
+ * Specifies the lot number.
+ *
+ * @ORM\Column(type="text")
+ * @Groups({"default"})
+ *
+ * @var string
+ */
+ private $lotNumber;
+
+ /**
+ * @return string
+ */
+ public function getLotNumber()
+ {
+ return $this->lotNumber;
+ }
+
+ /**
+ * @param string $lotNumber
+ */
+ public function setLotNumber($lotNumber)
+ {
+ $this->lotNumber = $lotNumber;
+ }
+
+ /**
* @return ProjectRun
*/
public function getProjectRun()
