fix-8985: [Badge wizard] Fields section always expands when clicking saving. (#9013)

Author: Hieu Lam - TMA

app/api/badge_forms.py

@@ -137,6 +137,7 @@ def before_patch(_args, kwargs, data):
                     badgeFieldForm.margin_right = badgeField['margin_right']
                     badgeFieldForm.qr_custom_field = badgeField.get('qr_custom_field')
                     badgeFieldForm.is_deleted = badgeField['is_deleted']
+                    badgeFieldForm.is_field_expanded = badgeField['is_field_expanded']
                     db.session.add(badgeFieldForm)
 
     @staticmethod

app/api/custom/schema/badge_form_field.py

@@ -23,3 +23,4 @@ class BadgeFieldFormSchema(Schema):
     margin_left = fields.Integer(allow_none=True)
     margin_right = fields.Integer(allow_none=True)
     qr_custom_field = fields.List(fields.String(), allow_none=True, default=None)
+    is_field_expanded = fields.Boolean(allow_none=True, default=True)

app/api/data_layers/BadgeFormLayer.py

@@ -50,6 +50,7 @@ def create_object(data, _view_kwargs):
                 'margin_right',
                 'qr_custom_field',
                 'is_deleted',
+                'is_field_expanded',
             ]
             for item in data['badge_fields']:
                 badgeFieldForm = BadgeFieldForms()

app/api/schema/badge_field_forms.py

@@ -43,3 +43,4 @@ class Meta:
     margin_right = fields.Integer(required=False)
     text_rotation = fields.Integer(required=False)
     qr_custom_field = fields.List(fields.String(), required=False)
+    is_field_expanded = fields.Boolean(required=False, default=False)

app/models/badge_field_form.py

@@ -31,6 +31,7 @@ class BadgeFieldForms(db.Model):
     margin_left = db.Column(db.Integer, nullable=True)
     margin_right = db.Column(db.Integer, nullable=True)
     qr_custom_field = db.Column(ARRAY(String), nullable=True)
+    is_field_expanded = db.Column(db.Boolean, nullable=True)
 
     def __repr__(self):
         return f'<BadgeFieldForms {self.id}>'
@@ -56,6 +57,7 @@ def convert_to_dict(self):
             'margin_left': self.margin_left,
             'margin_right': self.margin_right,
             'qr_custom_field': self.qr_custom_field,
+            'is_field_expanded': self.is_field_expanded,
         }
 
     def get_badge_field(self):

migrations/versions/rev-2023-07-26-10:30:16-8bd9e8e80517_.py

@@ -0,0 +1,27 @@
+"""empty message
+
+Revision ID: 8bd9e8e80517
+Revises: e3075e4e1327
+Create Date: 2023-07-26 10:30:16.958006
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '8bd9e8e80517'
+down_revision = 'e3075e4e1327'
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('badge_field_forms', sa.Column('is_field_expanded', sa.Boolean(), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('badge_field_forms', 'is_field_expanded')
+    # ### end Alembic commands ###