Remove FCG and fix excel template usage #38

mvandenbos · Dec 15, 2019 · fc1e6bf · fc1e6bf
1 parent 3e41658
commit fc1e6bf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/background/excelreport.js b/src/background/excelreport.js
@@ -6,9 +6,11 @@ const fs = require('fs')
 const path = require("path");
 const filePath = path.join(__dirname, "..", "/template/template.json");
 
+import keys from '../config/LocalForageKeys'
+import localFileManager from '../utilities/localFileManager'
+
 function getTemplateData () {
- let rawdata = fs.readFileSync(filePath); 
- let data = JSON.parse(rawdata); 
+ let data = localFileManager.get(window.localStorage, keys.TEMPLATE);
  return data
 }
 
@@ -35,7 +37,7 @@ function generateExcelReport (reports) {
 
  let ws1 = xlsx.utils.json_to_sheet(reports, { header: headerOrder })
  let wb = xlsx.utils.book_new()
- xlsx.utils.book_append_sheet(wb, ws1, "FCG-Spender")
+ xlsx.utils.book_append_sheet(wb, ws1, "Spender")
 
  let templateData = getTemplateData();
 
@@ -44,7 +46,7 @@ function generateExcelReport (reports) {
  name: 'Excel',
  extensions: ['xlsx']
  }],
- defaultPath: '~/fcg-spendenbescheinigung-' + templateData.year + '.xlsx'
+ defaultPath: '~/Spendenbescheinigung-' + templateData.year + '.xlsx'
  }, function(file_path) {
  if (file_path) { 
  var wopts = { bookType:'xlsx', bookSST:false, type:'buffer' } 

diff --git a/src/background/pdfreport.js b/src/background/pdfreport.js
@@ -278,7 +278,7 @@ async function generatePDFReport (reports) {
  let templateData = getTemplateData();
  let pdf = getPDFDocument(reports, templateData)
  let year = (new Date()).getFullYear();
- let filePath = (reports.length > 1) ? "~/fcg-spendenbescheinigung-" + templateData.year + ".pdf" : "~/fcg-spendenbescheinigung-" + templateData.year + "-" + reports[0].name + "-(" + reports[0].optigem_nr + ").pdf"
+ let filePath = (reports.length > 1) ? "~/Spendenbescheinigung-" + templateData.year + ".pdf" : "~/Spendenbescheinigung-" + templateData.year + "-" + reports[0].name + "-(" + reports[0].optigem_nr + ").pdf"
 
  dialog.showSaveDialog(
  {