Merge branch 'bogie-master'

Author: modesty

lib/pdf.js

@@ -351,6 +351,10 @@ export default class PDFJSClass extends EventEmitter {
 		return PDFField.getAllFieldsTypes({ Pages: this.pages || [] });
 	}
 
+	getAllFieldData() {
+		return PDFField.getAllFieldData({ Pages: this.pages || [] });
+	}
+
 	getMergedTextBlocksIfNeeded() {
 		for (let p = 0; p < this.pages.length; p++) {
 			let prevText = null;

lib/pdfanno.js

@@ -2,13 +2,13 @@ import nodeUtil from "util";
 
 //BEGIN - MQZ 9/19/2012. Helper functions to parse acroForm elements
 function setupRadioButton(annotation, item) {
-    let asName = '';
+    //let asName = '';
     //PDF Spec p.689: parent item's DV holds the item's value that is selected by default
     const po = annotation.get('Parent');
     if (po) {
         po.forEach((key, val) => {
             if (key === 'DV') {
-                asName = val.name || '';
+                //asName = val.name || '';
             }
             else if (key === 'TU') {
                 //radio buttons use the alternative text from the parent
@@ -28,7 +28,8 @@ function setupRadioButton(annotation, item) {
         if (key.toLowerCase() !== "off") {
             //value if selected
             item.value = key; //export value
-            item.checked = (key === asName); //initial selection state
+            
+            item.checked = (item.fieldValue === item.value); //initial selection state
         }
     });
 

lib/pdffield.js

@@ -270,6 +270,7 @@ export default class PDFField {
     //static public method to generate fieldsType object based on parser result
     static getAllFieldsTypes(data) {
         const isFieldReadOnly = field => (field.AM & kFBANotOverridable) ? true : false;
+
 		const getFieldBase = field => ({
 			id: field.id.Id,
 			type: field.T.Name,
@@ -295,4 +296,45 @@ export default class PDFField {
         });
         return retVal;
     }
+    
+    //static public method to generate data output for all field types
+    static getAllFieldData(data) {
+        const isFieldReadOnly = field => (field.AM & kFBANotOverridable) ? true : false;
+
+        function getFieldValue(field) {
+            switch(field.T.Name) {
+                case 'box':
+                    return field.checked === undefined ? false : field.checked;
+                case 'alpha':
+                case 'date':
+                    default:
+                    return field.V;
+            }
+        }
+		const getFieldBase = field => ({
+			id: field.id.Id,
+			type: field.T.Name,
+			calc: isFieldReadOnly(field),
+			value: getFieldValue(field)
+		});
+
+        const retVal = [];
+        data.Pages.forEach( page => {
+            page.Boxsets.forEach( boxsets => {
+                if (boxsets.boxes.length > 1) { //radio button
+                    boxsets.boxes.forEach( box => {
+                        if(box.checked)
+                        retVal.push({ id: boxsets.id.Id, type: "radio", calc: isFieldReadOnly(box), value: box.id.Id });
+                    });
+                }
+                else { //checkbox
+                    retVal.push(getFieldBase(boxsets.boxes[0]));
+                }
+            });
+
+            page.Fields.forEach(field => retVal.push(getFieldBase(field)));
+
+        });
+        return retVal;
+    }
 }