feature-8980: Badge creation in wizard misses default options (#9023)

* feature-8980: Badge creation in wizard misses default options
font style options

* feature-8980: Badge creation in wizard misses default options
add font style as multiple choice

* fix multiple head revision

* fix empty font style

* fix ci/cd

* fix ci/cd

---------

Co-authored-by: lthanhhieu <[email protected]>
Co-authored-by: Khang On - TMA <[email protected]>

Author: 3 people

app/api/badge_forms.py

@@ -45,6 +45,7 @@ def after_get(badge_forms):
             badgeFieldForms = (
                 BadgeFieldForms.query.filter_by(badge_form_id=item['id'])
                 .filter_by(badge_id=item['attributes']['badge-id'])
+                .order_by(BadgeFieldForms.id.asc())
                 .all()
             )
             for badgeFieldForm in badgeFieldForms:
@@ -127,7 +128,7 @@ def before_patch(_args, kwargs, data):
                     badgeFieldForm.font_name = badgeField['font_name']
                     badgeFieldForm.font_size = badgeField['font_size']
                     badgeFieldForm.font_color = badgeField['font_color']
-                    badgeFieldForm.font_weight = badgeField['font_weight']
+                    badgeFieldForm.font_weight = badgeField.get('font_weight')
                     badgeFieldForm.text_rotation = badgeField['text_rotation']
                     badgeFieldForm.text_alignment = badgeField['text_alignment']
                     badgeFieldForm.text_type = badgeField['text_type']

app/api/custom/schema/badge_form_field.py

@@ -1,5 +1,7 @@
 from marshmallow import Schema, fields
 
+from app.api.schema.badge_field_forms import FontWeight
+
 
 class BadgeFieldFormSchema(Schema):
     """Badge Field Form Schema"""
@@ -11,7 +13,7 @@ class BadgeFieldFormSchema(Schema):
     sample_text = fields.String(allow_none=True)
     font_size = fields.Integer(allow_none=True)
     font_name = fields.String(allow_none=True)
-    font_weight = fields.Integer(allow_none=True)
+    font_weight = fields.List(fields.Nested(FontWeight), allow_none=True)
     font_color = fields.String(allow_none=True)
     text_rotation = fields.Integer(allow_none=True)
     text_alignment = fields.String(allow_none=True)

app/api/helpers/badge_forms.py

@@ -29,6 +29,30 @@ def create_preivew_badge_pdf(badgeForms):
     badgeForms = badgeForms[0]
     badgeFieldForms = badgeForms['badgeFields']
     badgeId = badgeForms['badgeID']
+    for badge_field in badgeFieldForms:
+        font_weight = []
+        font_style = []
+        text_decoration = []
+        if badge_field.get('font_weight'):
+            for item in badge_field.get('font_weight'):
+                if item.get('font_weight'):
+                    font_weight.append(item.get('font_weight'))
+                if item.get('font_style'):
+                    font_style.append(item.get('font_style'))
+                if item.get('text_decoration'):
+                    text_decoration.append(item.get('text_decoration'))
+        if not font_weight:
+            badge_field['font_weight'] = 'none'
+        else:
+            badge_field['font_weight'] = ','.join(font_weight)
+        if not font_style:
+            badge_field['font_style'] = 'none'
+        else:
+            badge_field['font_style'] = ','.join(font_style)
+        if not text_decoration:
+            badge_field['text_decoration'] = 'none'
+        else:
+            badge_field['text_decoration'] = ','.join(text_decoration)
     create_save_pdf(
         render_template(
             'pdf/badge_forms.html', badgeForms=badgeForms, badgeFieldForms=badgeFieldForms
@@ -119,6 +143,32 @@ def create_print_badge_pdf(badge_form, ticket_holder, list_field_show):
             continue
 
         get_value_from_field_indentifier(field, ticket_holder)
+
+    for badge_field in badgeFieldForms:
+        font_weight = []
+        font_style = []
+        text_decoration = []
+        if badge_field.get('font_weight'):
+            for item in badge_field.get('font_weight'):
+                if item.get('font_weight'):
+                    font_weight.append(item.get('font_weight'))
+                if item.get('font_style'):
+                    font_style.append(item.get('font_style'))
+                if item.get('text_decoration'):
+                    text_decoration.append(item.get('text_decoration'))
+        if not font_weight:
+            badge_field['font_weight'] = 'none'
+        else:
+            badge_field['font_weight'] = ','.join(font_weight)
+        if not font_style:
+            badge_field['font_style'] = 'none'
+        else:
+            badge_field['font_style'] = ','.join(font_style)
+        if not text_decoration:
+            badge_field['text_decoration'] = 'none'
+        else:
+            badge_field['text_decoration'] = ','.join(text_decoration)
+
     create_save_pdf(
         render_template(
             'pdf/badge_forms.html', badgeForms=badge_form, badgeFieldForms=badgeFieldForms

app/api/schema/badge_field_forms.py

@@ -1,10 +1,18 @@
+from marshmallow.schema import Schema
 from marshmallow_jsonapi import fields
-from marshmallow_jsonapi.flask import Relationship, Schema
+from marshmallow_jsonapi.flask import Relationship
 
 from app.api.helpers.utilities import dasherize
 from utils.common import use_defaults
 
 
+class FontWeight(Schema):
+    name = fields.String(required=False)
+    font_weight = fields.String(required=False)
+    font_style = fields.String(required=False)
+    text_decoration = fields.String(required=False)
+
+
 @use_defaults()
 class BadgeFieldFormSchema(Schema):
     """API Schema for Badge Field Forms database model"""
@@ -35,7 +43,7 @@ class Meta:
     text_type = fields.String(required=False)
     is_deleted = fields.Boolean(required=False, default=False)
     font_name = fields.String(required=False)
-    font_weight = fields.Integer(required=False)
+    font_weight = fields.List(fields.Nested(FontWeight), allow_none=True, required=False)
     font_color = fields.String(required=False)
     margin_top = fields.Integer(required=False)
     margin_bottom = fields.Integer(required=False)

app/models/badge_field_form.py

@@ -20,7 +20,7 @@ class BadgeFieldForms(db.Model):
     sample_text = db.Column(db.String, nullable=True)
     font_size = db.Column(db.Integer, nullable=True)
     font_name = db.Column(db.String, nullable=True)
-    font_weight = db.Column(db.Integer, nullable=True)
+    font_weight = db.Column(ARRAY(db.JSON), nullable=True)
     font_color = db.Column(db.String, nullable=True)
     text_rotation = db.Column(db.Integer, nullable=True)
     text_alignment = db.Column(db.String, nullable=True)

app/templates/pdf/badge_forms.html

@@ -11,19 +11,21 @@
         {% for badgeFieldForm in badgeFieldForms %}
             {% if badgeFieldForm.custom_field == 'QR' %}
                 <div id="badge_qr" style="text-align: center;
-                    margin-top:{{badgeFieldForm.margin_top}}mm; 
-                    margin-bottom:{{badgeFieldForm.margin_bottom}}mm; 
-                    margin-left:{{badgeFieldForm.margin_left}}mm; 
+                    margin-top:{{badgeFieldForm.margin_top}}mm;
+                    margin-bottom:{{badgeFieldForm.margin_bottom}}mm;
+                    margin-left:{{badgeFieldForm.margin_left}}mm;
                     margin-right:{{badgeFieldForm.margin_right}}mm;">
                     <img src="data:image/png;base64, {{ badgeFieldForm.sample_text }}" width="400" alt="QR" />
                 </div>
             {% else %}
-                <p class="field-style" 
+                <p class="field-style"
                     style="font-family: {{badgeFieldForm.font_name}};
                     font-size: {{badgeFieldForm.font_size}} px;
                     text-align: center;
                     text-transform: {{badgeFieldForm.text_type}};
-                    font-weight:{{badgeFieldForm.font_weight}};
+                    font-weight: {{badgeFieldForm.font_weight}};
+                    font-style: {{badgeFieldForm.font_style}};
+                    text-decoration: {{badgeFieldForm.text_decoration}};
                     -webkit-transform: rotate({{badgeFieldForm.text_rotation}}deg);
                     -moz-transform: rotate({{badgeFieldForm.text_rotation}}deg);
                     -o-transform: rotate({{badgeFieldForm.text_rotation}}deg);
@@ -39,4 +41,4 @@
         {% endfor %}
     </div>
 </body>
-</html>
+</html>

migrations/versions/rev-2023-08-01-14:10:12-8b5bc48e1d4c_.py

@@ -0,0 +1,34 @@
+"""empty message
+
+Revision ID: 8b5bc48e1d4c
+Revises: 21c79d253f21
+Create Date: 2023-08-01 14:10:12.187180
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = '8b5bc48e1d4c'
+down_revision = '21c79d253f21'
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column('badge_field_forms', 'font_weight',
+               existing_type=sa.TEXT(),
+               type_=postgresql.ARRAY(sa.JSON()),
+               postgresql_using='font_weight::json[]',
+               existing_nullable=True)
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column('badge_field_forms', 'font_weight',
+               existing_type=postgresql.ARRAY(sa.JSON()),
+               type_=sa.TEXT(),
+               existing_nullable=True)
+    # ### end Alembic commands ###