Merge branch '264-p0-comp-01-tax-forms-screen' of https://github.com/Oloodi/krow-workforce into 264-p0-comp-01-tax-forms-screen

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/.guides/usage.md

@@ -1,16 +1,16 @@
 # Basic Usage
 
 ```dart
-ExampleConnector.instance.createFaqData(createFaqDataVariables).execute();
-ExampleConnector.instance.updateFaqData(updateFaqDataVariables).execute();
-ExampleConnector.instance.deleteFaqData(deleteFaqDataVariables).execute();
-ExampleConnector.instance.createStaffAvailability(createStaffAvailabilityVariables).execute();
-ExampleConnector.instance.updateStaffAvailability(updateStaffAvailabilityVariables).execute();
-ExampleConnector.instance.deleteStaffAvailability(deleteStaffAvailabilityVariables).execute();
-ExampleConnector.instance.listStaffAvailabilityStats(listStaffAvailabilityStatsVariables).execute();
-ExampleConnector.instance.getStaffAvailabilityStatsByStaffId(getStaffAvailabilityStatsByStaffIdVariables).execute();
-ExampleConnector.instance.filterStaffAvailabilityStats(filterStaffAvailabilityStatsVariables).execute();
 ExampleConnector.instance.createTaxForm(createTaxFormVariables).execute();
+ExampleConnector.instance.updateTaxForm(updateTaxFormVariables).execute();
+ExampleConnector.instance.deleteTaxForm(deleteTaxFormVariables).execute();
+ExampleConnector.instance.listClientFeedbacks(listClientFeedbacksVariables).execute();
+ExampleConnector.instance.getClientFeedbackById(getClientFeedbackByIdVariables).execute();
+ExampleConnector.instance.listClientFeedbacksByBusinessId(listClientFeedbacksByBusinessIdVariables).execute();
+ExampleConnector.instance.listClientFeedbacksByVendorId(listClientFeedbacksByVendorIdVariables).execute();
+ExampleConnector.instance.listClientFeedbacksByBusinessAndVendor(listClientFeedbacksByBusinessAndVendorVariables).execute();
+ExampleConnector.instance.filterClientFeedbacks(filterClientFeedbacksVariables).execute();
+ExampleConnector.instance.listClientFeedbackRatingsByVendorId(listClientFeedbackRatingsByVendorIdVariables).execute();
 
 ```
 
@@ -23,8 +23,8 @@ Optional fields can be discovered based on classes that have `Optional` object t
 This is an example of a mutation with an optional field:
 
 ```dart
-await ExampleConnector.instance.updateWorkforce({ ... })
+await ExampleConnector.instance.filterFaqDatas({ ... })
-.workforceNumber(...)
+.category(...)
 .execute();
 ```
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/create_tax_form.dart

