Erweiterungen

lib/model/job.dart

@@ -26,9 +26,17 @@ class Job {
   late int vhtId;
   @JsonKey(name: 'rem')
   late String rem;
+  @JsonKey(name: 'delayOrderTime')
+  late int delayOrderTime;
   @JsonKey(name: 'tours')
   late List<JobTour> tours;
 
+  @Ignore()
+  late DateTime? firstDisplayTime = null;
+
+  @Ignore()
+  late int enableDelay;
+
   Job();
 
   factory Job.fromJson(Map<String, dynamic> json) => _$JobFromJson(json);

lib/model/job.g.dart

@@ -22,44 +22,49 @@ const JobSchema = CollectionSchema(
       name: r'crFilter',
       type: IsarType.string,
     ),
-    r'global': PropertySchema(
+    r'delayOrderTime': PropertySchema(
       id: 1,
+      name: r'delayOrderTime',
+      type: IsarType.long,
+    ),
+    r'global': PropertySchema(
+      id: 2,
       name: r'global',
       type: IsarType.bool,
     ),
     r'offsWarn': PropertySchema(
-      id: 2,
+      id: 3,
       name: r'offsWarn',
       type: IsarType.long,
     ),
     r'ordertime': PropertySchema(
-      id: 3,
+      id: 4,
       name: r'ordertime',
       type: IsarType.string,
     ),
     r'rem': PropertySchema(
-      id: 4,
+      id: 5,
       name: r'rem',
       type: IsarType.string,
     ),
     r'state': PropertySchema(
-      id: 5,
+      id: 6,
       name: r'state',
       type: IsarType.long,
     ),
     r'tours': PropertySchema(
-      id: 6,
+      id: 7,
       name: r'tours',
       type: IsarType.objectList,
       target: r'JobTour',
     ),
     r'ver': PropertySchema(
-      id: 7,
+      id: 8,
       name: r'ver',
       type: IsarType.string,
     ),
     r'vhtId': PropertySchema(
-      id: 8,
+      id: 9,
       name: r'vhtId',
       type: IsarType.long,
     )
@@ -116,19 +121,20 @@ void _jobSerialize(
   Map<Type, List<int>> allOffsets,
 ) {
   writer.writeString(offsets[0], object.crFilter);
-  writer.writeBool(offsets[1], object.global);
-  writer.writeLong(offsets[2], object.offsWarn);
-  writer.writeString(offsets[3], object.ordertime);
-  writer.writeString(offsets[4], object.rem);
-  writer.writeLong(offsets[5], object.state);
+  writer.writeLong(offsets[1], object.delayOrderTime);
+  writer.writeBool(offsets[2], object.global);
+  writer.writeLong(offsets[3], object.offsWarn);
+  writer.writeString(offsets[4], object.ordertime);
+  writer.writeString(offsets[5], object.rem);
+  writer.writeLong(offsets[6], object.state);
   writer.writeObjectList<JobTour>(
-    offsets[6],
+    offsets[7],
     allOffsets,
     JobTourSchema.serialize,
     object.tours,
   );
-  writer.writeString(offsets[7], object.ver);
-  writer.writeLong(offsets[8], object.vhtId);
+  writer.writeString(offsets[8], object.ver);
+  writer.writeLong(offsets[9], object.vhtId);
 }
 
 Job _jobDeserialize(
@@ -139,21 +145,22 @@ Job _jobDeserialize(
 ) {
   final object = Job();
   object.crFilter = reader.readStringOrNull(offsets[0]);
-  object.global = reader.readBool(offsets[1]);
+  object.delayOrderTime = reader.readLong(offsets[1]);
+  object.global = reader.readBool(offsets[2]);
   object.id = id;
-  object.offsWarn = reader.readLong(offsets[2]);
-  object.ordertime = reader.readString(offsets[3]);
-  object.rem = reader.readString(offsets[4]);
-  object.state = reader.readLong(offsets[5]);
+  object.offsWarn = reader.readLong(offsets[3]);
+  object.ordertime = reader.readString(offsets[4]);
+  object.rem = reader.readString(offsets[5]);
+  object.state = reader.readLong(offsets[6]);
   object.tours = reader.readObjectList<JobTour>(
-        offsets[6],
+        offsets[7],
         JobTourSchema.deserialize,
         allOffsets,
         JobTour(),
       ) ??
       [];
-  object.ver = reader.readString(offsets[7]);
-  object.vhtId = reader.readLong(offsets[8]);
+  object.ver = reader.readString(offsets[8]);
+  object.vhtId = reader.readLong(offsets[9]);
   return object;
 }
 
@@ -167,16 +174,18 @@ P _jobDeserializeProp<P>(
     case 0:
       return (reader.readStringOrNull(offset)) as P;
     case 1:
-      return (reader.readBool(offset)) as P;
-    case 2:
       return (reader.readLong(offset)) as P;
+    case 2:
+      return (reader.readBool(offset)) as P;
     case 3:
-      return (reader.readString(offset)) as P;
+      return (reader.readLong(offset)) as P;
     case 4:
       return (reader.readString(offset)) as P;
     case 5:
-      return (reader.readLong(offset)) as P;
+      return (reader.readString(offset)) as P;
     case 6:
+      return (reader.readLong(offset)) as P;
+    case 7:
       return (reader.readObjectList<JobTour>(
             offset,
             JobTourSchema.deserialize,
@@ -184,9 +193,9 @@ P _jobDeserializeProp<P>(
             JobTour(),
           ) ??
           []) as P;
-    case 7:
-      return (reader.readString(offset)) as P;
     case 8:
+      return (reader.readString(offset)) as P;
+    case 9:
       return (reader.readLong(offset)) as P;
     default:
       throw IsarError('Unknown property with id $propertyId');
@@ -425,6 +434,59 @@ extension JobQueryFilter on QueryBuilder<Job, Job, QFilterCondition> {
     });
   }
 
+  QueryBuilder<Job, Job, QAfterFilterCondition> delayOrderTimeEqualTo(
+      int value) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'delayOrderTime',
+        value: value,
+      ));
+    });
+  }
+
+  QueryBuilder<Job, Job, QAfterFilterCondition> delayOrderTimeGreaterThan(
+    int value, {
+    bool include = false,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'delayOrderTime',
+        value: value,
+      ));
+    });
+  }
+
+  QueryBuilder<Job, Job, QAfterFilterCondition> delayOrderTimeLessThan(
+    int value, {
+    bool include = false,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'delayOrderTime',
+        value: value,
+      ));
+    });
+  }
+
+  QueryBuilder<Job, Job, QAfterFilterCondition> delayOrderTimeBetween(
+    int lower,
+    int upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'delayOrderTime',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+      ));
+    });
+  }
+
   QueryBuilder<Job, Job, QAfterFilterCondition> globalEqualTo(bool value) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
