[FIX] cambios de nombres para evitar conflicto con el modulo eiru_dashboard

static/src/js/configuration.js

@@ -1,140 +0,0 @@
-function configuration_reporting_widget (instance, widget) {
-    "use strict";
-
-    var QWeb = instance.web.qweb;
-
-    widget.DashboardConfigurationWidget = instance.Widget.extend({
-        template: 'ConfigurationTmpl',
-        events: {
-            'click .user_wrapper': 'selectUser',
-            'dragstart .grid-stack': 'onDragWidget',
-            'dragstop .grid-stack': 'onDropWidget',
-            'added .grid-stack': 'onDropWidget',
-            'click .widget_action': 'onClickWidgetAction',
-        },
-        init: function (parent) {
-            this._super(parent);
-        },
-        start: function () {
-            this.renderUsersArea();
-            this.renderWidgetsAsignedArea();
-            this.renderWidgetsArea();
-
-            this.isBorderDancing = false;
-        },
-        getUsers: function () {
-            var User = new instance.web.Model('res.users');
-            var fields = ['name', 'display_name', 'image_medium'];
-            var domain = [['active', '=', true]];
-            return User.query(fields).filter(domain).order_by(['id']).all();
-        },
-        renderUsersArea: function () {
-            var self = this;
-
-            self.getUsers().then(function (users) {
-                this.users = users;
-
-                var usersAreaHtml = QWeb.render('ConfigurationUsersTmpl', { users: users });
-                self.$el.find('.user_selectable_area').html(usersAreaHtml);
-            });
-        },
-        renderWidgetsAsignedArea: function () {
-            this.$el.find('.widgets_droppable_area > div').gridstack({
-                cellHeight: 100,
-                animate: true,
-                acceptWidgets: true,
-                disableResize: true,
-                minWidth: 100,
-                width: 4
-            });
-        },
-        renderWidgetsArea: function () {
-            var widgets = [
-                {
-                    id: "w_01",
-                    name: 'Widget 1',
-                    description: 'Description 1'
-                },
-                {
-                    id: "w_02",
-                    name: 'Widget 2',
-                    description: 'Description 2'
-                },
-                {
-                    id: "w_03",
-                    name: 'Widget 3',
-                    description: 'Description 3'
-                },
-                {
-                    id: "w_04",
-                    name: 'Widget 4',
-                    description: 'Description 4'
-                },
-                {
-                    id: "w_05",
-                    name: 'Widget 5',
-                    description: 'Description 5'
-                }
-            ];
-            var element = this.$el.find('.widgets_draggable_area');
-            var widgetsAreaHtml = QWeb.render('ConfigurationWidgetsTmpl', { widgets: widgets });
-            element.html(widgetsAreaHtml);
-            element.find('.grid-stack').gridstack({
-                cellHeight: 100,
-                animate: true,
-                disableResize: true,
-                width: 1
-            });
-        },
-        selectUser: function (e) {
-            this.$el.find('.user_wrapper').removeClass('user_selected');
-
-            var element = $(e.target).closest('.user_wrapper');
-            element.addClass('user_selected');
-        },
-        borderDance: function (e) {
-            this.isBorderDancing = !this.isBorderDancing;
-
-            if (this.isBorderDancing) {
-                this.$el.find('.widgets_draggable_area').removeClass('vertical_scrollable');
-                this.$el.find('.widgets_droppable_area').addClass('dancing_border');
-            } else {
-                this.$el.find('.widgets_draggable_area').addClass('vertical_scrollable')
-                this.$el.find('.widgets_droppable_area').removeClass('dancing_border');
-            }
-        },
-        onDragWidget: function (e, ui) {
-            this.borderDance(e);
-        },
-        onDropWidget: function (e, ui) {
-            this.borderDance(e);
-
-            if (e.type === 'added') {
-                var el = ui.shift().el;
-                var trash = el.find('.widget_trash');
-                var add = el.find('.widget_add');
-                var display = trash.css('display');
-
-                trash.css('display', add.css('display'));
-                add.css('display', display);
-            }
-        },
-        onClickWidgetAction: function (e) {
-            var gridOrigin = $(e.target).closest('.grid-stack').data('gridstack');
-            var gridDest = null;
-            var el = $(e.target).closest('.grid-stack-item');
-            var action = $(e.target).closest('.widget_action').data('action');
-
-            if (action === 'add') {
-                gridDest = this.$el.find('.widgets_droppable_area > .grid-stack').data('gridstack');
-            } else {
-                gridDest = this.$el.find('.widgets_draggable_area > .grid-stack').data('gridstack');
-            }
-
-            this.borderDance();
-
-            gridOrigin.removeWidget(el);
-            gridDest.addWidget(el);
-        }
-    });
-}

