Merge pull request #5 from ndu2/develop

Develop

Author: ndu2

documentation.md

@@ -616,6 +616,11 @@ includeLabels:
 - pending
 - approved
 
+# labels  free of charge
+freeLabels:
+ - at no charge
+ - free
+ 
 # Only works if using a local configuration file!
 # Extend the global configuration if set to true, pass a string to extend 
 # the configuration file stored at the given path

src/output/base.js

@@ -100,10 +100,16 @@ class base {
         let totalEstimate = 0;
         let totalSpent = 0;
         let spent = 0;
+        let spentFree = 0;
         let users = {};
         let projects = {};
         let times = [];
 
+        let spentFreeLabels = this.config.get('freeLabels');
+        if(undefined === spentFreeLabels) {
+            spentFreeLabels = [];
+        }
+
         ['issues', 'mergeRequests'].forEach(type => {
             this.report[type].forEach(issue => {
                 issue.times.forEach(time => {
@@ -114,6 +120,16 @@ class base {
                     projects[time.project_namespace] += time.seconds;
 
                     spent += time.seconds;
+                    //if(time.parent.labels)
+                    let free = false;
+                    time.parent.labels.forEach(label => {
+                            spentFreeLabels.forEach(freeLabel => {
+                                free |= (freeLabel == label);
+                            });
+                        });
+                    if(free) {
+                        spentFree += time.seconds;
+                    }
                     times.push(time);
                 });
 
@@ -141,10 +157,12 @@ class base {
         this.stats = {
             'total estimate': this.config.toHumanReadable(totalEstimate, 'stats'),
             'total spent': this.config.toHumanReadable(totalSpent, 'stats'),
-            'spent': this.config.toHumanReadable(spent, 'stats')
+            'spent': this.config.toHumanReadable(spent, 'stats'),
+            'spent free': this.config.toHumanReadable(spentFree, 'stats'),
         };
         this.totalEstimate = totalEstimate;
         this.spent = spent;
+        this.spentFree = spentFree;
         this.totalSpent = totalSpent;
     }
 

src/output/invoice.js

@@ -19,7 +19,7 @@ class invoice extends Base {
         this.invoiceCurrencyPerHour = this.config.get('invoiceCurrencyPerHour');
         this.invoiceVAT = this.config.get('invoiceVAT');
         this.invoiceCurrencyMaxUnit = this.config.get('invoiceCurrencyMaxUnit');
-        this.totalhForInvoice = this.spent / 3600.0;
+        this.totalhForInvoice = (this.spent-this.spentFree) / 3600.0;
         this.totalForInvoiceExkl = this.totalhForInvoice * this.invoiceCurrencyPerHour;
         this.totalForInvoiceMwst = this.totalForInvoiceExkl * this.invoiceVAT;
         this.totalForInvoice = this.totalForInvoiceExkl + this.totalForInvoiceMwst;