Modified animals with Seperation State
This commit is contained in:
@@ -185,7 +185,7 @@ class ADIS:
|
||||
"""
|
||||
Creating entity for 880022
|
||||
"""
|
||||
animalnr, earmark, rfid, forbidmilk, tsforbidstart, tsforbidend = animalinfo
|
||||
animalnr, earmark, rfid, forbidmilk, tsforbidstart, tsforbidend, sepertation = animalinfo
|
||||
#Check milking forbidden
|
||||
milkforbid = 0
|
||||
if forbidmilk:
|
||||
@@ -260,7 +260,7 @@ def createlkv (businessinfos, animalinfos, milkdata):
|
||||
retval += dd + "\n"
|
||||
|
||||
if animalinfos:
|
||||
for animalnr, earmark, rfid, forbidmilk, tsforbidstart, tsforbidend in animalinfos:
|
||||
for animalnr, earmark, rfid, forbidmilk, tsforbidstart, tsforbidend, sepertation in animalinfos:
|
||||
if animalnr in milkdata:
|
||||
ds = adis.createmilkdataset ((animalnr, earmark, rfid, forbidmilk, tsforbidstart, tsforbidend), milkdata[animalnr])
|
||||
retval += ds
|
||||
@@ -274,7 +274,7 @@ def createlkv (businessinfos, animalinfos, milkdata):
|
||||
|
||||
if __name__ == "__main__":
|
||||
businessinfos = {'businessid' : '123567'}
|
||||
animalinfos = [(100, '2730000000000000', '', '1', '2019-09-11', '2019-09-20')]
|
||||
animalinfos = [(100, '2730000000000000', '', '1', '2019-09-11', '2019-09-20'), 'Normal']
|
||||
milkdata = {100: [(3462, 177.6, '2019-08-11', '06:26:47'), (1235, 421.6, '2019-08-07', '18:06:43')]}
|
||||
print (createlkv (businessinfos, animalinfos, milkdata))
|
||||
|
||||
|
||||
BIN
siliconform.zexp
BIN
siliconform.zexp
Binary file not shown.
Reference in New Issue
Block a user