static/src/js/dashboard.js

@@ -25,29 +25,30 @@ function dashboard_reporting_widget (instance, widget) {
         renderWidgets: function () { 
             var self = this; 
 
-            //Invoice History
-            var wInvoiceHistory = new widgets.InvoiceHistoryWidget(self);
-            wInvoiceHistory.renderElement();
-            wInvoiceHistory.start();
-            self.grid.addWidget(wInvoiceHistory.$el, 0, 0, wInvoiceHistory.size.width,  wInvoiceHistory.size.height, true);
+            var wChartInvoice = new widgets.ChartInvoiceWidget(self);
+            wChartInvoice.renderElement();
+            wChartInvoice.start();
+            self.grid.addWidget(wChartInvoice.$el, 0, 0, wChartInvoice.size.width,  wChartInvoice.size.height, true);
             
             //Ranking pos orders Salesman
-            var wRankingPosOrderSalesman = new widgets.RankingPosOrdersSalesmanWidget(self);
-            wRankingPosOrderSalesman.renderElement();
-            wRankingPosOrderSalesman.start();
-            self.grid.addWidget(wRankingPosOrderSalesman.$el, 0, 0, wRankingPosOrderSalesman.size.width,  wRankingPosOrderSalesman.size.height, true);
-
+            var wChartPosOrderSalesman = new widgets.ChartPosOrderSalesmanWidget(self);
+            wChartPosOrderSalesman.renderElement();
+            wChartPosOrderSalesman.start();
+            self.grid.addWidget(wChartPosOrderSalesman.$el, 0, 0, wChartPosOrderSalesman.size.width,  wChartPosOrderSalesman.size.height, true);
+            
             // Ranking de clientes
-            var wRankingPosOrderPartner = new widgets.RankingPosOrdersPartnerWidget(self);
-            wRankingPosOrderPartner.renderElement();
-            wRankingPosOrderPartner.start();
-            self.grid.addWidget(wRankingPosOrderPartner.$el, 0, 0, wRankingPosOrderPartner.size.width,  wRankingPosOrderPartner.size.height, true);
+            var wChartPosOrderCustomer = new widgets.ChartPosOrderCustomerWidget(self);
+            wChartPosOrderCustomer.renderElement();
+            wChartPosOrderCustomer.start();
+            self.grid.addWidget(wChartPosOrderCustomer.$el, 0, 0, wChartPosOrderCustomer.size.width,  wChartPosOrderCustomer.size.height, true);
             
             //Ranking de Ventas de Producto por Mes - Point Of Sale
-            var wRankingPosOrderProduct = new widgets.RankingPosOrdersProductWidget(self);
-            wRankingPosOrderProduct.renderElement();
-            wRankingPosOrderProduct.start();
-            self.grid.addWidget(wRankingPosOrderProduct.$el, 0, 0, wRankingPosOrderProduct.size.width,  wRankingPosOrderProduct.size.height, true);
+            var wChartPosOrderProduct = new widgets.ChartPosOrderProductWidget(self);
+            wChartPosOrderProduct.renderElement();
+            wChartPosOrderProduct.start();
+            self.grid.addWidget(wChartPosOrderProduct.$el, 0, 0, wChartPosOrderProduct.size.width,  wChartPosOrderProduct.size.height, true);
+        
+            
         }
     });
 }

static/src/js/main.js

@@ -11,16 +11,14 @@ openerp.eiru_reporting_dashboard = function (instance) {
     
     // Widgets
     try{
-        invoice_history(dashboard);
-        ranking_pos_orders_salesman(dashboard);
-        ranking_pos_orders_partner(dashboard);
-        ranking_pos_orders_product(dashboard);
+        chart_invoice(dashboard);
+        chart_pos_order_customer(dashboard);
+        chart_pos_order_product(dashboard);
+        chart_pos_order_salesman(dashboard);
     }catch(e){
         // error
     }
     
     // Action
     instance.web.client_actions.add('eiru_reporting_dashboard.action_dashboard', 'instance.eiru_reporting_dashboard.DashboardReportingWidget');
-    // instance.web.client_actions.add('eiru_reporting_dashboard.action_dashboard_sale', 'instance.eiru_reporting_dashboard.SaleWidget');
-    // instance.web.client_actions.add('eiru_reporting_dashboard.action_dashboard_configuration', 'instance.eiru_reporting_dashboard.DashboardConfigurationWidget');
 }

