[ADD] fix features when socket is connected

static/src/js/main.js

@@ -27,6 +27,7 @@ openerp.print_engine = function (instance, local) {
                     self.socket.on('connect_error', self.handle_connect_error);
                     self.socket.on('request_printer_name', self.handle_printer_selection);
                     self.socket.on('show_print_status', self.handle_print_status);
+                    self.socket.on('download_data', self.handle_download_data);
                 }
             }
 
@@ -47,14 +48,14 @@ openerp.print_engine = function (instance, local) {
             instance.web.unblockUI();
             var self = this;
 
-            if (data.printers && data.printer.length === 0) {
+            if (data.printers && data.printers.length === 0) {
                 instance.web.notification.do_notify('Impresión', 'No hay impresoras instaladas');
                 return;
             }
 
-            var widget = new local.PrinterSelectionWidget(data);
-            widget.get_selection().then(function (new_request) {
-                self.emit('request_print', new_request);
+            var widget = new local.PrinterSelectionDialog(data);
+            widget.get_selection().then(function (request) {
+                self.emit('request_print', request);
             });
         },
         handle_print_status: function (data) {
@@ -89,6 +90,30 @@ openerp.print_engine = function (instance, local) {
                 instance.web.notification.do_warn('Impresión', 'Ocurrió un error al imprimir: ' + data.printer);
             }
         },
+        handle_download_data: function (data) {
+            instance.web.blockUI();
+
+            instance.pdfJs.getDocument({
+                data: atob(data)
+            }).then(function (pdf) {
+                if (local.socket_manager.config.action_download_pdf) {
+                    pdf.getData().then(function (data) {
+                        instance.web.unblockUI();
+    
+                        var url = instance.pdfJs.createObjectURL(data, 'application/pdf');
+                        var a = document.createElement('a');
+    
+                        a.href = url;
+                        a.download = 'download.pdf';
+                        a.target = '_parent';
+                        a.click();
+                    });
+                    return;
+                }
+
+                new local.PdfViewerDialog(null, pdf);
+            });
+        },
         get_socket_config: function () {
             var url = '/print_engine/socket_config';
             return this.get_from_server(url);
@@ -109,7 +134,7 @@ openerp.print_engine = function (instance, local) {
             var userAgent = navigator.userAgent;
             return /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(userAgent) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(userAgent.substr(0, 4));
         },
-        request_print: function (data) {
+        request_print: function (data, print_directly) {
             if (!data) {
                 instance.web.notification.do_warn('Impresión', 'No hay datos para imprimir');
                 return;
@@ -121,19 +146,22 @@ openerp.print_engine = function (instance, local) {
             }
 
             instance.web.blockUI();
+
+            var mime_type = 'data:application/pdf;base64,';
             
             if (data instanceof Uint8Array) {
-                data = 'data:application/pdf;base64,' + btoa(String.fromCharCode.apply(null, data));
+                data = mime_type + btoa(String.fromCharCode.apply(null, data));
             }
 
-            if (!data.startsWith('data:application/pdf;base64,')) {
-                instance.web.unblockUI();
-                return;
+            if (!data.startsWith(mime_type)) {
+                data = mime_type + data;
             }
 
             try {
+                atob(data.replace(mime_type, ''));
+
                 this.socket.emit('request_print', {
-                    print_directly: this.config.print_directly,
+                    print_directly: print_directly || this.config.print_directly,
                     data: data
                 });
             } catch (e) {
@@ -143,15 +171,15 @@ openerp.print_engine = function (instance, local) {
         }
     });
 
-    local.PrinterTopWidget = instance.web.Widget.extend({
-        template: 'PrinterTopWidget',
+    local.PrinterTopNotificator = instance.web.Widget.extend({
+        template: 'PrinterTopNotificator',
         init: function (parent) {
             this._super(parent);
         }
     });
 
-    local.PrinterUnavailableWidget = instance.web.Widget.extend({
-        template: 'PrinterUnavailableWidget',
+    local.PrinterUnavailableDialog = instance.web.Widget.extend({
+        template: 'PrinterUnavailableDialog',
         events: {
             'click li': 'on_download'
         },
@@ -188,15 +216,17 @@ openerp.print_engine = function (instance, local) {
         }
     });
 
-    local.PrinterSelectionWidget = instance.web.Widget.extend({
-        template: 'PrinterSelectionWidget',
+    local.PrinterSelectionDialog = instance.web.Widget.extend({
+        template: 'PrinterSelectionDialog',
         events: {
             'click li': 'on_select'
         },
-        printers: [],
         init: function (data) {
+            var config = local.socket_manager.config;
+            this.download_pdf = config.action_download_pdf || config.action_preview_pdf || false;
+
+            this.printers = data.printers || [];
             this.id = data.id;
-            this.printers = data.printers;
 
             this.start();
         },
@@ -230,7 +260,6 @@ openerp.print_engine = function (instance, local) {
                 print_directly: true
             });
 
-            self.destroy();
             self.$el.remove();
         }
     });
@@ -246,14 +275,51 @@ openerp.print_engine = function (instance, local) {
             this.source = source;
             this.name = name;
 
+            this.set('current_page', -1);
+            this.on('change:current_page', this, this.render_page);
+
+            if (_.isObject(this.source)) {
+                this.pdf = source;
+                this.render_widget();
+
+                return;
+            }
+
+            var matchReportUrl = this.source.match(/(?:\/(?:web\/)?report(?:\/pdf)?)/);
+
+            if (matchReportUrl) {
+                var self = this;
+
+                instance.web.blockUI();
+                instance.pdfJs.getDocument(self.source).then(function (pdf) {
+                    self.pdf = pdf;
+                    self.render_widget();
+                });
+
+                return;
+            }
+
+            var matchMimeType = this.source.match(/data:[a-zA-Z0-9]+\/[a-zA-Z0-9-.+]+.*,/);
+
+            if (matchMimeType) {
+                if (self.source.startsWith('data:application/pdf;base64,')) {
+                    self.source = {
+                        data: self.source
+                    };
+                }
+            }
+
+            try {
+                atob(this.source.data || this.source);
+            } catch (e) {
+                instance.webclient.crashmanager.show_message('Unknown data format');
+            }
+
             var self = this;
 
             instance.web.blockUI();
-            instance.pdfJs.getDocument(source).then(function (pdf) {
+            instance.pdfJs.getDocument(self.source.data || self.source).then(function (pdf) {
                 self.pdf = pdf;
-
-                self.set('current_page', -1);
-                self.on('change:current_page', self, self.render_page);
                 self.render_widget();
             });
         },
@@ -270,6 +336,7 @@ openerp.print_engine = function (instance, local) {
             var self = e.data;
             
             if (!self.pdf) {
+                instance.web.unblockUI();
                 instance.web.notification.do_warn('No hay archivo PDF');
                 return;
             }
@@ -315,6 +382,7 @@ openerp.print_engine = function (instance, local) {
         },
         on_action: function (e) {
             e.preventDefault();
+
             var action = $(e.target).closest('a').data('action');
             this['on_' + action]();
         },
@@ -348,8 +416,6 @@ openerp.print_engine = function (instance, local) {
                     printable: instance.pdfJs.createObjectURL(data, 'application/pdf')
                 });
             });
-            
-
         },
         on_download: function () {
             var self = this;
@@ -376,7 +442,7 @@ openerp.print_engine = function (instance, local) {
         if (instance.web.UserMenu) {
             instance.web.UserMenu.include({
                 do_update: function () {
-                    var printer = new local.PrinterTopWidget(this);
+                    var printer = new local.PrinterTopNotificator(this);
                     printer.appendTo($('.oe_systray'));
                     local.socket_manager = new local.SocketManager();
                     return this._super.apply(this, arguments);
@@ -462,14 +528,14 @@ openerp.print_engine = function (instance, local) {
                     instance.web.jsonRpc(url, 'call', {
                         context: ctx
                     }).done(function (result) {
-                        instance.print_engine.socket_manager.request_print(result.data);
+                        local.socket_manager.request_print(result.data);
                     }).fail(function (e) {
                         instance.webclient.crashmanager.show_message(e);
                     });
                 },
                 ir_actions_report_xml: function (action, options) {
                     var self = this;
-                    var config = instance.print_engine.socket_manager.config;
+                    var config = local.socket_manager.config;
 
                     var eval_contexts = ([instance.session.user_context] || []).concat([action.context]);
                     action.context = instance.web.pyeval.eval('contexts', eval_contexts);
@@ -482,10 +548,10 @@ openerp.print_engine = function (instance, local) {
                     if (instance.print_engine.socket_manager.socket.disconnected) {
                         if (config.action_download_pdf) {
                             self.trigger_download_pdf(action);
-                            return
+                            return;
                         }
 
-                        var widget = new local.PrinterUnavailableWidget(this);
+                        var widget = new local.PrinterUnavailableDialog(this);
                         widget.can_download().then(function (can_download) {
                             if (!can_download) {
                                 return;

static/src/xml/main.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates xml:space="preserve">
-    <t t-name="PrinterTopWidget">
+    <t t-name="PrinterTopNotificator">
         <li t-att-title='_t("Printer Status")'>
             <a href="#">
                 <i class="fa fa-print" aria-hidden="true" />
@@ -8,7 +8,7 @@
             </a>
         </li>
     </t>
-    <t t-name="PrinterUnavailableWidget">
+    <t t-name="PrinterUnavailableDialog">
         <div aria-hidden="false" class="modal fade" role="dialog" tabindex="-1">
             <div class="modal-dialog">
                 <div class="modal-content openerp">
@@ -36,7 +36,7 @@
             </div>
         </div>
     </t>
-    <t t-name="PrinterSelectionWidget">
+    <t t-name="PrinterSelectionDialog">
         <div aria-hidden="false" class="modal fade" role="dialog" tabindex="-1">
             <div class="modal-dialog">
                 <div class="modal-content openerp">
@@ -54,12 +54,12 @@
                                         <p t-if="p.isDefault">Predeterminado</p>
                                     </div>
                                 </li>
-                                <!-- <li data-name="download">
+                                <li t-if="widget.download_pdf" data-name="download">
                                     <i class="fa fa-file-pdf-o"></i>
                                     <div>
                                         <h2>Descargar PDF</h2>
                                     </div>
-                                </li> -->
+                                </li>
                             </ul>
                         </div>
                     </div>