@dvrd/dvr-controls 1.0.34 → 1.0.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dvrd/dvr-controls",
-  "version": "1.0.34",
+  "version": "1.0.36",
   "description": "Custom web controls",
   "main": "index.ts",
   "files": [

package/src/js/pdf/invoiceTable/pdfInvoiceTable.tsx

@@ -25,7 +25,7 @@ interface Props {
     height?: number;
     persistent?: PDFElementPersist;
     mainFont: PdfFont;
-    subExclVat?: boolean;
+    tableHeaderLabels?: [string, string, string, string, string];
 }
 
 interface State {
@@ -148,10 +148,16 @@ export default class PdfInvoiceTable extends PdfElement<Props, State> {
         )
     };
 
+    getTableHeaderLabels = (): [string, string, string, string, string] => {
+        const {tableHeaderLabels} = this.props;
+        if (tableHeaderLabels) return tableHeaderLabels;
+        return ['Omschrijving', 'Aantal', 'Bedrag', 'BTW', 'Subtotaal incl. BTW'];
+    }
+
     render = () => {
         const {dragging, settings} = this.state;
-        const {draggable, defaultPosition, width, height, onSaveHistory, subExclVat} = this.props;
-        const subTotalLabel = `Subtotaal ${subExclVat ? 'excl.' : 'incl.'} BTW`;
+        const {draggable, defaultPosition, width, height, onSaveHistory} = this.props;
+        const headLabels = this.getTableHeaderLabels();
         return (
             <WithEvents events={this.event}>
                 <PDFDraggable dragging={dragging} draggable={draggable} onDragStart={this.onDragStart}
@@ -166,11 +172,11 @@ export default class PdfInvoiceTable extends PdfElement<Props, State> {
                               onResized={onSaveHistory} onDragged={onSaveHistory}>
                     <div className='pdf-invoice-table' onClick={this.onClick}>
                         <div className='invoice-line' style={this.getRowStyle(true)}>
-                            <span>Omschrijving</span>
-                            <span>Aantal</span>
-                            <span>Bedrag</span>
-                            <span>BTW</span>
-                            <span className='end'>{subTotalLabel}</span>
+                            <span>{headLabels[0]}</span>
+                            <span>{headLabels[1]}</span>
+                            <span>{headLabels[2]}</span>
+                            <span>{headLabels[3]}</span>
+                            <span className='end'>{headLabels[4]}</span>
                         </div>
                         {[1, 2].map(this.renderInvoiceLine)}
                         {this.renderTotals()}

package/src/js/pdf/pdfTemplateCreator.tsx

@@ -49,7 +49,7 @@ interface Props {
     options?: PDFOptions;
     singleImage: boolean;
     headerButtons?: Array<ReactElement>;
-    subExclVat?: boolean;
+    tableHeaderLabels?: [string, string, string, string, string];
 }
 
 interface State {
@@ -204,7 +204,7 @@ export default class PDFTemplateCreator extends PureComponent<Props, State> {
         };
         const width = dimensions?.width;
         const height = dimensions?.height;
-        const {values, mainFont, subExclVat} = this.props;
+        const {values, mainFont, tableHeaderLabels} = this.props;
         const key: string = generateUUID();
         const sharedProps = {
             defaultPosition: position,
@@ -231,7 +231,8 @@ export default class PDFTemplateCreator extends PureComponent<Props, State> {
                 break;
             case PDFElementType.INVOICE_TABLE:
                 element = <PdfInvoiceTable {...sharedProps} width={width} height={height} mainFont={mainFont}
-                                           persistent={PDFElementPersist.PERSISTENT} subExclVat={subExclVat}/>;
+                                           persistent={PDFElementPersist.PERSISTENT}
+                                           tableHeaderLabels={tableHeaderLabels}/>;
                 break;
         }
         return {element, config};

package/src/js/util/miscUtil.ts

@@ -136,7 +136,11 @@ export const shuffleArray = (arr: any[]): any[] => {
     return arr;
 };
 
-export const nullify = <T extends string | Array<any> | Set<any>>(value?: T | null): T | null => {
+export function nullify<T extends string | Array<any> | Set<any> | number>(value?: T | null): T | null {
+    if (typeof value === 'number') {
+        if (value > 0) return value;
+        return null;
+    }
     if (!value) return null;
     else if (Array.isArray(value) || typeof value === 'string')
         return value.length ? value : null;