static/src/js/widgets/invoice_history.js → static/src/js/widgets/chart_invoice.js

@@ -1,10 +1,10 @@
-function invoice_history (widget) {
+function chart_invoice (widget) {
     "use strict";
 
     var model = openerp;
 
-    widget.InvoiceHistoryWidget = widget.Base.extend({
-        template: 'InvoiceHistory',
+    widget.ChartInvoiceWidget = widget.Base.extend({
+        template: 'ChartInvoice',
         data: [],
         countPosOrder: [],
         resPartner: [],

static/src/js/widgets/ranking_pos_orders_partner.js → static/src/js/widgets/chart_pos_order_customer.js

@@ -1,10 +1,10 @@
-function ranking_pos_orders_partner (widget) {
+function chart_pos_order_customer (widget) {
     "use strict";
 
     var model = openerp;
 
-    widget.RankingPosOrdersPartnerWidget = widget.Base.extend({
-        template: 'RankingPosOrdersPartner',
+    widget.ChartPosOrderCustomerWidget = widget.Base.extend({
+        template: 'ChartPosOrderCustomer',
         data: [],
         countPosOrder: [],
         resPartner: [],

static/src/js/widgets/ranking_pos_orders_product.js → static/src/js/widgets/chart_pos_order_product.js

@@ -1,10 +1,10 @@
-function ranking_pos_orders_product (widget) {
+function chart_pos_order_product (widget) {
     "use strict";
 
     var model = openerp;
 
-    widget.RankingPosOrdersProductWidget = widget.Base.extend({
-        template: 'RankingPosOrdersProduct',
+    widget.ChartPosOrderProductWidget = widget.Base.extend({
+        template: 'ChartPosOrderProduct',
         data: [],
         accountInvoice: [],
         invoiceLine: [],

static/src/js/widgets/ranking_pos_orders_salesman.js → static/src/js/widgets/chart_pos_order_salesman.js

@@ -1,10 +1,10 @@
-function ranking_pos_orders_salesman (widget) {
+function chart_pos_order_salesman (widget) {
     "use strict";
 
     var model = openerp;
 
-    widget.RankingPosOrdersSalesmanWidget = widget.Base.extend({
-        template: 'RankingPosOrdersSalesman',
+    widget.ChartPosOrderSalesmanWidget = widget.Base.extend({
+        template: 'ChartPosOrderSalesman',
         data: [],
         countPosOrder: [],
         resPartner: [],

static/src/xml/configuration.xml

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<template xml:space="preserve">
-    <t t-name="ConfigurationReportingTemplate">
-        <div class="configuration_container">
-            <div class="oe_horizontal_separator">
-                Configuración del Tablero
-            </div>
-            <div class="configuration_dashboard">
-                <div>
-                    <div>
-                        <div class="user_selectable_area"></div>
-                    </div>
-                    <div>
-                        <div class="widgets_droppable_area">
-                            <div class="grid-stack grid-stack-4"></div>
-                        </div>
-                    </div>
-                    <div>
-                        <div class="widgets_draggable_area vertical_scrollable"></div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </t>
-
-    <t t-name="ConfigurationUsersTmpl">
-        <t t-foreach="users" t-as="user">
-            <div class="user_wrapper" t-att-data-id="user.id">
-                <div class="user_photo">
-                    <img src="/eiru_reporting_dashboard/static/img/user.png" />
-                </div>
-                <h2><t t-esc="user.name"/></h2>
-            </div>
-        </t>
-    </t>
-
-    <t t-name="ConfigurationWidgetsTmpl">
-        <input type="text" placeholder="Buscar..." />
-        <div class="grid-stack grid-stack-1">
-            <t t-foreach="widgets" t-as="widget">
-                <div class="grid-stack-item" t-att-data-id="widget.id" data-gs-width="1" data-gs-height="1">
-                    <div class="grid-stack-item-content widget_wrapper">
-                        <h2><t t-esc="widget.name" /></h2>
-                        <p><t t-esc="widget.description" /></p>
-                        <div class="widget_action widget_add" data-action="add">
-                            <i class="fa fa-plus"></i>
-                        </div>
-                        <div class="widget_action widget_trash" data-action="remove">
-                            <i class="fa fa-trash"></i>
-                        </div>
-                    </div>
-                </div>
-            </t>
-        </div>
-    </t>
-</template>

static/src/xml/widget_base.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <template xml:space="preserve">
-    <t t-name="WidgetBaseTmpl">
+    <t t-name="WidgetReportingBaseTemplate">
         <div>
             <div class="grid-stack-item-content dashboard">
                 <t t-raw="0" />

static/src/xml/widgets/invoice_history.xml → static/src/xml/widgets/chart_invoice.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <template xml:space="preserve">
-    <t t-name="InvoiceHistory">
-        <t t-call="WidgetBaseTmpl">
+    <t t-name="ChartInvoice">
+        <t t-call="WidgetReportingBaseTemplate">
             <h2  class="widget-title">
                 <i class="fa fa-bar-chart" aria-hidden="true"></i>
                 <span>Historico de facturas</span>

static/src/xml/widgets/ranking_pos_orders_partner.xml → static/src/xml/widgets/chart_pos_order_customer.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <template xml:space="preserve">
-    <t t-name="RankingPosOrdersPartner">
-        <t t-call="WidgetBaseTmpl">
+    <t t-name="ChartPosOrderCustomer">
+        <t t-call="WidgetReportingBaseTemplate">
             <h2  class="widget-title">
                 <i class="fa fa-bar-chart" aria-hidden="true"></i>
                 <span>Ranking de clientes con más compras en el mes</span>

static/src/xml/widgets/ranking_pos_orders_product.xml → static/src/xml/widgets/chart_pos_order_product.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template xml:space="preserve">
-    <t t-name="RankingPosOrdersProduct">
-        <t t-call="WidgetBaseTmpl">
+    <t t-name="ChartPosOrderProduct">
+        <t t-call="WidgetReportingBaseTemplate">
             <h2  class="widget-title">
                 <i class="fa fa-bar-chart" aria-hidden="true"></i>
                 <span>Ranking de productos y servicios</span>

static/src/xml/widgets/ranking_pos_orders_salesman.xml → static/src/xml/widgets/chart_pos_order_salesman.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <template xml:space="preserve">
-    <t t-name="RankingPosOrdersSalesman">
-        <t t-call="WidgetBaseTmpl">
+    <t t-name="ChartPosOrderSalesman">
+        <t t-call="WidgetReportingBaseTemplate">
             <h2  class="widget-title">
                 <i class="fa fa-bar-chart" aria-hidden="true"></i>
                 <span>Ranking de clientes con más compras en el mes</span>

templates.xml

@@ -14,14 +14,13 @@
                 <script type="text/javascript" src="/eiru_reporting_dashboard/static/src/lib/jquery.timeago.es.js" />
 
                 <!-- Point Of Sale -->
-                <script type="text/javascript" src="/eiru_reporting_dashboard/static/src/js/widgets/ranking_pos_orders_partner.js" />
-                <script type="text/javascript" src="/eiru_reporting_dashboard/static/src/js/widgets/ranking_pos_orders_product.js" />
-                <script type="text/javascript" src="/eiru_reporting_dashboard/static/src/js/widgets/invoice_history.js" />
-                <script type="text/javascript" src="/eiru_reporting_dashboard/static/src/js/widgets/ranking_pos_orders_salesman.js" />
+                <script type="text/javascript" src="/eiru_reporting_dashboard/static/src/js/widgets/chart_invoice.js" />
+                <script type="text/javascript" src="/eiru_reporting_dashboard/static/src/js/widgets/chart_pos_order_customer.js" />
+                <script type="text/javascript" src="/eiru_reporting_dashboard/static/src/js/widgets/chart_pos_order_product.js" />
+                <script type="text/javascript" src="/eiru_reporting_dashboard/static/src/js/widgets/chart_pos_order_salesman.js" />
 
                 <!-- Dashboard Main  -->
                 <script type="text/javascript" src="/eiru_reporting_dashboard/static/src/js/dashboard.js" />
-                <!-- <script type="text/javascript" src="/eiru_reporting_dashboard/static/src/js/configuration.js" /> -->
                 <script type="text/javascript" src="/eiru_reporting_dashboard/static/src/js/main.js" />
             </xpath>
         </template>