@@ -2,31 +2,140 @@ part of 'generated.dart';
 
 class CreateTaxFormVariablesBuilder {
   TaxFormType formType;
-  String title;
+  String firstName;
-  Optional<String> _subtitle = Optional.optional(nativeFromJson, nativeToJson);
+  String lastName;
-  Optional<String> _description = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _mInitial = Optional.optional(nativeFromJson, nativeToJson);
-  Optional<TaxFormStatus> _status = Optional.optional((data) => TaxFormStatus.values.byName(data), enumSerializer);
+  Optional<String> _oLastName = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<Timestamp> _dob = Optional.optional((json) => json['dob'] = Timestamp.fromJson(json['dob']), defaultSerializer);
+  int socialSN;
+  Optional<String> _email = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _phone = Optional.optional(nativeFromJson, nativeToJson);
+  String address;
+  Optional<String> _city = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _apt = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _state = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _zipCode = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<MaritalStatus> _marital = Optional.optional((data) => MaritalStatus.values.byName(data), enumSerializer);
+  Optional<bool> _multipleJob = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<int> _childrens = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<int> _otherDeps = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<double> _totalCredits = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<double> _otherInconme = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<double> _deductions = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<double> _extraWithholding = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<CitizenshipStatus> _citizen = Optional.optional((data) => CitizenshipStatus.values.byName(data), enumSerializer);
+  Optional<String> _uscis = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _passportNumber = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _countryIssue = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<bool> _prepartorOrTranslator = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _signature = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<Timestamp> _date = Optional.optional((json) => json['date'] = Timestamp.fromJson(json['date']), defaultSerializer);
+  TaxFormStatus status;
   String staffId;
-  Optional<AnyValue> _formData = Optional.optional(AnyValue.fromJson, defaultSerializer);
+  Optional<String> _createdBy = Optional.optional(nativeFromJson, nativeToJson);
 
-  final FirebaseDataConnect _dataConnect;  CreateTaxFormVariablesBuilder subtitle(String? t) {
+  final FirebaseDataConnect _dataConnect;  CreateTaxFormVariablesBuilder mInitial(String? t) {
-   _subtitle.value = t;
+   _mInitial.value = t;
    return this;
   }
-  CreateTaxFormVariablesBuilder description(String? t) {
+  CreateTaxFormVariablesBuilder oLastName(String? t) {
-   _description.value = t;
+   _oLastName.value = t;
    return this;
   }
-  CreateTaxFormVariablesBuilder status(TaxFormStatus? t) {
+  CreateTaxFormVariablesBuilder dob(Timestamp? t) {
-   _status.value = t;
+   _dob.value = t;
    return this;
   }
-  CreateTaxFormVariablesBuilder formData(AnyValue? t) {
+  CreateTaxFormVariablesBuilder email(String? t) {
-   _formData.value = t;
+   _email.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder phone(String? t) {
+   _phone.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder city(String? t) {
+   _city.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder apt(String? t) {
+   _apt.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder state(String? t) {
+   _state.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder zipCode(String? t) {
+   _zipCode.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder marital(MaritalStatus? t) {
+   _marital.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder multipleJob(bool? t) {
+   _multipleJob.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder childrens(int? t) {
+   _childrens.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder otherDeps(int? t) {
+   _otherDeps.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder totalCredits(double? t) {
+   _totalCredits.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder otherInconme(double? t) {
+   _otherInconme.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder deductions(double? t) {
+   _deductions.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder extraWithholding(double? t) {
+   _extraWithholding.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder citizen(CitizenshipStatus? t) {
+   _citizen.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder uscis(String? t) {
+   _uscis.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder passportNumber(String? t) {
+   _passportNumber.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder countryIssue(String? t) {
+   _countryIssue.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder prepartorOrTranslator(bool? t) {
+   _prepartorOrTranslator.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder signature(String? t) {
+   _signature.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder date(Timestamp? t) {
+   _date.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder createdBy(String? t) {
+   _createdBy.value = t;
    return this;
   }
 
-  CreateTaxFormVariablesBuilder(this._dataConnect, {required  this.formType,required  this.title,required  this.staffId,});
+  CreateTaxFormVariablesBuilder(this._dataConnect, {required  this.formType,required  this.firstName,required  this.lastName,required  this.socialSN,required  this.address,required  this.status,required  this.staffId,});
   Deserializer<CreateTaxFormData> dataDeserializer = (dynamic json)  => CreateTaxFormData.fromJson(jsonDecode(json));
   Serializer<CreateTaxFormVariables> varsSerializer = (CreateTaxFormVariables vars) => jsonEncode(vars.toJson());
   Future<OperationResult<CreateTaxFormData, CreateTaxFormVariables>> execute() {
@@ -34,7 +143,7 @@ class CreateTaxFormVariablesBuilder {
   }
 
   MutationRef<CreateTaxFormData, CreateTaxFormVariables> ref() {
-    CreateTaxFormVariables vars= CreateTaxFormVariables(formType: formType,title: title,subtitle: _subtitle,description: _description,status: _status,staffId: staffId,formData: _formData,);
+    CreateTaxFormVariables vars= CreateTaxFormVariables(formType: formType,firstName: firstName,lastName: lastName,mInitial: _mInitial,oLastName: _oLastName,dob: _dob,socialSN: socialSN,email: _email,phone: _phone,address: address,city: _city,apt: _apt,state: _state,zipCode: _zipCode,marital: _marital,multipleJob: _multipleJob,childrens: _childrens,otherDeps: _otherDeps,totalCredits: _totalCredits,otherInconme: _otherInconme,deductions: _deductions,extraWithholding: _extraWithholding,citizen: _citizen,uscis: _uscis,passportNumber: _passportNumber,countryIssue: _countryIssue,prepartorOrTranslator: _prepartorOrTranslator,signature: _signature,date: _date,status: status,staffId: staffId,createdBy: _createdBy,);
     return _dataConnect.mutation("createTaxForm", dataDeserializer, varsSerializer, vars);
   }
 }
@@ -110,37 +219,154 @@ class CreateTaxFormData {
 @immutable
 class CreateTaxFormVariables {
   final TaxFormType formType;
-  final String title;
+  final String firstName;
-  late final Optional<String>subtitle;
+  final String lastName;
-  late final Optional<String>description;
+  late final Optional<String>mInitial;
-  late final Optional<TaxFormStatus>status;
+  late final Optional<String>oLastName;
+  late final Optional<Timestamp>dob;
+  final int socialSN;
+  late final Optional<String>email;
+  late final Optional<String>phone;
+  final String address;
+  late final Optional<String>city;
+  late final Optional<String>apt;
+  late final Optional<String>state;
+  late final Optional<String>zipCode;
+  late final Optional<MaritalStatus>marital;
+  late final Optional<bool>multipleJob;
+  late final Optional<int>childrens;
+  late final Optional<int>otherDeps;
+  late final Optional<double>totalCredits;
+  late final Optional<double>otherInconme;
+  late final Optional<double>deductions;
+  late final Optional<double>extraWithholding;
+  late final Optional<CitizenshipStatus>citizen;
+  late final Optional<String>uscis;
+  late final Optional<String>passportNumber;
+  late final Optional<String>countryIssue;
+  late final Optional<bool>prepartorOrTranslator;
+  late final Optional<String>signature;
+  late final Optional<Timestamp>date;
+  final TaxFormStatus status;
   final String staffId;
-  late final Optional<AnyValue>formData;
+  late final Optional<String>createdBy;
   @Deprecated('fromJson is deprecated for Variable classes as they are no longer required for deserialization.')
   CreateTaxFormVariables.fromJson(Map<String, dynamic> json):
   
   formType = TaxFormType.values.byName(json['formType']),
-  title = nativeFromJson<String>(json['title']),
+  firstName = nativeFromJson<String>(json['firstName']),
+  lastName = nativeFromJson<String>(json['lastName']),
+  socialSN = nativeFromJson<int>(json['socialSN']),
+  address = nativeFromJson<String>(json['address']),
+  status = TaxFormStatus.values.byName(json['status']),
   staffId = nativeFromJson<String>(json['staffId']) {
   
   
   
   
-    subtitle = Optional.optional(nativeFromJson, nativeToJson);
+  
-    subtitle.value = json['subtitle'] == null ? null : nativeFromJson<String>(json['subtitle']);
+    mInitial = Optional.optional(nativeFromJson, nativeToJson);
+    mInitial.value = json['mInitial'] == null ? null : nativeFromJson<String>(json['mInitial']);
   
   
-    description = Optional.optional(nativeFromJson, nativeToJson);
+    oLastName = Optional.optional(nativeFromJson, nativeToJson);
-    description.value = json['description'] == null ? null : nativeFromJson<String>(json['description']);
+    oLastName.value = json['oLastName'] == null ? null : nativeFromJson<String>(json['oLastName']);
   
   
-    status = Optional.optional((data) => TaxFormStatus.values.byName(data), enumSerializer);
+    dob = Optional.optional((json) => json['dob'] = Timestamp.fromJson(json['dob']), defaultSerializer);
-    status.value = json['status'] == null ? null : TaxFormStatus.values.byName(json['status']);
+    dob.value = json['dob'] == null ? null : Timestamp.fromJson(json['dob']);
   
   
   
-    formData = Optional.optional(AnyValue.fromJson, defaultSerializer);
+    email = Optional.optional(nativeFromJson, nativeToJson);
-    formData.value = json['formData'] == null ? null : AnyValue.fromJson(json['formData']);
+    email.value = json['email'] == null ? null : nativeFromJson<String>(json['email']);
+  
+  
+    phone = Optional.optional(nativeFromJson, nativeToJson);
+    phone.value = json['phone'] == null ? null : nativeFromJson<String>(json['phone']);
+  
+  
+  
+    city = Optional.optional(nativeFromJson, nativeToJson);
+    city.value = json['city'] == null ? null : nativeFromJson<String>(json['city']);
+  
+  
+    apt = Optional.optional(nativeFromJson, nativeToJson);
+    apt.value = json['apt'] == null ? null : nativeFromJson<String>(json['apt']);
+  
+  
+    state = Optional.optional(nativeFromJson, nativeToJson);
+    state.value = json['state'] == null ? null : nativeFromJson<String>(json['state']);
+  
+  
+    zipCode = Optional.optional(nativeFromJson, nativeToJson);
+    zipCode.value = json['zipCode'] == null ? null : nativeFromJson<String>(json['zipCode']);
+  
+  
+    marital = Optional.optional((data) => MaritalStatus.values.byName(data), enumSerializer);
+    marital.value = json['marital'] == null ? null : MaritalStatus.values.byName(json['marital']);
+  
+  
+    multipleJob = Optional.optional(nativeFromJson, nativeToJson);
+    multipleJob.value = json['multipleJob'] == null ? null : nativeFromJson<bool>(json['multipleJob']);
+  
+  
+    childrens = Optional.optional(nativeFromJson, nativeToJson);
+    childrens.value = json['childrens'] == null ? null : nativeFromJson<int>(json['childrens']);
+  
+  
+    otherDeps = Optional.optional(nativeFromJson, nativeToJson);
+    otherDeps.value = json['otherDeps'] == null ? null : nativeFromJson<int>(json['otherDeps']);
+  
+  
+    totalCredits = Optional.optional(nativeFromJson, nativeToJson);
+    totalCredits.value = json['totalCredits'] == null ? null : nativeFromJson<double>(json['totalCredits']);
+  
+  
+    otherInconme = Optional.optional(nativeFromJson, nativeToJson);
+    otherInconme.value = json['otherInconme'] == null ? null : nativeFromJson<double>(json['otherInconme']);
+  
+  
+    deductions = Optional.optional(nativeFromJson, nativeToJson);
+    deductions.value = json['deductions'] == null ? null : nativeFromJson<double>(json['deductions']);
+  
+  
+    extraWithholding = Optional.optional(nativeFromJson, nativeToJson);
+    extraWithholding.value = json['extraWithholding'] == null ? null : nativeFromJson<double>(json['extraWithholding']);
+  
+  
+    citizen = Optional.optional((data) => CitizenshipStatus.values.byName(data), enumSerializer);
+    citizen.value = json['citizen'] == null ? null : CitizenshipStatus.values.byName(json['citizen']);
+  
+  
+    uscis = Optional.optional(nativeFromJson, nativeToJson);
+    uscis.value = json['uscis'] == null ? null : nativeFromJson<String>(json['uscis']);
+  
+  
+    passportNumber = Optional.optional(nativeFromJson, nativeToJson);
+    passportNumber.value = json['passportNumber'] == null ? null : nativeFromJson<String>(json['passportNumber']);
+  
+  
+    countryIssue = Optional.optional(nativeFromJson, nativeToJson);
+    countryIssue.value = json['countryIssue'] == null ? null : nativeFromJson<String>(json['countryIssue']);
+  
+  
+    prepartorOrTranslator = Optional.optional(nativeFromJson, nativeToJson);
+    prepartorOrTranslator.value = json['prepartorOrTranslator'] == null ? null : nativeFromJson<bool>(json['prepartorOrTranslator']);
+  
+  
+    signature = Optional.optional(nativeFromJson, nativeToJson);
+    signature.value = json['signature'] == null ? null : nativeFromJson<String>(json['signature']);
+  
+  
+    date = Optional.optional((json) => json['date'] = Timestamp.fromJson(json['date']), defaultSerializer);
+    date.value = json['date'] == null ? null : Timestamp.fromJson(json['date']);
+  
+  
+  
+  
+    createdBy = Optional.optional(nativeFromJson, nativeToJson);
+    createdBy.value = json['createdBy'] == null ? null : nativeFromJson<String>(json['createdBy']);
   
   }
   @override
@@ -154,16 +380,41 @@ class CreateTaxFormVariables {
 
     final CreateTaxFormVariables otherTyped = other as CreateTaxFormVariables;
     return formType == otherTyped.formType && 
-    title == otherTyped.title && 
+    firstName == otherTyped.firstName && 
-    subtitle == otherTyped.subtitle && 
+    lastName == otherTyped.lastName && 
-    description == otherTyped.description && 
+    mInitial == otherTyped.mInitial && 
+    oLastName == otherTyped.oLastName && 
+    dob == otherTyped.dob && 
+    socialSN == otherTyped.socialSN && 
+    email == otherTyped.email && 
+    phone == otherTyped.phone && 
+    address == otherTyped.address && 
+    city == otherTyped.city && 
+    apt == otherTyped.apt && 
+    state == otherTyped.state && 
+    zipCode == otherTyped.zipCode && 
+    marital == otherTyped.marital && 
+    multipleJob == otherTyped.multipleJob && 
+    childrens == otherTyped.childrens && 
+    otherDeps == otherTyped.otherDeps && 
+    totalCredits == otherTyped.totalCredits && 
+    otherInconme == otherTyped.otherInconme && 
+    deductions == otherTyped.deductions && 
+    extraWithholding == otherTyped.extraWithholding && 
+    citizen == otherTyped.citizen && 
+    uscis == otherTyped.uscis && 
+    passportNumber == otherTyped.passportNumber && 
+    countryIssue == otherTyped.countryIssue && 
+    prepartorOrTranslator == otherTyped.prepartorOrTranslator && 
+    signature == otherTyped.signature && 
+    date == otherTyped.date && 
     status == otherTyped.status && 
     staffId == otherTyped.staffId && 
-    formData == otherTyped.formData;
+    createdBy == otherTyped.createdBy;
     
   }
   @override
-  int get hashCode => Object.hashAll([formType.hashCode, title.hashCode, subtitle.hashCode, description.hashCode, status.hashCode, staffId.hashCode, formData.hashCode]);
+  int get hashCode => Object.hashAll([formType.hashCode, firstName.hashCode, lastName.hashCode, mInitial.hashCode, oLastName.hashCode, dob.hashCode, socialSN.hashCode, email.hashCode, phone.hashCode, address.hashCode, city.hashCode, apt.hashCode, state.hashCode, zipCode.hashCode, marital.hashCode, multipleJob.hashCode, childrens.hashCode, otherDeps.hashCode, totalCredits.hashCode, otherInconme.hashCode, deductions.hashCode, extraWithholding.hashCode, citizen.hashCode, uscis.hashCode, passportNumber.hashCode, countryIssue.hashCode, prepartorOrTranslator.hashCode, signature.hashCode, date.hashCode, status.hashCode, staffId.hashCode, createdBy.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -171,31 +422,125 @@ class CreateTaxFormVariables {
     json['formType'] = 
     formType.name
     ;
-    json['title'] = nativeToJson<String>(title);
+    json['firstName'] = nativeToJson<String>(firstName);
-    if(subtitle.state == OptionalState.set) {
+    json['lastName'] = nativeToJson<String>(lastName);
-      json['subtitle'] = subtitle.toJson();
+    if(mInitial.state == OptionalState.set) {
+      json['mInitial'] = mInitial.toJson();
     }
-    if(description.state == OptionalState.set) {
+    if(oLastName.state == OptionalState.set) {
-      json['description'] = description.toJson();
+      json['oLastName'] = oLastName.toJson();
     }
-    if(status.state == OptionalState.set) {
+    if(dob.state == OptionalState.set) {
-      json['status'] = status.toJson();
+      json['dob'] = dob.toJson();
     }
+    json['socialSN'] = nativeToJson<int>(socialSN);
+    if(email.state == OptionalState.set) {
+      json['email'] = email.toJson();
+    }
+    if(phone.state == OptionalState.set) {
+      json['phone'] = phone.toJson();
+    }
+    json['address'] = nativeToJson<String>(address);
+    if(city.state == OptionalState.set) {
+      json['city'] = city.toJson();
+    }
+    if(apt.state == OptionalState.set) {
+      json['apt'] = apt.toJson();
+    }
+    if(state.state == OptionalState.set) {
+      json['state'] = state.toJson();
+    }
+    if(zipCode.state == OptionalState.set) {
+      json['zipCode'] = zipCode.toJson();
+    }
+    if(marital.state == OptionalState.set) {
+      json['marital'] = marital.toJson();
+    }
+    if(multipleJob.state == OptionalState.set) {
+      json['multipleJob'] = multipleJob.toJson();
+    }
+    if(childrens.state == OptionalState.set) {
+      json['childrens'] = childrens.toJson();
+    }
+    if(otherDeps.state == OptionalState.set) {
+      json['otherDeps'] = otherDeps.toJson();
+    }
+    if(totalCredits.state == OptionalState.set) {
+      json['totalCredits'] = totalCredits.toJson();
+    }
+    if(otherInconme.state == OptionalState.set) {
+      json['otherInconme'] = otherInconme.toJson();
+    }
+    if(deductions.state == OptionalState.set) {
+      json['deductions'] = deductions.toJson();
+    }
+    if(extraWithholding.state == OptionalState.set) {
+      json['extraWithholding'] = extraWithholding.toJson();
+    }
+    if(citizen.state == OptionalState.set) {
+      json['citizen'] = citizen.toJson();
+    }
+    if(uscis.state == OptionalState.set) {
+      json['uscis'] = uscis.toJson();
+    }
+    if(passportNumber.state == OptionalState.set) {
+      json['passportNumber'] = passportNumber.toJson();
+    }
+    if(countryIssue.state == OptionalState.set) {
+      json['countryIssue'] = countryIssue.toJson();
+    }
+    if(prepartorOrTranslator.state == OptionalState.set) {
+      json['prepartorOrTranslator'] = prepartorOrTranslator.toJson();
+    }
+    if(signature.state == OptionalState.set) {
+      json['signature'] = signature.toJson();
+    }
+    if(date.state == OptionalState.set) {
+      json['date'] = date.toJson();
+    }
+    json['status'] = 
+    status.name
+    ;
     json['staffId'] = nativeToJson<String>(staffId);
-    if(formData.state == OptionalState.set) {
+    if(createdBy.state == OptionalState.set) {
-      json['formData'] = formData.toJson();
+      json['createdBy'] = createdBy.toJson();
     }
     return json;
   }
 
   CreateTaxFormVariables({
     required this.formType,
-    required this.title,
+    required this.firstName,
-    required this.subtitle,
+    required this.lastName,
-    required this.description,
+    required this.mInitial,
+    required this.oLastName,
+    required this.dob,
+    required this.socialSN,
+    required this.email,
+    required this.phone,
+    required this.address,
+    required this.city,
+    required this.apt,
+    required this.state,
+    required this.zipCode,
+    required this.marital,
+    required this.multipleJob,
+    required this.childrens,
+    required this.otherDeps,
+    required this.totalCredits,
+    required this.otherInconme,
+    required this.deductions,
+    required this.extraWithholding,
+    required this.citizen,
+    required this.uscis,
+    required this.passportNumber,
+    required this.countryIssue,
+    required this.prepartorOrTranslator,
+    required this.signature,
+    required this.date,
     required this.status,
     required this.staffId,
-    required this.formData,
+    required this.createdBy,
   });
 }
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/filter_tax_forms.dart

@@ -1,189 +0,0 @@
-part of 'generated.dart';
-
-class FilterTaxFormsVariablesBuilder {
-  Optional<TaxFormType> _formType = Optional.optional((data) => TaxFormType.values.byName(data), enumSerializer);
-  Optional<TaxFormStatus> _status = Optional.optional((data) => TaxFormStatus.values.byName(data), enumSerializer);
-  Optional<String> _staffId = Optional.optional(nativeFromJson, nativeToJson);
-
-  final FirebaseDataConnect _dataConnect;
-  FilterTaxFormsVariablesBuilder formType(TaxFormType? t) {
-   _formType.value = t;
-   return this;
-  }
-  FilterTaxFormsVariablesBuilder status(TaxFormStatus? t) {
-   _status.value = t;
-   return this;
-  }
-  FilterTaxFormsVariablesBuilder staffId(String? t) {
-   _staffId.value = t;
-   return this;
-  }
-
-  FilterTaxFormsVariablesBuilder(this._dataConnect, );
-  Deserializer<FilterTaxFormsData> dataDeserializer = (dynamic json)  => FilterTaxFormsData.fromJson(jsonDecode(json));
-  Serializer<FilterTaxFormsVariables> varsSerializer = (FilterTaxFormsVariables vars) => jsonEncode(vars.toJson());
-  Future<QueryResult<FilterTaxFormsData, FilterTaxFormsVariables>> execute() {
-    return ref().execute();
-  }
-
-  QueryRef<FilterTaxFormsData, FilterTaxFormsVariables> ref() {
-    FilterTaxFormsVariables vars= FilterTaxFormsVariables(formType: _formType,status: _status,staffId: _staffId,);
-    return _dataConnect.query("filterTaxForms", dataDeserializer, varsSerializer, vars);
-  }
-}
-
-@immutable
-class FilterTaxFormsTaxForms {
-  final String id;
-  final EnumValue<TaxFormType> formType;
-  final String title;
-  final EnumValue<TaxFormStatus> status;
-  final String staffId;
-  FilterTaxFormsTaxForms.fromJson(dynamic json):
-  
-  id = nativeFromJson<String>(json['id']),
-  formType = taxFormTypeDeserializer(json['formType']),
-  title = nativeFromJson<String>(json['title']),
-  status = taxFormStatusDeserializer(json['status']),
-  staffId = nativeFromJson<String>(json['staffId']);
-  @override
-  bool operator ==(Object other) {
-    if(identical(this, other)) {
-      return true;
-    }
-    if(other.runtimeType != runtimeType) {
-      return false;
-    }
-
-    final FilterTaxFormsTaxForms otherTyped = other as FilterTaxFormsTaxForms;
-    return id == otherTyped.id && 
-    formType == otherTyped.formType && 
-    title == otherTyped.title && 
-    status == otherTyped.status && 
-    staffId == otherTyped.staffId;
-    
-  }
-  @override
-  int get hashCode => Object.hashAll([id.hashCode, formType.hashCode, title.hashCode, status.hashCode, staffId.hashCode]);
-  
-
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> json = {};
-    json['id'] = nativeToJson<String>(id);
-    json['formType'] = 
-    taxFormTypeSerializer(formType)
-    ;
-    json['title'] = nativeToJson<String>(title);
-    json['status'] = 
-    taxFormStatusSerializer(status)
-    ;
-    json['staffId'] = nativeToJson<String>(staffId);
-    return json;
-  }
-
-  FilterTaxFormsTaxForms({
-    required this.id,
-    required this.formType,
-    required this.title,
-    required this.status,
-    required this.staffId,
-  });
-}
-
-@immutable
-class FilterTaxFormsData {
-  final List<FilterTaxFormsTaxForms> taxForms;
-  FilterTaxFormsData.fromJson(dynamic json):
-  
-  taxForms = (json['taxForms'] as List<dynamic>)
-        .map((e) => FilterTaxFormsTaxForms.fromJson(e))
-        .toList();
-  @override
-  bool operator ==(Object other) {
-    if(identical(this, other)) {
-      return true;
-    }
-    if(other.runtimeType != runtimeType) {
-      return false;
-    }
-
-    final FilterTaxFormsData otherTyped = other as FilterTaxFormsData;
-    return taxForms == otherTyped.taxForms;
-    
-  }
-  @override
-  int get hashCode => taxForms.hashCode;
-  
-
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> json = {};
-    json['taxForms'] = taxForms.map((e) => e.toJson()).toList();
-    return json;
-  }
-
-  FilterTaxFormsData({
-    required this.taxForms,
-  });
-}
-
-@immutable
-class FilterTaxFormsVariables {
-  late final Optional<TaxFormType>formType;
-  late final Optional<TaxFormStatus>status;
-  late final Optional<String>staffId;
-  @Deprecated('fromJson is deprecated for Variable classes as they are no longer required for deserialization.')
-  FilterTaxFormsVariables.fromJson(Map<String, dynamic> json) {
-  
-  
-    formType = Optional.optional((data) => TaxFormType.values.byName(data), enumSerializer);
-    formType.value = json['formType'] == null ? null : TaxFormType.values.byName(json['formType']);
-  
-  
-    status = Optional.optional((data) => TaxFormStatus.values.byName(data), enumSerializer);
-    status.value = json['status'] == null ? null : TaxFormStatus.values.byName(json['status']);
-  
-  
-    staffId = Optional.optional(nativeFromJson, nativeToJson);
-    staffId.value = json['staffId'] == null ? null : nativeFromJson<String>(json['staffId']);
-  
-  }
-  @override
-  bool operator ==(Object other) {
-    if(identical(this, other)) {
-      return true;
-    }
-    if(other.runtimeType != runtimeType) {
-      return false;
-    }
-
-    final FilterTaxFormsVariables otherTyped = other as FilterTaxFormsVariables;
-    return formType == otherTyped.formType && 
-    status == otherTyped.status && 
-    staffId == otherTyped.staffId;
-    
-  }
-  @override
-  int get hashCode => Object.hashAll([formType.hashCode, status.hashCode, staffId.hashCode]);
-  
-
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> json = {};
-    if(formType.state == OptionalState.set) {
-      json['formType'] = formType.toJson();
-    }
-    if(status.state == OptionalState.set) {
-      json['status'] = status.toJson();
-    }
-    if(staffId.state == OptionalState.set) {
-      json['staffId'] = staffId.toJson();
-    }
-    return json;
-  }
-
-  FilterTaxFormsVariables({
-    required this.formType,
-    required this.status,
-    required this.staffId,
-  });
-}
-

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/get_tax_form_by_id.dart

@@ -21,12 +21,36 @@ class GetTaxFormByIdVariablesBuilder {
 class GetTaxFormByIdTaxForm {
   final String id;
   final EnumValue<TaxFormType> formType;
-  final String title;
+  final String firstName;
-  final String? subtitle;
+  final String lastName;
-  final String? description;
+  final String? mInitial;
+  final String? oLastName;
+  final Timestamp? dob;
+  final int socialSN;
+  final String? email;
+  final String? phone;
+  final String address;
+  final String? city;
+  final String? apt;
+  final String? state;
+  final String? zipCode;
+  final EnumValue<MaritalStatus>? marital;
+  final bool? multipleJob;
+  final int? childrens;
+  final int? otherDeps;
+  final double? totalCredits;
+  final double? otherInconme;
+  final double? deductions;
+  final double? extraWithholding;
+  final EnumValue<CitizenshipStatus>? citizen;
+  final String? uscis;
+  final String? passportNumber;
+  final String? countryIssue;
+  final bool? prepartorOrTranslator;
+  final String? signature;
+  final Timestamp? date;
   final EnumValue<TaxFormStatus> status;
   final String staffId;
-  final AnyValue? formData;
   final Timestamp? createdAt;
   final Timestamp? updatedAt;
   final String? createdBy;
@@ -34,12 +58,36 @@ class GetTaxFormByIdTaxForm {
   
   id = nativeFromJson<String>(json['id']),
   formType = taxFormTypeDeserializer(json['formType']),
-  title = nativeFromJson<String>(json['title']),
+  firstName = nativeFromJson<String>(json['firstName']),
-  subtitle = json['subtitle'] == null ? null : nativeFromJson<String>(json['subtitle']),
+  lastName = nativeFromJson<String>(json['lastName']),
-  description = json['description'] == null ? null : nativeFromJson<String>(json['description']),
+  mInitial = json['mInitial'] == null ? null : nativeFromJson<String>(json['mInitial']),
+  oLastName = json['oLastName'] == null ? null : nativeFromJson<String>(json['oLastName']),
+  dob = json['dob'] == null ? null : Timestamp.fromJson(json['dob']),
+  socialSN = nativeFromJson<int>(json['socialSN']),
+  email = json['email'] == null ? null : nativeFromJson<String>(json['email']),
+  phone = json['phone'] == null ? null : nativeFromJson<String>(json['phone']),
+  address = nativeFromJson<String>(json['address']),
+  city = json['city'] == null ? null : nativeFromJson<String>(json['city']),
+  apt = json['apt'] == null ? null : nativeFromJson<String>(json['apt']),
+  state = json['state'] == null ? null : nativeFromJson<String>(json['state']),
+  zipCode = json['zipCode'] == null ? null : nativeFromJson<String>(json['zipCode']),
+  marital = json['marital'] == null ? null : maritalStatusDeserializer(json['marital']),
+  multipleJob = json['multipleJob'] == null ? null : nativeFromJson<bool>(json['multipleJob']),
+  childrens = json['childrens'] == null ? null : nativeFromJson<int>(json['childrens']),
+  otherDeps = json['otherDeps'] == null ? null : nativeFromJson<int>(json['otherDeps']),
+  totalCredits = json['totalCredits'] == null ? null : nativeFromJson<double>(json['totalCredits']),
+  otherInconme = json['otherInconme'] == null ? null : nativeFromJson<double>(json['otherInconme']),
+  deductions = json['deductions'] == null ? null : nativeFromJson<double>(json['deductions']),
+  extraWithholding = json['extraWithholding'] == null ? null : nativeFromJson<double>(json['extraWithholding']),
+  citizen = json['citizen'] == null ? null : citizenshipStatusDeserializer(json['citizen']),
+  uscis = json['uscis'] == null ? null : nativeFromJson<String>(json['uscis']),
+  passportNumber = json['passportNumber'] == null ? null : nativeFromJson<String>(json['passportNumber']),
+  countryIssue = json['countryIssue'] == null ? null : nativeFromJson<String>(json['countryIssue']),
+  prepartorOrTranslator = json['prepartorOrTranslator'] == null ? null : nativeFromJson<bool>(json['prepartorOrTranslator']),
+  signature = json['signature'] == null ? null : nativeFromJson<String>(json['signature']),
+  date = json['date'] == null ? null : Timestamp.fromJson(json['date']),
   status = taxFormStatusDeserializer(json['status']),
   staffId = nativeFromJson<String>(json['staffId']),
-  formData = json['formData'] == null ? null : AnyValue.fromJson(json['formData']),
   createdAt = json['createdAt'] == null ? null : Timestamp.fromJson(json['createdAt']),
   updatedAt = json['updatedAt'] == null ? null : Timestamp.fromJson(json['updatedAt']),
   createdBy = json['createdBy'] == null ? null : nativeFromJson<String>(json['createdBy']);
@@ -55,19 +103,43 @@ class GetTaxFormByIdTaxForm {
     final GetTaxFormByIdTaxForm otherTyped = other as GetTaxFormByIdTaxForm;
     return id == otherTyped.id && 
     formType == otherTyped.formType && 
-    title == otherTyped.title && 
+    firstName == otherTyped.firstName && 
-    subtitle == otherTyped.subtitle && 
+    lastName == otherTyped.lastName && 
-    description == otherTyped.description && 
+    mInitial == otherTyped.mInitial && 
+    oLastName == otherTyped.oLastName && 
+    dob == otherTyped.dob && 
+    socialSN == otherTyped.socialSN && 
+    email == otherTyped.email && 
+    phone == otherTyped.phone && 
+    address == otherTyped.address && 
+    city == otherTyped.city && 
+    apt == otherTyped.apt && 
+    state == otherTyped.state && 
+    zipCode == otherTyped.zipCode && 
+    marital == otherTyped.marital && 
+    multipleJob == otherTyped.multipleJob && 
+    childrens == otherTyped.childrens && 
+    otherDeps == otherTyped.otherDeps && 
+    totalCredits == otherTyped.totalCredits && 
+    otherInconme == otherTyped.otherInconme && 
+    deductions == otherTyped.deductions && 
+    extraWithholding == otherTyped.extraWithholding && 
+    citizen == otherTyped.citizen && 
+    uscis == otherTyped.uscis && 
+    passportNumber == otherTyped.passportNumber && 
+    countryIssue == otherTyped.countryIssue && 
+    prepartorOrTranslator == otherTyped.prepartorOrTranslator && 
+    signature == otherTyped.signature && 
+    date == otherTyped.date && 
     status == otherTyped.status && 
     staffId == otherTyped.staffId && 
-    formData == otherTyped.formData && 
     createdAt == otherTyped.createdAt && 
     updatedAt == otherTyped.updatedAt && 
     createdBy == otherTyped.createdBy;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, formType.hashCode, title.hashCode, subtitle.hashCode, description.hashCode, status.hashCode, staffId.hashCode, formData.hashCode, createdAt.hashCode, updatedAt.hashCode, createdBy.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, formType.hashCode, firstName.hashCode, lastName.hashCode, mInitial.hashCode, oLastName.hashCode, dob.hashCode, socialSN.hashCode, email.hashCode, phone.hashCode, address.hashCode, city.hashCode, apt.hashCode, state.hashCode, zipCode.hashCode, marital.hashCode, multipleJob.hashCode, childrens.hashCode, otherDeps.hashCode, totalCredits.hashCode, otherInconme.hashCode, deductions.hashCode, extraWithholding.hashCode, citizen.hashCode, uscis.hashCode, passportNumber.hashCode, countryIssue.hashCode, prepartorOrTranslator.hashCode, signature.hashCode, date.hashCode, status.hashCode, staffId.hashCode, createdAt.hashCode, updatedAt.hashCode, createdBy.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -76,20 +148,90 @@ class GetTaxFormByIdTaxForm {
     json['formType'] = 
     taxFormTypeSerializer(formType)
     ;
-    json['title'] = nativeToJson<String>(title);
+    json['firstName'] = nativeToJson<String>(firstName);
-    if (subtitle != null) {
+    json['lastName'] = nativeToJson<String>(lastName);
-      json['subtitle'] = nativeToJson<String?>(subtitle);
+    if (mInitial != null) {
+      json['mInitial'] = nativeToJson<String?>(mInitial);
     }
-    if (description != null) {
+    if (oLastName != null) {
-      json['description'] = nativeToJson<String?>(description);
+      json['oLastName'] = nativeToJson<String?>(oLastName);
+    }
+    if (dob != null) {
+      json['dob'] = dob!.toJson();
+    }
+    json['socialSN'] = nativeToJson<int>(socialSN);
+    if (email != null) {
+      json['email'] = nativeToJson<String?>(email);
+    }
+    if (phone != null) {
+      json['phone'] = nativeToJson<String?>(phone);
+    }
+    json['address'] = nativeToJson<String>(address);
+    if (city != null) {
+      json['city'] = nativeToJson<String?>(city);
+    }
+    if (apt != null) {
+      json['apt'] = nativeToJson<String?>(apt);
+    }
+    if (state != null) {
+      json['state'] = nativeToJson<String?>(state);
+    }
+    if (zipCode != null) {
+      json['zipCode'] = nativeToJson<String?>(zipCode);
+    }
+    if (marital != null) {
+      json['marital'] = 
+    maritalStatusSerializer(marital!)
+    ;
+    }
+    if (multipleJob != null) {
+      json['multipleJob'] = nativeToJson<bool?>(multipleJob);
+    }
+    if (childrens != null) {
+      json['childrens'] = nativeToJson<int?>(childrens);
+    }
+    if (otherDeps != null) {
+      json['otherDeps'] = nativeToJson<int?>(otherDeps);
+    }
+    if (totalCredits != null) {
+      json['totalCredits'] = nativeToJson<double?>(totalCredits);
+    }
+    if (otherInconme != null) {
+      json['otherInconme'] = nativeToJson<double?>(otherInconme);
+    }
+    if (deductions != null) {
+      json['deductions'] = nativeToJson<double?>(deductions);
+    }
+    if (extraWithholding != null) {
+      json['extraWithholding'] = nativeToJson<double?>(extraWithholding);
+    }
+    if (citizen != null) {
+      json['citizen'] = 
+    citizenshipStatusSerializer(citizen!)
+    ;
+    }
+    if (uscis != null) {
+      json['uscis'] = nativeToJson<String?>(uscis);
+    }
+    if (passportNumber != null) {
+      json['passportNumber'] = nativeToJson<String?>(passportNumber);
+    }
+    if (countryIssue != null) {
+      json['countryIssue'] = nativeToJson<String?>(countryIssue);
+    }
+    if (prepartorOrTranslator != null) {
+      json['prepartorOrTranslator'] = nativeToJson<bool?>(prepartorOrTranslator);
+    }
+    if (signature != null) {
+      json['signature'] = nativeToJson<String?>(signature);
+    }
+    if (date != null) {
+      json['date'] = date!.toJson();
     }
     json['status'] = 
     taxFormStatusSerializer(status)
     ;
     json['staffId'] = nativeToJson<String>(staffId);
-    if (formData != null) {
-      json['formData'] = formData!.toJson();
-    }
     if (createdAt != null) {
       json['createdAt'] = createdAt!.toJson();
     }
@@ -105,12 +247,36 @@ class GetTaxFormByIdTaxForm {
   GetTaxFormByIdTaxForm({
     required this.id,
     required this.formType,
-    required this.title,
+    required this.firstName,
-    this.subtitle,
+    required this.lastName,
-    this.description,
+    this.mInitial,
+    this.oLastName,
+    this.dob,
+    required this.socialSN,
+    this.email,
+    this.phone,
+    required this.address,
+    this.city,
+    this.apt,
+    this.state,
+    this.zipCode,
+    this.marital,
+    this.multipleJob,
+    this.childrens,
+    this.otherDeps,
+    this.totalCredits,
+    this.otherInconme,
+    this.deductions,
+    this.extraWithholding,
+    this.citizen,
+    this.uscis,
+    this.passportNumber,
+    this.countryIssue,
+    this.prepartorOrTranslator,
+    this.signature,
+    this.date,
     required this.status,
     required this.staffId,
-    this.formData,
     this.createdAt,
     this.updatedAt,
     this.createdBy,

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/get_tax_forms_by_staff_id.dart

@@ -0,0 +1,389 @@
+part of 'generated.dart';
+
+class GetTaxFormsByStaffIdVariablesBuilder {
+  String staffId;
+  Optional<int> _offset = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<int> _limit = Optional.optional(nativeFromJson, nativeToJson);
+
+  final FirebaseDataConnect _dataConnect;  GetTaxFormsByStaffIdVariablesBuilder offset(int? t) {
+   _offset.value = t;
+   return this;
+  }
+  GetTaxFormsByStaffIdVariablesBuilder limit(int? t) {
+   _limit.value = t;
+   return this;
+  }
+
+  GetTaxFormsByStaffIdVariablesBuilder(this._dataConnect, {required  this.staffId,});
+  Deserializer<GetTaxFormsByStaffIdData> dataDeserializer = (dynamic json)  => GetTaxFormsByStaffIdData.fromJson(jsonDecode(json));
+  Serializer<GetTaxFormsByStaffIdVariables> varsSerializer = (GetTaxFormsByStaffIdVariables vars) => jsonEncode(vars.toJson());
+  Future<QueryResult<GetTaxFormsByStaffIdData, GetTaxFormsByStaffIdVariables>> execute() {
+    return ref().execute();
+  }
+
+  QueryRef<GetTaxFormsByStaffIdData, GetTaxFormsByStaffIdVariables> ref() {
+    GetTaxFormsByStaffIdVariables vars= GetTaxFormsByStaffIdVariables(staffId: staffId,offset: _offset,limit: _limit,);
+    return _dataConnect.query("getTaxFormsByStaffId", dataDeserializer, varsSerializer, vars);
+  }
+}
+
+@immutable
+class GetTaxFormsByStaffIdTaxForms {
+  final String id;
+  final EnumValue<TaxFormType> formType;
+  final String firstName;
+  final String lastName;
+  final String? mInitial;
+  final String? oLastName;
+  final Timestamp? dob;
+  final int socialSN;
+  final String? email;
+  final String? phone;
+  final String address;
+  final String? city;
+  final String? apt;
+  final String? state;
+  final String? zipCode;
+  final EnumValue<MaritalStatus>? marital;
+  final bool? multipleJob;
+  final int? childrens;
+  final int? otherDeps;
+  final double? totalCredits;
+  final double? otherInconme;
+  final double? deductions;
+  final double? extraWithholding;
+  final EnumValue<CitizenshipStatus>? citizen;
+  final String? uscis;
+  final String? passportNumber;
+  final String? countryIssue;
+  final bool? prepartorOrTranslator;
+  final String? signature;
+  final Timestamp? date;
+  final EnumValue<TaxFormStatus> status;
+  final String staffId;
+  final Timestamp? createdAt;
+  final Timestamp? updatedAt;
+  final String? createdBy;
+  GetTaxFormsByStaffIdTaxForms.fromJson(dynamic json):
+  
+  id = nativeFromJson<String>(json['id']),
+  formType = taxFormTypeDeserializer(json['formType']),
+  firstName = nativeFromJson<String>(json['firstName']),
+  lastName = nativeFromJson<String>(json['lastName']),
+  mInitial = json['mInitial'] == null ? null : nativeFromJson<String>(json['mInitial']),
+  oLastName = json['oLastName'] == null ? null : nativeFromJson<String>(json['oLastName']),
+  dob = json['dob'] == null ? null : Timestamp.fromJson(json['dob']),
+  socialSN = nativeFromJson<int>(json['socialSN']),
+  email = json['email'] == null ? null : nativeFromJson<String>(json['email']),
+  phone = json['phone'] == null ? null : nativeFromJson<String>(json['phone']),
+  address = nativeFromJson<String>(json['address']),
+  city = json['city'] == null ? null : nativeFromJson<String>(json['city']),
+  apt = json['apt'] == null ? null : nativeFromJson<String>(json['apt']),
+  state = json['state'] == null ? null : nativeFromJson<String>(json['state']),
+  zipCode = json['zipCode'] == null ? null : nativeFromJson<String>(json['zipCode']),
+  marital = json['marital'] == null ? null : maritalStatusDeserializer(json['marital']),
+  multipleJob = json['multipleJob'] == null ? null : nativeFromJson<bool>(json['multipleJob']),
+  childrens = json['childrens'] == null ? null : nativeFromJson<int>(json['childrens']),
+  otherDeps = json['otherDeps'] == null ? null : nativeFromJson<int>(json['otherDeps']),
+  totalCredits = json['totalCredits'] == null ? null : nativeFromJson<double>(json['totalCredits']),
+  otherInconme = json['otherInconme'] == null ? null : nativeFromJson<double>(json['otherInconme']),
+  deductions = json['deductions'] == null ? null : nativeFromJson<double>(json['deductions']),
+  extraWithholding = json['extraWithholding'] == null ? null : nativeFromJson<double>(json['extraWithholding']),
+  citizen = json['citizen'] == null ? null : citizenshipStatusDeserializer(json['citizen']),
+  uscis = json['uscis'] == null ? null : nativeFromJson<String>(json['uscis']),
+  passportNumber = json['passportNumber'] == null ? null : nativeFromJson<String>(json['passportNumber']),
+  countryIssue = json['countryIssue'] == null ? null : nativeFromJson<String>(json['countryIssue']),
+  prepartorOrTranslator = json['prepartorOrTranslator'] == null ? null : nativeFromJson<bool>(json['prepartorOrTranslator']),
+  signature = json['signature'] == null ? null : nativeFromJson<String>(json['signature']),
+  date = json['date'] == null ? null : Timestamp.fromJson(json['date']),
+  status = taxFormStatusDeserializer(json['status']),
+  staffId = nativeFromJson<String>(json['staffId']),
+  createdAt = json['createdAt'] == null ? null : Timestamp.fromJson(json['createdAt']),
+  updatedAt = json['updatedAt'] == null ? null : Timestamp.fromJson(json['updatedAt']),
+  createdBy = json['createdBy'] == null ? null : nativeFromJson<String>(json['createdBy']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final GetTaxFormsByStaffIdTaxForms otherTyped = other as GetTaxFormsByStaffIdTaxForms;
+    return id == otherTyped.id && 
+    formType == otherTyped.formType && 
+    firstName == otherTyped.firstName && 
+    lastName == otherTyped.lastName && 
+    mInitial == otherTyped.mInitial && 
+    oLastName == otherTyped.oLastName && 
+    dob == otherTyped.dob && 
+    socialSN == otherTyped.socialSN && 
+    email == otherTyped.email && 
+    phone == otherTyped.phone && 
+    address == otherTyped.address && 
+    city == otherTyped.city && 
+    apt == otherTyped.apt && 
+    state == otherTyped.state && 
+    zipCode == otherTyped.zipCode && 
+    marital == otherTyped.marital && 
+    multipleJob == otherTyped.multipleJob && 
+    childrens == otherTyped.childrens && 
+    otherDeps == otherTyped.otherDeps && 
+    totalCredits == otherTyped.totalCredits && 
+    otherInconme == otherTyped.otherInconme && 
+    deductions == otherTyped.deductions && 
+    extraWithholding == otherTyped.extraWithholding && 
+    citizen == otherTyped.citizen && 
+    uscis == otherTyped.uscis && 
+    passportNumber == otherTyped.passportNumber && 
+    countryIssue == otherTyped.countryIssue && 
+    prepartorOrTranslator == otherTyped.prepartorOrTranslator && 
+    signature == otherTyped.signature && 
+    date == otherTyped.date && 
+    status == otherTyped.status && 
+    staffId == otherTyped.staffId && 
+    createdAt == otherTyped.createdAt && 
+    updatedAt == otherTyped.updatedAt && 
+    createdBy == otherTyped.createdBy;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([id.hashCode, formType.hashCode, firstName.hashCode, lastName.hashCode, mInitial.hashCode, oLastName.hashCode, dob.hashCode, socialSN.hashCode, email.hashCode, phone.hashCode, address.hashCode, city.hashCode, apt.hashCode, state.hashCode, zipCode.hashCode, marital.hashCode, multipleJob.hashCode, childrens.hashCode, otherDeps.hashCode, totalCredits.hashCode, otherInconme.hashCode, deductions.hashCode, extraWithholding.hashCode, citizen.hashCode, uscis.hashCode, passportNumber.hashCode, countryIssue.hashCode, prepartorOrTranslator.hashCode, signature.hashCode, date.hashCode, status.hashCode, staffId.hashCode, createdAt.hashCode, updatedAt.hashCode, createdBy.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['id'] = nativeToJson<String>(id);
+    json['formType'] = 
+    taxFormTypeSerializer(formType)
+    ;
+    json['firstName'] = nativeToJson<String>(firstName);
+    json['lastName'] = nativeToJson<String>(lastName);
+    if (mInitial != null) {
+      json['mInitial'] = nativeToJson<String?>(mInitial);
+    }
+    if (oLastName != null) {
+      json['oLastName'] = nativeToJson<String?>(oLastName);
+    }
+    if (dob != null) {
+      json['dob'] = dob!.toJson();
+    }
+    json['socialSN'] = nativeToJson<int>(socialSN);
+    if (email != null) {
+      json['email'] = nativeToJson<String?>(email);
+    }
+    if (phone != null) {
+      json['phone'] = nativeToJson<String?>(phone);
+    }
+    json['address'] = nativeToJson<String>(address);
+    if (city != null) {
+      json['city'] = nativeToJson<String?>(city);
+    }
+    if (apt != null) {
+      json['apt'] = nativeToJson<String?>(apt);
+    }
+    if (state != null) {
+      json['state'] = nativeToJson<String?>(state);
+    }
+    if (zipCode != null) {
+      json['zipCode'] = nativeToJson<String?>(zipCode);
+    }
+    if (marital != null) {
+      json['marital'] = 
+    maritalStatusSerializer(marital!)
+    ;
+    }
+    if (multipleJob != null) {
+      json['multipleJob'] = nativeToJson<bool?>(multipleJob);
+    }
+    if (childrens != null) {
+      json['childrens'] = nativeToJson<int?>(childrens);
+    }
+    if (otherDeps != null) {
+      json['otherDeps'] = nativeToJson<int?>(otherDeps);
+    }
+    if (totalCredits != null) {
+      json['totalCredits'] = nativeToJson<double?>(totalCredits);
+    }
+    if (otherInconme != null) {
+      json['otherInconme'] = nativeToJson<double?>(otherInconme);
+    }
+    if (deductions != null) {
+      json['deductions'] = nativeToJson<double?>(deductions);
+    }
+    if (extraWithholding != null) {
+      json['extraWithholding'] = nativeToJson<double?>(extraWithholding);
+    }
+    if (citizen != null) {
+      json['citizen'] = 
+    citizenshipStatusSerializer(citizen!)
+    ;
+    }
+    if (uscis != null) {
+      json['uscis'] = nativeToJson<String?>(uscis);
+    }
+    if (passportNumber != null) {
+      json['passportNumber'] = nativeToJson<String?>(passportNumber);
+    }
+    if (countryIssue != null) {
+      json['countryIssue'] = nativeToJson<String?>(countryIssue);
+    }
+    if (prepartorOrTranslator != null) {
+      json['prepartorOrTranslator'] = nativeToJson<bool?>(prepartorOrTranslator);
+    }
+    if (signature != null) {
+      json['signature'] = nativeToJson<String?>(signature);
+    }
+    if (date != null) {
+      json['date'] = date!.toJson();
+    }
+    json['status'] = 
+    taxFormStatusSerializer(status)
+    ;
+    json['staffId'] = nativeToJson<String>(staffId);
+    if (createdAt != null) {
+      json['createdAt'] = createdAt!.toJson();
+    }
+    if (updatedAt != null) {
+      json['updatedAt'] = updatedAt!.toJson();
+    }
+    if (createdBy != null) {
+      json['createdBy'] = nativeToJson<String?>(createdBy);
+    }
+    return json;
+  }
+
+  GetTaxFormsByStaffIdTaxForms({
+    required this.id,
+    required this.formType,
+    required this.firstName,
+    required this.lastName,
+    this.mInitial,
+    this.oLastName,
+    this.dob,
+    required this.socialSN,
+    this.email,
+    this.phone,
+    required this.address,
+    this.city,
+    this.apt,
+    this.state,
+    this.zipCode,
+    this.marital,
+    this.multipleJob,
+    this.childrens,
+    this.otherDeps,
+    this.totalCredits,
+    this.otherInconme,
+    this.deductions,
+    this.extraWithholding,
+    this.citizen,
+    this.uscis,
+    this.passportNumber,
+    this.countryIssue,
+    this.prepartorOrTranslator,
+    this.signature,
+    this.date,
+    required this.status,
+    required this.staffId,
+    this.createdAt,
+    this.updatedAt,
+    this.createdBy,
+  });
+}
+
+@immutable
+class GetTaxFormsByStaffIdData {
+  final List<GetTaxFormsByStaffIdTaxForms> taxForms;
+  GetTaxFormsByStaffIdData.fromJson(dynamic json):
+  
+  taxForms = (json['taxForms'] as List<dynamic>)
+        .map((e) => GetTaxFormsByStaffIdTaxForms.fromJson(e))
+        .toList();
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final GetTaxFormsByStaffIdData otherTyped = other as GetTaxFormsByStaffIdData;
+    return taxForms == otherTyped.taxForms;
+    
+  }
+  @override
+  int get hashCode => taxForms.hashCode;
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['taxForms'] = taxForms.map((e) => e.toJson()).toList();
+    return json;
+  }
+
+  GetTaxFormsByStaffIdData({
+    required this.taxForms,
+  });
+}
+
+@immutable
+class GetTaxFormsByStaffIdVariables {
+  final String staffId;
+  late final Optional<int>offset;
+  late final Optional<int>limit;
+  @Deprecated('fromJson is deprecated for Variable classes as they are no longer required for deserialization.')
+  GetTaxFormsByStaffIdVariables.fromJson(Map<String, dynamic> json):
+  
+  staffId = nativeFromJson<String>(json['staffId']) {
+  
+  
+  
+    offset = Optional.optional(nativeFromJson, nativeToJson);
+    offset.value = json['offset'] == null ? null : nativeFromJson<int>(json['offset']);
+  
+  
+    limit = Optional.optional(nativeFromJson, nativeToJson);
+    limit.value = json['limit'] == null ? null : nativeFromJson<int>(json['limit']);
+  
+  }
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final GetTaxFormsByStaffIdVariables otherTyped = other as GetTaxFormsByStaffIdVariables;
+    return staffId == otherTyped.staffId && 
+    offset == otherTyped.offset && 
+    limit == otherTyped.limit;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([staffId.hashCode, offset.hashCode, limit.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['staffId'] = nativeToJson<String>(staffId);
+    if(offset.state == OptionalState.set) {
+      json['offset'] = offset.toJson();
+    }
+    if(limit.state == OptionalState.set) {
+      json['limit'] = limit.toJson();
+    }
+    return json;
+  }
+
+  GetTaxFormsByStaffIdVariables({
+    required this.staffId,
+    required this.offset,
+    required this.limit,
+  });
+}
+

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/get_tax_forms_bystaff_id.dart

@@ -1,190 +0,0 @@
-part of 'generated.dart';
-
-class GetTaxFormsBystaffIdVariablesBuilder {
-  String staffId;
-
-  final FirebaseDataConnect _dataConnect;
-  GetTaxFormsBystaffIdVariablesBuilder(this._dataConnect, {required  this.staffId,});
-  Deserializer<GetTaxFormsBystaffIdData> dataDeserializer = (dynamic json)  => GetTaxFormsBystaffIdData.fromJson(jsonDecode(json));
-  Serializer<GetTaxFormsBystaffIdVariables> varsSerializer = (GetTaxFormsBystaffIdVariables vars) => jsonEncode(vars.toJson());
-  Future<QueryResult<GetTaxFormsBystaffIdData, GetTaxFormsBystaffIdVariables>> execute() {
-    return ref().execute();
-  }
-
-  QueryRef<GetTaxFormsBystaffIdData, GetTaxFormsBystaffIdVariables> ref() {
-    GetTaxFormsBystaffIdVariables vars= GetTaxFormsBystaffIdVariables(staffId: staffId,);
-    return _dataConnect.query("getTaxFormsBystaffId", dataDeserializer, varsSerializer, vars);
-  }
-}
-
-@immutable
-class GetTaxFormsBystaffIdTaxForms {
-  final String id;
-  final EnumValue<TaxFormType> formType;
-  final String title;
-  final String? subtitle;
-  final String? description;
-  final EnumValue<TaxFormStatus> status;
-  final String staffId;
-  final AnyValue? formData;
-  final Timestamp? createdAt;
-  final Timestamp? updatedAt;
-  final String? createdBy;
-  GetTaxFormsBystaffIdTaxForms.fromJson(dynamic json):
-  
-  id = nativeFromJson<String>(json['id']),
-  formType = taxFormTypeDeserializer(json['formType']),
-  title = nativeFromJson<String>(json['title']),
-  subtitle = json['subtitle'] == null ? null : nativeFromJson<String>(json['subtitle']),
-  description = json['description'] == null ? null : nativeFromJson<String>(json['description']),
-  status = taxFormStatusDeserializer(json['status']),
-  staffId = nativeFromJson<String>(json['staffId']),
-  formData = json['formData'] == null ? null : AnyValue.fromJson(json['formData']),
-  createdAt = json['createdAt'] == null ? null : Timestamp.fromJson(json['createdAt']),
-  updatedAt = json['updatedAt'] == null ? null : Timestamp.fromJson(json['updatedAt']),
-  createdBy = json['createdBy'] == null ? null : nativeFromJson<String>(json['createdBy']);
-  @override
-  bool operator ==(Object other) {
-    if(identical(this, other)) {
-      return true;
-    }
-    if(other.runtimeType != runtimeType) {
-      return false;
-    }
-
-    final GetTaxFormsBystaffIdTaxForms otherTyped = other as GetTaxFormsBystaffIdTaxForms;
-    return id == otherTyped.id && 
-    formType == otherTyped.formType && 
-    title == otherTyped.title && 
-    subtitle == otherTyped.subtitle && 
-    description == otherTyped.description && 
-    status == otherTyped.status && 
-    staffId == otherTyped.staffId && 
-    formData == otherTyped.formData && 
-    createdAt == otherTyped.createdAt && 
-    updatedAt == otherTyped.updatedAt && 
-    createdBy == otherTyped.createdBy;
-    
-  }
-  @override
-  int get hashCode => Object.hashAll([id.hashCode, formType.hashCode, title.hashCode, subtitle.hashCode, description.hashCode, status.hashCode, staffId.hashCode, formData.hashCode, createdAt.hashCode, updatedAt.hashCode, createdBy.hashCode]);
-  
-
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> json = {};
-    json['id'] = nativeToJson<String>(id);
-    json['formType'] = 
-    taxFormTypeSerializer(formType)
-    ;
-    json['title'] = nativeToJson<String>(title);
-    if (subtitle != null) {
-      json['subtitle'] = nativeToJson<String?>(subtitle);
-    }
-    if (description != null) {
-      json['description'] = nativeToJson<String?>(description);
-    }
-    json['status'] = 
-    taxFormStatusSerializer(status)
-    ;
-    json['staffId'] = nativeToJson<String>(staffId);
-    if (formData != null) {
-      json['formData'] = formData!.toJson();
-    }
-    if (createdAt != null) {
-      json['createdAt'] = createdAt!.toJson();
-    }
-    if (updatedAt != null) {
-      json['updatedAt'] = updatedAt!.toJson();
-    }
-    if (createdBy != null) {
-      json['createdBy'] = nativeToJson<String?>(createdBy);
-    }
-    return json;
-  }
-
-  GetTaxFormsBystaffIdTaxForms({
-    required this.id,
-    required this.formType,
-    required this.title,
-    this.subtitle,
-    this.description,
-    required this.status,
-    required this.staffId,
-    this.formData,
-    this.createdAt,
-    this.updatedAt,
-    this.createdBy,
-  });
-}
-
-@immutable
-class GetTaxFormsBystaffIdData {
-  final List<GetTaxFormsBystaffIdTaxForms> taxForms;
-  GetTaxFormsBystaffIdData.fromJson(dynamic json):
-  
-  taxForms = (json['taxForms'] as List<dynamic>)
-        .map((e) => GetTaxFormsBystaffIdTaxForms.fromJson(e))
-        .toList();
-  @override
-  bool operator ==(Object other) {
-    if(identical(this, other)) {
-      return true;
-    }
-    if(other.runtimeType != runtimeType) {
-      return false;
-    }
-
-    final GetTaxFormsBystaffIdData otherTyped = other as GetTaxFormsBystaffIdData;
-    return taxForms == otherTyped.taxForms;
-    
-  }
-  @override
-  int get hashCode => taxForms.hashCode;
-  
-
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> json = {};
-    json['taxForms'] = taxForms.map((e) => e.toJson()).toList();
-    return json;
-  }
-
-  GetTaxFormsBystaffIdData({
-    required this.taxForms,
-  });
-}
-
-@immutable
-class GetTaxFormsBystaffIdVariables {
-  final String staffId;
-  @Deprecated('fromJson is deprecated for Variable classes as they are no longer required for deserialization.')
-  GetTaxFormsBystaffIdVariables.fromJson(Map<String, dynamic> json):
-  
-  staffId = nativeFromJson<String>(json['staffId']);
-  @override
-  bool operator ==(Object other) {
-    if(identical(this, other)) {
-      return true;
-    }
-    if(other.runtimeType != runtimeType) {
-      return false;
-    }
-
-    final GetTaxFormsBystaffIdVariables otherTyped = other as GetTaxFormsBystaffIdVariables;
-    return staffId == otherTyped.staffId;
-    
-  }
-  @override
-  int get hashCode => staffId.hashCode;
-  
-
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> json = {};
-    json['staffId'] = nativeToJson<String>(staffId);
-    return json;
-  }
-
-  GetTaxFormsBystaffIdVariables({
-    required this.staffId,
-  });
-}
-

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_tax_forms.dart

@@ -1,18 +1,29 @@
 part of 'generated.dart';
 
 class ListTaxFormsVariablesBuilder {
-  
+  Optional<int> _offset = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<int> _limit = Optional.optional(nativeFromJson, nativeToJson);
+
   final FirebaseDataConnect _dataConnect;
+  ListTaxFormsVariablesBuilder offset(int? t) {
+   _offset.value = t;
+   return this;
+  }
+  ListTaxFormsVariablesBuilder limit(int? t) {
+   _limit.value = t;
+   return this;
+  }
+
   ListTaxFormsVariablesBuilder(this._dataConnect, );
   Deserializer<ListTaxFormsData> dataDeserializer = (dynamic json)  => ListTaxFormsData.fromJson(jsonDecode(json));
-  
+  Serializer<ListTaxFormsVariables> varsSerializer = (ListTaxFormsVariables vars) => jsonEncode(vars.toJson());
-  Future<QueryResult<ListTaxFormsData, void>> execute() {
+  Future<QueryResult<ListTaxFormsData, ListTaxFormsVariables>> execute() {
     return ref().execute();
   }
 
-  QueryRef<ListTaxFormsData, void> ref() {
+  QueryRef<ListTaxFormsData, ListTaxFormsVariables> ref() {
-    
+    ListTaxFormsVariables vars= ListTaxFormsVariables(offset: _offset,limit: _limit,);
-    return _dataConnect.query("listTaxForms", dataDeserializer, emptySerializer, null);
+    return _dataConnect.query("listTaxForms", dataDeserializer, varsSerializer, vars);
   }
 }
 
@@ -20,12 +31,36 @@ class ListTaxFormsVariablesBuilder {
 class ListTaxFormsTaxForms {
   final String id;
   final EnumValue<TaxFormType> formType;
-  final String title;
+  final String firstName;
-  final String? subtitle;
+  final String lastName;
-  final String? description;
+  final String? mInitial;
+  final String? oLastName;
+  final Timestamp? dob;
+  final int socialSN;
+  final String? email;
+  final String? phone;
+  final String address;
+  final String? city;
+  final String? apt;
+  final String? state;
+  final String? zipCode;
+  final EnumValue<MaritalStatus>? marital;
+  final bool? multipleJob;
+  final int? childrens;
+  final int? otherDeps;
+  final double? totalCredits;
+  final double? otherInconme;
+  final double? deductions;
+  final double? extraWithholding;
+  final EnumValue<CitizenshipStatus>? citizen;
+  final String? uscis;
+  final String? passportNumber;
+  final String? countryIssue;
+  final bool? prepartorOrTranslator;
+  final String? signature;
+  final Timestamp? date;
   final EnumValue<TaxFormStatus> status;
   final String staffId;
-  final AnyValue? formData;
   final Timestamp? createdAt;
   final Timestamp? updatedAt;
   final String? createdBy;
@@ -33,12 +68,36 @@ class ListTaxFormsTaxForms {
   
   id = nativeFromJson<String>(json['id']),
   formType = taxFormTypeDeserializer(json['formType']),
-  title = nativeFromJson<String>(json['title']),
+  firstName = nativeFromJson<String>(json['firstName']),
-  subtitle = json['subtitle'] == null ? null : nativeFromJson<String>(json['subtitle']),
+  lastName = nativeFromJson<String>(json['lastName']),
-  description = json['description'] == null ? null : nativeFromJson<String>(json['description']),
+  mInitial = json['mInitial'] == null ? null : nativeFromJson<String>(json['mInitial']),
+  oLastName = json['oLastName'] == null ? null : nativeFromJson<String>(json['oLastName']),
+  dob = json['dob'] == null ? null : Timestamp.fromJson(json['dob']),
+  socialSN = nativeFromJson<int>(json['socialSN']),
+  email = json['email'] == null ? null : nativeFromJson<String>(json['email']),
+  phone = json['phone'] == null ? null : nativeFromJson<String>(json['phone']),
+  address = nativeFromJson<String>(json['address']),
+  city = json['city'] == null ? null : nativeFromJson<String>(json['city']),
+  apt = json['apt'] == null ? null : nativeFromJson<String>(json['apt']),
+  state = json['state'] == null ? null : nativeFromJson<String>(json['state']),
+  zipCode = json['zipCode'] == null ? null : nativeFromJson<String>(json['zipCode']),
+  marital = json['marital'] == null ? null : maritalStatusDeserializer(json['marital']),
+  multipleJob = json['multipleJob'] == null ? null : nativeFromJson<bool>(json['multipleJob']),
+  childrens = json['childrens'] == null ? null : nativeFromJson<int>(json['childrens']),
+  otherDeps = json['otherDeps'] == null ? null : nativeFromJson<int>(json['otherDeps']),
+  totalCredits = json['totalCredits'] == null ? null : nativeFromJson<double>(json['totalCredits']),
+  otherInconme = json['otherInconme'] == null ? null : nativeFromJson<double>(json['otherInconme']),
+  deductions = json['deductions'] == null ? null : nativeFromJson<double>(json['deductions']),
+  extraWithholding = json['extraWithholding'] == null ? null : nativeFromJson<double>(json['extraWithholding']),
+  citizen = json['citizen'] == null ? null : citizenshipStatusDeserializer(json['citizen']),
+  uscis = json['uscis'] == null ? null : nativeFromJson<String>(json['uscis']),
+  passportNumber = json['passportNumber'] == null ? null : nativeFromJson<String>(json['passportNumber']),
+  countryIssue = json['countryIssue'] == null ? null : nativeFromJson<String>(json['countryIssue']),
+  prepartorOrTranslator = json['prepartorOrTranslator'] == null ? null : nativeFromJson<bool>(json['prepartorOrTranslator']),
+  signature = json['signature'] == null ? null : nativeFromJson<String>(json['signature']),
+  date = json['date'] == null ? null : Timestamp.fromJson(json['date']),
   status = taxFormStatusDeserializer(json['status']),
   staffId = nativeFromJson<String>(json['staffId']),
-  formData = json['formData'] == null ? null : AnyValue.fromJson(json['formData']),
   createdAt = json['createdAt'] == null ? null : Timestamp.fromJson(json['createdAt']),
   updatedAt = json['updatedAt'] == null ? null : Timestamp.fromJson(json['updatedAt']),
   createdBy = json['createdBy'] == null ? null : nativeFromJson<String>(json['createdBy']);
@@ -54,19 +113,43 @@ class ListTaxFormsTaxForms {
     final ListTaxFormsTaxForms otherTyped = other as ListTaxFormsTaxForms;
     return id == otherTyped.id && 
     formType == otherTyped.formType && 
-    title == otherTyped.title && 
+    firstName == otherTyped.firstName && 
-    subtitle == otherTyped.subtitle && 
+    lastName == otherTyped.lastName && 
-    description == otherTyped.description && 
+    mInitial == otherTyped.mInitial && 
+    oLastName == otherTyped.oLastName && 
+    dob == otherTyped.dob && 
+    socialSN == otherTyped.socialSN && 
+    email == otherTyped.email && 
+    phone == otherTyped.phone && 
+    address == otherTyped.address && 
+    city == otherTyped.city && 
+    apt == otherTyped.apt && 
+    state == otherTyped.state && 
+    zipCode == otherTyped.zipCode && 
+    marital == otherTyped.marital && 
+    multipleJob == otherTyped.multipleJob && 
+    childrens == otherTyped.childrens && 
+    otherDeps == otherTyped.otherDeps && 
+    totalCredits == otherTyped.totalCredits && 
+    otherInconme == otherTyped.otherInconme && 
+    deductions == otherTyped.deductions && 
+    extraWithholding == otherTyped.extraWithholding && 
+    citizen == otherTyped.citizen && 
+    uscis == otherTyped.uscis && 
+    passportNumber == otherTyped.passportNumber && 
+    countryIssue == otherTyped.countryIssue && 
+    prepartorOrTranslator == otherTyped.prepartorOrTranslator && 
+    signature == otherTyped.signature && 
+    date == otherTyped.date && 
     status == otherTyped.status && 
     staffId == otherTyped.staffId && 
-    formData == otherTyped.formData && 
     createdAt == otherTyped.createdAt && 
     updatedAt == otherTyped.updatedAt && 
     createdBy == otherTyped.createdBy;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, formType.hashCode, title.hashCode, subtitle.hashCode, description.hashCode, status.hashCode, staffId.hashCode, formData.hashCode, createdAt.hashCode, updatedAt.hashCode, createdBy.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, formType.hashCode, firstName.hashCode, lastName.hashCode, mInitial.hashCode, oLastName.hashCode, dob.hashCode, socialSN.hashCode, email.hashCode, phone.hashCode, address.hashCode, city.hashCode, apt.hashCode, state.hashCode, zipCode.hashCode, marital.hashCode, multipleJob.hashCode, childrens.hashCode, otherDeps.hashCode, totalCredits.hashCode, otherInconme.hashCode, deductions.hashCode, extraWithholding.hashCode, citizen.hashCode, uscis.hashCode, passportNumber.hashCode, countryIssue.hashCode, prepartorOrTranslator.hashCode, signature.hashCode, date.hashCode, status.hashCode, staffId.hashCode, createdAt.hashCode, updatedAt.hashCode, createdBy.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -75,20 +158,90 @@ class ListTaxFormsTaxForms {
     json['formType'] = 
     taxFormTypeSerializer(formType)
     ;
-    json['title'] = nativeToJson<String>(title);
+    json['firstName'] = nativeToJson<String>(firstName);
-    if (subtitle != null) {
+    json['lastName'] = nativeToJson<String>(lastName);
-      json['subtitle'] = nativeToJson<String?>(subtitle);
+    if (mInitial != null) {
+      json['mInitial'] = nativeToJson<String?>(mInitial);
     }
-    if (description != null) {
+    if (oLastName != null) {
-      json['description'] = nativeToJson<String?>(description);
+      json['oLastName'] = nativeToJson<String?>(oLastName);
+    }
+    if (dob != null) {
+      json['dob'] = dob!.toJson();
+    }
+    json['socialSN'] = nativeToJson<int>(socialSN);
+    if (email != null) {
+      json['email'] = nativeToJson<String?>(email);
+    }
+    if (phone != null) {
+      json['phone'] = nativeToJson<String?>(phone);
+    }
+    json['address'] = nativeToJson<String>(address);
+    if (city != null) {
+      json['city'] = nativeToJson<String?>(city);
+    }
+    if (apt != null) {
+      json['apt'] = nativeToJson<String?>(apt);
+    }
+    if (state != null) {
+      json['state'] = nativeToJson<String?>(state);
+    }
+    if (zipCode != null) {
+      json['zipCode'] = nativeToJson<String?>(zipCode);
+    }
+    if (marital != null) {
+      json['marital'] = 
+    maritalStatusSerializer(marital!)
+    ;
+    }
+    if (multipleJob != null) {
+      json['multipleJob'] = nativeToJson<bool?>(multipleJob);
+    }
+    if (childrens != null) {
+      json['childrens'] = nativeToJson<int?>(childrens);
+    }
+    if (otherDeps != null) {
+      json['otherDeps'] = nativeToJson<int?>(otherDeps);
+    }
+    if (totalCredits != null) {
+      json['totalCredits'] = nativeToJson<double?>(totalCredits);
+    }
+    if (otherInconme != null) {
+      json['otherInconme'] = nativeToJson<double?>(otherInconme);
+    }
+    if (deductions != null) {
+      json['deductions'] = nativeToJson<double?>(deductions);
+    }
+    if (extraWithholding != null) {
+      json['extraWithholding'] = nativeToJson<double?>(extraWithholding);
+    }
+    if (citizen != null) {
+      json['citizen'] = 
+    citizenshipStatusSerializer(citizen!)
+    ;
+    }
+    if (uscis != null) {
+      json['uscis'] = nativeToJson<String?>(uscis);
+    }
+    if (passportNumber != null) {
+      json['passportNumber'] = nativeToJson<String?>(passportNumber);
+    }
+    if (countryIssue != null) {
+      json['countryIssue'] = nativeToJson<String?>(countryIssue);
+    }
+    if (prepartorOrTranslator != null) {
+      json['prepartorOrTranslator'] = nativeToJson<bool?>(prepartorOrTranslator);
+    }
+    if (signature != null) {
+      json['signature'] = nativeToJson<String?>(signature);
+    }
+    if (date != null) {
+      json['date'] = date!.toJson();
     }
     json['status'] = 
     taxFormStatusSerializer(status)
     ;
     json['staffId'] = nativeToJson<String>(staffId);
-    if (formData != null) {
-      json['formData'] = formData!.toJson();
-    }
     if (createdAt != null) {
       json['createdAt'] = createdAt!.toJson();
     }
@@ -104,12 +257,36 @@ class ListTaxFormsTaxForms {
   ListTaxFormsTaxForms({
     required this.id,
     required this.formType,
-    required this.title,
+    required this.firstName,
-    this.subtitle,
+    required this.lastName,
-    this.description,
+    this.mInitial,
+    this.oLastName,
+    this.dob,
+    required this.socialSN,
+    this.email,
+    this.phone,
+    required this.address,
+    this.city,
+    this.apt,
+    this.state,
+    this.zipCode,
+    this.marital,
+    this.multipleJob,
+    this.childrens,
+    this.otherDeps,
+    this.totalCredits,
+    this.otherInconme,
+    this.deductions,
+    this.extraWithholding,
+    this.citizen,
+    this.uscis,
+    this.passportNumber,
+    this.countryIssue,
+    this.prepartorOrTranslator,
+    this.signature,
+    this.date,
     required this.status,
     required this.staffId,
-    this.formData,
     this.createdAt,
     this.updatedAt,
     this.createdBy,
@@ -152,3 +329,54 @@ class ListTaxFormsData {
   });
 }
 
+@immutable
+class ListTaxFormsVariables {
+  late final Optional<int>offset;
+  late final Optional<int>limit;
+  @Deprecated('fromJson is deprecated for Variable classes as they are no longer required for deserialization.')
+  ListTaxFormsVariables.fromJson(Map<String, dynamic> json) {
+  
+  
+    offset = Optional.optional(nativeFromJson, nativeToJson);
+    offset.value = json['offset'] == null ? null : nativeFromJson<int>(json['offset']);
+  
+  
+    limit = Optional.optional(nativeFromJson, nativeToJson);
+    limit.value = json['limit'] == null ? null : nativeFromJson<int>(json['limit']);
+  
+  }
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListTaxFormsVariables otherTyped = other as ListTaxFormsVariables;
+    return offset == otherTyped.offset && 
+    limit == otherTyped.limit;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([offset.hashCode, limit.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    if(offset.state == OptionalState.set) {
+      json['offset'] = offset.toJson();
+    }
+    if(limit.state == OptionalState.set) {
+      json['limit'] = limit.toJson();
+    }
+    return json;
+  }
+
+  ListTaxFormsVariables({
+    required this.offset,
+    required this.limit,
+  });
+}
+

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_tax_forms_where.dart

@@ -0,0 +1,427 @@
+part of 'generated.dart';
+
+class ListTaxFormsWhereVariablesBuilder {
+  Optional<TaxFormType> _formType = Optional.optional((data) => TaxFormType.values.byName(data), enumSerializer);
+  Optional<TaxFormStatus> _status = Optional.optional((data) => TaxFormStatus.values.byName(data), enumSerializer);
+  Optional<String> _staffId = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<int> _offset = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<int> _limit = Optional.optional(nativeFromJson, nativeToJson);
+
+  final FirebaseDataConnect _dataConnect;
+  ListTaxFormsWhereVariablesBuilder formType(TaxFormType? t) {
+   _formType.value = t;
+   return this;
+  }
+  ListTaxFormsWhereVariablesBuilder status(TaxFormStatus? t) {
+   _status.value = t;
+   return this;
+  }
+  ListTaxFormsWhereVariablesBuilder staffId(String? t) {
+   _staffId.value = t;
+   return this;
+  }
+  ListTaxFormsWhereVariablesBuilder offset(int? t) {
+   _offset.value = t;
+   return this;
+  }
+  ListTaxFormsWhereVariablesBuilder limit(int? t) {
+   _limit.value = t;
+   return this;
+  }
+
+  ListTaxFormsWhereVariablesBuilder(this._dataConnect, );
+  Deserializer<ListTaxFormsWhereData> dataDeserializer = (dynamic json)  => ListTaxFormsWhereData.fromJson(jsonDecode(json));
+  Serializer<ListTaxFormsWhereVariables> varsSerializer = (ListTaxFormsWhereVariables vars) => jsonEncode(vars.toJson());
+  Future<QueryResult<ListTaxFormsWhereData, ListTaxFormsWhereVariables>> execute() {
+    return ref().execute();
+  }
+
+  QueryRef<ListTaxFormsWhereData, ListTaxFormsWhereVariables> ref() {
+    ListTaxFormsWhereVariables vars= ListTaxFormsWhereVariables(formType: _formType,status: _status,staffId: _staffId,offset: _offset,limit: _limit,);
+    return _dataConnect.query("listTaxFormsWhere", dataDeserializer, varsSerializer, vars);
+  }
+}
+
+@immutable
+class ListTaxFormsWhereTaxForms {
+  final String id;
+  final EnumValue<TaxFormType> formType;
+  final String firstName;
+  final String lastName;
+  final String? mInitial;
+  final String? oLastName;
+  final Timestamp? dob;
+  final int socialSN;
+  final String? email;
+  final String? phone;
+  final String address;
+  final String? city;
+  final String? apt;
+  final String? state;
+  final String? zipCode;
+  final EnumValue<MaritalStatus>? marital;
+  final bool? multipleJob;
+  final int? childrens;
+  final int? otherDeps;
+  final double? totalCredits;
+  final double? otherInconme;
+  final double? deductions;
+  final double? extraWithholding;
+  final EnumValue<CitizenshipStatus>? citizen;
+  final String? uscis;
+  final String? passportNumber;
+  final String? countryIssue;
+  final bool? prepartorOrTranslator;
+  final String? signature;
+  final Timestamp? date;
+  final EnumValue<TaxFormStatus> status;
+  final String staffId;
+  final Timestamp? createdAt;
+  final Timestamp? updatedAt;
+  final String? createdBy;
+  ListTaxFormsWhereTaxForms.fromJson(dynamic json):
+  
+  id = nativeFromJson<String>(json['id']),
+  formType = taxFormTypeDeserializer(json['formType']),
+  firstName = nativeFromJson<String>(json['firstName']),
+  lastName = nativeFromJson<String>(json['lastName']),
+  mInitial = json['mInitial'] == null ? null : nativeFromJson<String>(json['mInitial']),
+  oLastName = json['oLastName'] == null ? null : nativeFromJson<String>(json['oLastName']),
+  dob = json['dob'] == null ? null : Timestamp.fromJson(json['dob']),
+  socialSN = nativeFromJson<int>(json['socialSN']),
+  email = json['email'] == null ? null : nativeFromJson<String>(json['email']),
+  phone = json['phone'] == null ? null : nativeFromJson<String>(json['phone']),
+  address = nativeFromJson<String>(json['address']),
+  city = json['city'] == null ? null : nativeFromJson<String>(json['city']),
+  apt = json['apt'] == null ? null : nativeFromJson<String>(json['apt']),
+  state = json['state'] == null ? null : nativeFromJson<String>(json['state']),
+  zipCode = json['zipCode'] == null ? null : nativeFromJson<String>(json['zipCode']),
+  marital = json['marital'] == null ? null : maritalStatusDeserializer(json['marital']),
+  multipleJob = json['multipleJob'] == null ? null : nativeFromJson<bool>(json['multipleJob']),
+  childrens = json['childrens'] == null ? null : nativeFromJson<int>(json['childrens']),
+  otherDeps = json['otherDeps'] == null ? null : nativeFromJson<int>(json['otherDeps']),
+  totalCredits = json['totalCredits'] == null ? null : nativeFromJson<double>(json['totalCredits']),
+  otherInconme = json['otherInconme'] == null ? null : nativeFromJson<double>(json['otherInconme']),
+  deductions = json['deductions'] == null ? null : nativeFromJson<double>(json['deductions']),
+  extraWithholding = json['extraWithholding'] == null ? null : nativeFromJson<double>(json['extraWithholding']),
+  citizen = json['citizen'] == null ? null : citizenshipStatusDeserializer(json['citizen']),
+  uscis = json['uscis'] == null ? null : nativeFromJson<String>(json['uscis']),
+  passportNumber = json['passportNumber'] == null ? null : nativeFromJson<String>(json['passportNumber']),
+  countryIssue = json['countryIssue'] == null ? null : nativeFromJson<String>(json['countryIssue']),
+  prepartorOrTranslator = json['prepartorOrTranslator'] == null ? null : nativeFromJson<bool>(json['prepartorOrTranslator']),
+  signature = json['signature'] == null ? null : nativeFromJson<String>(json['signature']),
+  date = json['date'] == null ? null : Timestamp.fromJson(json['date']),
+  status = taxFormStatusDeserializer(json['status']),
+  staffId = nativeFromJson<String>(json['staffId']),
+  createdAt = json['createdAt'] == null ? null : Timestamp.fromJson(json['createdAt']),
+  updatedAt = json['updatedAt'] == null ? null : Timestamp.fromJson(json['updatedAt']),
+  createdBy = json['createdBy'] == null ? null : nativeFromJson<String>(json['createdBy']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListTaxFormsWhereTaxForms otherTyped = other as ListTaxFormsWhereTaxForms;
+    return id == otherTyped.id && 
+    formType == otherTyped.formType && 
+    firstName == otherTyped.firstName && 
+    lastName == otherTyped.lastName && 
+    mInitial == otherTyped.mInitial && 
+    oLastName == otherTyped.oLastName && 
+    dob == otherTyped.dob && 
+    socialSN == otherTyped.socialSN && 
+    email == otherTyped.email && 
+    phone == otherTyped.phone && 
+    address == otherTyped.address && 
+    city == otherTyped.city && 
+    apt == otherTyped.apt && 
+    state == otherTyped.state && 
+    zipCode == otherTyped.zipCode && 
+    marital == otherTyped.marital && 
+    multipleJob == otherTyped.multipleJob && 
+    childrens == otherTyped.childrens && 
+    otherDeps == otherTyped.otherDeps && 
+    totalCredits == otherTyped.totalCredits && 
+    otherInconme == otherTyped.otherInconme && 
+    deductions == otherTyped.deductions && 
+    extraWithholding == otherTyped.extraWithholding && 
+    citizen == otherTyped.citizen && 
+    uscis == otherTyped.uscis && 
+    passportNumber == otherTyped.passportNumber && 
+    countryIssue == otherTyped.countryIssue && 
+    prepartorOrTranslator == otherTyped.prepartorOrTranslator && 
+    signature == otherTyped.signature && 
+    date == otherTyped.date && 
+    status == otherTyped.status && 
+    staffId == otherTyped.staffId && 
+    createdAt == otherTyped.createdAt && 
+    updatedAt == otherTyped.updatedAt && 
+    createdBy == otherTyped.createdBy;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([id.hashCode, formType.hashCode, firstName.hashCode, lastName.hashCode, mInitial.hashCode, oLastName.hashCode, dob.hashCode, socialSN.hashCode, email.hashCode, phone.hashCode, address.hashCode, city.hashCode, apt.hashCode, state.hashCode, zipCode.hashCode, marital.hashCode, multipleJob.hashCode, childrens.hashCode, otherDeps.hashCode, totalCredits.hashCode, otherInconme.hashCode, deductions.hashCode, extraWithholding.hashCode, citizen.hashCode, uscis.hashCode, passportNumber.hashCode, countryIssue.hashCode, prepartorOrTranslator.hashCode, signature.hashCode, date.hashCode, status.hashCode, staffId.hashCode, createdAt.hashCode, updatedAt.hashCode, createdBy.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['id'] = nativeToJson<String>(id);
+    json['formType'] = 
+    taxFormTypeSerializer(formType)
+    ;
+    json['firstName'] = nativeToJson<String>(firstName);
+    json['lastName'] = nativeToJson<String>(lastName);
+    if (mInitial != null) {
+      json['mInitial'] = nativeToJson<String?>(mInitial);
+    }
+    if (oLastName != null) {
+      json['oLastName'] = nativeToJson<String?>(oLastName);
+    }
+    if (dob != null) {
+      json['dob'] = dob!.toJson();
+    }
+    json['socialSN'] = nativeToJson<int>(socialSN);
+    if (email != null) {
+      json['email'] = nativeToJson<String?>(email);
+    }
+    if (phone != null) {
+      json['phone'] = nativeToJson<String?>(phone);
+    }
+    json['address'] = nativeToJson<String>(address);
+    if (city != null) {
+      json['city'] = nativeToJson<String?>(city);
+    }
+    if (apt != null) {
+      json['apt'] = nativeToJson<String?>(apt);
+    }
+    if (state != null) {
+      json['state'] = nativeToJson<String?>(state);
+    }
+    if (zipCode != null) {
+      json['zipCode'] = nativeToJson<String?>(zipCode);
+    }
+    if (marital != null) {
+      json['marital'] = 
+    maritalStatusSerializer(marital!)
+    ;
+    }
+    if (multipleJob != null) {
+      json['multipleJob'] = nativeToJson<bool?>(multipleJob);
+    }
+    if (childrens != null) {
+      json['childrens'] = nativeToJson<int?>(childrens);
+    }
+    if (otherDeps != null) {
+      json['otherDeps'] = nativeToJson<int?>(otherDeps);
+    }
+    if (totalCredits != null) {
+      json['totalCredits'] = nativeToJson<double?>(totalCredits);
+    }
+    if (otherInconme != null) {
+      json['otherInconme'] = nativeToJson<double?>(otherInconme);
+    }
+    if (deductions != null) {
+      json['deductions'] = nativeToJson<double?>(deductions);
+    }
+    if (extraWithholding != null) {
+      json['extraWithholding'] = nativeToJson<double?>(extraWithholding);
+    }
+    if (citizen != null) {
+      json['citizen'] = 
+    citizenshipStatusSerializer(citizen!)
+    ;
+    }
+    if (uscis != null) {
+      json['uscis'] = nativeToJson<String?>(uscis);
+    }
+    if (passportNumber != null) {
+      json['passportNumber'] = nativeToJson<String?>(passportNumber);
+    }
+    if (countryIssue != null) {
+      json['countryIssue'] = nativeToJson<String?>(countryIssue);
+    }
+    if (prepartorOrTranslator != null) {
+      json['prepartorOrTranslator'] = nativeToJson<bool?>(prepartorOrTranslator);
+    }
+    if (signature != null) {
+      json['signature'] = nativeToJson<String?>(signature);
+    }
+    if (date != null) {
+      json['date'] = date!.toJson();
+    }
+    json['status'] = 
+    taxFormStatusSerializer(status)
+    ;
+    json['staffId'] = nativeToJson<String>(staffId);
+    if (createdAt != null) {
+      json['createdAt'] = createdAt!.toJson();
+    }
+    if (updatedAt != null) {
+      json['updatedAt'] = updatedAt!.toJson();
+    }
+    if (createdBy != null) {
+      json['createdBy'] = nativeToJson<String?>(createdBy);
+    }
+    return json;
+  }
+
+  ListTaxFormsWhereTaxForms({
+    required this.id,
+    required this.formType,
+    required this.firstName,
+    required this.lastName,
+    this.mInitial,
+    this.oLastName,
+    this.dob,
+    required this.socialSN,
+    this.email,
+    this.phone,
+    required this.address,
+    this.city,
+    this.apt,
+    this.state,
+    this.zipCode,
+    this.marital,
+    this.multipleJob,
+    this.childrens,
+    this.otherDeps,
+    this.totalCredits,
+    this.otherInconme,
+    this.deductions,
+    this.extraWithholding,
+    this.citizen,
+    this.uscis,
+    this.passportNumber,
+    this.countryIssue,
+    this.prepartorOrTranslator,
+    this.signature,
+    this.date,
+    required this.status,
+    required this.staffId,
+    this.createdAt,
+    this.updatedAt,
+    this.createdBy,
+  });
+}
+
+@immutable
+class ListTaxFormsWhereData {
+  final List<ListTaxFormsWhereTaxForms> taxForms;
+  ListTaxFormsWhereData.fromJson(dynamic json):
+  
+  taxForms = (json['taxForms'] as List<dynamic>)
+        .map((e) => ListTaxFormsWhereTaxForms.fromJson(e))
+        .toList();
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListTaxFormsWhereData otherTyped = other as ListTaxFormsWhereData;
+    return taxForms == otherTyped.taxForms;
+    
+  }
+  @override
+  int get hashCode => taxForms.hashCode;
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['taxForms'] = taxForms.map((e) => e.toJson()).toList();
+    return json;
+  }
+
+  ListTaxFormsWhereData({
+    required this.taxForms,
+  });
+}
+
+@immutable
+class ListTaxFormsWhereVariables {
+  late final Optional<TaxFormType>formType;
+  late final Optional<TaxFormStatus>status;
+  late final Optional<String>staffId;
+  late final Optional<int>offset;
+  late final Optional<int>limit;
+  @Deprecated('fromJson is deprecated for Variable classes as they are no longer required for deserialization.')
+  ListTaxFormsWhereVariables.fromJson(Map<String, dynamic> json) {
+  
+  
+    formType = Optional.optional((data) => TaxFormType.values.byName(data), enumSerializer);
+    formType.value = json['formType'] == null ? null : TaxFormType.values.byName(json['formType']);
+  
+  
+    status = Optional.optional((data) => TaxFormStatus.values.byName(data), enumSerializer);
+    status.value = json['status'] == null ? null : TaxFormStatus.values.byName(json['status']);
+  
+  
+    staffId = Optional.optional(nativeFromJson, nativeToJson);
+    staffId.value = json['staffId'] == null ? null : nativeFromJson<String>(json['staffId']);
+  
+  
+    offset = Optional.optional(nativeFromJson, nativeToJson);
+    offset.value = json['offset'] == null ? null : nativeFromJson<int>(json['offset']);
+  
+  
+    limit = Optional.optional(nativeFromJson, nativeToJson);
+    limit.value = json['limit'] == null ? null : nativeFromJson<int>(json['limit']);
+  
+  }
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListTaxFormsWhereVariables otherTyped = other as ListTaxFormsWhereVariables;
+    return formType == otherTyped.formType && 
+    status == otherTyped.status && 
+    staffId == otherTyped.staffId && 
+    offset == otherTyped.offset && 
+    limit == otherTyped.limit;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([formType.hashCode, status.hashCode, staffId.hashCode, offset.hashCode, limit.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    if(formType.state == OptionalState.set) {
+      json['formType'] = formType.toJson();
+    }
+    if(status.state == OptionalState.set) {
+      json['status'] = status.toJson();
+    }
+    if(staffId.state == OptionalState.set) {
+      json['staffId'] = staffId.toJson();
+    }
+    if(offset.state == OptionalState.set) {
+      json['offset'] = offset.toJson();
+    }
+    if(limit.state == OptionalState.set) {
+      json['limit'] = limit.toJson();
+    }
+    return json;
+  }
+
+  ListTaxFormsWhereVariables({
+    required this.formType,
+    required this.status,
+    required this.staffId,
+    required this.offset,
+    required this.limit,
+  });
+}
+

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/update_tax_form.dart

@@ -2,32 +2,157 @@ part of 'generated.dart';
 
 class UpdateTaxFormVariablesBuilder {
   String id;
+  Optional<TaxFormType> _formType = Optional.optional((data) => TaxFormType.values.byName(data), enumSerializer);
+  Optional<String> _firstName = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _lastName = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _mInitial = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _oLastName = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<Timestamp> _dob = Optional.optional((json) => json['dob'] = Timestamp.fromJson(json['dob']), defaultSerializer);
+  Optional<int> _socialSN = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _email = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _phone = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _address = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _city = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _apt = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _state = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _zipCode = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<MaritalStatus> _marital = Optional.optional((data) => MaritalStatus.values.byName(data), enumSerializer);
+  Optional<bool> _multipleJob = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<int> _childrens = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<int> _otherDeps = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<double> _totalCredits = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<double> _otherInconme = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<double> _deductions = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<double> _extraWithholding = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<CitizenshipStatus> _citizen = Optional.optional((data) => CitizenshipStatus.values.byName(data), enumSerializer);
+  Optional<String> _uscis = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _passportNumber = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _countryIssue = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<bool> _prepartorOrTranslator = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _signature = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<Timestamp> _date = Optional.optional((json) => json['date'] = Timestamp.fromJson(json['date']), defaultSerializer);
   Optional<TaxFormStatus> _status = Optional.optional((data) => TaxFormStatus.values.byName(data), enumSerializer);
-  Optional<AnyValue> _formData = Optional.optional(AnyValue.fromJson, defaultSerializer);
-  Optional<String> _title = Optional.optional(nativeFromJson, nativeToJson);
-  Optional<String> _subtitle = Optional.optional(nativeFromJson, nativeToJson);
-  Optional<String> _description = Optional.optional(nativeFromJson, nativeToJson);
 
-  final FirebaseDataConnect _dataConnect;  UpdateTaxFormVariablesBuilder status(TaxFormStatus? t) {
+  final FirebaseDataConnect _dataConnect;  UpdateTaxFormVariablesBuilder formType(TaxFormType? t) {
+   _formType.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder firstName(String? t) {
+   _firstName.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder lastName(String? t) {
+   _lastName.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder mInitial(String? t) {
+   _mInitial.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder oLastName(String? t) {
+   _oLastName.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder dob(Timestamp? t) {
+   _dob.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder socialSN(int? t) {
+   _socialSN.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder email(String? t) {
+   _email.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder phone(String? t) {
+   _phone.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder address(String? t) {
+   _address.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder city(String? t) {
+   _city.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder apt(String? t) {
+   _apt.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder state(String? t) {
+   _state.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder zipCode(String? t) {
+   _zipCode.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder marital(MaritalStatus? t) {
+   _marital.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder multipleJob(bool? t) {
+   _multipleJob.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder childrens(int? t) {
+   _childrens.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder otherDeps(int? t) {
+   _otherDeps.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder totalCredits(double? t) {
+   _totalCredits.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder otherInconme(double? t) {
+   _otherInconme.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder deductions(double? t) {
+   _deductions.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder extraWithholding(double? t) {
+   _extraWithholding.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder citizen(CitizenshipStatus? t) {
+   _citizen.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder uscis(String? t) {
+   _uscis.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder passportNumber(String? t) {
+   _passportNumber.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder countryIssue(String? t) {
+   _countryIssue.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder prepartorOrTranslator(bool? t) {
+   _prepartorOrTranslator.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder signature(String? t) {
+   _signature.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder date(Timestamp? t) {
+   _date.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder status(TaxFormStatus? t) {
    _status.value = t;
    return this;
   }
-  UpdateTaxFormVariablesBuilder formData(AnyValue? t) {
-   _formData.value = t;
-   return this;
-  }
-  UpdateTaxFormVariablesBuilder title(String? t) {
-   _title.value = t;
-   return this;
-  }
-  UpdateTaxFormVariablesBuilder subtitle(String? t) {
-   _subtitle.value = t;
-   return this;
-  }
-  UpdateTaxFormVariablesBuilder description(String? t) {
-   _description.value = t;
-   return this;
-  }
 
   UpdateTaxFormVariablesBuilder(this._dataConnect, {required  this.id,});
   Deserializer<UpdateTaxFormData> dataDeserializer = (dynamic json)  => UpdateTaxFormData.fromJson(jsonDecode(json));
@@ -37,7 +162,7 @@ class UpdateTaxFormVariablesBuilder {
   }
 
   MutationRef<UpdateTaxFormData, UpdateTaxFormVariables> ref() {
-    UpdateTaxFormVariables vars= UpdateTaxFormVariables(id: id,status: _status,formData: _formData,title: _title,subtitle: _subtitle,description: _description,);
+    UpdateTaxFormVariables vars= UpdateTaxFormVariables(id: id,formType: _formType,firstName: _firstName,lastName: _lastName,mInitial: _mInitial,oLastName: _oLastName,dob: _dob,socialSN: _socialSN,email: _email,phone: _phone,address: _address,city: _city,apt: _apt,state: _state,zipCode: _zipCode,marital: _marital,multipleJob: _multipleJob,childrens: _childrens,otherDeps: _otherDeps,totalCredits: _totalCredits,otherInconme: _otherInconme,deductions: _deductions,extraWithholding: _extraWithholding,citizen: _citizen,uscis: _uscis,passportNumber: _passportNumber,countryIssue: _countryIssue,prepartorOrTranslator: _prepartorOrTranslator,signature: _signature,date: _date,status: _status,);
     return _dataConnect.mutation("updateTaxForm", dataDeserializer, varsSerializer, vars);
   }
 }
@@ -115,11 +240,36 @@ class UpdateTaxFormData {
 @immutable
 class UpdateTaxFormVariables {
   final String id;
+  late final Optional<TaxFormType>formType;
+  late final Optional<String>firstName;
+  late final Optional<String>lastName;
+  late final Optional<String>mInitial;
+  late final Optional<String>oLastName;
+  late final Optional<Timestamp>dob;
+  late final Optional<int>socialSN;
+  late final Optional<String>email;
+  late final Optional<String>phone;
+  late final Optional<String>address;
+  late final Optional<String>city;
+  late final Optional<String>apt;
+  late final Optional<String>state;
+  late final Optional<String>zipCode;
+  late final Optional<MaritalStatus>marital;
+  late final Optional<bool>multipleJob;
+  late final Optional<int>childrens;
+  late final Optional<int>otherDeps;
+  late final Optional<double>totalCredits;
+  late final Optional<double>otherInconme;
+  late final Optional<double>deductions;
+  late final Optional<double>extraWithholding;
+  late final Optional<CitizenshipStatus>citizen;
+  late final Optional<String>uscis;
+  late final Optional<String>passportNumber;
+  late final Optional<String>countryIssue;
+  late final Optional<bool>prepartorOrTranslator;
+  late final Optional<String>signature;
+  late final Optional<Timestamp>date;
   late final Optional<TaxFormStatus>status;
-  late final Optional<AnyValue>formData;
-  late final Optional<String>title;
-  late final Optional<String>subtitle;
-  late final Optional<String>description;
   @Deprecated('fromJson is deprecated for Variable classes as they are no longer required for deserialization.')
   UpdateTaxFormVariables.fromJson(Map<String, dynamic> json):
   
@@ -127,25 +277,125 @@ class UpdateTaxFormVariables {
   
   
   
+    formType = Optional.optional((data) => TaxFormType.values.byName(data), enumSerializer);
+    formType.value = json['formType'] == null ? null : TaxFormType.values.byName(json['formType']);
+  
+  
+    firstName = Optional.optional(nativeFromJson, nativeToJson);
+    firstName.value = json['firstName'] == null ? null : nativeFromJson<String>(json['firstName']);
+  
+  
+    lastName = Optional.optional(nativeFromJson, nativeToJson);
+    lastName.value = json['lastName'] == null ? null : nativeFromJson<String>(json['lastName']);
+  
+  
+    mInitial = Optional.optional(nativeFromJson, nativeToJson);
+    mInitial.value = json['mInitial'] == null ? null : nativeFromJson<String>(json['mInitial']);
+  
+  
+    oLastName = Optional.optional(nativeFromJson, nativeToJson);
+    oLastName.value = json['oLastName'] == null ? null : nativeFromJson<String>(json['oLastName']);
+  
+  
+    dob = Optional.optional((json) => json['dob'] = Timestamp.fromJson(json['dob']), defaultSerializer);
+    dob.value = json['dob'] == null ? null : Timestamp.fromJson(json['dob']);
+  
+  
+    socialSN = Optional.optional(nativeFromJson, nativeToJson);
+    socialSN.value = json['socialSN'] == null ? null : nativeFromJson<int>(json['socialSN']);
+  
+  
+    email = Optional.optional(nativeFromJson, nativeToJson);
+    email.value = json['email'] == null ? null : nativeFromJson<String>(json['email']);
+  
+  
+    phone = Optional.optional(nativeFromJson, nativeToJson);
+    phone.value = json['phone'] == null ? null : nativeFromJson<String>(json['phone']);
+  
+  
+    address = Optional.optional(nativeFromJson, nativeToJson);
+    address.value = json['address'] == null ? null : nativeFromJson<String>(json['address']);
+  
+  
+    city = Optional.optional(nativeFromJson, nativeToJson);
+    city.value = json['city'] == null ? null : nativeFromJson<String>(json['city']);
+  
+  
+    apt = Optional.optional(nativeFromJson, nativeToJson);
+    apt.value = json['apt'] == null ? null : nativeFromJson<String>(json['apt']);
+  
+  
+    state = Optional.optional(nativeFromJson, nativeToJson);
+    state.value = json['state'] == null ? null : nativeFromJson<String>(json['state']);
+  
+  
+    zipCode = Optional.optional(nativeFromJson, nativeToJson);
+    zipCode.value = json['zipCode'] == null ? null : nativeFromJson<String>(json['zipCode']);
+  
+  
+    marital = Optional.optional((data) => MaritalStatus.values.byName(data), enumSerializer);
+    marital.value = json['marital'] == null ? null : MaritalStatus.values.byName(json['marital']);
+  
+  
+    multipleJob = Optional.optional(nativeFromJson, nativeToJson);
+    multipleJob.value = json['multipleJob'] == null ? null : nativeFromJson<bool>(json['multipleJob']);
+  
+  
+    childrens = Optional.optional(nativeFromJson, nativeToJson);
+    childrens.value = json['childrens'] == null ? null : nativeFromJson<int>(json['childrens']);
+  
+  
+    otherDeps = Optional.optional(nativeFromJson, nativeToJson);
+    otherDeps.value = json['otherDeps'] == null ? null : nativeFromJson<int>(json['otherDeps']);
+  
+  
+    totalCredits = Optional.optional(nativeFromJson, nativeToJson);
+    totalCredits.value = json['totalCredits'] == null ? null : nativeFromJson<double>(json['totalCredits']);
+  
+  
+    otherInconme = Optional.optional(nativeFromJson, nativeToJson);
+    otherInconme.value = json['otherInconme'] == null ? null : nativeFromJson<double>(json['otherInconme']);
+  
+  
+    deductions = Optional.optional(nativeFromJson, nativeToJson);
+    deductions.value = json['deductions'] == null ? null : nativeFromJson<double>(json['deductions']);
+  
+  
+    extraWithholding = Optional.optional(nativeFromJson, nativeToJson);
+    extraWithholding.value = json['extraWithholding'] == null ? null : nativeFromJson<double>(json['extraWithholding']);
+  
+  
+    citizen = Optional.optional((data) => CitizenshipStatus.values.byName(data), enumSerializer);
+    citizen.value = json['citizen'] == null ? null : CitizenshipStatus.values.byName(json['citizen']);
+  
+  
+    uscis = Optional.optional(nativeFromJson, nativeToJson);
+    uscis.value = json['uscis'] == null ? null : nativeFromJson<String>(json['uscis']);
+  
+  
+    passportNumber = Optional.optional(nativeFromJson, nativeToJson);
+    passportNumber.value = json['passportNumber'] == null ? null : nativeFromJson<String>(json['passportNumber']);
+  
+  
+    countryIssue = Optional.optional(nativeFromJson, nativeToJson);
+    countryIssue.value = json['countryIssue'] == null ? null : nativeFromJson<String>(json['countryIssue']);
+  
+  
+    prepartorOrTranslator = Optional.optional(nativeFromJson, nativeToJson);
+    prepartorOrTranslator.value = json['prepartorOrTranslator'] == null ? null : nativeFromJson<bool>(json['prepartorOrTranslator']);
+  
+  
+    signature = Optional.optional(nativeFromJson, nativeToJson);
+    signature.value = json['signature'] == null ? null : nativeFromJson<String>(json['signature']);
+  
+  
+    date = Optional.optional((json) => json['date'] = Timestamp.fromJson(json['date']), defaultSerializer);
+    date.value = json['date'] == null ? null : Timestamp.fromJson(json['date']);
+  
+  
     status = Optional.optional((data) => TaxFormStatus.values.byName(data), enumSerializer);
     status.value = json['status'] == null ? null : TaxFormStatus.values.byName(json['status']);
   
-  
-    formData = Optional.optional(AnyValue.fromJson, defaultSerializer);
-    formData.value = json['formData'] == null ? null : AnyValue.fromJson(json['formData']);
-  
-  
-    title = Optional.optional(nativeFromJson, nativeToJson);
-    title.value = json['title'] == null ? null : nativeFromJson<String>(json['title']);
-  
-  
-    subtitle = Optional.optional(nativeFromJson, nativeToJson);
-    subtitle.value = json['subtitle'] == null ? null : nativeFromJson<String>(json['subtitle']);
-  
-  
-    description = Optional.optional(nativeFromJson, nativeToJson);
-    description.value = json['description'] == null ? null : nativeFromJson<String>(json['description']);
-  
   }
   @override
   bool operator ==(Object other) {
@@ -158,45 +408,170 @@ class UpdateTaxFormVariables {
 
     final UpdateTaxFormVariables otherTyped = other as UpdateTaxFormVariables;
     return id == otherTyped.id && 
-    status == otherTyped.status && 
+    formType == otherTyped.formType && 
-    formData == otherTyped.formData && 
+    firstName == otherTyped.firstName && 
-    title == otherTyped.title && 
+    lastName == otherTyped.lastName && 
-    subtitle == otherTyped.subtitle && 
+    mInitial == otherTyped.mInitial && 
-    description == otherTyped.description;
+    oLastName == otherTyped.oLastName && 
+    dob == otherTyped.dob && 
+    socialSN == otherTyped.socialSN && 
+    email == otherTyped.email && 
+    phone == otherTyped.phone && 
+    address == otherTyped.address && 
+    city == otherTyped.city && 
+    apt == otherTyped.apt && 
+    state == otherTyped.state && 
+    zipCode == otherTyped.zipCode && 
+    marital == otherTyped.marital && 
+    multipleJob == otherTyped.multipleJob && 
+    childrens == otherTyped.childrens && 
+    otherDeps == otherTyped.otherDeps && 
+    totalCredits == otherTyped.totalCredits && 
+    otherInconme == otherTyped.otherInconme && 
+    deductions == otherTyped.deductions && 
+    extraWithholding == otherTyped.extraWithholding && 
+    citizen == otherTyped.citizen && 
+    uscis == otherTyped.uscis && 
+    passportNumber == otherTyped.passportNumber && 
+    countryIssue == otherTyped.countryIssue && 
+    prepartorOrTranslator == otherTyped.prepartorOrTranslator && 
+    signature == otherTyped.signature && 
+    date == otherTyped.date && 
+    status == otherTyped.status;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, status.hashCode, formData.hashCode, title.hashCode, subtitle.hashCode, description.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, formType.hashCode, firstName.hashCode, lastName.hashCode, mInitial.hashCode, oLastName.hashCode, dob.hashCode, socialSN.hashCode, email.hashCode, phone.hashCode, address.hashCode, city.hashCode, apt.hashCode, state.hashCode, zipCode.hashCode, marital.hashCode, multipleJob.hashCode, childrens.hashCode, otherDeps.hashCode, totalCredits.hashCode, otherInconme.hashCode, deductions.hashCode, extraWithholding.hashCode, citizen.hashCode, uscis.hashCode, passportNumber.hashCode, countryIssue.hashCode, prepartorOrTranslator.hashCode, signature.hashCode, date.hashCode, status.hashCode]);
   
 
   Map<String, dynamic> toJson() {
     Map<String, dynamic> json = {};
     json['id'] = nativeToJson<String>(id);
+    if(formType.state == OptionalState.set) {
+      json['formType'] = formType.toJson();
+    }
+    if(firstName.state == OptionalState.set) {
+      json['firstName'] = firstName.toJson();
+    }
+    if(lastName.state == OptionalState.set) {
+      json['lastName'] = lastName.toJson();
+    }
+    if(mInitial.state == OptionalState.set) {
+      json['mInitial'] = mInitial.toJson();
+    }
+    if(oLastName.state == OptionalState.set) {
+      json['oLastName'] = oLastName.toJson();
+    }
+    if(dob.state == OptionalState.set) {
+      json['dob'] = dob.toJson();
+    }
+    if(socialSN.state == OptionalState.set) {
+      json['socialSN'] = socialSN.toJson();
+    }
+    if(email.state == OptionalState.set) {
+      json['email'] = email.toJson();
+    }
+    if(phone.state == OptionalState.set) {
+      json['phone'] = phone.toJson();
+    }
+    if(address.state == OptionalState.set) {
+      json['address'] = address.toJson();
+    }
+    if(city.state == OptionalState.set) {
+      json['city'] = city.toJson();
+    }
+    if(apt.state == OptionalState.set) {
+      json['apt'] = apt.toJson();
+    }
+    if(state.state == OptionalState.set) {
+      json['state'] = state.toJson();
+    }
+    if(zipCode.state == OptionalState.set) {
+      json['zipCode'] = zipCode.toJson();
+    }
+    if(marital.state == OptionalState.set) {
+      json['marital'] = marital.toJson();
+    }
+    if(multipleJob.state == OptionalState.set) {
+      json['multipleJob'] = multipleJob.toJson();
+    }
+    if(childrens.state == OptionalState.set) {
+      json['childrens'] = childrens.toJson();
+    }
+    if(otherDeps.state == OptionalState.set) {
+      json['otherDeps'] = otherDeps.toJson();
+    }
+    if(totalCredits.state == OptionalState.set) {
+      json['totalCredits'] = totalCredits.toJson();
+    }
+    if(otherInconme.state == OptionalState.set) {
+      json['otherInconme'] = otherInconme.toJson();
+    }
+    if(deductions.state == OptionalState.set) {
+      json['deductions'] = deductions.toJson();
+    }
+    if(extraWithholding.state == OptionalState.set) {
+      json['extraWithholding'] = extraWithholding.toJson();
+    }
+    if(citizen.state == OptionalState.set) {
+      json['citizen'] = citizen.toJson();
+    }
+    if(uscis.state == OptionalState.set) {
+      json['uscis'] = uscis.toJson();
+    }
+    if(passportNumber.state == OptionalState.set) {
+      json['passportNumber'] = passportNumber.toJson();
+    }
+    if(countryIssue.state == OptionalState.set) {
+      json['countryIssue'] = countryIssue.toJson();
+    }
+    if(prepartorOrTranslator.state == OptionalState.set) {
+      json['prepartorOrTranslator'] = prepartorOrTranslator.toJson();
+    }
+    if(signature.state == OptionalState.set) {
+      json['signature'] = signature.toJson();
+    }
+    if(date.state == OptionalState.set) {
+      json['date'] = date.toJson();
+    }
     if(status.state == OptionalState.set) {
       json['status'] = status.toJson();
     }
-    if(formData.state == OptionalState.set) {
-      json['formData'] = formData.toJson();
-    }
-    if(title.state == OptionalState.set) {
-      json['title'] = title.toJson();
-    }
-    if(subtitle.state == OptionalState.set) {
-      json['subtitle'] = subtitle.toJson();
-    }
-    if(description.state == OptionalState.set) {
-      json['description'] = description.toJson();
-    }
     return json;
   }
 
   UpdateTaxFormVariables({
     required this.id,
+    required this.formType,
+    required this.firstName,
+    required this.lastName,
+    required this.mInitial,
+    required this.oLastName,
+    required this.dob,
+    required this.socialSN,
+    required this.email,
+    required this.phone,
+    required this.address,
+    required this.city,
+    required this.apt,
+    required this.state,
+    required this.zipCode,
+    required this.marital,
+    required this.multipleJob,
+    required this.childrens,
+    required this.otherDeps,
+    required this.totalCredits,
+    required this.otherInconme,
+    required this.deductions,
+    required this.extraWithholding,
+    required this.citizen,
+    required this.uscis,
+    required this.passportNumber,
+    required this.countryIssue,
+    required this.prepartorOrTranslator,
+    required this.signature,
+    required this.date,
     required this.status,
-    required this.formData,
-    required this.title,
-    required this.subtitle,
-    required this.description,
   });
 }
 

backend/dataconnect/connector/taxForm/mutations.gql

@@ -1,45 +1,169 @@
 mutation createTaxForm(
   $formType: TaxFormType!
-  $title: String!
+  $firstName: String!
-  $subtitle: String
+  $lastName: String!
-  $description: String
+  $mInitial: String
-  $status: TaxFormStatus
+  $oLastName: String
+  $dob: Timestamp
+  $socialSN: Int!
+  $email: String
+  $phone: String
+  $address: String!
+  $city: String
+  $apt: String
+  $state: String
+  $zipCode: String
+
+  # W-4
+  $marital: MaritalStatus
+  $multipleJob: Boolean
+  $childrens: Int
+  $otherDeps: Int
+  $totalCredits: Float
+  $otherInconme: Float
+  $deductions: Float
+  $extraWithholding: Float
+
+  # I-9
+  $citizen: CitizenshipStatus
+  $uscis: String
+  $passportNumber: String
+  $countryIssue: String
+  $prepartorOrTranslator: Boolean
+
+  # both
+  $signature: String
+  $date: Timestamp
+
+  $status: TaxFormStatus!
   $staffId: UUID!
-  $formData: Any
+  $createdBy: String
 ) @auth(level: USER) {
   taxForm_insert(
     data: {
       formType: $formType
-      title: $title
+      firstName: $firstName
-      subtitle: $subtitle
+      lastName: $lastName
-      description: $description
+      mInitial: $mInitial
+      oLastName: $oLastName
+      dob: $dob
+      socialSN: $socialSN
+      email: $email
+      phone: $phone
+      address: $address
+      city: $city
+      apt: $apt
+      state: $state
+      zipCode: $zipCode
+
+      marital: $marital
+      multipleJob: $multipleJob
+      childrens: $childrens
+      otherDeps: $otherDeps
+      totalCredits: $totalCredits
+      otherInconme: $otherInconme
+      deductions: $deductions
+      extraWithholding: $extraWithholding
+
+      citizen: $citizen
+      uscis: $uscis
+      passportNumber: $passportNumber
+      countryIssue: $countryIssue
+      prepartorOrTranslator: $prepartorOrTranslator
+
+      signature: $signature
+      date: $date
+
       status: $status
       staffId: $staffId
-      formData: $formData
+      createdBy: $createdBy
     }
-  ) 
+  )
 }
 
 mutation updateTaxForm(
   $id: UUID!
+
+  $formType: TaxFormType
+  $firstName: String
+  $lastName: String
+  $mInitial: String
+  $oLastName: String
+  $dob: Timestamp
+  $socialSN: Int
+  $email: String
+  $phone: String
+  $address: String
+  $city: String
+  $apt: String
+  $state: String
+  $zipCode: String
+
+  # W-4
+  $marital: MaritalStatus
+  $multipleJob: Boolean
+  $childrens: Int
+  $otherDeps: Int
+  $totalCredits: Float
+  $otherInconme: Float
+  $deductions: Float
+  $extraWithholding: Float
+
+  # I-9
+  $citizen: CitizenshipStatus
+  $uscis: String
+  $passportNumber: String
+  $countryIssue: String
+  $prepartorOrTranslator: Boolean
+
+  # both
+  $signature: String
+  $date: Timestamp
+
   $status: TaxFormStatus
-  $formData: Any
+
-  $title: String
-  $subtitle: String
-  $description: String
 ) @auth(level: USER) {
   taxForm_update(
     id: $id
     data: {
+      formType: $formType
+      firstName: $firstName
+      lastName: $lastName
+      mInitial: $mInitial
+      oLastName: $oLastName
+      dob: $dob
+      socialSN: $socialSN
+      email: $email
+      phone: $phone
+      address: $address
+      city: $city
+      apt: $apt
+      state: $state
+      zipCode: $zipCode
+
+      marital: $marital
+      multipleJob: $multipleJob
+      childrens: $childrens
+      otherDeps: $otherDeps
+      totalCredits: $totalCredits
+      otherInconme: $otherInconme
+      deductions: $deductions
+      extraWithholding: $extraWithholding
+
+      citizen: $citizen
+      uscis: $uscis
+      passportNumber: $passportNumber
+      countryIssue: $countryIssue
+      prepartorOrTranslator: $prepartorOrTranslator
+
+      signature: $signature
+      date: $date
+
       status: $status
-      formData: $formData
-      title: $title
-      subtitle: $subtitle
-      description: $description
     }
-  ) 
+  )
 }
 
 mutation deleteTaxForm($id: UUID!) @auth(level: USER) {
-  taxForm_delete(id: $id) 
+  taxForm_delete(id: $id)
 }

backend/dataconnect/connector/taxForm/queries.gql

@@ -1,13 +1,47 @@
-query listTaxForms @auth(level: USER) {
+
-  taxForms {
+# ==========================================================
+# TAX FORM - QUERIES (USE where, NOT filter)
+# Include ALL fields from the new TaxForm type
+# ==========================================================
+
+query listTaxForms($offset: Int, $limit: Int) @auth(level: USER) {
+  taxForms(offset: $offset, limit: $limit, orderBy: { createdAt: DESC }) {
     id
     formType
-    title
+    firstName
-    subtitle
+    lastName
-    description
+    mInitial
+    oLastName
+    dob
+    socialSN
+    email
+    phone
+    address
+    city
+    apt
+    state
+    zipCode
+
+    marital
+    multipleJob
+    childrens
+    otherDeps
+    totalCredits
+    otherInconme
+    deductions
+    extraWithholding
+
+    citizen
+    uscis
+    passportNumber
+    countryIssue
+    prepartorOrTranslator
+
+    signature
+    date
+
     status
     staffId
-    formData
     createdAt
     updatedAt
     createdBy
@@ -18,38 +52,105 @@ query getTaxFormById($id: UUID!) @auth(level: USER) {
   taxForm(id: $id) {
     id
     formType
-    title
+    firstName
-    subtitle
+    lastName
-    description
+    mInitial
+    oLastName
+    dob
+    socialSN
+    email
+    phone
+    address
+    city
+    apt
+    state
+    zipCode
+
+    marital
+    multipleJob
+    childrens
+    otherDeps
+    totalCredits
+    otherInconme
+    deductions
+    extraWithholding
+
+    citizen
+    uscis
+    passportNumber
+    countryIssue
+    prepartorOrTranslator
+
+    signature
+    date
+
     status
     staffId
-    formData
     createdAt
     updatedAt
     createdBy
   }
 }
 
-query getTaxFormsBystaffId($staffId: UUID!) @auth(level: USER) {
+query getTaxFormsByStaffId(
-  taxForms(where: { staffId: { eq: $staffId } }) {
+  $staffId: UUID!
+  $offset: Int
+  $limit: Int
+) @auth(level: USER) {
+  taxForms(
+    where: { staffId: { eq: $staffId } }
+    offset: $offset
+    limit: $limit
+    orderBy: { createdAt: DESC }
+  ) {
     id
     formType
-    title
+    firstName
-    subtitle
+    lastName
-    description
+    mInitial
+    oLastName
+    dob
+    socialSN
+    email
+    phone
+    address
+    city
+    apt
+    state
+    zipCode
+
+    marital
+    multipleJob
+    childrens
+    otherDeps
+    totalCredits
+    otherInconme
+    deductions
+    extraWithholding
+
+    citizen
+    uscis
+    passportNumber
+    countryIssue
+    prepartorOrTranslator
+
+    signature
+    date
+
     status
     staffId
-    formData
     createdAt
     updatedAt
     createdBy
   }
 }
 
-query filterTaxForms(
+query listTaxFormsWhere(
   $formType: TaxFormType
   $status: TaxFormStatus
   $staffId: UUID
+  $offset: Int
+  $limit: Int
 ) @auth(level: USER) {
   taxForms(
     where: {
@@ -57,11 +158,48 @@ query filterTaxForms(
       status: { eq: $status }
       staffId: { eq: $staffId }
     }
+    offset: $offset
+    limit: $limit
+    orderBy: { createdAt: DESC }
   ) {
     id
     formType
-    title
+    firstName
+    lastName
+    mInitial
+    oLastName
+    dob
+    socialSN
+    email
+    phone
+    address
+    city
+    apt
+    state
+    zipCode
+
+    marital
+    multipleJob
+    childrens
+    otherDeps
+    totalCredits
+    otherInconme
+    deductions
+    extraWithholding
+
+    citizen
+    uscis
+    passportNumber
+    countryIssue
+    prepartorOrTranslator
+
+    signature
+    date
+
     status
     staffId
+    createdAt
+    updatedAt
+    createdBy
   }
 }

backend/dataconnect/schema/taxForm.gql

@@ -11,15 +11,66 @@ enum TaxFormType {
   W4
 }
 
+enum MaritalStatus{
+  SINGLE
+  MARRIED
+  HEAD
+}
+
+enum CitizenshipStatus{
+  CITIZEN
+  NONCITIZEN
+  PERMANENT_RESIDENT
+  ALIEN
+}
+
 type TaxForm @table(name: "tax_forms") {
   id: UUID! @default(expr: "uuidV4()")
+
   formType: TaxFormType!
-  title: String!
+  firstName: String!
-  subtitle: String
+  lastName: String!
-  description: String
+  mInitial: String
+  oLastName:String
+  dob: Timestamp
+  socialSN: Int!
+  email: String
+  phone: String
+  address: String!
+  city: String
+  apt: String
+  state: String
+  zipCode: String
+
+  # form W-4
+  marital: MaritalStatus
+
+  multipleJob: Boolean @default(expr: "false")
+
+  childrens: Int
+  otherDeps: Int
+  totalCredits: Float @default(expr: "0")
+
+  otherInconme: Float @default(expr: "0")
+  deductions: Float @default(expr: "0")
+  extraWithholding: Float @default(expr: "0")
+
+  # form I-9
+
+  citizen: CitizenshipStatus
+  
+  uscis: String
+  passportNumber: String
+  countryIssue: String
+
+  prepartorOrTranslator: Boolean @default(expr: "false")
+
+  # both forms
+  signature:String
+  date: Timestamp
+
   status: TaxFormStatus!
   staffId: UUID!
-  formData: Any
 
   createdAt: Timestamp @default(expr: "request.time")
   updatedAt: Timestamp @default(expr: "request.time")