diff --git a/CHANGELOG.md b/CHANGELOG.md index b5ea42d7..db0d41f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,3 @@ # CHANGELOG -Lib version: 1.11.0-SNAPSHOT-250429091819 +Lib version: 1.11.0-SNAPSHOT-250430075938 diff --git a/lib/calendar.pb.dart b/lib/calendar.pb.dart index e5c0fe42..a64abd68 100644 --- a/lib/calendar.pb.dart +++ b/lib/calendar.pb.dart @@ -18,6 +18,66 @@ import 'shared.pbenum.dart' as $35; export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions; +class WorkDay extends $pb.GeneratedMessage { + factory WorkDay({ + $35.WeekDay? weekDay, + $core.Iterable<$35.TimeRange>? timeRanges, + }) { + final $result = create(); + if (weekDay != null) { + $result.weekDay = weekDay; + } + if (timeRanges != null) { + $result.timeRanges.addAll(timeRanges); + } + return $result; + } + WorkDay._() : super(); + factory WorkDay.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory WorkDay.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'WorkDay', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create) + ..e<$35.WeekDay>(1, _omitFieldNames ? '' : 'WeekDay', $pb.PbFieldType.OE, protoName: 'WeekDay', defaultOrMaker: $35.WeekDay.WEEKDAY_UNDEFINED, valueOf: $35.WeekDay.valueOf, enumValues: $35.WeekDay.values) + ..pc<$35.TimeRange>(2, _omitFieldNames ? '' : 'TimeRanges', $pb.PbFieldType.PM, protoName: 'TimeRanges', subBuilder: $35.TimeRange.create) + ..hasRequiredFields = false + ; + + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') + WorkDay clone() => WorkDay()..mergeFromMessage(this); + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + WorkDay copyWith(void Function(WorkDay) updates) => super.copyWith((message) => updates(message as WorkDay)) as WorkDay; + + $pb.BuilderInfo get info_ => _i; + + @$core.pragma('dart2js:noInline') + static WorkDay create() => WorkDay._(); + WorkDay createEmptyInstance() => create(); + static $pb.PbList createRepeated() => $pb.PbList(); + @$core.pragma('dart2js:noInline') + static WorkDay getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static WorkDay? _defaultInstance; + + /// Day of the week + @$pb.TagNumber(1) + $35.WeekDay get weekDay => $_getN(0); + @$pb.TagNumber(1) + set weekDay($35.WeekDay v) { $_setField(1, v); } + @$pb.TagNumber(1) + $core.bool hasWeekDay() => $_has(0); + @$pb.TagNumber(1) + void clearWeekDay() => $_clearField(1); + + /// Opening hours definition according to filters + @$pb.TagNumber(2) + $pb.PbList<$35.TimeRange> get timeRanges => $_getList(1); +} + class ExceptionnalClosure extends $pb.GeneratedMessage { factory ExceptionnalClosure({ $core.Iterable<$35.LabelByLanguage>? label, @@ -146,6 +206,7 @@ class Calendar extends $pb.GeneratedMessage { $core.String? name, $core.String? description, $core.Iterable? exceptionnalClosures, + $core.Iterable? workDays, }) { final $result = create(); if (iD != null) { @@ -166,6 +227,9 @@ class Calendar extends $pb.GeneratedMessage { if (exceptionnalClosures != null) { $result.exceptionnalClosures.addAll(exceptionnalClosures); } + if (workDays != null) { + $result.workDays.addAll(workDays); + } return $result; } Calendar._() : super(); @@ -179,6 +243,7 @@ class Calendar extends $pb.GeneratedMessage { ..aOS(4, _omitFieldNames ? '' : 'Name', protoName: 'Name') ..aOS(5, _omitFieldNames ? '' : 'Description', protoName: 'Description') ..pc(6, _omitFieldNames ? '' : 'ExceptionnalClosures', $pb.PbFieldType.PM, protoName: 'ExceptionnalClosures', subBuilder: ExceptionnalClosure.create) + ..pc(7, _omitFieldNames ? '' : 'WorkDays', $pb.PbFieldType.PM, protoName: 'WorkDays', subBuilder: WorkDay.create) ..hasRequiredFields = false ; @@ -255,6 +320,10 @@ class Calendar extends $pb.GeneratedMessage { /// List of exceptionnal closure @$pb.TagNumber(6) $pb.PbList get exceptionnalClosures => $_getList(5); + + /// Definition of the opening rules by week day + @$pb.TagNumber(7) + $pb.PbList get workDays => $_getList(6); } /// Create a calendar at organisation level diff --git a/lib/calendar.pbjson.dart b/lib/calendar.pbjson.dart index b7b7ea32..2066bfcd 100644 --- a/lib/calendar.pbjson.dart +++ b/lib/calendar.pbjson.dart @@ -13,6 +13,20 @@ import 'dart:convert' as $convert; import 'dart:core' as $core; import 'dart:typed_data' as $typed_data; +@$core.Deprecated('Use workDayDescriptor instead') +const WorkDay$json = { + '1': 'WorkDay', + '2': [ + {'1': 'WeekDay', '3': 1, '4': 1, '5': 14, '6': '.api.WeekDay', '10': 'WeekDay'}, + {'1': 'TimeRanges', '3': 2, '4': 3, '5': 11, '6': '.api.TimeRange', '10': 'TimeRanges'}, + ], +}; + +/// Descriptor for `WorkDay`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List workDayDescriptor = $convert.base64Decode( + 'CgdXb3JrRGF5EiYKB1dlZWtEYXkYASABKA4yDC5hcGkuV2Vla0RheVIHV2Vla0RheRIuCgpUaW' + '1lUmFuZ2VzGAIgAygLMg4uYXBpLlRpbWVSYW5nZVIKVGltZVJhbmdlcw=='); + @$core.Deprecated('Use exceptionnalClosureDescriptor instead') const ExceptionnalClosure$json = { '1': 'ExceptionnalClosure', @@ -47,6 +61,7 @@ const Calendar$json = { {'1': 'Name', '3': 4, '4': 1, '5': 9, '10': 'Name'}, {'1': 'Description', '3': 5, '4': 1, '5': 9, '8': {}, '10': 'Description'}, {'1': 'ExceptionnalClosures', '3': 6, '4': 3, '5': 11, '6': '.api.ExceptionnalClosure', '10': 'ExceptionnalClosures'}, + {'1': 'WorkDays', '3': 7, '4': 3, '5': 11, '6': '.api.WorkDay', '8': {}, '10': 'WorkDays'}, ], }; @@ -56,7 +71,8 @@ final $typed_data.Uint8List calendarDescriptor = $convert.base64Decode( 'FwaS5SZXNvdXJjZVR5cGVSB1JzY1R5cGUSHgoKUmVzb3VyY2VJRBgDIAEoCVIKUmVzb3VyY2VJ' 'RBISCgROYW1lGAQgASgJUgROYW1lEikKC0Rlc2NyaXB0aW9uGAUgASgJQgf6QgRyAhABUgtEZX' 'NjcmlwdGlvbhJMChRFeGNlcHRpb25uYWxDbG9zdXJlcxgGIAMoCzIYLmFwaS5FeGNlcHRpb25u' - 'YWxDbG9zdXJlUhRFeGNlcHRpb25uYWxDbG9zdXJlcw=='); + 'YWxDbG9zdXJlUhRFeGNlcHRpb25uYWxDbG9zdXJlcxI1CghXb3JrRGF5cxgHIAMoCzIMLmFwaS' + '5Xb3JrRGF5QgvqwRgHV2Vla0RheVIIV29ya0RheXM='); @$core.Deprecated('Use createCalendarOnOrganisationRequestDescriptor instead') const CreateCalendarOnOrganisationRequest$json = { diff --git a/lib/shared.pb.dart b/lib/shared.pb.dart index 16e21139..de17d177 100644 --- a/lib/shared.pb.dart +++ b/lib/shared.pb.dart @@ -74,6 +74,72 @@ class RequestHeader extends $pb.GeneratedMessage { void clearProject() => $_clearField(1); } +class TimeRange extends $pb.GeneratedMessage { + factory TimeRange({ + $core.String? startTime, + $core.String? endTime, + }) { + final $result = create(); + if (startTime != null) { + $result.startTime = startTime; + } + if (endTime != null) { + $result.endTime = endTime; + } + return $result; + } + TimeRange._() : super(); + factory TimeRange.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory TimeRange.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'TimeRange', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create) + ..aOS(1, _omitFieldNames ? '' : 'StartTime', protoName: 'StartTime') + ..aOS(2, _omitFieldNames ? '' : 'EndTime', protoName: 'EndTime') + ..hasRequiredFields = false + ; + + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') + TimeRange clone() => TimeRange()..mergeFromMessage(this); + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + TimeRange copyWith(void Function(TimeRange) updates) => super.copyWith((message) => updates(message as TimeRange)) as TimeRange; + + $pb.BuilderInfo get info_ => _i; + + @$core.pragma('dart2js:noInline') + static TimeRange create() => TimeRange._(); + TimeRange createEmptyInstance() => create(); + static $pb.PbList createRepeated() => $pb.PbList(); + @$core.pragma('dart2js:noInline') + static TimeRange getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static TimeRange? _defaultInstance; + + /// Start time, format hh:mm + @$pb.TagNumber(1) + $core.String get startTime => $_getSZ(0); + @$pb.TagNumber(1) + set startTime($core.String v) { $_setString(0, v); } + @$pb.TagNumber(1) + $core.bool hasStartTime() => $_has(0); + @$pb.TagNumber(1) + void clearStartTime() => $_clearField(1); + + /// End time, format hh:mm + @$pb.TagNumber(2) + $core.String get endTime => $_getSZ(1); + @$pb.TagNumber(2) + set endTime($core.String v) { $_setString(1, v); } + @$pb.TagNumber(2) + $core.bool hasEndTime() => $_has(1); + @$pb.TagNumber(2) + void clearEndTime() => $_clearField(2); +} + /// Header for all requests on project resources class RequestProjectHeader extends $pb.GeneratedMessage { factory RequestProjectHeader({ diff --git a/lib/shared.pbjson.dart b/lib/shared.pbjson.dart index 0f0fecbe..f1b50a76 100644 --- a/lib/shared.pbjson.dart +++ b/lib/shared.pbjson.dart @@ -417,6 +417,21 @@ final $typed_data.Uint8List requestHeaderDescriptor = $convert.base64Decode( 'Cg1SZXF1ZXN0SGVhZGVyEkMKB1Byb2plY3QYASABKAlCKZJBGzIZSWRlbnRpZmllciBvZiB0aG' 'UgcHJvamVjdPpCCHIGEAG6AQEgUgdQcm9qZWN0'); +@$core.Deprecated('Use timeRangeDescriptor instead') +const TimeRange$json = { + '1': 'TimeRange', + '2': [ + {'1': 'StartTime', '3': 1, '4': 1, '5': 9, '8': {}, '10': 'StartTime'}, + {'1': 'EndTime', '3': 2, '4': 1, '5': 9, '8': {}, '10': 'EndTime'}, + ], +}; + +/// Descriptor for `TimeRange`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List timeRangeDescriptor = $convert.base64Decode( + 'CglUaW1lUmFuZ2USRgoJU3RhcnRUaW1lGAEgASgJQij6QiVyIzIhXig/OlswMV1bMC05XXwyWz' + 'AtM10pOlswLTVdWzAtOV0kUglTdGFydFRpbWUSQgoHRW5kVGltZRgCIAEoCUIo+kIlciMyIV4o' + 'PzpbMDFdWzAtOV18MlswLTNdKTpbMC01XVswLTldJFIHRW5kVGltZQ=='); + @$core.Deprecated('Use requestProjectHeaderDescriptor instead') const RequestProjectHeader$json = { '1': 'RequestProjectHeader', diff --git a/lib/slotbooking.pb.dart b/lib/slotbooking.pb.dart index b3064b52..b8fd7951 100644 --- a/lib/slotbooking.pb.dart +++ b/lib/slotbooking.pb.dart @@ -578,7 +578,7 @@ class OpeningDefinition extends $pb.GeneratedMessage { class OpeningDayDefinition extends $pb.GeneratedMessage { factory OpeningDayDefinition({ - $core.Iterable? timeRanges, + $core.Iterable<$35.TimeRange>? timeRanges, RuleFilter? filter, $core.int? orderAppliance, }) { @@ -599,7 +599,7 @@ class OpeningDayDefinition extends $pb.GeneratedMessage { factory OpeningDayDefinition.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'OpeningDayDefinition', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create) - ..pc(2, _omitFieldNames ? '' : 'TimeRanges', $pb.PbFieldType.PM, protoName: 'TimeRanges', subBuilder: TimeRange.create) + ..pc<$35.TimeRange>(2, _omitFieldNames ? '' : 'TimeRanges', $pb.PbFieldType.PM, protoName: 'TimeRanges', subBuilder: $35.TimeRange.create) ..aOM(3, _omitFieldNames ? '' : 'Filter', protoName: 'Filter', subBuilder: RuleFilter.create) ..a<$core.int>(4, _omitFieldNames ? '' : 'OrderAppliance', $pb.PbFieldType.O3, protoName: 'OrderAppliance') ..hasRequiredFields = false @@ -628,7 +628,7 @@ class OpeningDayDefinition extends $pb.GeneratedMessage { /// List of opening hours @$pb.TagNumber(2) - $pb.PbList get timeRanges => $_getList(0); + $pb.PbList<$35.TimeRange> get timeRanges => $_getList(0); /// Validity filters for this opening rule definition @$pb.TagNumber(3) @@ -653,72 +653,6 @@ class OpeningDayDefinition extends $pb.GeneratedMessage { void clearOrderAppliance() => $_clearField(4); } -class TimeRange extends $pb.GeneratedMessage { - factory TimeRange({ - $core.String? startTime, - $core.String? endTime, - }) { - final $result = create(); - if (startTime != null) { - $result.startTime = startTime; - } - if (endTime != null) { - $result.endTime = endTime; - } - return $result; - } - TimeRange._() : super(); - factory TimeRange.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory TimeRange.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'TimeRange', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create) - ..aOS(1, _omitFieldNames ? '' : 'StartTime', protoName: 'StartTime') - ..aOS(2, _omitFieldNames ? '' : 'EndTime', protoName: 'EndTime') - ..hasRequiredFields = false - ; - - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') - TimeRange clone() => TimeRange()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - TimeRange copyWith(void Function(TimeRange) updates) => super.copyWith((message) => updates(message as TimeRange)) as TimeRange; - - $pb.BuilderInfo get info_ => _i; - - @$core.pragma('dart2js:noInline') - static TimeRange create() => TimeRange._(); - TimeRange createEmptyInstance() => create(); - static $pb.PbList createRepeated() => $pb.PbList(); - @$core.pragma('dart2js:noInline') - static TimeRange getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static TimeRange? _defaultInstance; - - /// Start time, format hh:mm - @$pb.TagNumber(1) - $core.String get startTime => $_getSZ(0); - @$pb.TagNumber(1) - set startTime($core.String v) { $_setString(0, v); } - @$pb.TagNumber(1) - $core.bool hasStartTime() => $_has(0); - @$pb.TagNumber(1) - void clearStartTime() => $_clearField(1); - - /// End time, format hh:mm - @$pb.TagNumber(2) - $core.String get endTime => $_getSZ(1); - @$pb.TagNumber(2) - set endTime($core.String v) { $_setString(1, v); } - @$pb.TagNumber(2) - $core.bool hasEndTime() => $_has(1); - @$pb.TagNumber(2) - void clearEndTime() => $_clearField(2); -} - class CapacityRule extends $pb.GeneratedMessage { factory CapacityRule({ $core.String? startDate, diff --git a/lib/slotbooking.pbjson.dart b/lib/slotbooking.pbjson.dart index 905e8d15..e6ce5606 100644 --- a/lib/slotbooking.pbjson.dart +++ b/lib/slotbooking.pbjson.dart @@ -247,21 +247,6 @@ final $typed_data.Uint8List openingDayDefinitionDescriptor = $convert.base64Deco '5nZVIKVGltZVJhbmdlcxInCgZGaWx0ZXIYAyABKAsyDy5hcGkuUnVsZUZpbHRlclIGRmlsdGVy' 'EiYKDk9yZGVyQXBwbGlhbmNlGAQgASgFUg5PcmRlckFwcGxpYW5jZQ=='); -@$core.Deprecated('Use timeRangeDescriptor instead') -const TimeRange$json = { - '1': 'TimeRange', - '2': [ - {'1': 'StartTime', '3': 1, '4': 1, '5': 9, '8': {}, '10': 'StartTime'}, - {'1': 'EndTime', '3': 2, '4': 1, '5': 9, '8': {}, '10': 'EndTime'}, - ], -}; - -/// Descriptor for `TimeRange`. Decode as a `google.protobuf.DescriptorProto`. -final $typed_data.Uint8List timeRangeDescriptor = $convert.base64Decode( - 'CglUaW1lUmFuZ2USRgoJU3RhcnRUaW1lGAEgASgJQij6QiVyIzIhXig/OlswMV1bMC05XXwyWz' - 'AtM10pOlswLTVdWzAtOV0kUglTdGFydFRpbWUSQgoHRW5kVGltZRgCIAEoCUIo+kIlciMyIV4o' - 'PzpbMDFdWzAtOV18MlswLTNdKTpbMC01XVswLTldJFIHRW5kVGltZQ=='); - @$core.Deprecated('Use capacityRuleDescriptor instead') const CapacityRule$json = { '1': 'CapacityRule', diff --git a/pubspec.yaml b/pubspec.yaml index 2e64a798..34af9edd 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: dart_core_sdk description: dart libs from core model proto files -version: 1.11.0-SNAPSHOT-250429091819 +version: 1.11.0-SNAPSHOT-250430075938 homepage: '' publish_to: '' repository: ''