@@ -1134,6 +1196,18 @@ extension JobQuerySortBy on QueryBuilder<Job, Job, QSortBy> {
     });
   }
 
+  QueryBuilder<Job, Job, QAfterSortBy> sortByDelayOrderTime() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addSortBy(r'delayOrderTime', Sort.asc);
+    });
+  }
+
+  QueryBuilder<Job, Job, QAfterSortBy> sortByDelayOrderTimeDesc() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addSortBy(r'delayOrderTime', Sort.desc);
+    });
+  }
+
   QueryBuilder<Job, Job, QAfterSortBy> sortByGlobal() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(r'global', Sort.asc);
@@ -1232,6 +1306,18 @@ extension JobQuerySortThenBy on QueryBuilder<Job, Job, QSortThenBy> {
     });
   }
 
+  QueryBuilder<Job, Job, QAfterSortBy> thenByDelayOrderTime() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addSortBy(r'delayOrderTime', Sort.asc);
+    });
+  }
+
+  QueryBuilder<Job, Job, QAfterSortBy> thenByDelayOrderTimeDesc() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addSortBy(r'delayOrderTime', Sort.desc);
+    });
+  }
+
   QueryBuilder<Job, Job, QAfterSortBy> thenByGlobal() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(r'global', Sort.asc);
@@ -1337,6 +1423,12 @@ extension JobQueryWhereDistinct on QueryBuilder<Job, Job, QDistinct> {
     });
   }
 
+  QueryBuilder<Job, Job, QDistinct> distinctByDelayOrderTime() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addDistinctBy(r'delayOrderTime');
+    });
+  }
+
   QueryBuilder<Job, Job, QDistinct> distinctByGlobal() {
     return QueryBuilder.apply(this, (query) {
       return query.addDistinctBy(r'global');
@@ -1394,6 +1486,12 @@ extension JobQueryProperty on QueryBuilder<Job, Job, QQueryProperty> {
     });
   }
 
+  QueryBuilder<Job, int, QQueryOperations> delayOrderTimeProperty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addPropertyName(r'delayOrderTime');
+    });
+  }
+
   QueryBuilder<Job, bool, QQueryOperations> globalProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addPropertyName(r'global');
@@ -1457,9 +1555,13 @@ Job _$JobFromJson(Map<String, dynamic> json) => Job()
   ..global = json['global'] as bool
   ..vhtId = json['vht_id'] as int
   ..rem = json['rem'] as String
+  ..delayOrderTime = json['delayOrderTime'] as int
   ..tours = (json['tours'] as List<dynamic>)
       .map((e) => JobTour.fromJson(e as Map<String, dynamic>))
-      .toList();
+      .toList()
+  ..firstDisplayTime = json['firstDisplayTime'] == null
+      ? null
+      : DateTime.parse(json['firstDisplayTime'] as String);
 
 Map<String, dynamic> _$JobToJson(Job instance) => <String, dynamic>{
       'id': instance.id,
@@ -1471,5 +1573,7 @@ Map<String, dynamic> _$JobToJson(Job instance) => <String, dynamic>{
       'global': instance.global,
       'vht_id': instance.vhtId,
       'rem': instance.rem,
+      'delayOrderTime': instance.delayOrderTime,
       'tours': instance.tours,
+      'firstDisplayTime': instance.firstDisplayTime?.toIso8601String(),
     };