Add vendor display name

This commit is contained in:
Hillel Coren 2023-10-25 12:30:18 +03:00
parent 98c1171c51
commit 8ccd9c9d6e
3 changed files with 35 additions and 9 deletions

View File

@ -94,6 +94,7 @@ abstract class VendorEntity extends Object
number: '', number: '',
isChanged: false, isChanged: false,
name: '', name: '',
displayName: '',
address1: '', address1: '',
address2: '', address2: '',
city: '', city: '',
@ -164,6 +165,9 @@ abstract class VendorEntity extends Object
String get name; String get name;
@BuiltValueField(wireName: 'display_name')
String get displayName;
String get address1; String get address1;
String get address2; String get address2;
@ -469,7 +473,8 @@ abstract class VendorEntity extends Object
@override @override
String get listDisplayName { String get listDisplayName {
return name; // TODO simplify once not needed any more
return displayName.isNotEmpty ? displayName : name;
} }
@override @override
@ -520,6 +525,7 @@ abstract class VendorEntity extends Object
..activities.replace(BuiltList<ActivityEntity>()) ..activities.replace(BuiltList<ActivityEntity>())
..lastLogin = 0 ..lastLogin = 0
..languageId = '' ..languageId = ''
..displayName = ''
..classification = ''; ..classification = '';
static Serializer<VendorEntity> get serializer => _$vendorEntitySerializer; static Serializer<VendorEntity> get serializer => _$vendorEntitySerializer;

View File

