Fixed Project Report Remarks

This commit keeps the project remark connected to the newly selected items in a project report.
partkeepr · May 30, 2023 · 667c17a · 667c17a
1 parent fad4de7
commit 667c17a
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 11 deletions.
diff --git a/Profile b/Profile
diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Project/MetaPartSubgrid.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Project/MetaPartSubgrid.js
@@ -85,6 +85,7 @@ Ext.define('PartKeepr.Components.Project.MetaPartSubgrid', {
     onApplyMetaPartsClick: function (button)
     {
         var parentRecord = button.up("grid").parentRecord;
+
         this.convertMetaPartsToParts(parentRecord);
     },
     /**
@@ -97,7 +98,7 @@ Ext.define('PartKeepr.Components.Project.MetaPartSubgrid', {
     {
         var missing;
 
-        var i, projectReportItem, subPart, projectPart;
+        var i, projectReportItem, subPart;
 
         for (i = 0; i < record.subParts().getCount(); i++)
         {
@@ -112,15 +113,17 @@ Ext.define('PartKeepr.Components.Project.MetaPartSubgrid', {
                 } else {
                     missing = Math.abs(missing);
                 }
-
+
+                if(subPart.get("comment").indexOf("DO NOT CHANGE") == -1)
+                    subPart.set("comment", subPart.get("comment") + "\nDO NOT CHANGE:" + record.data.report + record._part.data.name);
+                else if(subPart.get("comment").indexOf(record.data.report) != -1)
+                    subPart.set("comment", subPart.get("comment") + record._part.data.name);
+                else 
+                    subPart.set("comment", subPart.get("comment").slice(0,subPart.get("comment").indexOf("DO NOT CHANGE")+14) + record.data.report + record._part.data.name);
                 projectReportItem = Ext.create("PartKeepr.ProjectBundle.Entity.ReportPart");
                 projectReportItem.setPart(subPart);
                 projectReportItem.set("quantity", subPart.get("stockToUse"));
                 projectReportItem.setReport(this.up("#projectReportResult").projectReport);
-
-                projectPart = Ext.create("PartKeepr.ProjectBundle.Entity.ProjectPart");
-                projectPart.setPart(subPart);
-                projectPart.set("remarks", "remark");
                 record.store.add(projectReportItem);
             }
         }

diff --git a/...artKeepr/FrontendBundle/Resources/public/js/Components/Project/ProjectReportResultGrid.js b/...artKeepr/FrontendBundle/Resources/public/js/Components/Project/ProjectReportResultGrid.js
@@ -355,7 +355,7 @@ Ext.define("PartKeepr.Components.Project.ProjectReportResultGrid", {
                     amount: item.get("quantity"),
                     comment: item.getReport().reportProjects().getFieldValues("project.name").join(", "),
                     lotNumber: item.projectParts().getFieldValues("lotNumber").join(", "),
-                    projects: [] // item.getReport().reportProjects()
+                    projects: [] 
                 });
             }
 

diff --git a/...tKeepr/FrontendBundle/Resources/public/js/Components/Project/Renderers/RemarksRenderer.js b/...tKeepr/FrontendBundle/Resources/public/js/Components/Project/Renderers/RemarksRenderer.js
@@ -9,26 +9,40 @@ Ext.define("PartKeepr.Components.ProjectReport.Renderers.RemarksRenderer", {
     getProjectParts: function (rec) {
 
         var report = rec.getReport(),
-            i, j, project, projectPart, projectPartQuantities = [];
+            i, j, k, project, projectPart, projectPartQuantities = [];
 
         for (i = 0; i < report.reportProjects().getCount(); i++)
         {
             project = report.reportProjects().getAt(i).getProject();
-
+            
             for (j = 0; j < project.parts().getCount(); j++)
             {
                 projectPart = project.parts().getAt(j);
-
+
+
                 if (projectPart.getPart().getId() === rec.getPart().getId())
                 {
                     if (projectPart.get("remarks") !== "" && projectPart.get("remarks") !== null)
                     {
                         projectPartQuantities.push(project.get("name") + ": " + projectPart.get("remarks"));
                     }
                 }
+                else 
+                {
+
+                    if (rec.getPart().data.comment.includes(projectPart.getPart().data.name))
+                    {
+                        if (projectPart.get("remarks") !== "" && projectPart.get("remarks") !== null)
+                        {   
+                            projectPartQuantities.push(project.get("name") + ": " + projectPart.get("remarks"));
+                        }
+                    }
+
+                }
+
             }
         }
-
+        
         return projectPartQuantities.join("&#013;&#010;")
     },
 

diff --git a/src/PartKeepr/PartBundle/Entity/Part.php b/src/PartKeepr/PartBundle/Entity/Part.php
@@ -27,6 +27,7 @@
  */
 class Part extends BaseEntity
 {
+    private $origin;
     /**
      * The category of the part.
      *