From b8d87606f0579bbdfdf75dee4669d5f0fd9bb279 Mon Sep 17 00:00:00 2001 From: "Parth Gajjar (Open ERP)" Date: Wed, 19 Mar 2014 19:01:21 +0530 Subject: [PATCH] [IMP] added gengo statistics, displayed inprogress elements bzr revid: pga@tinyerp.com-20140319133121-31umju0ea84sm93y --- addons/website/controllers/main.py | 2 +- addons/website/static/src/css/editor.css | 4 ++ addons/website/static/src/css/editor.sass | 2 + .../static/src/js/website.translator.js | 5 ++ addons/website_gengo/__init__.py | 1 + addons/website_gengo/controllers/main.py | 19 +++++++ .../static/src/js/website_gengo.js | 51 +++++++++++++++++-- .../static/src/xml/website.gengo.xml | 32 ++++++++++-- 8 files changed, 108 insertions(+), 8 deletions(-) diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py index 4d20dd11d40..011a31e00e3 100644 --- a/addons/website/controllers/main.py +++ b/addons/website/controllers/main.py @@ -206,7 +206,7 @@ class Website(openerp.addons.web.controllers.main.Home): views_ids = [view.get('id') for view in views if view.get('active')] domain = [('type', '=', 'view'), ('res_id', 'in', views_ids), ('lang', '=', lang)] irt = request.registry.get('ir.translation') - return irt.search_read(request.cr, request.uid, domain, ['id', 'res_id', 'value'], context=request.context) + return irt.search_read(request.cr, request.uid, domain, ['id', 'res_id', 'value','state'], context=request.context) @http.route('/website/set_translations', type='json', auth='public', website=True) def set_translations(self, data, lang): diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css index da0fad43caf..5755bb06b03 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -145,6 +145,10 @@ table.editorbar-panel td.selected { background: #ffffb6; } +.oe_translatable_inprogress { + background: #b7e4ff; +} + /* ---- MENU ---- {{{ */ div.oe_menu_buttons { top: -8px; diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index 4571dcd257e..21b43ac77f3 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -115,6 +115,8 @@ table.editorbar-panel padding: 0 10px .oe_translatable_todo background: rgb(255, 255, 182) +.oe_translatable_todo + background: rgb(183, 228, 255) // }}} diff --git a/addons/website/static/src/js/website.translator.js b/addons/website/static/src/js/website.translator.js index c330d511170..12c740300c6 100644 --- a/addons/website/static/src/js/website.translator.js +++ b/addons/website/static/src/js/website.translator.js @@ -115,8 +115,13 @@ var trans = this.translations.filter(function (t) { return t.res_id === view_id && t.value === content; }); + console.log(trans); + console.log(this.translations); if (trans.length) { node.setAttribute('data-oe-translation-id', trans[0].id); + if(trans[0].state && trans[0].state == 'inprogress'){ + node.className += ' oe_translatable_inprogress'; + } } else { node.className += ' oe_translatable_todo'; } diff --git a/addons/website_gengo/__init__.py b/addons/website_gengo/__init__.py index 654cb5b6b1a..6da11461444 100644 --- a/addons/website_gengo/__init__.py +++ b/addons/website_gengo/__init__.py @@ -19,3 +19,4 @@ # ############################################################################## +import controllers \ No newline at end of file diff --git a/addons/website_gengo/controllers/main.py b/addons/website_gengo/controllers/main.py index e69de29bb2d..167e3e7bd36 100644 --- a/addons/website_gengo/controllers/main.py +++ b/addons/website_gengo/controllers/main.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- + +from openerp.addons.web import http +from openerp.addons.web.http import request +class website_gengo(http.Controller): + + @http.route('/website/get_gengo_info', type='json', auth='user', website=True) + def get_gengo_info(self, view_id, lang): + ir_translation_obj = request.registry['ir.translation'] + res_lang_obj = request.registry['res.lang'] + translation_ids = ir_translation_obj.search(request.cr, request.uid, [('res_id','=',view_id),('gengo_translation','!=', False),('lang','=',lang)]) + result={"total":0,"inprogess":0,"done":0} + for trans in ir_translation_obj.browse(request.cr, request.uid, translation_ids): + result['total'] += len(trans.source.split()) + if trans.state == 'translated': + result['done'] += len(trans.source.split()) + elif trans.state == 'inprogress': + result['inprogess'] += len(trans.source.split()) + return result diff --git a/addons/website_gengo/static/src/js/website_gengo.js b/addons/website_gengo/static/src/js/website_gengo.js index 6c5c2903dc6..94cc2ab5c11 100644 --- a/addons/website_gengo/static/src/js/website_gengo.js +++ b/addons/website_gengo/static/src/js/website_gengo.js @@ -8,13 +8,19 @@ events: _.extend({}, website.EditorBar.prototype.events, { 'click a[data-action=translation_gengo]': 'translation_gengo', 'click a[data-action=translation_gengo_post]': 'translation_gengo_post', + 'click a[data-action=translation_gengo_info]': 'translation_gengo_info', }), start: function () { this.gengo_translate = false; this._super.apply(this, arguments); var self = this; - self.$('button[data-action=edit]') - .after(openerp.qweb.render('website.ButtonGengoTranslator')); + var gengo_langs = ["ar_SA","id_ID","nl_NL","fr_CA","pl_PL","zh_TW","sv_SE","ko_KR","pt_PT","en_US","ja_JP","es_ES","zh_CN","de_DE","fr_FR","fr_BE","ru_RU","it_IT","pt_BR"]; + if (gengo_langs.indexOf(website.get_context()['lang']) != -1) + { + self.$('button[data-action=edit]') + .after(openerp.qweb.render('website.ButtonGengoTranslator')); + + } }, translation_gengo: function () { var self = this; @@ -25,8 +31,15 @@ dialog.$el.modal('hide'); self.translate().then(function () { self.gengo_translate = false; - self.$el.find('.gengo_translate').addClass("hidden"); - self.$el.find('.gengo_post').removeClass("hidden"); + if($('.oe_translatable_todo').length > 0){ + self.$el.find('.gengo_translate').addClass("hidden"); + self.$el.find('.gengo_post').removeClass("hidden"); + } + else{ + self.$el.find('.gengo_translate').addClass("hidden"); + self.$el.find('.gengo_inprogress').removeClass("hidden"); + + } }); }); @@ -39,6 +52,8 @@ dialog.on('service_level', this, function () { var gengo_service_level = dialog.$el.find(".form-control").val(); dialog.$el.modal('hide'); + self.$el.find('.gengo_post').addClass("hidden"); + self.$el.find('.gengo_inprogress').removeClass("hidden"); var trans ={} $('.oe_translatable_todo').each(function () { var $node = $(this); @@ -60,6 +75,18 @@ }); }, + translation_gengo_info: function () { + var repr = $(document.documentElement).data('mainObject') + var view_id = repr.match(/.+\((.+), (\d+)\)/)[2]; + openerp.jsonRpc('/website/get_gengo_info', 'call', { + 'view_id': view_id, + 'lang': website.get_context()['lang'], + }).done(function(res){ + var dialog = new website.GengoTranslatorStatisticDialog(res); + dialog.appendTo($(document.body)); + + }); + }, }); website.GengoTranslatorDialog = openerp.Widget.extend({ @@ -87,5 +114,21 @@ this.$el.modal(); }, }); + + website.GengoTranslatorStatisticDialog = openerp.Widget.extend({ + events: _.extend({}, website.EditorBar.prototype.events, { + 'hidden.bs.modal': 'destroy', + }), + template: 'website.GengoTranslatorStatisticDialog', + init:function(res){ + this.total = res.total; + this.inprogess = res.inprogess; + this.done = res.done; + return this._super.apply(this, arguments); + }, + start: function (res) { + this.$el.modal(this.res); + }, + }); })(); diff --git a/addons/website_gengo/static/src/xml/website.gengo.xml b/addons/website_gengo/static/src/xml/website.gengo.xml index 25d0cf8e44c..39338a15fca 100644 --- a/addons/website_gengo/static/src/xml/website.gengo.xml +++ b/addons/website_gengo/static/src/xml/website.gengo.xml @@ -1,8 +1,7 @@ - Buy Translation - + Buy Translation + + + + \ No newline at end of file