forked from Techsystech/web
[MIG] web_widget_digitized_signature: Migration to 11.0
parent
44eb815751
commit
f93e531038
|
@ -1,10 +1,29 @@
|
||||||
.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
|
==============================
|
||||||
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
|
Web Widget Digitized Signature
|
||||||
:alt: License: AGPL-3
|
==============================
|
||||||
|
|
||||||
=======================
|
.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||||
Web Digitized Signature
|
!! This file is generated by oca-gen-addon-readme !!
|
||||||
=======================
|
!! changes will be overwritten. !!
|
||||||
|
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||||
|
|
||||||
|
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
|
||||||
|
:target: https://odoo-community.org/page/development-status
|
||||||
|
:alt: Beta
|
||||||
|
.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
|
||||||
|
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
|
||||||
|
:alt: License: AGPL-3
|
||||||
|
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github
|
||||||
|
:target: https://github.com/OCA/web/tree/11.0/web_widget_digitized_signature
|
||||||
|
:alt: OCA/web
|
||||||
|
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
|
||||||
|
:target: https://translation.odoo-community.org/projects/web-11-0/web-11-0-web_widget_digitized_signature
|
||||||
|
:alt: Translate me on Weblate
|
||||||
|
.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
|
||||||
|
:target: https://runbot.odoo-community.org/runbot/162/11.0
|
||||||
|
:alt: Try me on Runbot
|
||||||
|
|
||||||
|
|badge1| |badge2| |badge3| |badge4| |badge5|
|
||||||
|
|
||||||
This module provides a widget for binary fields that allows to digitize a
|
This module provides a widget for binary fields that allows to digitize a
|
||||||
signature and store it as an image.
|
signature and store it as an image.
|
||||||
|
@ -12,13 +31,19 @@ signature and store it as an image.
|
||||||
As demonstration, it includes this widget at user level, so that we can store
|
As demonstration, it includes this widget at user level, so that we can store
|
||||||
a signature image for each user.
|
a signature image for each user.
|
||||||
|
|
||||||
|
**Table of contents**
|
||||||
|
|
||||||
|
.. contents::
|
||||||
|
:local:
|
||||||
|
|
||||||
Configuration
|
Configuration
|
||||||
=============
|
=============
|
||||||
|
|
||||||
#. To use this module, you need to add ``widget="signature"`` to your binary
|
#. To use this module, you need to add ``widget="signature"`` to your binary
|
||||||
field in your view.
|
field in your view.
|
||||||
#. You can specifify signature dimensions like the following:
|
#. You can specifify signature dimensions like the following:
|
||||||
``<field name="signature_image" widget="signature" width="400" height="100"/>``
|
``<field name="signature_image" widget="signature" width="400"
|
||||||
|
height="100"/>``
|
||||||
|
|
||||||
Usage
|
Usage
|
||||||
=====
|
=====
|
||||||
|
@ -27,44 +52,47 @@ Usage
|
||||||
#. Open one of the existing users.
|
#. Open one of the existing users.
|
||||||
#. You can set a digital signature for it on the field "Signature".
|
#. You can set a digital signature for it on the field "Signature".
|
||||||
|
|
||||||
|
|
||||||
.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
|
|
||||||
:alt: Try me on Runbot
|
|
||||||
:target: https://runbot.odoo-community.org/runbot/162/10.0
|
|
||||||
|
|
||||||
Bug Tracker
|
Bug Tracker
|
||||||
===========
|
===========
|
||||||
|
|
||||||
Bugs are tracked on `GitHub Issues
|
Bugs are tracked on `GitHub Issues <https://github.com/OCA/web/issues>`_.
|
||||||
<https://github.com/OCA/web/issues>`_. In case of trouble, please
|
In case of trouble, please check there if your issue has already been reported.
|
||||||
check there if your issue has already been reported. If you spotted it first,
|
If you spotted it first, help us smashing it by providing a detailed and welcomed
|
||||||
help us smashing it by providing a detailed and welcomed feedback.
|
`feedback <https://github.com/OCA/web/issues/new?body=module:%20web_widget_digitized_signature%0Aversion:%2011.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
|
||||||
|
|
||||||
|
Do not contact contributors directly about support or help with technical issues.
|
||||||
|
|
||||||
Credits
|
Credits
|
||||||
=======
|
=======
|
||||||
|
|
||||||
Images
|
Authors
|
||||||
------
|
~~~~~~~
|
||||||
|
|
||||||
* Odoo Community Association: `Icon <https://github.com/OCA/maintainer-tools/blob/master/template/module/static/description/icon.svg>`_.
|
* Serpent Consulting Services Pvt. Ltd.
|
||||||
|
* Agile Business Group
|
||||||
|
* Tecnativa
|
||||||
|
|
||||||
Contributors
|
Contributors
|
||||||
------------
|
~~~~~~~~~~~~
|
||||||
|
|
||||||
* Jay Vora <jay.vora@serpentcs.com>
|
* Jay Vora <jay.vora@serpentcs.com>
|
||||||
* Vicent Cubells <vicent.cubells@tecnativa.com>
|
* Tecnativa <https://www.tecnativa.com>:
|
||||||
|
|
||||||
Maintainer
|
* Vicent Cubells <vicent.cubells@tecnativa.com>
|
||||||
----------
|
|
||||||
|
Maintainers
|
||||||
|
~~~~~~~~~~~
|
||||||
|
|
||||||
|
This module is maintained by the OCA.
|
||||||
|
|
||||||
.. image:: https://odoo-community.org/logo.png
|
.. image:: https://odoo-community.org/logo.png
|
||||||
:alt: Odoo Community Association
|
:alt: Odoo Community Association
|
||||||
:target: https://odoo-community.org
|
:target: https://odoo-community.org
|
||||||
|
|
||||||
This module is maintained by the OCA.
|
|
||||||
|
|
||||||
OCA, or the Odoo Community Association, is a nonprofit organization whose
|
OCA, or the Odoo Community Association, is a nonprofit organization whose
|
||||||
mission is to support the collaborative development of Odoo features and
|
mission is to support the collaborative development of Odoo features and
|
||||||
promote its widespread use.
|
promote its widespread use.
|
||||||
|
|
||||||
To contribute to this module, please visit https://odoo-community.org.
|
This module is part of the `OCA/web <https://github.com/OCA/web/tree/11.0/web_widget_digitized_signature>`_ project on GitHub.
|
||||||
|
|
||||||
|
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
# Copyright 2004-2010 OpenERP SA (<http://www.openerp.com>)
|
# Copyright 2004-2010 OpenERP SA (<http://www.openerp.com>)
|
||||||
# Copyright 2011-2015 Serpent Consulting Services Pvt. Ltd.
|
# Copyright 2011-2015 Serpent Consulting Services Pvt. Ltd.
|
||||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
|
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
# Copyright 2004-2010 OpenERP SA (<http://www.openerp.com>)
|
# Copyright 2004-2010 OpenERP SA (<http://www.openerp.com>)
|
||||||
# Copyright 2011-2015 Serpent Consulting Services Pvt. Ltd.
|
# Copyright 2011-2015 Serpent Consulting Services Pvt. Ltd.
|
||||||
# Copyright 2017 Tecnativa - Vicent Cubells
|
# Copyright 2017 Tecnativa - Vicent Cubells
|
||||||
|
@ -6,11 +5,12 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "Web Widget Digitized Signature",
|
"name": "Web Widget Digitized Signature",
|
||||||
"version": "10.0.0.1.0",
|
"version": "11.0.0.1.0",
|
||||||
"author": "Serpent Consulting Services Pvt. Ltd., "
|
"author": "Serpent Consulting Services Pvt. Ltd., "
|
||||||
"Agile Business Group, "
|
"Agile Business Group, "
|
||||||
"Tecnativa, "
|
"Tecnativa, "
|
||||||
"Odoo Community Association (OCA)",
|
"Odoo Community Association (OCA)",
|
||||||
|
'website': 'https://github.com/OCA/web',
|
||||||
"license": "AGPL-3",
|
"license": "AGPL-3",
|
||||||
"category": 'Web',
|
"category": 'Web',
|
||||||
'depends': [
|
'depends': [
|
||||||
|
@ -21,7 +21,6 @@
|
||||||
'views/web_digital_sign_view.xml',
|
'views/web_digital_sign_view.xml',
|
||||||
'views/res_users_view.xml',
|
'views/res_users_view.xml',
|
||||||
],
|
],
|
||||||
'website': 'http://www.serpentcs.com',
|
|
||||||
'qweb': [
|
'qweb': [
|
||||||
'static/src/xml/digital_sign.xml',
|
'static/src/xml/digital_sign.xml',
|
||||||
],
|
],
|
||||||
|
|
|
@ -4,8 +4,10 @@
|
||||||
#
|
#
|
||||||
msgid ""
|
msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: Odoo Server 10.0\n"
|
"Project-Id-Version: Odoo Server 11.0\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
|
"POT-Creation-Date: 2019-04-19 08:29+0000\n"
|
||||||
|
"PO-Revision-Date: 2019-04-19 08:29+0000\n"
|
||||||
"Last-Translator: <>\n"
|
"Last-Translator: <>\n"
|
||||||
"Language-Team: \n"
|
"Language-Team: \n"
|
||||||
"MIME-Version: 1.0\n"
|
"MIME-Version: 1.0\n"
|
||||||
|
@ -15,27 +17,27 @@ msgstr ""
|
||||||
|
|
||||||
#. module: web_widget_digitized_signature
|
#. module: web_widget_digitized_signature
|
||||||
#. openerp-web
|
#. openerp-web
|
||||||
#: code:addons/web_widget_digitized_signature/static/src/xml/digital_sign.xml:7
|
#: code:addons/web_widget_digitized_signature/static/src/xml/digital_sign.xml:8
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Clear"
|
msgid "Clear"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. module: web_widget_digitized_signature
|
#. module: web_widget_digitized_signature
|
||||||
#. openerp-web
|
#. openerp-web
|
||||||
#: code:addons/web_widget_digitized_signature/static/src/js/digital_sign.js:81
|
#: code:addons/web_widget_digitized_signature/static/src/js/digital_sign.js:99
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Could not display the selected image."
|
msgid "Could not display the selected image."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. module: web_widget_digitized_signature
|
#. module: web_widget_digitized_signature
|
||||||
#: code:addons/web_widget_digitized_signature/models/mail_thread.py:33
|
#: code:addons/web_widget_digitized_signature/models/mail_thread.py:32
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Deletion date: %s"
|
msgid "Deletion date: %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. module: web_widget_digitized_signature
|
#. module: web_widget_digitized_signature
|
||||||
#. openerp-web
|
#. openerp-web
|
||||||
#: code:addons/web_widget_digitized_signature/static/src/xml/digital_sign.xml:10
|
#: code:addons/web_widget_digitized_signature/static/src/xml/digital_sign.xml:11
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Draw your signature"
|
msgid "Draw your signature"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
@ -47,30 +49,32 @@ msgstr ""
|
||||||
|
|
||||||
#. module: web_widget_digitized_signature
|
#. module: web_widget_digitized_signature
|
||||||
#. openerp-web
|
#. openerp-web
|
||||||
#: code:addons/web_widget_digitized_signature/static/src/js/digital_sign.js:81
|
#: code:addons/web_widget_digitized_signature/static/src/js/digital_sign.js:99
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Image"
|
msgid "Image"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. module: web_widget_digitized_signature
|
#. module: web_widget_digitized_signature
|
||||||
#: model:ir.model.fields,field_description:web_widget_digitized_signature.field_res_users_signature_image
|
#: model:ir.model.fields,field_description:web_widget_digitized_signature.field_res_users_digital_signature
|
||||||
|
#: model:ir.ui.view,arch_db:web_widget_digitized_signature.inherited_res_users_form
|
||||||
|
#: model:ir.ui.view,arch_db:web_widget_digitized_signature.inherited_res_users_preferences_form
|
||||||
msgid "Signature"
|
msgid "Signature"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. module: web_widget_digitized_signature
|
#. module: web_widget_digitized_signature
|
||||||
#: code:addons/web_widget_digitized_signature/models/mail_thread.py:30
|
#: code:addons/web_widget_digitized_signature/models/mail_thread.py:29
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Signature date: %s"
|
msgid "Signature date: %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. module: web_widget_digitized_signature
|
#. module: web_widget_digitized_signature
|
||||||
#: code:addons/web_widget_digitized_signature/models/mail_thread.py:28
|
#: code:addons/web_widget_digitized_signature/models/mail_thread.py:27
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Signature has been created."
|
msgid "Signature has been created."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. module: web_widget_digitized_signature
|
#. module: web_widget_digitized_signature
|
||||||
#: code:addons/web_widget_digitized_signature/models/mail_thread.py:32
|
#: code:addons/web_widget_digitized_signature/models/mail_thread.py:31
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Signature has been deleted."
|
msgid "Signature has been deleted."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
# Copyright 2004-2010 OpenERP SA (<http://www.openerp.com>)
|
# Copyright 2004-2010 OpenERP SA (<http://www.openerp.com>)
|
||||||
# Copyright 2011-2015 Serpent Consulting Services Pvt. Ltd.
|
# Copyright 2011-2015 Serpent Consulting Services Pvt. Ltd.
|
||||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
|
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
# Copyright 2004-2010 OpenERP SA (<http://www.openerp.com>)
|
# Copyright 2004-2010 OpenERP SA (<http://www.openerp.com>)
|
||||||
# Copyright 2011-2015 Serpent Consulting Services Pvt. Ltd.
|
# Copyright 2011-2015 Serpent Consulting Services Pvt. Ltd.
|
||||||
# Copyright 2017 Tecnativa - Vicent Cubells
|
# Copyright 2017 Tecnativa - Vicent Cubells
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
# Copyright 2004-2010 OpenERP SA (<http://www.openerp.com>)
|
# Copyright 2004-2010 OpenERP SA (<http://www.openerp.com>)
|
||||||
# Copyright 2011-2015 Serpent Consulting Services Pvt. Ltd.
|
# Copyright 2011-2015 Serpent Consulting Services Pvt. Ltd.
|
||||||
# Copyright 2017 Tecnativa - Vicent Cubells
|
# Copyright 2017 Tecnativa - Vicent Cubells
|
||||||
|
@ -11,17 +10,18 @@ class ResUsers(models.Model):
|
||||||
_name = 'res.users'
|
_name = 'res.users'
|
||||||
_inherit = ['res.users', 'mail.thread']
|
_inherit = ['res.users', 'mail.thread']
|
||||||
|
|
||||||
signature_image = fields.Binary(
|
digital_signature = fields.Binary(
|
||||||
string='Signature',
|
string='Signature',
|
||||||
|
oldname="signature_image",
|
||||||
)
|
)
|
||||||
|
|
||||||
@api.model
|
@api.model
|
||||||
def create(self, vals):
|
def create(self, vals):
|
||||||
res = super(ResUsers, self).create(vals)
|
res = super(ResUsers, self).create(vals)
|
||||||
res._track_signature(vals, 'signature_image')
|
res._track_signature(vals, 'digital_signature')
|
||||||
return res
|
return res
|
||||||
|
|
||||||
@api.multi
|
@api.multi
|
||||||
def write(self, vals):
|
def write(self, vals):
|
||||||
self._track_signature(vals, 'signature_image')
|
self._track_signature(vals, 'digital_signature')
|
||||||
return super(ResUsers, self).write(vals)
|
return super(ResUsers, self).write(vals)
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
#. To use this module, you need to add ``widget="signature"`` to your binary
|
||||||
|
field in your view.
|
||||||
|
#. You can specify signature dimensions like the following:
|
||||||
|
``<field name="signature_image" widget="signature" width="400"
|
||||||
|
height="100"/>``
|
|
@ -0,0 +1,4 @@
|
||||||
|
* Jay Vora <jay.vora@serpentcs.com>
|
||||||
|
* Tecnativa <https://www.tecnativa.com>:
|
||||||
|
|
||||||
|
* Vicent Cubells
|
|
@ -0,0 +1,5 @@
|
||||||
|
This module provides a widget for binary fields that allows to digitize a
|
||||||
|
signature and store it as an image.
|
||||||
|
|
||||||
|
As demonstration, it includes this widget at user level, so that we can store
|
||||||
|
a signature image for each user.
|
|
@ -0,0 +1,3 @@
|
||||||
|
#. Go to *Settings > Users > Users*.
|
||||||
|
#. Open one of the existing users.
|
||||||
|
#. You can set a digital signature for it on the field "Signature".
|
|
@ -0,0 +1,448 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8" ?>
|
||||||
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||||
|
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
|
||||||
|
<head>
|
||||||
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||||
|
<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
|
||||||
|
<title>Web Widget Digitized Signature</title>
|
||||||
|
<style type="text/css">
|
||||||
|
|
||||||
|
/*
|
||||||
|
:Author: David Goodger (goodger@python.org)
|
||||||
|
:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
|
||||||
|
:Copyright: This stylesheet has been placed in the public domain.
|
||||||
|
|
||||||
|
Default cascading style sheet for the HTML output of Docutils.
|
||||||
|
|
||||||
|
See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
|
||||||
|
customize this style sheet.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* used to remove borders from tables and images */
|
||||||
|
.borderless, table.borderless td, table.borderless th {
|
||||||
|
border: 0 }
|
||||||
|
|
||||||
|
table.borderless td, table.borderless th {
|
||||||
|
/* Override padding for "table.docutils td" with "! important".
|
||||||
|
The right padding separates the table cells. */
|
||||||
|
padding: 0 0.5em 0 0 ! important }
|
||||||
|
|
||||||
|
.first {
|
||||||
|
/* Override more specific margin styles with "! important". */
|
||||||
|
margin-top: 0 ! important }
|
||||||
|
|
||||||
|
.last, .with-subtitle {
|
||||||
|
margin-bottom: 0 ! important }
|
||||||
|
|
||||||
|
.hidden {
|
||||||
|
display: none }
|
||||||
|
|
||||||
|
.subscript {
|
||||||
|
vertical-align: sub;
|
||||||
|
font-size: smaller }
|
||||||
|
|
||||||
|
.superscript {
|
||||||
|
vertical-align: super;
|
||||||
|
font-size: smaller }
|
||||||
|
|
||||||
|
a.toc-backref {
|
||||||
|
text-decoration: none ;
|
||||||
|
color: black }
|
||||||
|
|
||||||
|
blockquote.epigraph {
|
||||||
|
margin: 2em 5em ; }
|
||||||
|
|
||||||
|
dl.docutils dd {
|
||||||
|
margin-bottom: 0.5em }
|
||||||
|
|
||||||
|
object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Uncomment (and remove this text!) to get bold-faced definition list terms
|
||||||
|
dl.docutils dt {
|
||||||
|
font-weight: bold }
|
||||||
|
*/
|
||||||
|
|
||||||
|
div.abstract {
|
||||||
|
margin: 2em 5em }
|
||||||
|
|
||||||
|
div.abstract p.topic-title {
|
||||||
|
font-weight: bold ;
|
||||||
|
text-align: center }
|
||||||
|
|
||||||
|
div.admonition, div.attention, div.caution, div.danger, div.error,
|
||||||
|
div.hint, div.important, div.note, div.tip, div.warning {
|
||||||
|
margin: 2em ;
|
||||||
|
border: medium outset ;
|
||||||
|
padding: 1em }
|
||||||
|
|
||||||
|
div.admonition p.admonition-title, div.hint p.admonition-title,
|
||||||
|
div.important p.admonition-title, div.note p.admonition-title,
|
||||||
|
div.tip p.admonition-title {
|
||||||
|
font-weight: bold ;
|
||||||
|
font-family: sans-serif }
|
||||||
|
|
||||||
|
div.attention p.admonition-title, div.caution p.admonition-title,
|
||||||
|
div.danger p.admonition-title, div.error p.admonition-title,
|
||||||
|
div.warning p.admonition-title, .code .error {
|
||||||
|
color: red ;
|
||||||
|
font-weight: bold ;
|
||||||
|
font-family: sans-serif }
|
||||||
|
|
||||||
|
/* Uncomment (and remove this text!) to get reduced vertical space in
|
||||||
|
compound paragraphs.
|
||||||
|
div.compound .compound-first, div.compound .compound-middle {
|
||||||
|
margin-bottom: 0.5em }
|
||||||
|
|
||||||
|
div.compound .compound-last, div.compound .compound-middle {
|
||||||
|
margin-top: 0.5em }
|
||||||
|
*/
|
||||||
|
|
||||||
|
div.dedication {
|
||||||
|
margin: 2em 5em ;
|
||||||
|
text-align: center ;
|
||||||
|
font-style: italic }
|
||||||
|
|
||||||
|
div.dedication p.topic-title {
|
||||||
|
font-weight: bold ;
|
||||||
|
font-style: normal }
|
||||||
|
|
||||||
|
div.figure {
|
||||||
|
margin-left: 2em ;
|
||||||
|
margin-right: 2em }
|
||||||
|
|
||||||
|
div.footer, div.header {
|
||||||
|
clear: both;
|
||||||
|
font-size: smaller }
|
||||||
|
|
||||||
|
div.line-block {
|
||||||
|
display: block ;
|
||||||
|
margin-top: 1em ;
|
||||||
|
margin-bottom: 1em }
|
||||||
|
|
||||||
|
div.line-block div.line-block {
|
||||||
|
margin-top: 0 ;
|
||||||
|
margin-bottom: 0 ;
|
||||||
|
margin-left: 1.5em }
|
||||||
|
|
||||||
|
div.sidebar {
|
||||||
|
margin: 0 0 0.5em 1em ;
|
||||||
|
border: medium outset ;
|
||||||
|
padding: 1em ;
|
||||||
|
background-color: #ffffee ;
|
||||||
|
width: 40% ;
|
||||||
|
float: right ;
|
||||||
|
clear: right }
|
||||||
|
|
||||||
|
div.sidebar p.rubric {
|
||||||
|
font-family: sans-serif ;
|
||||||
|
font-size: medium }
|
||||||
|
|
||||||
|
div.system-messages {
|
||||||
|
margin: 5em }
|
||||||
|
|
||||||
|
div.system-messages h1 {
|
||||||
|
color: red }
|
||||||
|
|
||||||
|
div.system-message {
|
||||||
|
border: medium outset ;
|
||||||
|
padding: 1em }
|
||||||
|
|
||||||
|
div.system-message p.system-message-title {
|
||||||
|
color: red ;
|
||||||
|
font-weight: bold }
|
||||||
|
|
||||||
|
div.topic {
|
||||||
|
margin: 2em }
|
||||||
|
|
||||||
|
h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
|
||||||
|
h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
|
||||||
|
margin-top: 0.4em }
|
||||||
|
|
||||||
|
h1.title {
|
||||||
|
text-align: center }
|
||||||
|
|
||||||
|
h2.subtitle {
|
||||||
|
text-align: center }
|
||||||
|
|
||||||
|
hr.docutils {
|
||||||
|
width: 75% }
|
||||||
|
|
||||||
|
img.align-left, .figure.align-left, object.align-left, table.align-left {
|
||||||
|
clear: left ;
|
||||||
|
float: left ;
|
||||||
|
margin-right: 1em }
|
||||||
|
|
||||||
|
img.align-right, .figure.align-right, object.align-right, table.align-right {
|
||||||
|
clear: right ;
|
||||||
|
float: right ;
|
||||||
|
margin-left: 1em }
|
||||||
|
|
||||||
|
img.align-center, .figure.align-center, object.align-center {
|
||||||
|
display: block;
|
||||||
|
margin-left: auto;
|
||||||
|
margin-right: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
table.align-center {
|
||||||
|
margin-left: auto;
|
||||||
|
margin-right: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.align-left {
|
||||||
|
text-align: left }
|
||||||
|
|
||||||
|
.align-center {
|
||||||
|
clear: both ;
|
||||||
|
text-align: center }
|
||||||
|
|
||||||
|
.align-right {
|
||||||
|
text-align: right }
|
||||||
|
|
||||||
|
/* reset inner alignment in figures */
|
||||||
|
div.align-right {
|
||||||
|
text-align: inherit }
|
||||||
|
|
||||||
|
/* div.align-center * { */
|
||||||
|
/* text-align: left } */
|
||||||
|
|
||||||
|
.align-top {
|
||||||
|
vertical-align: top }
|
||||||
|
|
||||||
|
.align-middle {
|
||||||
|
vertical-align: middle }
|
||||||
|
|
||||||
|
.align-bottom {
|
||||||
|
vertical-align: bottom }
|
||||||
|
|
||||||
|
ol.simple, ul.simple {
|
||||||
|
margin-bottom: 1em }
|
||||||
|
|
||||||
|
ol.arabic {
|
||||||
|
list-style: decimal }
|
||||||
|
|
||||||
|
ol.loweralpha {
|
||||||
|
list-style: lower-alpha }
|
||||||
|
|
||||||
|
ol.upperalpha {
|
||||||
|
list-style: upper-alpha }
|
||||||
|
|
||||||
|
ol.lowerroman {
|
||||||
|
list-style: lower-roman }
|
||||||
|
|
||||||
|
ol.upperroman {
|
||||||
|
list-style: upper-roman }
|
||||||
|
|
||||||
|
p.attribution {
|
||||||
|
text-align: right ;
|
||||||
|
margin-left: 50% }
|
||||||
|
|
||||||
|
p.caption {
|
||||||
|
font-style: italic }
|
||||||
|
|
||||||
|
p.credits {
|
||||||
|
font-style: italic ;
|
||||||
|
font-size: smaller }
|
||||||
|
|
||||||
|
p.label {
|
||||||
|
white-space: nowrap }
|
||||||
|
|
||||||
|
p.rubric {
|
||||||
|
font-weight: bold ;
|
||||||
|
font-size: larger ;
|
||||||
|
color: maroon ;
|
||||||
|
text-align: center }
|
||||||
|
|
||||||
|
p.sidebar-title {
|
||||||
|
font-family: sans-serif ;
|
||||||
|
font-weight: bold ;
|
||||||
|
font-size: larger }
|
||||||
|
|
||||||
|
p.sidebar-subtitle {
|
||||||
|
font-family: sans-serif ;
|
||||||
|
font-weight: bold }
|
||||||
|
|
||||||
|
p.topic-title {
|
||||||
|
font-weight: bold }
|
||||||
|
|
||||||
|
pre.address {
|
||||||
|
margin-bottom: 0 ;
|
||||||
|
margin-top: 0 ;
|
||||||
|
font: inherit }
|
||||||
|
|
||||||
|
pre.literal-block, pre.doctest-block, pre.math, pre.code {
|
||||||
|
margin-left: 2em ;
|
||||||
|
margin-right: 2em }
|
||||||
|
|
||||||
|
pre.code .ln { color: grey; } /* line numbers */
|
||||||
|
pre.code, code { background-color: #eeeeee }
|
||||||
|
pre.code .comment, code .comment { color: #5C6576 }
|
||||||
|
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
|
||||||
|
pre.code .literal.string, code .literal.string { color: #0C5404 }
|
||||||
|
pre.code .name.builtin, code .name.builtin { color: #352B84 }
|
||||||
|
pre.code .deleted, code .deleted { background-color: #DEB0A1}
|
||||||
|
pre.code .inserted, code .inserted { background-color: #A3D289}
|
||||||
|
|
||||||
|
span.classifier {
|
||||||
|
font-family: sans-serif ;
|
||||||
|
font-style: oblique }
|
||||||
|
|
||||||
|
span.classifier-delimiter {
|
||||||
|
font-family: sans-serif ;
|
||||||
|
font-weight: bold }
|
||||||
|
|
||||||
|
span.interpreted {
|
||||||
|
font-family: sans-serif }
|
||||||
|
|
||||||
|
span.option {
|
||||||
|
white-space: nowrap }
|
||||||
|
|
||||||
|
span.pre {
|
||||||
|
white-space: pre }
|
||||||
|
|
||||||
|
span.problematic {
|
||||||
|
color: red }
|
||||||
|
|
||||||
|
span.section-subtitle {
|
||||||
|
/* font-size relative to parent (h1..h6 element) */
|
||||||
|
font-size: 80% }
|
||||||
|
|
||||||
|
table.citation {
|
||||||
|
border-left: solid 1px gray;
|
||||||
|
margin-left: 1px }
|
||||||
|
|
||||||
|
table.docinfo {
|
||||||
|
margin: 2em 4em }
|
||||||
|
|
||||||
|
table.docutils {
|
||||||
|
margin-top: 0.5em ;
|
||||||
|
margin-bottom: 0.5em }
|
||||||
|
|
||||||
|
table.footnote {
|
||||||
|
border-left: solid 1px black;
|
||||||
|
margin-left: 1px }
|
||||||
|
|
||||||
|
table.docutils td, table.docutils th,
|
||||||
|
table.docinfo td, table.docinfo th {
|
||||||
|
padding-left: 0.5em ;
|
||||||
|
padding-right: 0.5em ;
|
||||||
|
vertical-align: top }
|
||||||
|
|
||||||
|
table.docutils th.field-name, table.docinfo th.docinfo-name {
|
||||||
|
font-weight: bold ;
|
||||||
|
text-align: left ;
|
||||||
|
white-space: nowrap ;
|
||||||
|
padding-left: 0 }
|
||||||
|
|
||||||
|
/* "booktabs" style (no vertical lines) */
|
||||||
|
table.docutils.booktabs {
|
||||||
|
border: 0px;
|
||||||
|
border-top: 2px solid;
|
||||||
|
border-bottom: 2px solid;
|
||||||
|
border-collapse: collapse;
|
||||||
|
}
|
||||||
|
table.docutils.booktabs * {
|
||||||
|
border: 0px;
|
||||||
|
}
|
||||||
|
table.docutils.booktabs th {
|
||||||
|
border-bottom: thin solid;
|
||||||
|
text-align: left;
|
||||||
|
}
|
||||||
|
|
||||||
|
h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
|
||||||
|
h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
|
||||||
|
font-size: 100% }
|
||||||
|
|
||||||
|
ul.auto-toc {
|
||||||
|
list-style-type: none }
|
||||||
|
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<div class="document" id="web-widget-digitized-signature">
|
||||||
|
<h1 class="title">Web Widget Digitized Signature</h1>
|
||||||
|
|
||||||
|
<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||||
|
!! This file is generated by oca-gen-addon-readme !!
|
||||||
|
!! changes will be overwritten. !!
|
||||||
|
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
|
||||||
|
<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/web/tree/11.0/web_widget_digitized_signature"><img alt="OCA/web" src="https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/web-11-0/web-11-0-web_widget_digitized_signature"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/162/11.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
|
||||||
|
<p>This module provides a widget for binary fields that allows to digitize a
|
||||||
|
signature and store it as an image.</p>
|
||||||
|
<p>As demonstration, it includes this widget at user level, so that we can store
|
||||||
|
a signature image for each user.</p>
|
||||||
|
<p><strong>Table of contents</strong></p>
|
||||||
|
<div class="contents local topic" id="contents">
|
||||||
|
<ul class="simple">
|
||||||
|
<li><a class="reference internal" href="#configuration" id="id1">Configuration</a></li>
|
||||||
|
<li><a class="reference internal" href="#usage" id="id2">Usage</a></li>
|
||||||
|
<li><a class="reference internal" href="#bug-tracker" id="id3">Bug Tracker</a></li>
|
||||||
|
<li><a class="reference internal" href="#credits" id="id4">Credits</a><ul>
|
||||||
|
<li><a class="reference internal" href="#authors" id="id5">Authors</a></li>
|
||||||
|
<li><a class="reference internal" href="#contributors" id="id6">Contributors</a></li>
|
||||||
|
<li><a class="reference internal" href="#maintainers" id="id7">Maintainers</a></li>
|
||||||
|
</ul>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
<div class="section" id="configuration">
|
||||||
|
<h1><a class="toc-backref" href="#id1">Configuration</a></h1>
|
||||||
|
<ol class="arabic simple">
|
||||||
|
<li>To use this module, you need to add <tt class="docutils literal"><span class="pre">widget="signature"</span></tt> to your binary
|
||||||
|
field in your view.</li>
|
||||||
|
<li>You can specifify signature dimensions like the following:
|
||||||
|
<tt class="docutils literal"><field <span class="pre">name="signature_image"</span> <span class="pre">widget="signature"</span> <span class="pre">width="400"</span>
|
||||||
|
<span class="pre">height="100"/></span></tt></li>
|
||||||
|
</ol>
|
||||||
|
</div>
|
||||||
|
<div class="section" id="usage">
|
||||||
|
<h1><a class="toc-backref" href="#id2">Usage</a></h1>
|
||||||
|
<ol class="arabic simple">
|
||||||
|
<li>Go to <em>Settings > Users > Users</em>.</li>
|
||||||
|
<li>Open one of the existing users.</li>
|
||||||
|
<li>You can set a digital signature for it on the field “Signature”.</li>
|
||||||
|
</ol>
|
||||||
|
</div>
|
||||||
|
<div class="section" id="bug-tracker">
|
||||||
|
<h1><a class="toc-backref" href="#id3">Bug Tracker</a></h1>
|
||||||
|
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/web/issues">GitHub Issues</a>.
|
||||||
|
In case of trouble, please check there if your issue has already been reported.
|
||||||
|
If you spotted it first, help us smashing it by providing a detailed and welcomed
|
||||||
|
<a class="reference external" href="https://github.com/OCA/web/issues/new?body=module:%20web_widget_digitized_signature%0Aversion:%2011.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
|
||||||
|
<p>Do not contact contributors directly about support or help with technical issues.</p>
|
||||||
|
</div>
|
||||||
|
<div class="section" id="credits">
|
||||||
|
<h1><a class="toc-backref" href="#id4">Credits</a></h1>
|
||||||
|
<div class="section" id="authors">
|
||||||
|
<h2><a class="toc-backref" href="#id5">Authors</a></h2>
|
||||||
|
<ul class="simple">
|
||||||
|
<li>Serpent Consulting Services Pvt. Ltd.</li>
|
||||||
|
<li>Agile Business Group</li>
|
||||||
|
<li>Tecnativa</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
<div class="section" id="contributors">
|
||||||
|
<h2><a class="toc-backref" href="#id6">Contributors</a></h2>
|
||||||
|
<ul class="simple">
|
||||||
|
<li>Jay Vora <<a class="reference external" href="mailto:jay.vora@serpentcs.com">jay.vora@serpentcs.com</a>></li>
|
||||||
|
<li>Tecnativa <<a class="reference external" href="https://www.tecnativa.com">https://www.tecnativa.com</a>>:<ul>
|
||||||
|
<li>Vicent Cubells <<a class="reference external" href="mailto:vicent.cubells@tecnativa.com">vicent.cubells@tecnativa.com</a>></li>
|
||||||
|
</ul>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
<div class="section" id="maintainers">
|
||||||
|
<h2><a class="toc-backref" href="#id7">Maintainers</a></h2>
|
||||||
|
<p>This module is maintained by the OCA.</p>
|
||||||
|
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
|
||||||
|
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
|
||||||
|
mission is to support the collaborative development of Odoo features and
|
||||||
|
promote its widespread use.</p>
|
||||||
|
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/web/tree/11.0/web_widget_digitized_signature">OCA/web</a> project on GitHub.</p>
|
||||||
|
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</body>
|
||||||
|
</html>
|
|
@ -1,10 +1,11 @@
|
||||||
/** @preserve
|
/** @preserve
|
||||||
jSignature v2 "${buildDate}" "${commitID}"
|
jSignature v2 "${buildDate}" "${commitID}"
|
||||||
Copyright (c) 2012 Willow Systems Corp http://willow-systems.com
|
Copyright (c) 2012 Willow Systems Corp http://willow-systems.com
|
||||||
Copyright (c) 2010 Brinley Ang http://www.unbolt.net
|
Copyright (c) 2010 Brinley Ang http://www.unbolt.net
|
||||||
MIT License <http://www.opensource.org/licenses/mit-license.php>
|
MIT License <http://www.opensource.org/licenses/mit-license.php>
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
;(function() {
|
;(function() {
|
||||||
|
|
||||||
var apinamespace = 'jSignature'
|
var apinamespace = 'jSignature'
|
||||||
|
@ -25,7 +26,7 @@ var KickTimerClass = function(time, callback) {
|
||||||
timer = setTimeout(
|
timer = setTimeout(
|
||||||
callback
|
callback
|
||||||
, time
|
, time
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
this.clear = function() {
|
this.clear = function() {
|
||||||
clearTimeout(timer)
|
clearTimeout(timer)
|
||||||
|
@ -35,7 +36,7 @@ var KickTimerClass = function(time, callback) {
|
||||||
|
|
||||||
var PubSubClass = function(context){
|
var PubSubClass = function(context){
|
||||||
'use strict'
|
'use strict'
|
||||||
/* @preserve
|
/* @preserve
|
||||||
-----------------------------------------------------------------------------------------------
|
-----------------------------------------------------------------------------------------------
|
||||||
JavaScript PubSub library
|
JavaScript PubSub library
|
||||||
2012 (c) Willow Systems Corp (www.willow-systems.com)
|
2012 (c) Willow Systems Corp (www.willow-systems.com)
|
||||||
|
@ -68,7 +69,7 @@ var PubSubClass = function(context){
|
||||||
|
|
||||||
for (i = 0, l = currentTopic.length; i < l; i++) {
|
for (i = 0, l = currentTopic.length; i < l; i++) {
|
||||||
pair = currentTopic[i] // this is a [function, once_flag] array
|
pair = currentTopic[i] // this is a [function, once_flag] array
|
||||||
fn = pair[0]
|
fn = pair[0]
|
||||||
if (pair[1] /* 'run once' flag set */){
|
if (pair[1] /* 'run once' flag set */){
|
||||||
pair[0] = function(){}
|
pair[0] = function(){}
|
||||||
toremove.push(i)
|
toremove.push(i)
|
||||||
|
@ -81,13 +82,13 @@ var PubSubClass = function(context){
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* Allows listener code to subscribe to channel and be called when data is available
|
* Allows listener code to subscribe to channel and be called when data is available
|
||||||
* @public
|
* @public
|
||||||
* @function
|
* @function
|
||||||
* @param topic {String} Name of the channel on which to voice this event
|
* @param topic {String} Name of the channel on which to voice this event
|
||||||
* @param callback {Function} Executable (function pointer) that will be ran when event is voiced on this channel.
|
* @param callback {Function} Executable (function pointer) that will be ran when event is voiced on this channel.
|
||||||
* @param once {Boolean} (optional. False by default) Flag indicating if the function is to be triggered only once.
|
* @param once {Boolean} (optional. False by default) Flag indicating if the function is to be triggered only once.
|
||||||
* @returns {Object} A token object that cen be used for unsubscribing.
|
* @returns {Object} A token object that cen be used for unsubscribing.
|
||||||
*/
|
*/
|
||||||
this.subscribe = function(topic, callback, once) {
|
this.subscribe = function(topic, callback, once) {
|
||||||
'use strict'
|
'use strict'
|
||||||
|
@ -102,15 +103,15 @@ var PubSubClass = function(context){
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
/**
|
/**
|
||||||
* Allows listener code to unsubscribe from a channel
|
* Allows listener code to unsubscribe from a channel
|
||||||
* @public
|
* @public
|
||||||
* @function
|
* @function
|
||||||
* @param token {Object} A token object that was returned by `subscribe` method
|
* @param token {Object} A token object that was returned by `subscribe` method
|
||||||
*/
|
*/
|
||||||
this.unsubscribe = function(token) {
|
this.unsubscribe = function(token) {
|
||||||
if (this.topics[token.topic]) {
|
if (this.topics[token.topic]) {
|
||||||
var currentTopic = this.topics[token.topic]
|
var currentTopic = this.topics[token.topic]
|
||||||
|
|
||||||
for (var i = 0, l = currentTopic.length; i < l; i++) {
|
for (var i = 0, l = currentTopic.length; i < l; i++) {
|
||||||
if (currentTopic[i][0] === token.callback) {
|
if (currentTopic[i][0] === token.callback) {
|
||||||
currentTopic.splice(i, 1)
|
currentTopic.splice(i, 1)
|
||||||
|
@ -127,7 +128,7 @@ function getColors($e){
|
||||||
, frontcolor = $e.css('color')
|
, frontcolor = $e.css('color')
|
||||||
, backcolor
|
, backcolor
|
||||||
, e = $e[0]
|
, e = $e[0]
|
||||||
|
|
||||||
var toOfDOM = false
|
var toOfDOM = false
|
||||||
while(e && !backcolor && !toOfDOM){
|
while(e && !backcolor && !toOfDOM){
|
||||||
try{
|
try{
|
||||||
|
@ -192,18 +193,18 @@ function getColors($e){
|
||||||
// backcolorcomponents = {'r':0,'g':0,'b':0}
|
// backcolorcomponents = {'r':0,'g':0,'b':0}
|
||||||
// }
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
// Deriving Decor color
|
// Deriving Decor color
|
||||||
// THis is LAZY!!!! Better way would be to use HSL and adjust luminocity. However, that could be an overkill.
|
// THis is LAZY!!!! Better way would be to use HSL and adjust luminocity. However, that could be an overkill.
|
||||||
|
|
||||||
var toRGBfn = function(o){return 'rgb(' + [o.r, o.g, o.b].join(', ') + ')'}
|
var toRGBfn = function(o){return 'rgb(' + [o.r, o.g, o.b].join(', ') + ')'}
|
||||||
, decorcolorcomponents
|
, decorcolorcomponents
|
||||||
, frontcolorbrightness
|
, frontcolorbrightness
|
||||||
, adjusted
|
, adjusted
|
||||||
|
|
||||||
if (frontcolorcomponents && backcolorcomponents){
|
if (frontcolorcomponents && backcolorcomponents){
|
||||||
var backcolorbrightness = Math.max.apply(null, [frontcolorcomponents.r, frontcolorcomponents.g, frontcolorcomponents.b])
|
var backcolorbrightness = Math.max.apply(null, [frontcolorcomponents.r, frontcolorcomponents.g, frontcolorcomponents.b])
|
||||||
|
|
||||||
frontcolorbrightness = Math.max.apply(null, [backcolorcomponents.r, backcolorcomponents.g, backcolorcomponents.b])
|
frontcolorbrightness = Math.max.apply(null, [backcolorcomponents.r, backcolorcomponents.g, backcolorcomponents.b])
|
||||||
adjusted = Math.round(frontcolorbrightness + (-1 * (frontcolorbrightness - backcolorbrightness) * 0.75)) // "dimming" the difference between pen and back.
|
adjusted = Math.round(frontcolorbrightness + (-1 * (frontcolorbrightness - backcolorbrightness) * 0.75)) // "dimming" the difference between pen and back.
|
||||||
decorcolorcomponents = {'r':adjusted,'g':adjusted,'b':adjusted} // always shade of gray
|
decorcolorcomponents = {'r':adjusted,'g':adjusted,'b':adjusted} // always shade of gray
|
||||||
|
@ -231,7 +232,7 @@ function Vector(x,y){
|
||||||
this.x = x
|
this.x = x
|
||||||
this.y = y
|
this.y = y
|
||||||
this.reverse = function(){
|
this.reverse = function(){
|
||||||
return new this.constructor(
|
return new this.constructor(
|
||||||
this.x * -1
|
this.x * -1
|
||||||
, this.y * -1
|
, this.y * -1
|
||||||
)
|
)
|
||||||
|
@ -243,7 +244,7 @@ function Vector(x,y){
|
||||||
}
|
}
|
||||||
return this._length
|
return this._length
|
||||||
}
|
}
|
||||||
|
|
||||||
var polarity = function (e){
|
var polarity = function (e){
|
||||||
return Math.round(e / Math.abs(e))
|
return Math.round(e / Math.abs(e))
|
||||||
}
|
}
|
||||||
|
@ -267,12 +268,12 @@ function Vector(x,y){
|
||||||
}
|
}
|
||||||
return this
|
return this
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Calculates the angle between 'this' vector and another.
|
* Calculates the angle between 'this' vector and another.
|
||||||
* @public
|
* @public
|
||||||
* @function
|
* @function
|
||||||
* @returns {Number} The angle between the two vectors as measured in PI.
|
* @returns {Number} The angle between the two vectors as measured in PI.
|
||||||
*/
|
*/
|
||||||
this.angleTo = function(vectorB) {
|
this.angleTo = function(vectorB) {
|
||||||
var divisor = this.getLength() * vectorB.getLength()
|
var divisor = this.getLength() * vectorB.getLength()
|
||||||
|
@ -283,8 +284,8 @@ function Vector(x,y){
|
||||||
// because of it, the core of the formula can, on occasion, have values
|
// because of it, the core of the formula can, on occasion, have values
|
||||||
// over 1.0 and below -1.0.
|
// over 1.0 and below -1.0.
|
||||||
return Math.acos(
|
return Math.acos(
|
||||||
Math.min(
|
Math.min(
|
||||||
Math.max(
|
Math.max(
|
||||||
( this.x * vectorB.x + this.y * vectorB.y ) / divisor
|
( this.x * vectorB.x + this.y * vectorB.y ) / divisor
|
||||||
, -1.0
|
, -1.0
|
||||||
)
|
)
|
||||||
|
@ -298,7 +299,7 @@ function Vector(x,y){
|
||||||
function Point(x,y){
|
function Point(x,y){
|
||||||
this.x = x
|
this.x = x
|
||||||
this.y = y
|
this.y = y
|
||||||
|
|
||||||
this.getVectorToCoordinates = function (x, y) {
|
this.getVectorToCoordinates = function (x, y) {
|
||||||
return new Vector(x - this.x, y - this.y)
|
return new Vector(x - this.x, y - this.y)
|
||||||
}
|
}
|
||||||
|
@ -316,17 +317,17 @@ function Point(x,y){
|
||||||
/*
|
/*
|
||||||
* About data structure:
|
* About data structure:
|
||||||
* We don't store / deal with "pictures" this signature capture code captures "vectors"
|
* We don't store / deal with "pictures" this signature capture code captures "vectors"
|
||||||
*
|
*
|
||||||
* We don't store bitmaps. We store "strokes" as arrays of arrays. (Actually, arrays of objects containing arrays of coordinates.
|
* We don't store bitmaps. We store "strokes" as arrays of arrays. (Actually, arrays of objects containing arrays of coordinates.
|
||||||
*
|
*
|
||||||
* Stroke = mousedown + mousemoved * n (+ mouseup but we don't record that as that was the "end / lack of movement" indicator)
|
* Stroke = mousedown + mousemoved * n (+ mouseup but we don't record that as that was the "end / lack of movement" indicator)
|
||||||
*
|
*
|
||||||
* Vectors = not classical vectors where numbers indicated shift relative last position. Our vectors are actually coordinates against top left of canvas.
|
* Vectors = not classical vectors where numbers indicated shift relative last position. Our vectors are actually coordinates against top left of canvas.
|
||||||
* we could calc the classical vectors, but keeping the the actual coordinates allows us (through Math.max / min)
|
* we could calc the classical vectors, but keeping the the actual coordinates allows us (through Math.max / min)
|
||||||
* to calc the size of resulting drawing very quickly. If we want classical vectors later, we can always get them in backend code.
|
* to calc the size of resulting drawing very quickly. If we want classical vectors later, we can always get them in backend code.
|
||||||
*
|
*
|
||||||
* So, the data structure:
|
* So, the data structure:
|
||||||
*
|
*
|
||||||
* var data = [
|
* var data = [
|
||||||
* { // stroke starts
|
* { // stroke starts
|
||||||
* x : [101, 98, 57, 43] // x points
|
* x : [101, 98, 57, 43] // x points
|
||||||
|
@ -341,9 +342,9 @@ function Point(x,y){
|
||||||
* , y : [151] // y points
|
* , y : [151] // y points
|
||||||
* } // stroke ends
|
* } // stroke ends
|
||||||
* ]
|
* ]
|
||||||
*
|
*
|
||||||
* we don't care or store stroke width (it's canvas-size-relative), color, shadow values. These can be added / changed on whim post-capture.
|
* we don't care or store stroke width (it's canvas-size-relative), color, shadow values. These can be added / changed on whim post-capture.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
function DataEngine(storageObject, context, startStrokeFn, addToStrokeFn, endStrokeFn){
|
function DataEngine(storageObject, context, startStrokeFn, addToStrokeFn, endStrokeFn){
|
||||||
this.data = storageObject // we expect this to be an instance of Array
|
this.data = storageObject // we expect this to be an instance of Array
|
||||||
|
@ -354,7 +355,7 @@ function DataEngine(storageObject, context, startStrokeFn, addToStrokeFn, endStr
|
||||||
var numofstrokes = storageObject.length
|
var numofstrokes = storageObject.length
|
||||||
, stroke
|
, stroke
|
||||||
, numofpoints
|
, numofpoints
|
||||||
|
|
||||||
for (var i = 0; i < numofstrokes; i++){
|
for (var i = 0; i < numofstrokes; i++){
|
||||||
stroke = storageObject[i]
|
stroke = storageObject[i]
|
||||||
numofpoints = stroke.x.length
|
numofpoints = stroke.x.length
|
||||||
|
@ -367,13 +368,13 @@ function DataEngine(storageObject, context, startStrokeFn, addToStrokeFn, endStr
|
||||||
}
|
}
|
||||||
|
|
||||||
this.changed = function(){}
|
this.changed = function(){}
|
||||||
|
|
||||||
this.startStrokeFn = startStrokeFn
|
this.startStrokeFn = startStrokeFn
|
||||||
this.addToStrokeFn = addToStrokeFn
|
this.addToStrokeFn = addToStrokeFn
|
||||||
this.endStrokeFn = endStrokeFn
|
this.endStrokeFn = endStrokeFn
|
||||||
|
|
||||||
this.inStroke = false
|
this.inStroke = false
|
||||||
|
|
||||||
this._lastPoint = null
|
this._lastPoint = null
|
||||||
this._stroke = null
|
this._stroke = null
|
||||||
this.startStroke = function(point){
|
this.startStroke = function(point){
|
||||||
|
@ -383,7 +384,7 @@ function DataEngine(storageObject, context, startStrokeFn, addToStrokeFn, endStr
|
||||||
this._lastPoint = point
|
this._lastPoint = point
|
||||||
this.inStroke = true
|
this.inStroke = true
|
||||||
// 'this' does not work same inside setTimeout(
|
// 'this' does not work same inside setTimeout(
|
||||||
var stroke = this._stroke
|
var stroke = this._stroke
|
||||||
, fn = this.startStrokeFn
|
, fn = this.startStrokeFn
|
||||||
, context = this.context
|
, context = this.context
|
||||||
setTimeout(
|
setTimeout(
|
||||||
|
@ -402,8 +403,8 @@ function DataEngine(storageObject, context, startStrokeFn, addToStrokeFn, endStr
|
||||||
// when clustering of these is too tight, it produces noise on the line, which, because of smoothing, makes lines too curvy.
|
// when clustering of these is too tight, it produces noise on the line, which, because of smoothing, makes lines too curvy.
|
||||||
// maybe, later, we can expose this as a configurable setting of some sort.
|
// maybe, later, we can expose this as a configurable setting of some sort.
|
||||||
this.addToStroke = function(point){
|
this.addToStroke = function(point){
|
||||||
if (this.inStroke &&
|
if (this.inStroke &&
|
||||||
typeof(point.x) === "number" &&
|
typeof(point.x) === "number" &&
|
||||||
typeof(point.y) === "number" &&
|
typeof(point.y) === "number" &&
|
||||||
// calculates absolute shift in diagonal pixels away from original point
|
// calculates absolute shift in diagonal pixels away from original point
|
||||||
(Math.abs(point.x - this._lastPoint.x) + Math.abs(point.y - this._lastPoint.y)) > 4
|
(Math.abs(point.x - this._lastPoint.x) + Math.abs(point.y - this._lastPoint.y)) > 4
|
||||||
|
@ -412,7 +413,7 @@ function DataEngine(storageObject, context, startStrokeFn, addToStrokeFn, endStr
|
||||||
this._stroke.x.push(point.x)
|
this._stroke.x.push(point.x)
|
||||||
this._stroke.y.push(point.y)
|
this._stroke.y.push(point.y)
|
||||||
this._lastPoint = point
|
this._lastPoint = point
|
||||||
|
|
||||||
var stroke = this._stroke
|
var stroke = this._stroke
|
||||||
, fn = this.addToStrokeFn
|
, fn = this.addToStrokeFn
|
||||||
, context = this.context
|
, context = this.context
|
||||||
|
@ -478,7 +479,7 @@ var basicDot = function(ctx, x, y, size){
|
||||||
// Because we are funky this way, here we draw TWO curves.
|
// Because we are funky this way, here we draw TWO curves.
|
||||||
// 1. POSSIBLY "this line" - spanning from point right before us, to this latest point.
|
// 1. POSSIBLY "this line" - spanning from point right before us, to this latest point.
|
||||||
// 2. POSSIBLY "prior curve" - spanning from "latest point" to the one before it.
|
// 2. POSSIBLY "prior curve" - spanning from "latest point" to the one before it.
|
||||||
|
|
||||||
// Why you ask?
|
// Why you ask?
|
||||||
// long lines (ones with many pixels between them) do not look good when they are part of a large curvy stroke.
|
// long lines (ones with many pixels between them) do not look good when they are part of a large curvy stroke.
|
||||||
// You know, the jaggedy crocodile spine instead of a pretty, smooth curve. Yuck!
|
// You know, the jaggedy crocodile spine instead of a pretty, smooth curve. Yuck!
|
||||||
|
@ -486,23 +487,23 @@ var basicDot = function(ctx, x, y, size){
|
||||||
// To approximate a very nice curve we need to know the direction of line before and after.
|
// To approximate a very nice curve we need to know the direction of line before and after.
|
||||||
// Hence, on long lines we actually wait for another point beyond it to come back from
|
// Hence, on long lines we actually wait for another point beyond it to come back from
|
||||||
// mousemoved before we draw this curve.
|
// mousemoved before we draw this curve.
|
||||||
|
|
||||||
// So for "prior curve" to be calc'ed we need 4 points
|
// So for "prior curve" to be calc'ed we need 4 points
|
||||||
// A, B, C, D (we are on D now, A is 3 points in the past.)
|
// A, B, C, D (we are on D now, A is 3 points in the past.)
|
||||||
// and 3 lines:
|
// and 3 lines:
|
||||||
// pre-line (from points A to B),
|
// pre-line (from points A to B),
|
||||||
// this line (from points B to C), (we call it "this" because if it was not yet, it's the only one we can draw for sure.)
|
// this line (from points B to C), (we call it "this" because if it was not yet, it's the only one we can draw for sure.)
|
||||||
// post-line (from points C to D) (even through D point is 'current' we don't know how we can draw it yet)
|
// post-line (from points C to D) (even through D point is 'current' we don't know how we can draw it yet)
|
||||||
//
|
//
|
||||||
// Well, actually, we don't need to *know* the point A, just the vector A->B
|
// Well, actually, we don't need to *know* the point A, just the vector A->B
|
||||||
var Cpoint = new Point(stroke.x[positionInStroke-1], stroke.y[positionInStroke-1])
|
var Cpoint = new Point(stroke.x[positionInStroke-1], stroke.y[positionInStroke-1])
|
||||||
, Dpoint = new Point(stroke.x[positionInStroke], stroke.y[positionInStroke])
|
, Dpoint = new Point(stroke.x[positionInStroke], stroke.y[positionInStroke])
|
||||||
, CDvector = Cpoint.getVectorToPoint(Dpoint)
|
, CDvector = Cpoint.getVectorToPoint(Dpoint)
|
||||||
|
|
||||||
// Again, we have a chance here to draw TWO things:
|
// Again, we have a chance here to draw TWO things:
|
||||||
// BC Curve (only if it's long, because if it was short, it was drawn by previous callback) and
|
// BC Curve (only if it's long, because if it was short, it was drawn by previous callback) and
|
||||||
// CD Line (only if it's short)
|
// CD Line (only if it's short)
|
||||||
|
|
||||||
// So, let's start with BC curve.
|
// So, let's start with BC curve.
|
||||||
// if there is only 2 points in stroke array, we don't have "history" long enough to have point B, let alone point A.
|
// if there is only 2 points in stroke array, we don't have "history" long enough to have point B, let alone point A.
|
||||||
// Falling through to drawing line CD is proper, as that's the only line we have points for.
|
// Falling through to drawing line CD is proper, as that's the only line we have points for.
|
||||||
|
@ -530,7 +531,7 @@ var basicDot = function(ctx, x, y, size){
|
||||||
, CCP2vector = (new Vector(BCvector.x + CDvector.x, BCvector.y + CDvector.y)).reverse().resizeTo(
|
, CCP2vector = (new Vector(BCvector.x + CDvector.x, BCvector.y + CDvector.y)).reverse().resizeTo(
|
||||||
Math.max(minlenfraction, BCDangle) * maxlen
|
Math.max(minlenfraction, BCDangle) * maxlen
|
||||||
)
|
)
|
||||||
|
|
||||||
basicCurve(
|
basicCurve(
|
||||||
this.canvasContext
|
this.canvasContext
|
||||||
, Bpoint.x
|
, Bpoint.x
|
||||||
|
@ -558,23 +559,23 @@ var basicDot = function(ctx, x, y, size){
|
||||||
// this = jSignatureClass instance
|
// this = jSignatureClass instance
|
||||||
|
|
||||||
// Here we tidy up things left unfinished in last strokeAddCallback run.
|
// Here we tidy up things left unfinished in last strokeAddCallback run.
|
||||||
|
|
||||||
// What's POTENTIALLY left unfinished there is the curve between the last points
|
// What's POTENTIALLY left unfinished there is the curve between the last points
|
||||||
// in the stroke, if the len of that line is more than lineCurveThreshold
|
// in the stroke, if the len of that line is more than lineCurveThreshold
|
||||||
// If the last line was shorter than lineCurveThreshold, it was drawn there, and there
|
// If the last line was shorter than lineCurveThreshold, it was drawn there, and there
|
||||||
// is nothing for us here to do.
|
// is nothing for us here to do.
|
||||||
// We can also be called when there is only one point in the stroke (meaning, the
|
// We can also be called when there is only one point in the stroke (meaning, the
|
||||||
// stroke was just a dot), in which case, again, there is nothing for us to do.
|
// stroke was just a dot), in which case, again, there is nothing for us to do.
|
||||||
|
|
||||||
// So for "this curve" to be calc'ed we need 3 points
|
// So for "this curve" to be calc'ed we need 3 points
|
||||||
// A, B, C
|
// A, B, C
|
||||||
// and 2 lines:
|
// and 2 lines:
|
||||||
// pre-line (from points A to B),
|
// pre-line (from points A to B),
|
||||||
// this line (from points B to C)
|
// this line (from points B to C)
|
||||||
// Well, actually, we don't need to *know* the point A, just the vector A->B
|
// Well, actually, we don't need to *know* the point A, just the vector A->B
|
||||||
// so, we really need points B, C and AB vector.
|
// so, we really need points B, C and AB vector.
|
||||||
var positionInStroke = stroke.x.length - 1
|
var positionInStroke = stroke.x.length - 1
|
||||||
|
|
||||||
if (positionInStroke > 0){
|
if (positionInStroke > 0){
|
||||||
// there are at least 2 points in the stroke.we are in business.
|
// there are at least 2 points in the stroke.we are in business.
|
||||||
var Cpoint = new Point(stroke.x[positionInStroke], stroke.y[positionInStroke])
|
var Cpoint = new Point(stroke.x[positionInStroke], stroke.y[positionInStroke])
|
||||||
|
@ -649,7 +650,7 @@ var getDataStats = function(){
|
||||||
function conditionallyLinkCanvasResizeToWindowResize(jSignatureInstance, settingsWidth, apinamespace, globalEvents){
|
function conditionallyLinkCanvasResizeToWindowResize(jSignatureInstance, settingsWidth, apinamespace, globalEvents){
|
||||||
'use strict'
|
'use strict'
|
||||||
if ( settingsWidth === 'ratio' || settingsWidth.split('')[settingsWidth.length - 1] === '%' ) {
|
if ( settingsWidth === 'ratio' || settingsWidth.split('')[settingsWidth.length - 1] === '%' ) {
|
||||||
|
|
||||||
this.eventTokens[apinamespace + '.parentresized'] = globalEvents.subscribe(
|
this.eventTokens[apinamespace + '.parentresized'] = globalEvents.subscribe(
|
||||||
apinamespace + '.parentresized'
|
apinamespace + '.parentresized'
|
||||||
, (function(eventTokens, $parent, originalParentWidth, sizeRatio){
|
, (function(eventTokens, $parent, originalParentWidth, sizeRatio){
|
||||||
|
@ -660,9 +661,9 @@ function conditionallyLinkCanvasResizeToWindowResize(jSignatureInstance, setting
|
||||||
|
|
||||||
var w = $parent.width()
|
var w = $parent.width()
|
||||||
if (w !== originalParentWidth) {
|
if (w !== originalParentWidth) {
|
||||||
|
|
||||||
// UNsubscribing this particular instance of signature pad only.
|
// UNsubscribing this particular instance of signature pad only.
|
||||||
// there is a separate `eventTokens` per each instance of signature pad
|
// there is a separate `eventTokens` per each instance of signature pad
|
||||||
for (var key in eventTokens){
|
for (var key in eventTokens){
|
||||||
if (eventTokens.hasOwnProperty(key)) {
|
if (eventTokens.hasOwnProperty(key)) {
|
||||||
globalEvents.unsubscribe(eventTokens[key])
|
globalEvents.unsubscribe(eventTokens[key])
|
||||||
|
@ -677,21 +678,21 @@ function conditionallyLinkCanvasResizeToWindowResize(jSignatureInstance, setting
|
||||||
delete jSignatureInstance[key]
|
delete jSignatureInstance[key]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// scale data to new signature pad size
|
// scale data to new signature pad size
|
||||||
settings.data = (function(data, scale){
|
settings.data = (function(data, scale){
|
||||||
var newData = []
|
var newData = []
|
||||||
var o, i, l, j, m, stroke
|
var o, i, l, j, m, stroke
|
||||||
for ( i = 0, l = data.length; i < l; i++) {
|
for ( i = 0, l = data.length; i < l; i++) {
|
||||||
stroke = data[i]
|
stroke = data[i]
|
||||||
|
|
||||||
o = {'x':[],'y':[]}
|
o = {'x':[],'y':[]}
|
||||||
|
|
||||||
for ( j = 0, m = stroke.x.length; j < m; j++) {
|
for ( j = 0, m = stroke.x.length; j < m; j++) {
|
||||||
o.x.push(stroke.x[j] * scale)
|
o.x.push(stroke.x[j] * scale)
|
||||||
o.y.push(stroke.y[j] * scale)
|
o.y.push(stroke.y[j] * scale)
|
||||||
}
|
}
|
||||||
|
|
||||||
newData.push(o)
|
newData.push(o)
|
||||||
}
|
}
|
||||||
return newData
|
return newData
|
||||||
|
@ -699,7 +700,7 @@ function conditionallyLinkCanvasResizeToWindowResize(jSignatureInstance, setting
|
||||||
settings.data
|
settings.data
|
||||||
, w * 1.0 / originalParentWidth
|
, w * 1.0 / originalParentWidth
|
||||||
)
|
)
|
||||||
|
|
||||||
$parent[apinamespace](settings)
|
$parent[apinamespace](settings)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -769,14 +770,14 @@ function jSignatureClass(parent, options, instanceExtensions) {
|
||||||
|
|
||||||
// Most of our exposed API will be looking for this:
|
// Most of our exposed API will be looking for this:
|
||||||
$canvas.data(apinamespace + '.this', this)
|
$canvas.data(apinamespace + '.this', this)
|
||||||
|
|
||||||
|
|
||||||
settings.lineWidth = (function(defaultLineWidth, canvasWidth){
|
settings.lineWidth = (function(defaultLineWidth, canvasWidth){
|
||||||
if (!defaultLineWidth){
|
if (!defaultLineWidth){
|
||||||
return Math.max(
|
return Math.max(
|
||||||
Math.round(canvasWidth / 400) /*+1 pixel for every extra 300px of width.*/
|
Math.round(canvasWidth / 400) /*+1 pixel for every extra 300px of width.*/
|
||||||
, 2 /* minimum line width */
|
, 2 /* minimum line width */
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
return defaultLineWidth
|
return defaultLineWidth
|
||||||
}
|
}
|
||||||
|
@ -830,7 +831,7 @@ function jSignatureClass(parent, options, instanceExtensions) {
|
||||||
this.drawStartHandler = function(e) {
|
this.drawStartHandler = function(e) {
|
||||||
e.preventDefault()
|
e.preventDefault()
|
||||||
// for performance we cache the offsets
|
// for performance we cache the offsets
|
||||||
// we recalc these only at the beginning the stroke
|
// we recalc these only at the beginning the stroke
|
||||||
setStartValues()
|
setStartValues()
|
||||||
jSignatureInstance.dataEngine.startStroke( getPointFromEvent(e) )
|
jSignatureInstance.dataEngine.startStroke( getPointFromEvent(e) )
|
||||||
timer.kick()
|
timer.kick()
|
||||||
|
@ -839,7 +840,7 @@ function jSignatureClass(parent, options, instanceExtensions) {
|
||||||
e.preventDefault()
|
e.preventDefault()
|
||||||
if (!jSignatureInstance.dataEngine.inStroke){
|
if (!jSignatureInstance.dataEngine.inStroke){
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
jSignatureInstance.dataEngine.addToStroke( getPointFromEvent(e) )
|
jSignatureInstance.dataEngine.addToStroke( getPointFromEvent(e) )
|
||||||
timer.kick()
|
timer.kick()
|
||||||
}
|
}
|
||||||
|
@ -866,7 +867,7 @@ function jSignatureClass(parent, options, instanceExtensions) {
|
||||||
canvas.onmousemove = undef
|
canvas.onmousemove = undef
|
||||||
|
|
||||||
this.fatFingerCompensation = (
|
this.fatFingerCompensation = (
|
||||||
settings.minFatFingerCompensation &&
|
settings.minFatFingerCompensation &&
|
||||||
settings.lineWidth * -3 > settings.minFatFingerCompensation
|
settings.lineWidth * -3 > settings.minFatFingerCompensation
|
||||||
) ? settings.lineWidth * -3 : settings.minFatFingerCompensation
|
) ? settings.lineWidth * -3 : settings.minFatFingerCompensation
|
||||||
|
|
||||||
|
@ -888,7 +889,7 @@ function jSignatureClass(parent, options, instanceExtensions) {
|
||||||
canvas.onmousemove = drawMoveHandler
|
canvas.onmousemove = drawMoveHandler
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}).call(
|
}).call(
|
||||||
this
|
this
|
||||||
, movementHandlers.drawEndHandler
|
, movementHandlers.drawEndHandler
|
||||||
, movementHandlers.drawStartHandler
|
, movementHandlers.drawStartHandler
|
||||||
|
@ -918,7 +919,7 @@ function jSignatureClass(parent, options, instanceExtensions) {
|
||||||
, settings.width.toString(10)
|
, settings.width.toString(10)
|
||||||
, apinamespace, globalEvents
|
, apinamespace, globalEvents
|
||||||
)
|
)
|
||||||
|
|
||||||
// end of event handlers.
|
// end of event handlers.
|
||||||
// ===============================
|
// ===============================
|
||||||
|
|
||||||
|
@ -944,7 +945,7 @@ jSignatureClass.prototype.resetCanvas = function(data){
|
||||||
|
|
||||||
, cw = canvas.width
|
, cw = canvas.width
|
||||||
, ch = canvas.height
|
, ch = canvas.height
|
||||||
|
|
||||||
// preparing colors, drawing area
|
// preparing colors, drawing area
|
||||||
|
|
||||||
ctx.clearRect(0, 0, cw + 30, ch + 30)
|
ctx.clearRect(0, 0, cw + 30, ch + 30)
|
||||||
|
@ -952,13 +953,13 @@ jSignatureClass.prototype.resetCanvas = function(data){
|
||||||
ctx.shadowColor = ctx.fillStyle = settings['background-color']
|
ctx.shadowColor = ctx.fillStyle = settings['background-color']
|
||||||
if (isCanvasEmulator){
|
if (isCanvasEmulator){
|
||||||
// FLashCanvas fills with Black by default, covering up the parent div's background
|
// FLashCanvas fills with Black by default, covering up the parent div's background
|
||||||
// hence we refill
|
// hence we refill
|
||||||
ctx.fillRect(0,0,cw + 30, ch + 30)
|
ctx.fillRect(0,0,cw + 30, ch + 30)
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx.lineWidth = Math.ceil(parseInt(settings.lineWidth, 10))
|
ctx.lineWidth = Math.ceil(parseInt(settings.lineWidth, 10))
|
||||||
ctx.lineCap = ctx.lineJoin = "round"
|
ctx.lineCap = ctx.lineJoin = "round"
|
||||||
|
|
||||||
// signature line
|
// signature line
|
||||||
ctx.strokeStyle = settings['decor-color']
|
ctx.strokeStyle = settings['decor-color']
|
||||||
ctx.shadowOffsetX = 0
|
ctx.shadowOffsetX = 0
|
||||||
|
@ -971,13 +972,13 @@ jSignatureClass.prototype.resetCanvas = function(data){
|
||||||
ctx.shadowColor = ctx.strokeStyle
|
ctx.shadowColor = ctx.strokeStyle
|
||||||
ctx.shadowOffsetX = ctx.lineWidth * 0.5
|
ctx.shadowOffsetX = ctx.lineWidth * 0.5
|
||||||
ctx.shadowOffsetY = ctx.lineWidth * -0.6
|
ctx.shadowOffsetY = ctx.lineWidth * -0.6
|
||||||
ctx.shadowBlur = 0
|
ctx.shadowBlur = 0
|
||||||
}
|
}
|
||||||
|
|
||||||
// setting up new dataEngine
|
// setting up new dataEngine
|
||||||
|
|
||||||
if (!data) { data = [] }
|
if (!data) { data = [] }
|
||||||
|
|
||||||
var dataEngine = this.dataEngine = new DataEngine(
|
var dataEngine = this.dataEngine = new DataEngine(
|
||||||
data
|
data
|
||||||
, this
|
, this
|
||||||
|
@ -996,7 +997,7 @@ jSignatureClass.prototype.resetCanvas = function(data){
|
||||||
'use strict'
|
'use strict'
|
||||||
return function() {
|
return function() {
|
||||||
events.publish(apinamespace+'.change')
|
events.publish(apinamespace+'.change')
|
||||||
target.trigger('change')
|
target.trigger('change')
|
||||||
}
|
}
|
||||||
})(this.$parent, this.events, apinamespace)
|
})(this.$parent, this.events, apinamespace)
|
||||||
// let's trigger change on all data reloads
|
// let's trigger change on all data reloads
|
||||||
|
@ -1026,9 +1027,9 @@ function initializeCanvasEmulator(canvas){
|
||||||
|
|
||||||
if (FC) {
|
if (FC) {
|
||||||
canvas = FC.initElement(canvas)
|
canvas = FC.initElement(canvas)
|
||||||
|
|
||||||
var zoom = 1
|
var zoom = 1
|
||||||
// FlashCanvas uses flash which has this annoying habit of NOT scaling with page zoom.
|
// FlashCanvas uses flash which has this annoying habit of NOT scaling with page zoom.
|
||||||
// It matches pixel-to-pixel to screen instead.
|
// It matches pixel-to-pixel to screen instead.
|
||||||
// Since we are targeting ONLY IE 7, 8 with FlashCanvas, we will test the zoom only the IE8, IE7 way
|
// Since we are targeting ONLY IE 7, 8 with FlashCanvas, we will test the zoom only the IE8, IE7 way
|
||||||
if (window && window.screen && window.screen.deviceXDPI && window.screen.logicalXDPI){
|
if (window && window.screen && window.screen.deviceXDPI && window.screen.logicalXDPI){
|
||||||
|
@ -1105,7 +1106,7 @@ jSignatureClass.prototype.initializeCanvas = function(settings) {
|
||||||
|
|
||||||
canvas.width = $canvas.width()
|
canvas.width = $canvas.width()
|
||||||
canvas.height = $canvas.height()
|
canvas.height = $canvas.height()
|
||||||
|
|
||||||
// Special case Sizing code
|
// Special case Sizing code
|
||||||
|
|
||||||
this.isCanvasEmulator = initializeCanvasEmulator(canvas)
|
this.isCanvasEmulator = initializeCanvasEmulator(canvas)
|
||||||
|
@ -1124,7 +1125,7 @@ jSignatureClass.prototype.initializeCanvas = function(settings) {
|
||||||
var GlobalJSignatureObjectInitializer = function(window){
|
var GlobalJSignatureObjectInitializer = function(window){
|
||||||
|
|
||||||
var globalEvents = new PubSubClass()
|
var globalEvents = new PubSubClass()
|
||||||
|
|
||||||
// common "window resized" event listener.
|
// common "window resized" event listener.
|
||||||
// jSignature instances will subscribe to this chanel.
|
// jSignature instances will subscribe to this chanel.
|
||||||
// to resize themselves when needed.
|
// to resize themselves when needed.
|
||||||
|
@ -1144,7 +1145,7 @@ var GlobalJSignatureObjectInitializer = function(window){
|
||||||
if (resizetimer) {
|
if (resizetimer) {
|
||||||
clearTimeout(resizetimer)
|
clearTimeout(resizetimer)
|
||||||
}
|
}
|
||||||
resizetimer = setTimeout(
|
resizetimer = setTimeout(
|
||||||
runner
|
runner
|
||||||
, 500
|
, 500
|
||||||
)
|
)
|
||||||
|
@ -1160,13 +1161,13 @@ var GlobalJSignatureObjectInitializer = function(window){
|
||||||
})(globalEvents, apinamespace, $, window)
|
})(globalEvents, apinamespace, $, window)
|
||||||
|
|
||||||
var jSignatureInstanceExtensions = {
|
var jSignatureInstanceExtensions = {
|
||||||
|
|
||||||
'exampleExtension':function(extensionName){
|
'exampleExtension':function(extensionName){
|
||||||
// we are called very early in instance's life.
|
// we are called very early in instance's life.
|
||||||
// right after the settings are resolved and
|
// right after the settings are resolved and
|
||||||
// jSignatureInstance.events is created
|
// jSignatureInstance.events is created
|
||||||
// and right before first ("jSignature.initializing") event is called.
|
// and right before first ("jSignature.initializing") event is called.
|
||||||
// You don't really need to manupilate
|
// You don't really need to manupilate
|
||||||
// jSignatureInstance directly, just attach
|
// jSignatureInstance directly, just attach
|
||||||
// a bunch of events to jSignatureInstance.events
|
// a bunch of events to jSignatureInstance.events
|
||||||
// (look at the source of jSignatureClass to see when these fire)
|
// (look at the source of jSignatureClass to see when these fire)
|
||||||
|
@ -1201,7 +1202,7 @@ var GlobalJSignatureObjectInitializer = function(window){
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var exportplugins = {
|
var exportplugins = {
|
||||||
|
@ -1210,12 +1211,12 @@ var GlobalJSignatureObjectInitializer = function(window){
|
||||||
, 'image':function(data){
|
, 'image':function(data){
|
||||||
/*this = canvas elem */
|
/*this = canvas elem */
|
||||||
var imagestring = this.toDataURL()
|
var imagestring = this.toDataURL()
|
||||||
|
|
||||||
if (typeof imagestring === 'string' &&
|
if (typeof imagestring === 'string' &&
|
||||||
imagestring.length > 4 &&
|
imagestring.length > 4 &&
|
||||||
imagestring.slice(0,5) === 'data:' &&
|
imagestring.slice(0,5) === 'data:' &&
|
||||||
imagestring.indexOf(',') !== -1){
|
imagestring.indexOf(',') !== -1){
|
||||||
|
|
||||||
var splitterpos = imagestring.indexOf(',')
|
var splitterpos = imagestring.indexOf(',')
|
||||||
|
|
||||||
return [
|
return [
|
||||||
|
@ -1230,9 +1231,9 @@ var GlobalJSignatureObjectInitializer = function(window){
|
||||||
// will be part of "importplugins"
|
// will be part of "importplugins"
|
||||||
function _renderImageOnCanvas( data, formattype, rerendercallable ) {
|
function _renderImageOnCanvas( data, formattype, rerendercallable ) {
|
||||||
'use strict'
|
'use strict'
|
||||||
// #1. Do NOT rely on this. No worky on IE
|
// #1. Do NOT rely on this. No worky on IE
|
||||||
// (url max len + lack of base64 decoder + possibly other issues)
|
// (url max len + lack of base64 decoder + possibly other issues)
|
||||||
// #2. This does NOT affect what is captured as "signature" as far as vector data is
|
// #2. This does NOT affect what is captured as "signature" as far as vector data is
|
||||||
// concerned. This is treated same as "signature line" - i.e. completely ignored
|
// concerned. This is treated same as "signature line" - i.e. completely ignored
|
||||||
// the only time you see imported image data exported is if you export as image.
|
// the only time you see imported image data exported is if you export as image.
|
||||||
|
|
||||||
|
@ -1240,20 +1241,32 @@ var GlobalJSignatureObjectInitializer = function(window){
|
||||||
// because importing image does absolutely nothing to the underlying vector data storage
|
// because importing image does absolutely nothing to the underlying vector data storage
|
||||||
// This could be a way to "import" old signatures stored as images
|
// This could be a way to "import" old signatures stored as images
|
||||||
// This could also be a way to import extra decor into signature area.
|
// This could also be a way to import extra decor into signature area.
|
||||||
|
|
||||||
var img = new Image()
|
|
||||||
// this = Canvas DOM elem. Not jQuery object. Not Canvas's parent div.
|
|
||||||
, c = this
|
|
||||||
|
|
||||||
img.onload = function() {
|
// var img = new Image()
|
||||||
var ctx = c.getContext("2d").drawImage(
|
// // this = Canvas DOM elem. Not jQuery object. Not Canvas's parent div.
|
||||||
img, 0, 0
|
// , c = this
|
||||||
, ( img.width < c.width) ? img.width : c.width
|
//
|
||||||
, ( img.height < c.height) ? img.height : c.height
|
// img.onload = function() {
|
||||||
)
|
// var ctx = c.getContext("2d").drawImage(
|
||||||
}
|
// img, 0, 0
|
||||||
|
// , ( img.width < c.width) ? img.width : c.width
|
||||||
|
// , ( img.height < c.height) ? img.height : c.height
|
||||||
|
// )
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// img.src = 'data:' + formattype + ',' + data
|
||||||
|
|
||||||
img.src = 'data:' + formattype + ',' + data
|
var c = new Image,
|
||||||
|
e = this;
|
||||||
|
c.onload = function() {
|
||||||
|
var a = e.getContext("2d"),
|
||||||
|
b = a.shadowColor;
|
||||||
|
a.shadowColor = "transparent";
|
||||||
|
a.drawImage(c, 0, 0, c.width < e.width ? c.width : e.width, c.height <
|
||||||
|
e.height ? c.height : e.height);
|
||||||
|
a.shadowColor = b
|
||||||
|
};
|
||||||
|
c.src = "data:" + formattype + "," + data
|
||||||
}
|
}
|
||||||
|
|
||||||
var importplugins = {
|
var importplugins = {
|
||||||
|
@ -1281,7 +1294,7 @@ var GlobalJSignatureObjectInitializer = function(window){
|
||||||
if (formattype === undef && typeof data === 'string' && data.substr(0,5) === 'data:') {
|
if (formattype === undef && typeof data === 'string' && data.substr(0,5) === 'data:') {
|
||||||
formattype = data.slice(5).split(',')[0]
|
formattype = data.slice(5).split(',')[0]
|
||||||
// 5 chars of "data:" + mimetype len + 1 "," char = all skipped.
|
// 5 chars of "data:" + mimetype len + 1 "," char = all skipped.
|
||||||
data = data.slice(6 + formattype.length)
|
data = data.slice(6 + formattype.length)
|
||||||
if (formattype === data) return
|
if (formattype === data) return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1294,7 +1307,7 @@ var GlobalJSignatureObjectInitializer = function(window){
|
||||||
$canvas[0]
|
$canvas[0]
|
||||||
, data
|
, data
|
||||||
, formattype
|
, formattype
|
||||||
, (function(jSignatureInstance){
|
, (function(jSignatureInstance){
|
||||||
return function(){ return jSignatureInstance.resetCanvas.apply(jSignatureInstance, arguments) }
|
return function(){ return jSignatureInstance.resetCanvas.apply(jSignatureInstance, arguments) }
|
||||||
})($canvas.data(apinamespace+'.this'))
|
})($canvas.data(apinamespace+'.this'))
|
||||||
)
|
)
|
||||||
|
@ -1307,7 +1320,7 @@ var GlobalJSignatureObjectInitializer = function(window){
|
||||||
var topOfDOM = false
|
var topOfDOM = false
|
||||||
e = e.parentNode
|
e = e.parentNode
|
||||||
while (e && !topOfDOM){
|
while (e && !topOfDOM){
|
||||||
topOfDOM = $(e).find(".oe_form")
|
topOfDOM = $(e).find(".o_form_view")
|
||||||
e = e.parentNode
|
e = e.parentNode
|
||||||
}
|
}
|
||||||
return !topOfDOM
|
return !topOfDOM
|
||||||
|
@ -1319,7 +1332,7 @@ var GlobalJSignatureObjectInitializer = function(window){
|
||||||
'init' : function( options ) {
|
'init' : function( options ) {
|
||||||
return this.each( function() {
|
return this.each( function() {
|
||||||
if (!elementIsOrphan(this)) {
|
if (!elementIsOrphan(this)) {
|
||||||
new jSignatureClass(this, options, jSignatureInstanceExtensions)
|
new jSignatureClass(this, options, jSignatureInstanceExtensions)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@ -1353,7 +1366,7 @@ var GlobalJSignatureObjectInitializer = function(window){
|
||||||
, 'getData' : function( formattype ) {
|
, 'getData' : function( formattype ) {
|
||||||
var undef, $canvas=this.find('canvas.'+apinamespace).add(this.filter('canvas.'+apinamespace))
|
var undef, $canvas=this.find('canvas.'+apinamespace).add(this.filter('canvas.'+apinamespace))
|
||||||
if (formattype === undef) formattype = 'default'
|
if (formattype === undef) formattype = 'default'
|
||||||
if ($canvas.length !== 0 && exportplugins.hasOwnProperty(formattype)){
|
if ($canvas.length !== 0 && exportplugins.hasOwnProperty(formattype)){
|
||||||
return exportplugins[formattype].call(
|
return exportplugins[formattype].call(
|
||||||
$canvas.get(0) // canvas dom elem
|
$canvas.get(0) // canvas dom elem
|
||||||
, $canvas.data(apinamespace+'.data') // raw signature data as array of objects of arrays
|
, $canvas.data(apinamespace+'.data') // raw signature data as array of objects of arrays
|
||||||
|
@ -1373,7 +1386,7 @@ var GlobalJSignatureObjectInitializer = function(window){
|
||||||
.data(apinamespace+'.this').events
|
.data(apinamespace+'.this').events
|
||||||
}
|
}
|
||||||
} // end of methods declaration.
|
} // end of methods declaration.
|
||||||
|
|
||||||
$.fn[apinamespace] = function(method) {
|
$.fn[apinamespace] = function(method) {
|
||||||
'use strict'
|
'use strict'
|
||||||
if ( !method || typeof method === 'object' ) {
|
if ( !method || typeof method === 'object' ) {
|
||||||
|
|
|
@ -2,121 +2,155 @@ odoo.define('web_widget_digitized_signature.web_digital_sign', function(require)
|
||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
var core = require('web.core');
|
var core = require('web.core');
|
||||||
var FormView = require('web.FormView');
|
var BasicFields= require('web.basic_fields');
|
||||||
|
var FormController = require('web.FormController');
|
||||||
|
var Registry = require('web.field_registry');
|
||||||
var utils = require('web.utils');
|
var utils = require('web.utils');
|
||||||
var session = require('web.session');
|
var session = require('web.session');
|
||||||
var Model = require('web.Model');
|
var field_utils = require('web.field_utils');
|
||||||
|
|
||||||
var _t = core._t;
|
var _t = core._t;
|
||||||
var QWeb = core.qweb;
|
var QWeb = core.qweb;
|
||||||
|
|
||||||
var FieldSignature = core.form_widget_registry.map.image.extend({
|
var FieldSignature = BasicFields.FieldBinaryImage.extend({
|
||||||
template: 'FieldSignature',
|
template: 'FieldSignature',
|
||||||
|
events: _.extend({}, BasicFields.FieldBinaryImage.prototype.events, {
|
||||||
|
'click .save_sign': '_on_save_sign',
|
||||||
|
'click #sign_clean': '_on_clear_sign'
|
||||||
|
}),
|
||||||
|
jsLibs: ['/web_widget_digitized_signature/static/lib/jSignature/jSignatureCustom.js'],
|
||||||
placeholder: "/web/static/src/img/placeholder.png",
|
placeholder: "/web/static/src/img/placeholder.png",
|
||||||
initialize_content: function() {
|
init: function() {
|
||||||
var self = this;
|
this._super.apply(this, arguments);
|
||||||
this.$el.find('> img').remove();
|
this.$('> img').remove();
|
||||||
this.$el.find('.signature > canvas').remove();
|
this.$('.signature > canvas').remove();
|
||||||
var sign_options = {'decor-color' : '#D1D0CE', 'color': '#000', 'background-color': '#fff','height':'150','width':'550'};
|
this.sign_options = {
|
||||||
this.$el.find(".signature").jSignature("init",sign_options);
|
'decor-color': '#D1D0CE',
|
||||||
this.$el.find(".signature").attr({"tabindex": "0",'height':"100"});
|
'color': '#000',
|
||||||
this.empty_sign = this.$el.find(".signature").jSignature("getData",'image');
|
'background-color': '#fff',
|
||||||
this.$el.find('#sign_clean').click(this.on_clear_sign);
|
'height': '150',
|
||||||
this.$el.find('.save_sign').click(this.on_save_sign);
|
'width': '550'
|
||||||
|
};
|
||||||
|
this.empty_sign = [];
|
||||||
},
|
},
|
||||||
on_clear_sign: function() {
|
start: function() {
|
||||||
var self = this;
|
var self = this;
|
||||||
this.$el.find(".signature > canvas").remove();
|
this.$(".signature").jSignature("init", this.sign_options);
|
||||||
this.$el.find('> img').remove();
|
this.$(".signature").attr({
|
||||||
this.$el.find(".signature").attr("tabindex", "0");
|
"tabindex": "0",
|
||||||
var sign_options = {'decor-color' : '#D1D0CE', 'color': '#000', 'background-color': '#fff','height':'150','width':'550','clear': true};
|
'height': "100"
|
||||||
this.$el.find(".signature").jSignature(sign_options);
|
});
|
||||||
this.$el.find(".signature").focus();
|
this.empty_sign = this.$(".signature").jSignature("getData", 'image');
|
||||||
self.set('value', false);
|
self._render();
|
||||||
},
|
},
|
||||||
on_save_sign: function(value_) {
|
_on_clear_sign: function() {
|
||||||
|
this.$(".signature > canvas").remove();
|
||||||
|
this.$('> img').remove();
|
||||||
|
this.$(".signature").attr("tabindex", "0");
|
||||||
|
var sign_options = {
|
||||||
|
'decor-color': '#D1D0CE',
|
||||||
|
'color': '#000',
|
||||||
|
'background-color': '#fff',
|
||||||
|
'height': '150',
|
||||||
|
'width': '550',
|
||||||
|
'clear': true
|
||||||
|
};
|
||||||
|
this.$(".signature").jSignature(sign_options);
|
||||||
|
this.$(".signature").focus();
|
||||||
|
this._setValue(false);
|
||||||
|
},
|
||||||
|
_on_save_sign: function(value_) {
|
||||||
var self = this;
|
var self = this;
|
||||||
this.$el.find('> img').remove();
|
this.$('> img').remove();
|
||||||
var signature = self.$el.find(".signature").jSignature("getData",'image');
|
var signature = this.$(".signature").jSignature("getData", 'image');
|
||||||
var is_empty = signature
|
var is_empty = signature ?
|
||||||
? self.empty_sign[1] === signature[1]
|
self.empty_sign[1] === signature[1] :
|
||||||
: false;
|
false;
|
||||||
if (! is_empty && typeof signature !== "undefined" && signature[1]) {
|
if (!is_empty && typeof signature !== "undefined" && signature[1]) {
|
||||||
self.set('value',signature[1]);
|
this._setValue(signature[1]);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
render_value: function() {
|
_render: function() {
|
||||||
var self = this;
|
var self = this;
|
||||||
var url = this.placeholder;
|
var url = this.placeholder;
|
||||||
if (this.get('value') && !utils.is_bin_size(this.get('value'))) {
|
if (this.value && !utils.is_bin_size(this.value)) {
|
||||||
url = 'data:image/png;base64,' + this.get('value');
|
url = 'data:image/png;base64,' + this.value;
|
||||||
} else if (this.get('value')) {
|
} else if (this.value) {
|
||||||
url = this.session.url('/web/binary/image', {
|
url = session.url('/web/image', {
|
||||||
model: this.view.dataset.model,
|
model: this.model,
|
||||||
id: JSON.stringify(this.view.datarecord.id || null),
|
id: JSON.stringify(this.res_id),
|
||||||
field: this.options.preview_image
|
field: this.nodeOptions.preview_image || this.name,
|
||||||
? this.options.preview_image
|
unique: field_utils.format.datetime(this.recordData.__last_update).replace(/[^0-9]/g, ''),
|
||||||
: this.name,
|
|
||||||
t: new Date().getTime()
|
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
url = this.placeholder;
|
url = this.placeholder;
|
||||||
}
|
}
|
||||||
if (this.view.get("actual_mode") === 'view') {
|
if (this.mode === "readonly") {
|
||||||
var $img = $(QWeb.render("FieldBinaryImage-extend", { widget: this, url: url }));
|
var $img = $(QWeb.render("FieldBinaryImage-img", {
|
||||||
this.$el.find('> img').remove();
|
widget: self,
|
||||||
this.$el.find(".signature").hide();
|
url: url
|
||||||
|
}));
|
||||||
|
this.$('> img').remove();
|
||||||
|
this.$(".signature").hide();
|
||||||
this.$el.prepend($img);
|
this.$el.prepend($img);
|
||||||
$img.load(function() {
|
|
||||||
if (! self.options.size) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
$img.css("max-width", "" + self.options.size[0] + "px");
|
|
||||||
$img.css("max-height", "" + self.options.size[1] + "px");
|
|
||||||
$img.css("margin-left", "" + (self.options.size[0] - $img.width()) / 2 + "px");
|
|
||||||
$img.css("margin-top", "" + (self.options.size[1] - $img.height()) / 2 + "px");
|
|
||||||
});
|
|
||||||
$img.on('error', function() {
|
$img.on('error', function() {
|
||||||
|
self.on_clear();
|
||||||
$img.attr('src', self.placeholder);
|
$img.attr('src', self.placeholder);
|
||||||
self.do_warn(_t("Image"), _t("Could not display the selected image."));
|
self.do_warn(_t("Image"), _t("Could not display the selected image."));
|
||||||
});
|
});
|
||||||
} else if (this.view.get("actual_mode") === 'edit') {
|
} else if (this.mode === "edit") {
|
||||||
this.$el.find('> img').remove();
|
this.$('> img').remove();
|
||||||
if (this.get('value')) {
|
if (this.value) {
|
||||||
var field_name = this.options.preview_image
|
var field_name = this.nodeOptions.preview_image ?
|
||||||
? this.options.preview_image
|
this.nodeOptions.preview_image :
|
||||||
: this.name;
|
this.name;
|
||||||
new Model(this.view.dataset.model).call("read", [this.view.datarecord.id, [field_name]]).done(function(data) {
|
self._rpc({
|
||||||
|
model: this.model,
|
||||||
|
method: 'read',
|
||||||
|
args: [this.res_id, [field_name]]
|
||||||
|
}).done(function(data) {
|
||||||
if (data) {
|
if (data) {
|
||||||
var field_desc = _.values(_.pick(data, field_name));
|
var field_desc = _.values(_.pick(data[0], field_name));
|
||||||
self.$el.find(".signature").jSignature("reset");
|
self.$(".signature").jSignature("clear");
|
||||||
self.$el.find(".signature").jSignature("setData",'data:image/png;base64,'+field_desc[0]);
|
self.$(".signature").jSignature("setData", 'data:image/png;base64,' + field_desc[0]);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
this.$el.find('> img').remove();
|
this.$('> img').remove();
|
||||||
this.$el.find('.signature > canvas').remove();
|
this.$('.signature > canvas').remove();
|
||||||
var sign_options = {'decor-color' : '#D1D0CE', 'color': '#000','background-color': '#fff','height':'150','width':'550'};
|
var sign_options = {
|
||||||
this.$el.find(".signature").jSignature("init",sign_options);
|
'decor-color': '#D1D0CE',
|
||||||
|
'color': '#000',
|
||||||
|
'background-color': '#fff',
|
||||||
|
'height': '150',
|
||||||
|
'width': '550'
|
||||||
|
};
|
||||||
|
this.$(".signature").jSignature("init", sign_options);
|
||||||
}
|
}
|
||||||
} else if (this.view.get("actual_mode") === 'create') {
|
} else if (this.mode === 'create') {
|
||||||
this.$el.find('> img').remove();
|
this.$('> img').remove();
|
||||||
this.$el.find('> canvas').remove();
|
this.$('> canvas').remove();
|
||||||
if (!this.get('value')) {
|
if (!this.value) {
|
||||||
this.$el.find(".signature").empty().jSignature("init",{'decor-color' : '#D1D0CE', 'color': '#000','background-color': '#fff','height':'150','width':'550'});
|
this.$(".signature").empty().jSignature("init", {
|
||||||
}
|
'decor-color': '#D1D0CE',
|
||||||
}
|
'color': '#000',
|
||||||
|
'background-color': '#fff',
|
||||||
|
'height': '150',
|
||||||
|
'width': '550'
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
core.form_widget_registry.add('signature', FieldSignature);
|
FormController.include({
|
||||||
|
saveRecord: function() {
|
||||||
FormView.include({
|
this.$('.save_sign').click();
|
||||||
save: function() {
|
|
||||||
this.$el.find('.save_sign').click();
|
|
||||||
return this._super.apply(this, arguments);
|
return this._super.apply(this, arguments);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
});
|
Registry.add('signature', FieldSignature);
|
||||||
|
|
||||||
|
|
||||||
|
});
|
||||||
|
|
|
@ -1,24 +1,22 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
<template id="template" xml:space="preserve">
|
<templates id="template" xml:space="preserve">
|
||||||
<t t-name="FieldSignature">
|
<t t-name="FieldSignature">
|
||||||
<div class="panel panel-default mt16 mb0 " id="drawsign">
|
<t t-if="widget.mode != 'readonly'">
|
||||||
<div class="panel-heading oe_edit_only">
|
<div class="panel panel-default mt16 mb0 oe_edit_only" id="drawsign">
|
||||||
<div class="pull-right">
|
<div class="panel-heading">
|
||||||
<a id="sign_clean" class="btn btn-xs oe_edit_only">Clear</a>
|
<div class="pull-right">
|
||||||
<a class="oe_edit_only save_sign"></a>
|
<a id="sign_clean" class="btn btn-xs oe_edit_only">Clear</a>
|
||||||
|
<a class="oe_edit_only save_sign"></a>
|
||||||
|
</div>
|
||||||
|
<strong>Draw your signature</strong>
|
||||||
</div>
|
</div>
|
||||||
<strong>Draw your signature</strong>
|
<div class="signature"></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="signature panel-body"></div>
|
</t>
|
||||||
</div>
|
<t t-if="widget.mode == 'readonly'">
|
||||||
|
<div class="panel panel-default mt16 mb0 " id="drawsign">
|
||||||
|
<div class="signature"></div>
|
||||||
|
</div>
|
||||||
|
</t>
|
||||||
</t>
|
</t>
|
||||||
<t t-name="FieldBinaryImage-extend">
|
</templates>
|
||||||
<img t-att-src='url'
|
|
||||||
t-att-border="widget.readonly ? 0 : 1"
|
|
||||||
t-att-name="widget.name"
|
|
||||||
t-att-width="widget.node.attrs.img_width || widget.node.attrs.width"
|
|
||||||
t-att-height="widget.node.attrs.img_height || widget.node.attrs.height"
|
|
||||||
t-att-tabindex="widget.node.attrs.img_tabindex || widget.node.attrs.tabindex"
|
|
||||||
/>
|
|
||||||
</t>
|
|
||||||
</template>
|
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
|
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
|
||||||
|
|
||||||
from . import test_signature_tracking
|
from . import test_signature_tracking
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
# Copyright 2017 Tecnativa - Pedro M. Baeza
|
# Copyright 2017 Tecnativa - Pedro M. Baeza
|
||||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
|
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
|
||||||
|
|
||||||
|
@ -25,14 +24,14 @@ class TestSignatureTracking(common.SavepointCase):
|
||||||
direct chatter"""
|
direct chatter"""
|
||||||
prev_attachment_num = self.attachment_obj.search_count([])
|
prev_attachment_num = self.attachment_obj.search_count([])
|
||||||
prev_messages = self.message_obj.search([])
|
prev_messages = self.message_obj.search([])
|
||||||
self.user.signature_image = self.image
|
self.user.digital_signature = self.image
|
||||||
current_attachment_num = self.attachment_obj.search_count([])
|
current_attachment_num = self.attachment_obj.search_count([])
|
||||||
self.assertEqual(current_attachment_num - prev_attachment_num, 1)
|
self.assertEqual(current_attachment_num - prev_attachment_num, 1)
|
||||||
current_messages = self.message_obj.search([])
|
current_messages = self.message_obj.search([])
|
||||||
message = current_messages - prev_messages
|
message = current_messages - prev_messages
|
||||||
self.assertIn('Signature has been created.', message.body)
|
self.assertIn('Signature has been created.', message.body)
|
||||||
prev_messages = current_messages
|
prev_messages = current_messages
|
||||||
self.user.signature_image = False
|
self.user.digital_signature = False
|
||||||
current_messages = self.message_obj.search([])
|
current_messages = self.message_obj.search([])
|
||||||
message = current_messages - prev_messages
|
message = current_messages - prev_messages
|
||||||
self.assertIn('Signature has been deleted.', message.body)
|
self.assertIn('Signature has been deleted.', message.body)
|
||||||
|
|
|
@ -4,22 +4,26 @@
|
||||||
<record id="inherited_res_users_form" model="ir.ui.view">
|
<record id="inherited_res_users_form" model="ir.ui.view">
|
||||||
<field name="name">inherited.res.users.form</field>
|
<field name="name">inherited.res.users.form</field>
|
||||||
<field name="model">res.users</field>
|
<field name="model">res.users</field>
|
||||||
<field name="inherit_id" ref="base.view_users_form"/>
|
<field name="inherit_id" ref="base.view_users_form" />
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<xpath expr="//field[@name='signature']" position="after">
|
<xpath expr="//field[@name='signature']" position="after">
|
||||||
<label for="signature_image" class="oe_edit_only"/>
|
<label for="digital_signature" string="Signature" class="oe_edit_only" />
|
||||||
<h2><field name="signature_image" widget="signature"/></h2>
|
<h2>
|
||||||
|
<field name="digital_signature" widget="signature"/>
|
||||||
|
</h2>
|
||||||
</xpath>
|
</xpath>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
<record id="view_users_form_simple_modif" model="ir.ui.view">
|
<record id="inherited_res_users_preferences_form" model="ir.ui.view">
|
||||||
<field name="name">res.users.preferences.form</field>
|
<field name="name">inherited.res.users.preferences.form</field>
|
||||||
<field name="model">res.users</field>
|
<field name="model">res.users</field>
|
||||||
<field name="inherit_id" ref="base.view_users_form_simple_modif"/>
|
<field name="inherit_id" ref="base.view_users_form_simple_modif" />
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<xpath expr="//field[@name='signature']" position="after">
|
<xpath expr="//field[@name='signature']" position="after">
|
||||||
<label for="signature_image" class="oe_edit_only"/>
|
<label for="digital_signature" string="Signature" class="oe_edit_only"/>
|
||||||
<h2><field name="signature_image" widget="signature"/></h2>
|
<h2>
|
||||||
|
<field name="digital_signature" widget="signature"/>
|
||||||
|
</h2>
|
||||||
</xpath>
|
</xpath>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
|
|
||||||
<template id="web_widget_digitized_signature_backend" name="web_widget_digitized_signature assets" inherit_id="web.assets_backend">
|
<template id="web_widget_digitized_signature_backend" name="web_widget_digitized_signature assets" inherit_id="web.assets_backend">
|
||||||
<xpath expr="." position="inside">
|
<xpath expr="." position="inside">
|
||||||
<script type="text/javascript" src="/web_widget_digitized_signature/static/lib/jSignature/jSignatureCustom.js"></script>
|
|
||||||
<script type="text/javascript" src="/web_widget_digitized_signature/static/src/js/digital_sign.js"></script>
|
<script type="text/javascript" src="/web_widget_digitized_signature/static/src/js/digital_sign.js"></script>
|
||||||
</xpath>
|
</xpath>
|
||||||
</template>
|
</template>
|
||||||
|
|
Loading…
Reference in New Issue