@ -116,6 +116,9 @@ class _$VendorEntitySerializer implements StructuredSerializer<VendorEntity> {
final result = <Object?>[ final result = <Object?>[
'name', 'name',
serializers.serialize(object.name, specifiedType: const FullType(String)), serializers.serialize(object.name, specifiedType: const FullType(String)),
'display_name',
serializers.serialize(object.displayName,
specifiedType: const FullType(String)),
'address1', 'address1',
serializers.serialize(object.address1, serializers.serialize(object.address1,
specifiedType: const FullType(String)), specifiedType: const FullType(String)),
@ -260,6 +263,10 @@ class _$VendorEntitySerializer implements StructuredSerializer<VendorEntity> {
result.name = serializers.deserialize(value, result.name = serializers.deserialize(value,
specifiedType: const FullType(String))! as String; specifiedType: const FullType(String))! as String;
break; break;
case 'display_name':
result.displayName = serializers.deserialize(value,
specifiedType: const FullType(String))! as String;
break;
case 'address1': case 'address1':
result.address1 = serializers.deserialize(value, result.address1 = serializers.deserialize(value,
specifiedType: const FullType(String))! as String; specifiedType: const FullType(String))! as String;
@ -790,6 +797,8 @@ class _$VendorEntity extends VendorEntity {
@override @override
final String name; final String name;
@override @override
final String displayName;
@override
final String address1; final String address1;
@override @override
final String address2; final String address2;
@ -860,6 +869,7 @@ class _$VendorEntity extends VendorEntity {
_$VendorEntity._( _$VendorEntity._(
{this.loadedAt, {this.loadedAt,
required this.name, required this.name,
required this.displayName,
required this.address1, required this.address1,
required this.address2, required this.address2,
required this.city, required this.city,
@ -894,6 +904,8 @@ class _$VendorEntity extends VendorEntity {
required this.id}) required this.id})
: super._() { : super._() {
BuiltValueNullFieldError.checkNotNull(name, r'VendorEntity', 'name'); BuiltValueNullFieldError.checkNotNull(name, r'VendorEntity', 'name');
BuiltValueNullFieldError.checkNotNull(
displayName, r'VendorEntity', 'displayName');
BuiltValueNullFieldError.checkNotNull( BuiltValueNullFieldError.checkNotNull(
address1, r'VendorEntity', 'address1'); address1, r'VendorEntity', 'address1');
BuiltValueNullFieldError.checkNotNull( BuiltValueNullFieldError.checkNotNull(
@ -958,6 +970,7 @@ class _$VendorEntity extends VendorEntity {
if (identical(other, this)) return true; if (identical(other, this)) return true;
return other is VendorEntity && return other is VendorEntity &&
name == other.name && name == other.name &&
displayName == other.displayName &&
address1 == other.address1 && address1 == other.address1 &&
address2 == other.address2 && address2 == other.address2 &&
city == other.city && city == other.city &&
@ -998,6 +1011,7 @@ class _$VendorEntity extends VendorEntity {
if (__hashCode != null) return __hashCode!; if (__hashCode != null) return __hashCode!;
var _$hash = 0; var _$hash = 0;
_$hash = $jc(_$hash, name.hashCode); _$hash = $jc(_$hash, name.hashCode);
_$hash = $jc(_$hash, displayName.hashCode);
_$hash = $jc(_$hash, address1.hashCode); _$hash = $jc(_$hash, address1.hashCode);
_$hash = $jc(_$hash, address2.hashCode); _$hash = $jc(_$hash, address2.hashCode);
_$hash = $jc(_$hash, city.hashCode); _$hash = $jc(_$hash, city.hashCode);
@ -1039,6 +1053,7 @@ class _$VendorEntity extends VendorEntity {
return (newBuiltValueToStringHelper(r'VendorEntity') return (newBuiltValueToStringHelper(r'VendorEntity')
..add('loadedAt', loadedAt) ..add('loadedAt', loadedAt)
..add('name', name) ..add('name', name)
..add('displayName', displayName)
..add('address1', address1) ..add('address1', address1)
..add('address2', address2) ..add('address2', address2)
..add('city', city) ..add('city', city)
@ -1087,6 +1102,10 @@ class VendorEntityBuilder
String? get name => _$this._name; String? get name => _$this._name;
set name(String? name) => _$this._name = name; set name(String? name) => _$this._name = name;
String? _displayName;
String? get displayName => _$this._displayName;
set displayName(String? displayName) => _$this._displayName = displayName;
String? _address1; String? _address1;
String? get address1 => _$this._address1; String? get address1 => _$this._address1;
set address1(String? address1) => _$this._address1 = address1; set address1(String? address1) => _$this._address1 = address1;
@ -1233,6 +1252,7 @@ class VendorEntityBuilder
if ($v != null) { if ($v != null) {
_loadedAt = $v.loadedAt; _loadedAt = $v.loadedAt;
_name = $v.name; _name = $v.name;
_displayName = $v.displayName;
_address1 = $v.address1; _address1 = $v.address1;
_address2 = $v.address2; _address2 = $v.address2;
_city = $v.city; _city = $v.city;
@ -1292,6 +1312,8 @@ class VendorEntityBuilder
loadedAt: loadedAt, loadedAt: loadedAt,
name: BuiltValueNullFieldError.checkNotNull( name: BuiltValueNullFieldError.checkNotNull(
name, r'VendorEntity', 'name'), name, r'VendorEntity', 'name'),
displayName: BuiltValueNullFieldError.checkNotNull(
displayName, r'VendorEntity', 'displayName'),
address1: BuiltValueNullFieldError.checkNotNull( address1: BuiltValueNullFieldError.checkNotNull(
address1, r'VendorEntity', 'address1'), address1, r'VendorEntity', 'address1'),
address2: BuiltValueNullFieldError.checkNotNull( address2: BuiltValueNullFieldError.checkNotNull(
@ -1304,12 +1326,10 @@ class VendorEntityBuilder
postalCode, r'VendorEntity', 'postalCode'), postalCode, r'VendorEntity', 'postalCode'),
countryId: BuiltValueNullFieldError.checkNotNull( countryId: BuiltValueNullFieldError.checkNotNull(
countryId, r'VendorEntity', 'countryId'), countryId, r'VendorEntity', 'countryId'),
languageId: BuiltValueNullFieldError.checkNotNull( languageId:
languageId, r'VendorEntity', 'languageId'), BuiltValueNullFieldError.checkNotNull(languageId, r'VendorEntity', 'languageId'),
phone: BuiltValueNullFieldError.checkNotNull( phone: BuiltValueNullFieldError.checkNotNull(phone, r'VendorEntity', 'phone'),
phone, r'VendorEntity', 'phone'), privateNotes: BuiltValueNullFieldError.checkNotNull(privateNotes, r'VendorEntity', 'privateNotes'),
privateNotes:
BuiltValueNullFieldError.checkNotNull(privateNotes, r'VendorEntity', 'privateNotes'),
publicNotes: BuiltValueNullFieldError.checkNotNull(publicNotes, r'VendorEntity', 'publicNotes'), publicNotes: BuiltValueNullFieldError.checkNotNull(publicNotes, r'VendorEntity', 'publicNotes'),
website: BuiltValueNullFieldError.checkNotNull(website, r'VendorEntity', 'website'), website: BuiltValueNullFieldError.checkNotNull(website, r'VendorEntity', 'website'),
number: BuiltValueNullFieldError.checkNotNull(number, r'VendorEntity', 'number'), number: BuiltValueNullFieldError.checkNotNull(number, r'VendorEntity', 'number'),

View File

@ -61,8 +61,8 @@ class VendorEditFooter extends StatelessWidget {
padding: const EdgeInsets.only(left: 16, top: 8), padding: const EdgeInsets.only(left: 16, top: 8),
child: Text( child: Text(
vendor.number.isEmpty vendor.number.isEmpty
? vendor.name ? vendor.calculateDisplayName
: '${vendor.number}${vendor.name}', : '${vendor.number}${vendor.calculateDisplayName}',
style: TextStyle( style: TextStyle(
color: state.prefState.enableDarkMode color: state.prefState.enableDarkMode
? Colors.white ? Colors.white