@molochko-dev/data 1.4.23 → 1.4.24
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -117,7 +117,25 @@ class AnimalForEventFilter {
|
|
|
117
117
|
return this.abortFilter();
|
|
118
118
|
}
|
|
119
119
|
pozSuhostoiFilter() {
|
|
120
|
-
|
|
120
|
+
const result = [];
|
|
121
|
+
this.animals.forEach(animal => {
|
|
122
|
+
let genderOk = false;
|
|
123
|
+
let statusOk = false;
|
|
124
|
+
let ageOk = false;
|
|
125
|
+
if (this.genderFilter(animal, enums_1.ANIMAL_GENDER_ENUM.cow)) {
|
|
126
|
+
genderOk = true;
|
|
127
|
+
}
|
|
128
|
+
if (this.statusFilter(animal, [status.dry])) {
|
|
129
|
+
statusOk = true;
|
|
130
|
+
}
|
|
131
|
+
if (this.ageFilter(animal, defaultCowAge)) {
|
|
132
|
+
ageOk = true;
|
|
133
|
+
}
|
|
134
|
+
if (genderOk && statusOk && ageOk) {
|
|
135
|
+
result.push(animal);
|
|
136
|
+
}
|
|
137
|
+
});
|
|
138
|
+
return result;
|
|
121
139
|
}
|
|
122
140
|
filter() {
|
|
123
141
|
switch (this.eventType) {
|
package/package.json
CHANGED
|
@@ -135,7 +135,26 @@ export class AnimalForEventFilter {
|
|
|
135
135
|
}
|
|
136
136
|
|
|
137
137
|
pozSuhostoiFilter () {
|
|
138
|
-
|
|
138
|
+
const result: IAnimal[] = []
|
|
139
|
+
this.animals.forEach(animal => {
|
|
140
|
+
let genderOk = false
|
|
141
|
+
let statusOk = false
|
|
142
|
+
let ageOk = false
|
|
143
|
+
|
|
144
|
+
if (this.genderFilter(animal, ANIMAL_GENDER_ENUM.cow)) {
|
|
145
|
+
genderOk = true
|
|
146
|
+
}
|
|
147
|
+
if (this.statusFilter(animal, [status.dry])) {
|
|
148
|
+
statusOk = true
|
|
149
|
+
}
|
|
150
|
+
if (this.ageFilter(animal, defaultCowAge)) {
|
|
151
|
+
ageOk = true
|
|
152
|
+
}
|
|
153
|
+
if (genderOk && statusOk && ageOk) {
|
|
154
|
+
result.push(animal)
|
|
155
|
+
}
|
|
156
|
+
})
|
|
157
|
+
return result
|
|
139
158
|
}
|
|
140
159
|
|
|
141
160
|
filter () {
|