Skip to content

Commit fad4de7

Browse files
RezaMohammadi99vmw
authored andcommitted
Fixed Exporting Issue
This commit fixes the exporter adding accented characters to the file.
1 parent 8accb90 commit fad4de7

File tree

5 files changed

+34
-7
lines changed

5 files changed

+34
-7
lines changed

src/PartKeepr/FrontendBundle/Resources/public/js/Components/Exporter/GridExporter.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,12 @@ Ext.define("PartKeepr.Exporter.GridExporter", {
5050
}
5151

5252
if (!column.isHidden()) {
53-
rowValues.push(Ext.util.Format.stripTags(value));
53+
try{
54+
rowValues.push(Ext.util.Format.stripTags(value.replace(/[^\x1F-\x7D]/g,'')))
55+
}
56+
catch(err){
57+
rowValues.push(Ext.util.Format.stripTags(value));
58+
}
5459
}
5560
}
5661

src/PartKeepr/FrontendBundle/Resources/public/js/Components/Project/MetaPartSubgrid.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ Ext.define('PartKeepr.Components.Project.MetaPartSubgrid', {
8585
onApplyMetaPartsClick: function (button)
8686
{
8787
var parentRecord = button.up("grid").parentRecord;
88-
8988
this.convertMetaPartsToParts(parentRecord);
9089
},
9190
/**
@@ -98,7 +97,7 @@ Ext.define('PartKeepr.Components.Project.MetaPartSubgrid', {
9897
{
9998
var missing;
10099

101-
var i, projectReportItem, subPart;
100+
var i, projectReportItem, subPart, projectPart;
102101

103102
for (i = 0; i < record.subParts().getCount(); i++)
104103
{
@@ -119,7 +118,9 @@ Ext.define('PartKeepr.Components.Project.MetaPartSubgrid', {
119118
projectReportItem.set("quantity", subPart.get("stockToUse"));
120119
projectReportItem.setReport(this.up("#projectReportResult").projectReport);
121120

122-
121+
projectPart = Ext.create("PartKeepr.ProjectBundle.Entity.ProjectPart");
122+
projectPart.setPart(subPart);
123+
projectPart.set("remarks", "remark");
123124
record.store.add(projectReportItem);
124125
}
125126
}
@@ -192,4 +193,4 @@ Ext.define('PartKeepr.Components.Project.MetaPartSubgrid', {
192193
return total;
193194
}
194195

195-
});
196+
});

src/PartKeepr/FrontendBundle/Resources/public/js/Components/Project/ProjectReport.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ Ext.define('PartKeepr.ProjectReportView', {
108108
quantity: projectsToReport[i].quantity
109109
}));
110110
}
111-
111+
112112
this.doSaveProjectReport();
113113
},
114114
/**
@@ -130,7 +130,6 @@ Ext.define('PartKeepr.ProjectReportView', {
130130
{
131131
this.reportResult.setProjectsToReport([]);
132132
this.reportResult.setStore(new Ext.data.Store());
133-
134133
var selection = this.reportList.getSelection();
135134
if (selection.length === 1)
136135
{
@@ -153,6 +152,10 @@ Ext.define('PartKeepr.ProjectReportView', {
153152
});
154153

155154
this.reportList.getStore().reload();
155+
156+
157+
158+
156159
},
157160
onProjectReportLoaded: function () {
158161
this.reportResult.reconfigure(this.projectReport.reportParts());

src/PartKeepr/FrontendBundle/Resources/public/js/Components/Project/Renderers/RemarksRenderer.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Ext.define("PartKeepr.Components.ProjectReport.Renderers.RemarksRenderer", {
77
return renderObj.getProjectParts(record);
88
},
99
getProjectParts: function (rec) {
10+
1011
var report = rec.getReport(),
1112
i, j, project, projectPart, projectPartQuantities = [];
1213

src/PartKeepr/ProjectBundle/Entity/ReportPart.php

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ class ReportPart extends BaseEntity
4242
* @var int
4343
*/
4444
private $quantity;
45+
46+
private $remarks;
4547

4648
/**
4749
* @ORM\ManyToOne(targetEntity="PartKeepr\DistributorBundle\Entity\Distributor")
@@ -336,6 +338,21 @@ public function setPart($part)
336338

337339
return $this;
338340
}
341+
342+
// remark getter
343+
public function getRemarks()
344+
{
345+
return $this->remarks;
346+
}
347+
348+
//remark setter
349+
public function setRemarks($remarks)
350+
{
351+
$this->remarks = $remarks;
352+
353+
return $this;
354+
}
355+
339356

340357
public function __toString()
341358
{

0 commit comments

Comments
 (0)