feat(diary): New models for calendar and autocomplete fix

This commit is contained in:
2024-07-19 11:55:48 +03:00
parent dbe8ac0999
commit be461e4183
13 changed files with 1140 additions and 444 deletions

View File

@@ -8,23 +8,6 @@ class Product with _$Product {
const factory Product({
required int id,
required String name,
required String image,
required int productGroupId,
required String description,
required String formulations,
required int energyOn100gr,
required double proteinsOn100gr,
required double fatsOn100gr,
required double carbohydratesOn100gr,
required int portionMassGr,
required int energyOnPortion,
required int proteinsOnPortion,
required int fatsOnPortion,
required int carbohydratesOnPortion,
required String createdAt,
required String updatedAt,
required String lastState,
String? reqjectReason,
}) = _Product;
factory Product.fromJson(Map<String, Object?> json) =>

View File

@@ -22,23 +22,6 @@ Product _$ProductFromJson(Map<String, dynamic> json) {
mixin _$Product {
int get id => throw _privateConstructorUsedError;
String get name => throw _privateConstructorUsedError;
String get image => throw _privateConstructorUsedError;
int get productGroupId => throw _privateConstructorUsedError;
String get description => throw _privateConstructorUsedError;
String get formulations => throw _privateConstructorUsedError;
int get energyOn100gr => throw _privateConstructorUsedError;
double get proteinsOn100gr => throw _privateConstructorUsedError;
double get fatsOn100gr => throw _privateConstructorUsedError;
double get carbohydratesOn100gr => throw _privateConstructorUsedError;
int get portionMassGr => throw _privateConstructorUsedError;
int get energyOnPortion => throw _privateConstructorUsedError;
int get proteinsOnPortion => throw _privateConstructorUsedError;
int get fatsOnPortion => throw _privateConstructorUsedError;
int get carbohydratesOnPortion => throw _privateConstructorUsedError;
String get createdAt => throw _privateConstructorUsedError;
String get updatedAt => throw _privateConstructorUsedError;
String get lastState => throw _privateConstructorUsedError;
String? get reqjectReason => throw _privateConstructorUsedError;
Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
@JsonKey(ignore: true)
@@ -50,26 +33,7 @@ abstract class $ProductCopyWith<$Res> {
factory $ProductCopyWith(Product value, $Res Function(Product) then) =
_$ProductCopyWithImpl<$Res, Product>;
@useResult
$Res call(
{int id,
String name,
String image,
int productGroupId,
String description,
String formulations,
int energyOn100gr,
double proteinsOn100gr,
double fatsOn100gr,
double carbohydratesOn100gr,
int portionMassGr,
int energyOnPortion,
int proteinsOnPortion,
int fatsOnPortion,
int carbohydratesOnPortion,
String createdAt,
String updatedAt,
String lastState,
String? reqjectReason});
$Res call({int id, String name});
}
/// @nodoc
@@ -87,23 +51,6 @@ class _$ProductCopyWithImpl<$Res, $Val extends Product>
$Res call({
Object? id = null,
Object? name = null,
Object? image = null,
Object? productGroupId = null,
Object? description = null,
Object? formulations = null,
Object? energyOn100gr = null,
Object? proteinsOn100gr = null,
Object? fatsOn100gr = null,
Object? carbohydratesOn100gr = null,
Object? portionMassGr = null,
Object? energyOnPortion = null,
Object? proteinsOnPortion = null,
Object? fatsOnPortion = null,
Object? carbohydratesOnPortion = null,
Object? createdAt = null,
Object? updatedAt = null,
Object? lastState = null,
Object? reqjectReason = freezed,
}) {
return _then(_value.copyWith(
id: null == id
@@ -114,74 +61,6 @@ class _$ProductCopyWithImpl<$Res, $Val extends Product>
? _value.name
: name // ignore: cast_nullable_to_non_nullable
as String,
image: null == image
? _value.image
: image // ignore: cast_nullable_to_non_nullable
as String,
productGroupId: null == productGroupId
? _value.productGroupId
: productGroupId // ignore: cast_nullable_to_non_nullable
as int,
description: null == description
? _value.description
: description // ignore: cast_nullable_to_non_nullable
as String,
formulations: null == formulations
? _value.formulations
: formulations // ignore: cast_nullable_to_non_nullable
as String,
energyOn100gr: null == energyOn100gr
? _value.energyOn100gr
: energyOn100gr // ignore: cast_nullable_to_non_nullable
as int,
proteinsOn100gr: null == proteinsOn100gr
? _value.proteinsOn100gr
: proteinsOn100gr // ignore: cast_nullable_to_non_nullable
as double,
fatsOn100gr: null == fatsOn100gr
? _value.fatsOn100gr
: fatsOn100gr // ignore: cast_nullable_to_non_nullable
as double,
carbohydratesOn100gr: null == carbohydratesOn100gr
? _value.carbohydratesOn100gr
: carbohydratesOn100gr // ignore: cast_nullable_to_non_nullable
as double,
portionMassGr: null == portionMassGr
? _value.portionMassGr
: portionMassGr // ignore: cast_nullable_to_non_nullable
as int,
energyOnPortion: null == energyOnPortion
? _value.energyOnPortion
: energyOnPortion // ignore: cast_nullable_to_non_nullable
as int,
proteinsOnPortion: null == proteinsOnPortion
? _value.proteinsOnPortion
: proteinsOnPortion // ignore: cast_nullable_to_non_nullable
as int,
fatsOnPortion: null == fatsOnPortion
? _value.fatsOnPortion
: fatsOnPortion // ignore: cast_nullable_to_non_nullable
as int,
carbohydratesOnPortion: null == carbohydratesOnPortion
? _value.carbohydratesOnPortion
: carbohydratesOnPortion // ignore: cast_nullable_to_non_nullable
as int,
createdAt: null == createdAt
? _value.createdAt
: createdAt // ignore: cast_nullable_to_non_nullable
as String,
updatedAt: null == updatedAt
? _value.updatedAt
: updatedAt // ignore: cast_nullable_to_non_nullable
as String,
lastState: null == lastState
? _value.lastState
: lastState // ignore: cast_nullable_to_non_nullable
as String,
reqjectReason: freezed == reqjectReason
? _value.reqjectReason
: reqjectReason // ignore: cast_nullable_to_non_nullable
as String?,
) as $Val);
}
}
@@ -193,26 +72,7 @@ abstract class _$$ProductImplCopyWith<$Res> implements $ProductCopyWith<$Res> {
__$$ProductImplCopyWithImpl<$Res>;
@override
@useResult
$Res call(
{int id,
String name,
String image,
int productGroupId,
String description,
String formulations,
int energyOn100gr,
double proteinsOn100gr,
double fatsOn100gr,
double carbohydratesOn100gr,
int portionMassGr,
int energyOnPortion,
int proteinsOnPortion,
int fatsOnPortion,
int carbohydratesOnPortion,
String createdAt,
String updatedAt,
String lastState,
String? reqjectReason});
$Res call({int id, String name});
}
/// @nodoc
@@ -228,23 +88,6 @@ class __$$ProductImplCopyWithImpl<$Res>
$Res call({
Object? id = null,
Object? name = null,
Object? image = null,
Object? productGroupId = null,
Object? description = null,
Object? formulations = null,
Object? energyOn100gr = null,
Object? proteinsOn100gr = null,
Object? fatsOn100gr = null,
Object? carbohydratesOn100gr = null,
Object? portionMassGr = null,
Object? energyOnPortion = null,
Object? proteinsOnPortion = null,
Object? fatsOnPortion = null,
Object? carbohydratesOnPortion = null,
Object? createdAt = null,
Object? updatedAt = null,
Object? lastState = null,
Object? reqjectReason = freezed,
}) {
return _then(_$ProductImpl(
id: null == id
@@ -255,74 +98,6 @@ class __$$ProductImplCopyWithImpl<$Res>
? _value.name
: name // ignore: cast_nullable_to_non_nullable
as String,
image: null == image
? _value.image
: image // ignore: cast_nullable_to_non_nullable
as String,
productGroupId: null == productGroupId
? _value.productGroupId
: productGroupId // ignore: cast_nullable_to_non_nullable
as int,
description: null == description
? _value.description
: description // ignore: cast_nullable_to_non_nullable
as String,
formulations: null == formulations
? _value.formulations
: formulations // ignore: cast_nullable_to_non_nullable
as String,
energyOn100gr: null == energyOn100gr
? _value.energyOn100gr
: energyOn100gr // ignore: cast_nullable_to_non_nullable
as int,
proteinsOn100gr: null == proteinsOn100gr
? _value.proteinsOn100gr
: proteinsOn100gr // ignore: cast_nullable_to_non_nullable
as double,
fatsOn100gr: null == fatsOn100gr
? _value.fatsOn100gr
: fatsOn100gr // ignore: cast_nullable_to_non_nullable
as double,
carbohydratesOn100gr: null == carbohydratesOn100gr
? _value.carbohydratesOn100gr
: carbohydratesOn100gr // ignore: cast_nullable_to_non_nullable
as double,
portionMassGr: null == portionMassGr
? _value.portionMassGr
: portionMassGr // ignore: cast_nullable_to_non_nullable
as int,
energyOnPortion: null == energyOnPortion
? _value.energyOnPortion
: energyOnPortion // ignore: cast_nullable_to_non_nullable
as int,
proteinsOnPortion: null == proteinsOnPortion
? _value.proteinsOnPortion
: proteinsOnPortion // ignore: cast_nullable_to_non_nullable
as int,
fatsOnPortion: null == fatsOnPortion
? _value.fatsOnPortion
: fatsOnPortion // ignore: cast_nullable_to_non_nullable
as int,
carbohydratesOnPortion: null == carbohydratesOnPortion
? _value.carbohydratesOnPortion
: carbohydratesOnPortion // ignore: cast_nullable_to_non_nullable
as int,
createdAt: null == createdAt
? _value.createdAt
: createdAt // ignore: cast_nullable_to_non_nullable
as String,
updatedAt: null == updatedAt
? _value.updatedAt
: updatedAt // ignore: cast_nullable_to_non_nullable
as String,
lastState: null == lastState
? _value.lastState
: lastState // ignore: cast_nullable_to_non_nullable
as String,
reqjectReason: freezed == reqjectReason
? _value.reqjectReason
: reqjectReason // ignore: cast_nullable_to_non_nullable
as String?,
));
}
}
@@ -330,26 +105,7 @@ class __$$ProductImplCopyWithImpl<$Res>
/// @nodoc
@JsonSerializable()
class _$ProductImpl implements _Product {
const _$ProductImpl(
{required this.id,
required this.name,
required this.image,
required this.productGroupId,
required this.description,
required this.formulations,
required this.energyOn100gr,
required this.proteinsOn100gr,
required this.fatsOn100gr,
required this.carbohydratesOn100gr,
required this.portionMassGr,
required this.energyOnPortion,
required this.proteinsOnPortion,
required this.fatsOnPortion,
required this.carbohydratesOnPortion,
required this.createdAt,
required this.updatedAt,
required this.lastState,
this.reqjectReason});
const _$ProductImpl({required this.id, required this.name});
factory _$ProductImpl.fromJson(Map<String, dynamic> json) =>
_$$ProductImplFromJson(json);
@@ -358,44 +114,10 @@ class _$ProductImpl implements _Product {
final int id;
@override
final String name;
@override
final String image;
@override
final int productGroupId;
@override
final String description;
@override
final String formulations;
@override
final int energyOn100gr;
@override
final double proteinsOn100gr;
@override
final double fatsOn100gr;
@override
final double carbohydratesOn100gr;
@override
final int portionMassGr;
@override
final int energyOnPortion;
@override
final int proteinsOnPortion;
@override
final int fatsOnPortion;
@override
final int carbohydratesOnPortion;
@override
final String createdAt;
@override
final String updatedAt;
@override
final String lastState;
@override
final String? reqjectReason;
@override
String toString() {
return 'Product(id: $id, name: $name, image: $image, productGroupId: $productGroupId, description: $description, formulations: $formulations, energyOn100gr: $energyOn100gr, proteinsOn100gr: $proteinsOn100gr, fatsOn100gr: $fatsOn100gr, carbohydratesOn100gr: $carbohydratesOn100gr, portionMassGr: $portionMassGr, energyOnPortion: $energyOnPortion, proteinsOnPortion: $proteinsOnPortion, fatsOnPortion: $fatsOnPortion, carbohydratesOnPortion: $carbohydratesOnPortion, createdAt: $createdAt, updatedAt: $updatedAt, lastState: $lastState, reqjectReason: $reqjectReason)';
return 'Product(id: $id, name: $name)';
}
@override
@@ -404,66 +126,12 @@ class _$ProductImpl implements _Product {
(other.runtimeType == runtimeType &&
other is _$ProductImpl &&
(identical(other.id, id) || other.id == id) &&
(identical(other.name, name) || other.name == name) &&
(identical(other.image, image) || other.image == image) &&
(identical(other.productGroupId, productGroupId) ||
other.productGroupId == productGroupId) &&
(identical(other.description, description) ||
other.description == description) &&
(identical(other.formulations, formulations) ||
other.formulations == formulations) &&
(identical(other.energyOn100gr, energyOn100gr) ||
other.energyOn100gr == energyOn100gr) &&
(identical(other.proteinsOn100gr, proteinsOn100gr) ||
other.proteinsOn100gr == proteinsOn100gr) &&
(identical(other.fatsOn100gr, fatsOn100gr) ||
other.fatsOn100gr == fatsOn100gr) &&
(identical(other.carbohydratesOn100gr, carbohydratesOn100gr) ||
other.carbohydratesOn100gr == carbohydratesOn100gr) &&
(identical(other.portionMassGr, portionMassGr) ||
other.portionMassGr == portionMassGr) &&
(identical(other.energyOnPortion, energyOnPortion) ||
other.energyOnPortion == energyOnPortion) &&
(identical(other.proteinsOnPortion, proteinsOnPortion) ||
other.proteinsOnPortion == proteinsOnPortion) &&
(identical(other.fatsOnPortion, fatsOnPortion) ||
other.fatsOnPortion == fatsOnPortion) &&
(identical(other.carbohydratesOnPortion, carbohydratesOnPortion) ||
other.carbohydratesOnPortion == carbohydratesOnPortion) &&
(identical(other.createdAt, createdAt) ||
other.createdAt == createdAt) &&
(identical(other.updatedAt, updatedAt) ||
other.updatedAt == updatedAt) &&
(identical(other.lastState, lastState) ||
other.lastState == lastState) &&
(identical(other.reqjectReason, reqjectReason) ||
other.reqjectReason == reqjectReason));
(identical(other.name, name) || other.name == name));
}
@JsonKey(ignore: true)
@override
int get hashCode => Object.hashAll([
runtimeType,
id,
name,
image,
productGroupId,
description,
formulations,
energyOn100gr,
proteinsOn100gr,
fatsOn100gr,
carbohydratesOn100gr,
portionMassGr,
energyOnPortion,
proteinsOnPortion,
fatsOnPortion,
carbohydratesOnPortion,
createdAt,
updatedAt,
lastState,
reqjectReason
]);
int get hashCode => Object.hash(runtimeType, id, name);
@JsonKey(ignore: true)
@override
@@ -480,26 +148,8 @@ class _$ProductImpl implements _Product {
}
abstract class _Product implements Product {
const factory _Product(
{required final int id,
required final String name,
required final String image,
required final int productGroupId,
required final String description,
required final String formulations,
required final int energyOn100gr,
required final double proteinsOn100gr,
required final double fatsOn100gr,
required final double carbohydratesOn100gr,
required final int portionMassGr,
required final int energyOnPortion,
required final int proteinsOnPortion,
required final int fatsOnPortion,
required final int carbohydratesOnPortion,
required final String createdAt,
required final String updatedAt,
required final String lastState,
final String? reqjectReason}) = _$ProductImpl;
const factory _Product({required final int id, required final String name}) =
_$ProductImpl;
factory _Product.fromJson(Map<String, dynamic> json) = _$ProductImpl.fromJson;
@@ -508,40 +158,6 @@ abstract class _Product implements Product {
@override
String get name;
@override
String get image;
@override
int get productGroupId;
@override
String get description;
@override
String get formulations;
@override
int get energyOn100gr;
@override
double get proteinsOn100gr;
@override
double get fatsOn100gr;
@override
double get carbohydratesOn100gr;
@override
int get portionMassGr;
@override
int get energyOnPortion;
@override
int get proteinsOnPortion;
@override
int get fatsOnPortion;
@override
int get carbohydratesOnPortion;
@override
String get createdAt;
@override
String get updatedAt;
@override
String get lastState;
@override
String? get reqjectReason;
@override
@JsonKey(ignore: true)
_$$ProductImplCopyWith<_$ProductImpl> get copyWith =>
throw _privateConstructorUsedError;

View File

@@ -10,44 +10,10 @@ _$ProductImpl _$$ProductImplFromJson(Map<String, dynamic> json) =>
_$ProductImpl(
id: (json['id'] as num).toInt(),
name: json['name'] as String,
image: json['image'] as String,
productGroupId: (json['productGroupId'] as num).toInt(),
description: json['description'] as String,
formulations: json['formulations'] as String,
energyOn100gr: (json['energyOn100gr'] as num).toInt(),
proteinsOn100gr: (json['proteinsOn100gr'] as num).toDouble(),
fatsOn100gr: (json['fatsOn100gr'] as num).toDouble(),
carbohydratesOn100gr: (json['carbohydratesOn100gr'] as num).toDouble(),
portionMassGr: (json['portionMassGr'] as num).toInt(),
energyOnPortion: (json['energyOnPortion'] as num).toInt(),
proteinsOnPortion: (json['proteinsOnPortion'] as num).toInt(),
fatsOnPortion: (json['fatsOnPortion'] as num).toInt(),
carbohydratesOnPortion: (json['carbohydratesOnPortion'] as num).toInt(),
createdAt: json['createdAt'] as String,
updatedAt: json['updatedAt'] as String,
lastState: json['lastState'] as String,
reqjectReason: json['reqjectReason'] as String?,
);
Map<String, dynamic> _$$ProductImplToJson(_$ProductImpl instance) =>
<String, dynamic>{
'id': instance.id,
'name': instance.name,
'image': instance.image,
'productGroupId': instance.productGroupId,
'description': instance.description,
'formulations': instance.formulations,
'energyOn100gr': instance.energyOn100gr,
'proteinsOn100gr': instance.proteinsOn100gr,
'fatsOn100gr': instance.fatsOn100gr,
'carbohydratesOn100gr': instance.carbohydratesOn100gr,
'portionMassGr': instance.portionMassGr,
'energyOnPortion': instance.energyOnPortion,
'proteinsOnPortion': instance.proteinsOnPortion,
'fatsOnPortion': instance.fatsOnPortion,
'carbohydratesOnPortion': instance.carbohydratesOnPortion,
'createdAt': instance.createdAt,
'updatedAt': instance.updatedAt,
'lastState': instance.lastState,
'reqjectReason': instance.reqjectReason,
};