Changed the attribute datatype from string to bool in digit data mode…

…l package
egovernments · Nov 22, 2024 · 2fc780e · 2fc780e
1 parent acf5c79
commit 2fc780e
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 24 deletions.
diff --git a/packages/digit_data_model/lib/data/local_store/sql_store/sql_store.g.dart b/packages/digit_data_model/lib/data/local_store/sql_store/sql_store.g.dart
diff --git a/packages/digit_data_model/lib/data/local_store/sql_store/tables/attributes.dart b/packages/digit_data_model/lib/data/local_store/sql_store/tables/attributes.dart
@@ -9,7 +9,7 @@ class Attributes extends Table {
   TextColumn get tenantId => text().nullable()();
   TextColumn get code => text().nullable()();
   TextColumn get values => text().nullable()();
-  TextColumn get isActive => text().nullable()();
+  BoolColumn get isActive => boolean().nullable()();
   BoolColumn get required => boolean().nullable()();
   TextColumn get regex => text().nullable()();
   IntColumn get order => integer().nullable()();

diff --git a/packages/digit_data_model/lib/models/entities/attributes.dart b/packages/digit_data_model/lib/models/entities/attributes.dart
@@ -18,7 +18,7 @@ class AttributesSearchModel extends EntitySearchModel
   final String? referenceId;
   final String? tenantId;
   final String? code;
-  final String? isActive;
+  final bool? isActive;
   final bool? required;
   final String? regex;
   final int? order;
@@ -62,7 +62,7 @@ class AttributesModel extends EntityModel with AttributesModelMappable {
   final String? tenantId;
   final String? code;
   final List<String>? values;
-  final String? isActive;
+  final bool? isActive;
   final bool? required;
   final String? regex;
   final int? order;

diff --git a/packages/digit_data_model/lib/models/entities/attributes.mapper.dart b/packages/digit_data_model/lib/models/entities/attributes.mapper.dart
@@ -36,8 +36,8 @@ class AttributesSearchModelMapper
   static String? _$code(AttributesSearchModel v) => v.code;
   static const Field<AttributesSearchModel, String> _f$code =
       Field('code', _$code, opt: true);
-  static String? _$isActive(AttributesSearchModel v) => v.isActive;
-  static const Field<AttributesSearchModel, String> _f$isActive =
+  static bool? _$isActive(AttributesSearchModel v) => v.isActive;
+  static const Field<AttributesSearchModel, bool> _f$isActive =
       Field('isActive', _$isActive, opt: true);
   static bool? _$required(AttributesSearchModel v) => v.required;
   static const Field<AttributesSearchModel, bool> _f$required =
@@ -167,7 +167,7 @@ abstract class AttributesSearchModelCopyWith<
       String? referenceId,
       String? tenantId,
       String? code,
-      String? isActive,
+      bool? isActive,
       bool? required,
       String? regex,
       int? order,
@@ -270,8 +270,8 @@ class AttributesModelMapper extends SubClassMapperBase<AttributesModel> {
   static List<String>? _$values(AttributesModel v) => v.values;
   static const Field<AttributesModel, List<String>> _f$values =
       Field('values', _$values, opt: true);
-  static String? _$isActive(AttributesModel v) => v.isActive;
-  static const Field<AttributesModel, String> _f$isActive =
+  static bool? _$isActive(AttributesModel v) => v.isActive;
+  static const Field<AttributesModel, bool> _f$isActive =
       Field('isActive', _$isActive, opt: true);
   static bool? _$required(AttributesModel v) => v.required;
   static const Field<AttributesModel, bool> _f$required =
@@ -429,7 +429,7 @@ abstract class AttributesModelCopyWith<$R, $In extends AttributesModel, $Out>
       String? tenantId,
       String? code,
       List<String>? values,
-      String? isActive,
+      bool? isActive,
       bool? required,
       String? regex,
       int? order,

diff --git a/packages/survey_form/lib/pages/survey_form_view.dart b/packages/survey_form/lib/pages/survey_form_view.dart
@@ -379,7 +379,7 @@ class SurveyFormViewPageState extends LocalizedState<SurveyFormViewPage> {
                               textAlign: TextAlign.left,
                             ),
                           ),
-                          ...initialAttributes!.where((att) => att.isActive.toString() == 'true').map((
+                          ...initialAttributes!.where((att) => att.isActive == true).map((
                             e,
                           ) {
                             int index = (initialAttributes ?? []).indexOf(e);

diff --git a/packages/survey_form/test/constants/test_constants.dart b/packages/survey_form/test/constants/test_constants.dart
@@ -46,7 +46,7 @@ class ServiceTestConstants {
     dataType: testDataType,
     values: null,
     required: true,
-    isActive: 'true',
+    isActive: true,
     regex: null,
     order: 1,
   );
@@ -57,7 +57,7 @@ class ServiceTestConstants {
     dataType: testDataType,
     values: null,
     required: true,
-    isActive: 'true',
+    isActive: true,
     regex: null,
     order: 1,
   );