support multiple extra-positions

Author: Andreas Müller

src/gtt-report.js

@@ -151,8 +151,8 @@ config
     .set('invoiceCurrencyMaxUnit', program.opts().invoiceCurrencyMaxUnit)
     .set('invoicePositionText', program.opts().invoicePositionText)
     .set('invoicePositionExtra', program.opts().invoicePositionExtra)
-    .set('invoicePositionExtraText', program.opts().invoicePositionExtraText)
-    .set('invoicePositionExtraValue', program.opts().invoicePositionExtraValue)
+    .set('invoicePositionExtraText', program.opts().invoicePositionExtraText.split(','))
+    .set('invoicePositionExtraValue', program.opts().invoicePositionExtraValue.split(','))
     .set('_createDump', program.opts().output === 'dump');
 
 // date shortcuts
@@ -172,6 +172,11 @@ if (program.opts().this_month)
 Cli.quiet = config.get('quiet');
 Cli.verbose = config.get('_verbose');
 
+// check extra Text/value arrays
+if(config.get('invoicePositionExtraText').length != config.get('invoicePositionExtraValue').length) {
+    Cli.error(`invoicePositionExtraText and invoicePositionExtraValue length do not match`);
+}
+
 // create stuff
 let reports = new ReportCollection(config),
     master = new Report(config),

src/output/invoice.js

@@ -21,15 +21,21 @@ class invoice extends Base {
         this.invoiceCurrencyPerHour = this.config.get('invoiceCurrencyPerHour');
         this.invoiceVAT = this.config.get('invoiceVAT');
         this.invoicePositionText = this.config.get('invoicePositionText');
-        this.invoicePositionExtraText = this.config.get('invoicePositionExtraText');
-        this.invoicePositionExtraValue = parseFloat(this.config.get('invoicePositionExtraValue'));
-        if(!this.invoicePositionExtraValue > 0) {
-            this.invoicePositionExtraValue = 0.0;
-        }
+        this.invoicePositionExtraTexts = this.config.get('invoicePositionExtraText');
+        this.invoicePositionExtraValues = this.config.get('invoicePositionExtraValue').map(
+            (v) => {
+                const value = parseFloat(v);
+                return value > 0? value: 0; // NaN -> 0
+            });
+        this.invoicePositionExtraTotal = 0.0;
+        this.invoicePositionExtraValues.forEach(v => (this.invoicePositionExtraTotal += v));
+
+
+
         this.invoiceCurrencyMaxUnit = this.config.get('invoiceCurrencyMaxUnit');
         this.totalhForInvoice = (this.spent-this.spentFree-(this.spentHalfPrice*0.5)) / 3600.0;
         // round subtotals to 0.01 and total to invoiceCurrencyMaxUnit.
-        let invoiceTotal = this.totalhForInvoice * this.invoiceCurrencyPerHour + this.invoicePositionExtraValue;
+        let invoiceTotal = this.totalhForInvoice * this.invoiceCurrencyPerHour + this.invoicePositionExtraTotal;
         this.totalForInvoiceH = Math.round(this.totalhForInvoice * this.invoiceCurrencyPerHour * 100) * 0.01;
         this.totalForInvoiceExkl = Math.round(invoiceTotal * 100) * 0.01;
         this.totalForInvoiceMwst = Math.round(invoiceTotal * this.invoiceVAT * 100) * 0.01;
@@ -132,9 +138,15 @@ class invoice extends Base {
         svg.instance.height("");
         svg.instance.width("");
         let extra = "";
-        if(this.invoicePositionExtraValue > 0) {
-            extra = `<div class="positionDesc">${this.invoicePositionExtraText}</div>
-            <div class="positionValue">${this.invoiceCurrency} ${this.invoicePositionExtraValue.toFixed(2)}</div>`;
+        if(this.invoicePositionExtraTotal > 0) {
+            for(var i in this.invoicePositionExtraTexts) {
+                extra +=
+                `
+                <div class="positionDesc">${this.invoicePositionExtraTexts[i]}</div>
+                <div class="positionValue">${this.invoiceCurrency} ${this.invoicePositionExtraValues[i].toFixed(2)}</div>
+                `;
+            }
+
         }
 
         this.out += 

src/output/invoice2.js

@@ -23,11 +23,15 @@ class invoice2 extends Base {
         this.invoiceText = this.config.get('invoiceText') ? this.config.get('invoiceText') : '';
         this.invoicePositionText = this.config.get('invoicePositionText');
         this.invoicePositionExtra = this.config.get('invoicePositionExtra');
-        this.invoicePositionExtraText = this.config.get('invoicePositionExtraText');
-        this.invoicePositionExtraValue = parseFloat(this.config.get('invoicePositionExtraValue'));
-        if(!this.invoicePositionExtraValue > 0) {
-            this.invoicePositionExtraValue = 0.0;
-        }
+        this.invoicePositionExtraTexts = this.config.get('invoicePositionExtraText');
+        this.invoicePositionExtraValues = this.config.get('invoicePositionExtraValue').map(
+            (v) => {
+                const value = parseFloat(v);
+                return value > 0? value: 0; // NaN -> 0
+            });
+        this.invoicePositionExtraTotal = 0.0;
+        this.invoicePositionExtraValues.forEach(v => (this.invoicePositionExtraTotal += v));
+
         this.invoiceCurrencyMaxUnit = this.config.get('invoiceCurrencyMaxUnit');
         this.invoiceTimeMaxUnit = this.config.get('invoiceTimeMaxUnit');
 
@@ -48,7 +52,7 @@ class invoice2 extends Base {
                 );
             });
 
-        let invoiceTotal = this.invoicePositionExtraValue;
+        let invoiceTotal = this.invoicePositionExtraTotal;
         Object.keys(this.invoicePositions).forEach(
             k => {
                 invoiceTotal += this.invoicePositions[k][3];
@@ -169,15 +173,17 @@ class invoice2 extends Base {
         );
 
         let extra = "";
-        if(this.invoicePositionExtra || this.invoicePositionExtraValue > 0) {
+        if(this.invoicePositionExtra || this.invoicePositionExtraTotal > 0) {
             if(this.invoicePositionExtra) {
                 extra += `<div class="position">${this.invoicePositionExtra}</div>`;
             }
-            extra +=
-`
-<div class="positionDesc">${this.invoicePositionExtraText}</div>
-<div class="positionValue">${this.invoiceCurrency} ${this.invoicePositionExtraValue.toFixed(2)}</div>
-`;
+            for(var i in this.invoicePositionExtraTexts) {
+                extra +=
+                `
+                <div class="positionDesc">${this.invoicePositionExtraTexts[i]}</div>
+                <div class="positionValue">${this.invoiceCurrency} ${this.invoicePositionExtraValues[i].toFixed(2)}</div>
+                `;
+            }
         }
 
         this.out +=