Merge lp:~jfb-tempo-consulting/unifield-web/US-7088 into lp:unifield-web

[jftempo]

[lp:~jfb-tempo-consulting/unifield-web/US-7088]

4998. By jftempo on 2020-08-06

Survey align buttons

=== modified file 'addons/openerp/controllers/root.py'
--- addons/openerp/controllers/root.py	2018-04-25 09:45:33 +0000
+++ addons/openerp/controllers/root.py	2020-08-06 16:14:57 +0000
@@ -26,7 +26,7 @@
 
 from openobject.tools import url, expose, redirect
 from openobject.tools.ast import literal_eval
-
+import json
 _MAXIMUM_NUMBER_WELCOME_MESSAGES = 3
 
 def _cp_on_error():
@@ -53,7 +53,13 @@
             if read_result['action_id']:
                 next = '/openerp/home'
 
-        return self.menu(next=next)
+        if rpc.session.has_logged:
+            rpc.session.has_logged = False
+            from_login = True
+        else:
+            from_login = False
+
+        return self.menu(next=next, from_login=from_login)
 
     @expose()
     def home(self):
@@ -93,7 +99,7 @@
     """ % (url("/openerp/static/images/loading.gif"))
 
     @expose(template="/openerp/controllers/templates/index.mako")
-    def menu(self, active=None, next=None):
+    def menu(self, active=None, next=None, from_login=False):
         from openerp.widgets import tree_view
         if next == '/openerp/pref/update_password':
             # in case the password must be changed, do not do others operations
@@ -168,10 +174,17 @@
             widgets=None
             display_shortcut = False
 
-
-
+        main_survey = False
+        other_surveys = []
+        if from_login:
+            surveys = rpc.RPCProxy('sync_client.survey').get_surveys()
+            if surveys:
+                main_survey = surveys[0]
+            if len(surveys) > 1:
+                other_surveys = surveys[1:]
         return dict(parents=parents, tools=tools, load_content=(next and next or ''),
-                    welcome_messages=rpc.RPCProxy('publisher_warranty.contract').get_last_user_messages(_MAXIMUM_NUMBER_WELCOME_MESSAGES),
+                    survey=main_survey,
+                    other_surveys=json.dumps(other_surveys),
                     show_close_btn=rpc.session.uid == 1,
                     widgets=widgets,
                     display_shortcut=display_shortcut)
@@ -181,6 +194,7 @@
         target = kw.get('target') or '/'
         if target.startswith('/openerp/do_login'):
             target = '/'
+        rpc.session.has_logged = True
         raise redirect(target)
 
     @expose(allow_json=True)
@@ -257,5 +271,8 @@
             error = e
         return dict(error=error)
 
-
+    @expose(allow_json=True)
+    def survey_answer(self, answer, survey_id, stat_id):
+        rpc.RPCProxy('sync_client.survey.user').save_answer(answer, survey_id, stat_id)
+        return True
 # vim: ts=4 sts=4 sw=4 si et

=== modified file 'addons/openerp/controllers/templates/index.mako'
--- addons/openerp/controllers/templates/index.mako	2017-09-20 15:17:48 +0000
+++ addons/openerp/controllers/templates/index.mako	2020-08-06 16:14:57 +0000
@@ -170,12 +170,13 @@
                     </td>
                 </tr>
             % endif
+            <% user_locale = cp.locale().language %>
             <tr>
                 <td id="footer_section" colspan="4">
                     <div class="footer-a">
                         <p class="one">
                             <span>${rpc.session.protocol}://${_("%(user)s", user=rpc.session.loginname)}@${rpc.session.host}:${rpc.session.port}</span>
-                            <span>${cp.locale()}</span>
+                            <span>${user_locale}</span>
                         </p>
                         <p class="powered">${_("Powered by %(openerp)s ",
                                             openerp="""<a target="_blank" href="http://www.openerp.com/">openerp.com</a>""")|n}</p>
@@ -184,5 +185,85 @@
             </tr>
         </table>
     </div>
+
+
+    % if survey:
+        <div id="survey">
+                <div id="survey_title">${_('We welcome your feedback.')}</div>
+                <div>${_('Help us improve your experience by taking our short survey.')}</div>
+                <div id="survey_name">
+                % if user_locale == 'fr' and survey.get('name_fr'):
+                    ${survey.get('name_fr')}
+                % else:
+                    ${survey.get('name')}
+                % endif
+                </div>
+                 <div class="row">
+                  <div class="column"><div class="survey_button" onclick="click_answer('goto')">${_('Go to survey')}</div></div>
+                  <div class="column"><div class="survey_button" onclick="click_answer('later')">${_('Answer Later')}</div></div>
+                  <div class="column" id="button_never"
+                    % if survey['nb_displayed'] < 3:
+                        style="display: none"
+                    % endif
+		   ><div class="survey_button" onclick="click_answer('never')">${_('Do not ask me again')}</div></div>
+                </div>
+        </div>
+        <script type="text/javascript">
+            % if user_locale == 'fr' and survey.get('url_fr'):
+                var survey_url = "${survey.get('url_fr')}";
+            % else:
+                var survey_url = "${survey.get('url_en')}";
+            % endif
+            var survey_stat_id = ${survey['stat_id']};
+            var survey_id = ${survey['id']};
+            var survey_index = 0;
+
+            jQuery('#survey').fancybox({'modal': true, 'height': 250, 'width': 700, 'scrolling': 'no', 'autoDimensions': false, 'autoScale': false});
+
+            jQuery(document).ready(function() {
+                jQuery('#survey').trigger('click');
+                jQuery('#survey').show();
+                jQuery('#survey').unbind('click.fb');
+            })
+
+
+            function click_answer(answer) {
+                if (answer == 'goto') {
+                    window.open(survey_url,'_blank');
+                }
+                jQuery.post('/openerp/survey_answer', {'answer': answer, 'survey_id': survey_id, 'stat_id': survey_stat_id});
+                next_survey = false;
+                % if len(other_surveys):
+                    var other_surveys = ${other_surveys|n};
+                    if (other_surveys.length > survey_index) {
+                        jQuery('#survey').hide();
+                        next_survey = other_surveys[survey_index];
+                        % if user_locale == 'fr':
+                            survey_url = next_survey.url_fr||next_survey.url_en;
+                            survey_name = next_survey.name_fr||next_survey.name;
+                        % else:
+                            survey_url = next_survey.url_en;
+                            survey_name = next_survey.name;
+                        % endif
+                        survey_stat_id = next_survey.stat_id;
+                        survey_id = next_survey.id;
+                        $('#survey_name').html(survey_name);
+                        if (next_survey.nb_displayed > 2) {
+                            $('#button_never').show();
+                        } else {
+                            $('#button_never').hide();
+                        }
+                        survey_index += 1;
+                        setTimeout(function(){jQuery('#survey').show()}, 450);
+                    }
+                % endif
+
+                if (!next_survey) {
+                    jQuery('#survey').hide();
+                    jQuery.fancybox.close();
+                }
+            }
+        </script>
+    % endif
 </%def>
 

=== modified file 'addons/openerp/po/messages/fr.po'
--- addons/openerp/po/messages/fr.po	2019-10-09 16:15:16 +0000
+++ addons/openerp/po/messages/fr.po	2020-08-06 16:14:57 +0000
@@ -1830,3 +1830,23 @@
 msgid "In Progress"
 msgstr "En cours"
 
+#: controllers/templates/preferences/index.mako:191
+msgid "We welcome your feedback."
+msgstr "Nous apprécions vos remarques"
+
+#: controllers/templates/preferences/index.mako:191
+msgid "Help us improve your experience by taking our short survey."
+msgstr "Aidez-nous à améliorer votre expérience en répondant à notre court sondage."
+
+#: controllers/templates/preferences/index.mako:201
+msgid "Go to survey"
+msgstr "Répondre au sondage"
+
+#: controllers/templates/preferences/index.mako:202
+msgid "Answer Later"
+msgstr "Plus tard"
+
+#: controllers/templates/preferences/index.mako:207
+msgid "Do not ask me again"
+msgstr "Ne plus demander"
+

=== modified file 'addons/openerp/static/css/menu.css'
--- addons/openerp/static/css/menu.css	2018-05-28 13:16:01 +0000
+++ addons/openerp/static/css/menu.css	2020-08-06 16:14:57 +0000
@@ -138,3 +138,52 @@
     color: #C0C0C0;
 }
 
+#survey {
+  background-color: #5c5cff;
+  color: #ffffff;
+  font-size:20px;
+  text-align: center;
+  height: 250px;
+  display: none;
+}
+
+#survey_title {
+  font-size:35px;
+  padding-top: 10px;
+  margin-bottom: 35px;
+}
+
+#survey .column {
+  display: inline-block;
+  width: 32%;
+  text-align: center;
+}
+
+#survey .survey_button {
+  text-align: center;
+  background-color: white;
+  color: #5c5cff;
+  margin: 5px;
+  cursor: pointer;
+  border-radius: 3px;
+}
+
+#survey .survey_button:hover {
+    background-color: #00A3FF;
+    color: white;
+}
+
+#survey .row {
+    padding-top:25px;
+}
+/* Clear floats after the columns */
+#survey .row:after {
+  content: "";
+  display: table;
+  clear: both;
+}
+
+#survey_name {
+    font-weight: bold;
+    margin-top: 5px;
+}

=== modified file 'addons/openerp/widgets/listgrid.py'
--- addons/openerp/widgets/listgrid.py	2020-04-01 10:02:24 +0000
+++ addons/openerp/widgets/listgrid.py	2020-08-06 16:14:57 +0000
@@ -661,6 +661,14 @@
 class M2M(Char):
 
     def get_text(self):
+        if self.truncate:
+            if not self.value:
+                return ''
+            max_length = int(self.truncate)
+            value_string = ', '.join([x[1] for x in  rpc.RPCProxy(self.attrs['relation']).name_get(self.value, rpc.session.context)])
+            if len(value_string) > max_length:
+                value_string = '%s...' % value_string[:max_length-3]
+            return value_string
         return "%d" % len(self.value)
 
 class Selection(Char):
@@ -898,6 +906,8 @@
     def update_params(self, params):
         super(Hidden, self).update_params(params)
 
+class URL(Char):
+    template = "openerp/widgets/templates/listgrid/url.mako"
 
 CELLTYPES = {
     'char':Char,
@@ -917,4 +927,5 @@
     'separator': Separator,
     'human_size': HumanSize,
     'html_text': HtmlText,
+    'url': URL,
 }

=== added file 'addons/openerp/widgets/templates/listgrid/url.mako'
--- addons/openerp/widgets/templates/listgrid/url.mako	1970-01-01 00:00:00 +0000
+++ addons/openerp/widgets/templates/listgrid/url.mako	2020-08-06 16:14:57 +0000
@@ -0,0 +1,3 @@
+% if text:
+<a href="${text}" target="_blank"><img src="/openerp/static/images/icons/gtk-jump-to-ltr.png" title="${text}" /></a>
+% endif

=== modified file 'openobject/static/css/jquery.fancybox-1.3.1.css'
--- openobject/static/css/jquery.fancybox-1.3.1.css	2010-08-30 10:24:02 +0000
+++ openobject/static/css/jquery.fancybox-1.3.1.css	2020-08-06 16:14:57 +0000
@@ -114,6 +114,7 @@
 	background-position: -40px 0;
 	cursor: pointer;
 	z-index: 1103;
+    display: none;
 }
 
 #fancybox_error {