refactor: UI 일관성 개선 및 회사 타입 배지 통일
- 회사 리스트 화면의 배지를 ShadcnBadge 컴포넌트로 통일 - 본사(Blue)와 지점(Purple) 색상 차별화로 시각적 구분 강화 - 고객사(Orange), 파트너사(Green) 색상 체계 개선 - 장비/라이선스 관리 화면과 동일한 배지 스타일 적용 - 불필요한 문서 파일 정리 - 라이선스 만료 요약 모델 업데이트 - 리스트 화면들의 페이지네이션 및 필터링 로직 개선 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
@@ -6,12 +6,13 @@ part 'license_expiry_summary.g.dart';
|
||||
@freezed
|
||||
class LicenseExpirySummary with _$LicenseExpirySummary {
|
||||
const factory LicenseExpirySummary({
|
||||
@JsonKey(name: 'within_30_days') required int within30Days,
|
||||
@JsonKey(name: 'within_60_days') required int within60Days,
|
||||
@JsonKey(name: 'within_90_days') required int within90Days,
|
||||
@JsonKey(name: 'expired') required int expired,
|
||||
@JsonKey(name: 'total_active') required int totalActive,
|
||||
@JsonKey(name: 'licenses') required List<LicenseExpiryDetail> licenses,
|
||||
@JsonKey(name: 'expiring_30_days', defaultValue: 0) required int within30Days,
|
||||
@JsonKey(name: 'expiring_60_days', defaultValue: 0) required int within60Days,
|
||||
@JsonKey(name: 'expiring_90_days', defaultValue: 0) required int within90Days,
|
||||
@JsonKey(name: 'expired', defaultValue: 0) required int expired,
|
||||
@JsonKey(name: 'active', defaultValue: 0) required int totalActive,
|
||||
@JsonKey(name: 'licenses', defaultValue: []) required List<LicenseExpiryDetail> licenses,
|
||||
@JsonKey(name: 'expiring_7_days', defaultValue: 0) int? expiring7Days,
|
||||
}) = _LicenseExpirySummary;
|
||||
|
||||
factory LicenseExpirySummary.fromJson(Map<String, dynamic> json) =>
|
||||
|
||||
@@ -20,18 +20,20 @@ LicenseExpirySummary _$LicenseExpirySummaryFromJson(Map<String, dynamic> json) {
|
||||
|
||||
/// @nodoc
|
||||
mixin _$LicenseExpirySummary {
|
||||
@JsonKey(name: 'within_30_days')
|
||||
@JsonKey(name: 'expiring_30_days', defaultValue: 0)
|
||||
int get within30Days => throw _privateConstructorUsedError;
|
||||
@JsonKey(name: 'within_60_days')
|
||||
@JsonKey(name: 'expiring_60_days', defaultValue: 0)
|
||||
int get within60Days => throw _privateConstructorUsedError;
|
||||
@JsonKey(name: 'within_90_days')
|
||||
@JsonKey(name: 'expiring_90_days', defaultValue: 0)
|
||||
int get within90Days => throw _privateConstructorUsedError;
|
||||
@JsonKey(name: 'expired')
|
||||
@JsonKey(name: 'expired', defaultValue: 0)
|
||||
int get expired => throw _privateConstructorUsedError;
|
||||
@JsonKey(name: 'total_active')
|
||||
@JsonKey(name: 'active', defaultValue: 0)
|
||||
int get totalActive => throw _privateConstructorUsedError;
|
||||
@JsonKey(name: 'licenses')
|
||||
@JsonKey(name: 'licenses', defaultValue: [])
|
||||
List<LicenseExpiryDetail> get licenses => throw _privateConstructorUsedError;
|
||||
@JsonKey(name: 'expiring_7_days', defaultValue: 0)
|
||||
int? get expiring7Days => throw _privateConstructorUsedError;
|
||||
|
||||
/// Serializes this LicenseExpirySummary to a JSON map.
|
||||
Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
|
||||
@@ -50,12 +52,14 @@ abstract class $LicenseExpirySummaryCopyWith<$Res> {
|
||||
_$LicenseExpirySummaryCopyWithImpl<$Res, LicenseExpirySummary>;
|
||||
@useResult
|
||||
$Res call(
|
||||
{@JsonKey(name: 'within_30_days') int within30Days,
|
||||
@JsonKey(name: 'within_60_days') int within60Days,
|
||||
@JsonKey(name: 'within_90_days') int within90Days,
|
||||
@JsonKey(name: 'expired') int expired,
|
||||
@JsonKey(name: 'total_active') int totalActive,
|
||||
@JsonKey(name: 'licenses') List<LicenseExpiryDetail> licenses});
|
||||
{@JsonKey(name: 'expiring_30_days', defaultValue: 0) int within30Days,
|
||||
@JsonKey(name: 'expiring_60_days', defaultValue: 0) int within60Days,
|
||||
@JsonKey(name: 'expiring_90_days', defaultValue: 0) int within90Days,
|
||||
@JsonKey(name: 'expired', defaultValue: 0) int expired,
|
||||
@JsonKey(name: 'active', defaultValue: 0) int totalActive,
|
||||
@JsonKey(name: 'licenses', defaultValue: [])
|
||||
List<LicenseExpiryDetail> licenses,
|
||||
@JsonKey(name: 'expiring_7_days', defaultValue: 0) int? expiring7Days});
|
||||
}
|
||||
|
||||
/// @nodoc
|
||||
@@ -80,6 +84,7 @@ class _$LicenseExpirySummaryCopyWithImpl<$Res,
|
||||
Object? expired = null,
|
||||
Object? totalActive = null,
|
||||
Object? licenses = null,
|
||||
Object? expiring7Days = freezed,
|
||||
}) {
|
||||
return _then(_value.copyWith(
|
||||
within30Days: null == within30Days
|
||||
@@ -106,6 +111,10 @@ class _$LicenseExpirySummaryCopyWithImpl<$Res,
|
||||
? _value.licenses
|
||||
: licenses // ignore: cast_nullable_to_non_nullable
|
||||
as List<LicenseExpiryDetail>,
|
||||
expiring7Days: freezed == expiring7Days
|
||||
? _value.expiring7Days
|
||||
: expiring7Days // ignore: cast_nullable_to_non_nullable
|
||||
as int?,
|
||||
) as $Val);
|
||||
}
|
||||
}
|
||||
@@ -119,12 +128,14 @@ abstract class _$$LicenseExpirySummaryImplCopyWith<$Res>
|
||||
@override
|
||||
@useResult
|
||||
$Res call(
|
||||
{@JsonKey(name: 'within_30_days') int within30Days,
|
||||
@JsonKey(name: 'within_60_days') int within60Days,
|
||||
@JsonKey(name: 'within_90_days') int within90Days,
|
||||
@JsonKey(name: 'expired') int expired,
|
||||
@JsonKey(name: 'total_active') int totalActive,
|
||||
@JsonKey(name: 'licenses') List<LicenseExpiryDetail> licenses});
|
||||
{@JsonKey(name: 'expiring_30_days', defaultValue: 0) int within30Days,
|
||||
@JsonKey(name: 'expiring_60_days', defaultValue: 0) int within60Days,
|
||||
@JsonKey(name: 'expiring_90_days', defaultValue: 0) int within90Days,
|
||||
@JsonKey(name: 'expired', defaultValue: 0) int expired,
|
||||
@JsonKey(name: 'active', defaultValue: 0) int totalActive,
|
||||
@JsonKey(name: 'licenses', defaultValue: [])
|
||||
List<LicenseExpiryDetail> licenses,
|
||||
@JsonKey(name: 'expiring_7_days', defaultValue: 0) int? expiring7Days});
|
||||
}
|
||||
|
||||
/// @nodoc
|
||||
@@ -146,6 +157,7 @@ class __$$LicenseExpirySummaryImplCopyWithImpl<$Res>
|
||||
Object? expired = null,
|
||||
Object? totalActive = null,
|
||||
Object? licenses = null,
|
||||
Object? expiring7Days = freezed,
|
||||
}) {
|
||||
return _then(_$LicenseExpirySummaryImpl(
|
||||
within30Days: null == within30Days
|
||||
@@ -172,6 +184,10 @@ class __$$LicenseExpirySummaryImplCopyWithImpl<$Res>
|
||||
? _value._licenses
|
||||
: licenses // ignore: cast_nullable_to_non_nullable
|
||||
as List<LicenseExpiryDetail>,
|
||||
expiring7Days: freezed == expiring7Days
|
||||
? _value.expiring7Days
|
||||
: expiring7Days // ignore: cast_nullable_to_non_nullable
|
||||
as int?,
|
||||
));
|
||||
}
|
||||
}
|
||||
@@ -180,45 +196,53 @@ class __$$LicenseExpirySummaryImplCopyWithImpl<$Res>
|
||||
@JsonSerializable()
|
||||
class _$LicenseExpirySummaryImpl implements _LicenseExpirySummary {
|
||||
const _$LicenseExpirySummaryImpl(
|
||||
{@JsonKey(name: 'within_30_days') required this.within30Days,
|
||||
@JsonKey(name: 'within_60_days') required this.within60Days,
|
||||
@JsonKey(name: 'within_90_days') required this.within90Days,
|
||||
@JsonKey(name: 'expired') required this.expired,
|
||||
@JsonKey(name: 'total_active') required this.totalActive,
|
||||
@JsonKey(name: 'licenses')
|
||||
required final List<LicenseExpiryDetail> licenses})
|
||||
{@JsonKey(name: 'expiring_30_days', defaultValue: 0)
|
||||
required this.within30Days,
|
||||
@JsonKey(name: 'expiring_60_days', defaultValue: 0)
|
||||
required this.within60Days,
|
||||
@JsonKey(name: 'expiring_90_days', defaultValue: 0)
|
||||
required this.within90Days,
|
||||
@JsonKey(name: 'expired', defaultValue: 0) required this.expired,
|
||||
@JsonKey(name: 'active', defaultValue: 0) required this.totalActive,
|
||||
@JsonKey(name: 'licenses', defaultValue: [])
|
||||
required final List<LicenseExpiryDetail> licenses,
|
||||
@JsonKey(name: 'expiring_7_days', defaultValue: 0) this.expiring7Days})
|
||||
: _licenses = licenses;
|
||||
|
||||
factory _$LicenseExpirySummaryImpl.fromJson(Map<String, dynamic> json) =>
|
||||
_$$LicenseExpirySummaryImplFromJson(json);
|
||||
|
||||
@override
|
||||
@JsonKey(name: 'within_30_days')
|
||||
@JsonKey(name: 'expiring_30_days', defaultValue: 0)
|
||||
final int within30Days;
|
||||
@override
|
||||
@JsonKey(name: 'within_60_days')
|
||||
@JsonKey(name: 'expiring_60_days', defaultValue: 0)
|
||||
final int within60Days;
|
||||
@override
|
||||
@JsonKey(name: 'within_90_days')
|
||||
@JsonKey(name: 'expiring_90_days', defaultValue: 0)
|
||||
final int within90Days;
|
||||
@override
|
||||
@JsonKey(name: 'expired')
|
||||
@JsonKey(name: 'expired', defaultValue: 0)
|
||||
final int expired;
|
||||
@override
|
||||
@JsonKey(name: 'total_active')
|
||||
@JsonKey(name: 'active', defaultValue: 0)
|
||||
final int totalActive;
|
||||
final List<LicenseExpiryDetail> _licenses;
|
||||
@override
|
||||
@JsonKey(name: 'licenses')
|
||||
@JsonKey(name: 'licenses', defaultValue: [])
|
||||
List<LicenseExpiryDetail> get licenses {
|
||||
if (_licenses is EqualUnmodifiableListView) return _licenses;
|
||||
// ignore: implicit_dynamic_type
|
||||
return EqualUnmodifiableListView(_licenses);
|
||||
}
|
||||
|
||||
@override
|
||||
@JsonKey(name: 'expiring_7_days', defaultValue: 0)
|
||||
final int? expiring7Days;
|
||||
|
||||
@override
|
||||
String toString() {
|
||||
return 'LicenseExpirySummary(within30Days: $within30Days, within60Days: $within60Days, within90Days: $within90Days, expired: $expired, totalActive: $totalActive, licenses: $licenses)';
|
||||
return 'LicenseExpirySummary(within30Days: $within30Days, within60Days: $within60Days, within90Days: $within90Days, expired: $expired, totalActive: $totalActive, licenses: $licenses, expiring7Days: $expiring7Days)';
|
||||
}
|
||||
|
||||
@override
|
||||
@@ -235,7 +259,9 @@ class _$LicenseExpirySummaryImpl implements _LicenseExpirySummary {
|
||||
(identical(other.expired, expired) || other.expired == expired) &&
|
||||
(identical(other.totalActive, totalActive) ||
|
||||
other.totalActive == totalActive) &&
|
||||
const DeepCollectionEquality().equals(other._licenses, _licenses));
|
||||
const DeepCollectionEquality().equals(other._licenses, _licenses) &&
|
||||
(identical(other.expiring7Days, expiring7Days) ||
|
||||
other.expiring7Days == expiring7Days));
|
||||
}
|
||||
|
||||
@JsonKey(includeFromJson: false, includeToJson: false)
|
||||
@@ -247,7 +273,8 @@ class _$LicenseExpirySummaryImpl implements _LicenseExpirySummary {
|
||||
within90Days,
|
||||
expired,
|
||||
totalActive,
|
||||
const DeepCollectionEquality().hash(_licenses));
|
||||
const DeepCollectionEquality().hash(_licenses),
|
||||
expiring7Days);
|
||||
|
||||
/// Create a copy of LicenseExpirySummary
|
||||
/// with the given fields replaced by the non-null parameter values.
|
||||
@@ -269,36 +296,43 @@ class _$LicenseExpirySummaryImpl implements _LicenseExpirySummary {
|
||||
|
||||
abstract class _LicenseExpirySummary implements LicenseExpirySummary {
|
||||
const factory _LicenseExpirySummary(
|
||||
{@JsonKey(name: 'within_30_days') required final int within30Days,
|
||||
@JsonKey(name: 'within_60_days') required final int within60Days,
|
||||
@JsonKey(name: 'within_90_days') required final int within90Days,
|
||||
@JsonKey(name: 'expired') required final int expired,
|
||||
@JsonKey(name: 'total_active') required final int totalActive,
|
||||
@JsonKey(name: 'licenses')
|
||||
required final List<LicenseExpiryDetail> licenses}) =
|
||||
_$LicenseExpirySummaryImpl;
|
||||
{@JsonKey(name: 'expiring_30_days', defaultValue: 0)
|
||||
required final int within30Days,
|
||||
@JsonKey(name: 'expiring_60_days', defaultValue: 0)
|
||||
required final int within60Days,
|
||||
@JsonKey(name: 'expiring_90_days', defaultValue: 0)
|
||||
required final int within90Days,
|
||||
@JsonKey(name: 'expired', defaultValue: 0) required final int expired,
|
||||
@JsonKey(name: 'active', defaultValue: 0) required final int totalActive,
|
||||
@JsonKey(name: 'licenses', defaultValue: [])
|
||||
required final List<LicenseExpiryDetail> licenses,
|
||||
@JsonKey(name: 'expiring_7_days', defaultValue: 0)
|
||||
final int? expiring7Days}) = _$LicenseExpirySummaryImpl;
|
||||
|
||||
factory _LicenseExpirySummary.fromJson(Map<String, dynamic> json) =
|
||||
_$LicenseExpirySummaryImpl.fromJson;
|
||||
|
||||
@override
|
||||
@JsonKey(name: 'within_30_days')
|
||||
@JsonKey(name: 'expiring_30_days', defaultValue: 0)
|
||||
int get within30Days;
|
||||
@override
|
||||
@JsonKey(name: 'within_60_days')
|
||||
@JsonKey(name: 'expiring_60_days', defaultValue: 0)
|
||||
int get within60Days;
|
||||
@override
|
||||
@JsonKey(name: 'within_90_days')
|
||||
@JsonKey(name: 'expiring_90_days', defaultValue: 0)
|
||||
int get within90Days;
|
||||
@override
|
||||
@JsonKey(name: 'expired')
|
||||
@JsonKey(name: 'expired', defaultValue: 0)
|
||||
int get expired;
|
||||
@override
|
||||
@JsonKey(name: 'total_active')
|
||||
@JsonKey(name: 'active', defaultValue: 0)
|
||||
int get totalActive;
|
||||
@override
|
||||
@JsonKey(name: 'licenses')
|
||||
@JsonKey(name: 'licenses', defaultValue: [])
|
||||
List<LicenseExpiryDetail> get licenses;
|
||||
@override
|
||||
@JsonKey(name: 'expiring_7_days', defaultValue: 0)
|
||||
int? get expiring7Days;
|
||||
|
||||
/// Create a copy of LicenseExpirySummary
|
||||
/// with the given fields replaced by the non-null parameter values.
|
||||
|
||||
@@ -9,25 +9,29 @@ part of 'license_expiry_summary.dart';
|
||||
_$LicenseExpirySummaryImpl _$$LicenseExpirySummaryImplFromJson(
|
||||
Map<String, dynamic> json) =>
|
||||
_$LicenseExpirySummaryImpl(
|
||||
within30Days: (json['within_30_days'] as num).toInt(),
|
||||
within60Days: (json['within_60_days'] as num).toInt(),
|
||||
within90Days: (json['within_90_days'] as num).toInt(),
|
||||
expired: (json['expired'] as num).toInt(),
|
||||
totalActive: (json['total_active'] as num).toInt(),
|
||||
licenses: (json['licenses'] as List<dynamic>)
|
||||
.map((e) => LicenseExpiryDetail.fromJson(e as Map<String, dynamic>))
|
||||
.toList(),
|
||||
within30Days: (json['expiring_30_days'] as num?)?.toInt() ?? 0,
|
||||
within60Days: (json['expiring_60_days'] as num?)?.toInt() ?? 0,
|
||||
within90Days: (json['expiring_90_days'] as num?)?.toInt() ?? 0,
|
||||
expired: (json['expired'] as num?)?.toInt() ?? 0,
|
||||
totalActive: (json['active'] as num?)?.toInt() ?? 0,
|
||||
licenses: (json['licenses'] as List<dynamic>?)
|
||||
?.map((e) =>
|
||||
LicenseExpiryDetail.fromJson(e as Map<String, dynamic>))
|
||||
.toList() ??
|
||||
[],
|
||||
expiring7Days: (json['expiring_7_days'] as num?)?.toInt() ?? 0,
|
||||
);
|
||||
|
||||
Map<String, dynamic> _$$LicenseExpirySummaryImplToJson(
|
||||
_$LicenseExpirySummaryImpl instance) =>
|
||||
<String, dynamic>{
|
||||
'within_30_days': instance.within30Days,
|
||||
'within_60_days': instance.within60Days,
|
||||
'within_90_days': instance.within90Days,
|
||||
'expiring_30_days': instance.within30Days,
|
||||
'expiring_60_days': instance.within60Days,
|
||||
'expiring_90_days': instance.within90Days,
|
||||
'expired': instance.expired,
|
||||
'total_active': instance.totalActive,
|
||||
'active': instance.totalActive,
|
||||
'licenses': instance.licenses,
|
||||
'expiring_7_days': instance.expiring7Days,
|
||||
};
|
||||
|
||||
_$LicenseExpiryDetailImpl _$$LicenseExpiryDetailImplFromJson(
|
||||
|
||||
Reference in New Issue
Block a user