[IMP] sign_oca: Add placeholder and show required

OCA · Aug 23, 2023 · c6750c4 · c6750c4
1 parent 9eb23fb
commit c6750c4
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 5 deletions.
diff --git a/sign_oca/models/sign_oca_template.py b/sign_oca/models/sign_oca_template.py
@@ -81,6 +81,7 @@ class SignOcaTemplateItem(models.Model):
     position_y = fields.Float(required=True)
     width = fields.Float()
     height = fields.Float()
+    placeholder = fields.Char()
 
     @api.model
     def _get_default_role(self):
@@ -98,4 +99,5 @@ def get_info(self):
             "position_y": self.position_y,
             "width": self.width,
             "height": self.height,
+            "placeholder": self.placeholder,
         }
diff --git a/sign_oca/static/src/components/sign_oca_configure/sign_oca_configure.js b/sign_oca/static/src/components/sign_oca_configure/sign_oca_configure.js
@@ -157,6 +157,9 @@ odoo.define(
                                         var required = dialog.$el
                                             .find("input[name='required']")
                                             .prop("checked");
+                                        var placeholder = dialog.$el
+                                            .find("input[name='placeholder']")
+                                            .val();
                                         this.env.services
                                             .rpc({
                                                 model: this.props.model,
@@ -168,6 +171,7 @@ odoo.define(
                                                         field_id,
                                                         role_id,
                                                         required,
+                                                        placeholder,
                                                     },
                                                 ],
                                             })
@@ -179,6 +183,7 @@ odoo.define(
                                                 )[0].name;
                                                 item.role_id = role_id;
                                                 item.required = required;
+                                                item.placeholder = placeholder;
                                                 target.remove();
                                                 this.postIframeField(item);
                                             });

diff --git a/sign_oca/static/src/components/sign_oca_configure/sign_oca_configure.xml b/sign_oca/static/src/components/sign_oca_configure/sign_oca_configure.xml
@@ -80,6 +80,14 @@
                     t-att-checked="item.required? 'checked': undefined"
                 />
             </div>
+            <label for="placeholder">Placeholder</label>
+            <div class="o_sign_oca_field_edition_value">
+                <input
+                    type="text"
+                    name="placeholder"
+                    t-att-value="item.placeholder || ''"
+                />
+            </div>
         </div>
     </t>
 </templates>
diff --git a/sign_oca/static/src/components/sign_oca_pdf_common/sign_oca_pdf_common.js b/sign_oca/static/src/components/sign_oca_pdf_common/sign_oca_pdf_common.js
@@ -63,7 +63,7 @@ odoo.define(
                 var nbLayers = this.iframe.el.contentDocument.getElementsByClassName(
                     "textLayer"
                 ).length;
-                if (nbPages > 0 && nbLayers > 0 && nbPages === nbLayers) {
+                if (nbPages > 0 && nbLayers > 0) {
                     this.postIframeFields();
                 } else {
                     var self = this;

diff --git a/sign_oca/static/src/components/sign_oca_pdf_common/sign_oca_pdf_common.xml b/sign_oca/static/src/components/sign_oca_pdf_common/sign_oca_pdf_common.xml
@@ -9,8 +9,8 @@
     </div>
     <t t-name="sign_oca.sign_iframe_field">
         <div
-            class="o_sign_oca_field"
-            t-attf-data-field="id"
+            t-attf-class="o_sign_oca_field #{required? 'sign_oca_field_required': ''}"
+            t-att-data-field="id"
             t-attf-style="position:absolute;top:#{position_y}%; left: #{position_x}%; width: #{width}%;height: #{height}%"
         >
         </div>

diff --git a/sign_oca/static/src/elements/elements.xml b/sign_oca/static/src/elements/elements.xml
@@ -7,6 +7,7 @@
             type="text"
             t-att-tabindex="-1"
             t-att-value="item.value? item.value: undefined"
+            t-att-placeholder="item.placeholder || item.name"
             t-if="item.role == role"
         />
         <div
@@ -21,7 +22,7 @@
             t-attf-src="data:image/png;base64,{{item.value}}"
             t-if="item.value"
         />
-        <div style="width:100%;height:100%" t-else="" />
+        <div style="width:100%;height:100%" t-else="" t-esc="placeholder" />
     </t>
     <t t-name="sign_oca.sign_oca_sign_dialog">
         <div>

diff --git a/sign_oca/static/src/scss/sign.scss b/sign_oca/static/src/scss/sign.scss
@@ -1,14 +1,21 @@
 .o_sign_oca_field {
     background-color: rgba(0, 128, 128, 0.3);
+    &.sign_oca_field_required {
+        background-color: rgba(255, 113, 113, 0.5);
+    }
     &.sign_oca_selected {
-        background-color: rgba(0, 128, 128, 0.5);
+        background-color: rgba(0, 128, 128, 0.5) !important;
     }
     .o_placeholder {
         -webkit-user-select: none;
         -moz-user-select: none;
         -ms-user-select: none;
         user-select: none;
     }
+    input {
+        border: transparent;
+        background-color: transparent;
+    }
 }
 .o_sign_oca_field_config {
     position: absolute;

diff --git a/sign_oca/static/src/scss/sign_oca.scss b/sign_oca/static/src/scss/sign_oca.scss
@@ -27,5 +27,8 @@ html
     .o_sign_oca_field_edition_value {
         margin-bottom: 10px;
         max-width: 100%;
+        input[type="text"] {
+            max-width: 100%;
+        }
     }
 }
diff --git a/sign_oca/wizards/sign_oca_template_generate.py b/sign_oca/wizards/sign_oca_template_generate.py
@@ -41,6 +41,7 @@ def _get_item_info(self, item, item_id):
             "height": item.height,
             "value": False,
             "default_value": item.field_id.default_value,
+            "placeholder": item.placeholder,
         }
 
     def _generate_vals(self):