diff options
Diffstat (limited to 'nutrinoweb/controllers/Avatar.py')
| -rw-r--r-- | nutrinoweb/controllers/Avatar.py | 257 |
1 files changed, 111 insertions, 146 deletions
diff --git a/nutrinoweb/controllers/Avatar.py b/nutrinoweb/controllers/Avatar.py index a804218..79c610a 100644 --- a/nutrinoweb/controllers/Avatar.py +++ b/nutrinoweb/controllers/Avatar.py @@ -19,167 +19,132 @@ DATA_STATUS = os.path.join(DATA, 'status.json') # .. storage.check_file(DATA_STATUS) -class Character: - - def __init__(self): - self.water = 0.0 - self.energie = 0.0 - self.calcium = 0.0 - self.iron = 0.0 - self.magnesium = 0.0 - self.phosphorus = 0.0 - self.potassium = 0.0 - self.sodium = 0.0 - self.zinc = 0.0 - self.copper = 0.0 - self.vit_c = 0.0 - self.thiamin = 0.0 - self.riboflavin = 0.0 - self.niacin = 0.0 - self.panto_acid = 0.0 - self.vit_b6 = 0.0 - self.folate_tot = 0.0 - self.vit_b12 = 0.0 - self.vit_a = 0.0 - self.vit_e = 0.0 - self.vit_d = 0.0 - self.vit_total = 0.0 - self.construction = 0.0 +class Character(object): + + def __init__(self, water, energie, calcium, iron, magnesium, phosphorus, potassium, sodium, zinc, copper, vit_c, thiamin, riboflavin, niacin, panto_acid, vit_b6, folate_tot, vit_b12, vit_a, vit_e, vit_d, vit_total, construction, time, position): + self.Water = water + self.Energie = energie + self.Calcium = calcium + self.Iron = iron + self.Magnesium = magnesium + self.Phosphorus = phosphorus + self.Potassium = potassium + self.Sodium = sodium + self.Zinc = zinc + self.Copper = copper + self.Vit_c = vit_c + self.Thiamin = thiamin + self.Riboflavin = riboflavin + self.Niacin = niacin + self.Panto_acid = panto_acid + self.Vit_b6 = vit_b6 + self.Folate_tot = folate_tot + self.Vit_b12 = vit_b12 + self.Vit_a = vit_a + self.Vit_e = vit_e + self.Vit_d = vit_d + self.Vit_total = vit_total + self.Construction = construction + self.Time = time + self.Position = position def load_status(self): fh = open(DATA_STATUS,'r') status = json.load(fh) + + self.Water = float(status['water']) + self.Energie = float(status['energie']) + self.Calcium = float(status['calcium']) + self.Iron = float(status['iron']) + self.Magnesium = float(status['magnesium']) + self.Phosphorus = float(status['phosphorus']) + self.Potassium = float(status['potassium']) + self.Sodium = float(status['sodium']) + self.Zinc = float(status['zinc']) + self.Copper = float(status['copper']) + self.Vit_c = float(status['vit_c']) + self.Thiamin = float(status['thiamin']) + self.Riboflavin = float(status['riboflavin']) + self.Niacin = float(status['niacin']) + self.Panto_acid = float(status['panto_acid']) + self.Vit_b6 = float(status['vit_b6']) + self.Folate_tot = float(status['folate_tot']) + self.Vit_b12 = float(status['vit_b12']) + self.Vit_a = float(status['vit_a']) + self.Vit_e = float(status['vit_e']) + self.Vit_d = float(status['vit_d']) + self.Vit_total = float(status['vit_total']) + self.Construction = float(status['construction']) + self.Time = float(status['time']) + self.Position = status['position'] + fh.close() return status - def load_status1(self): - - fobj = open(DATA_STATUS) - - zuordnung = fobj.read().split("|") - - # little check - TODO nicer check - if len(zuordnung) < 23: - pass - else: - # OK! - self.water = zuordnung[1] - self.energie = zuordnung[2] - self.calcium = zuordnung[3] - self.iron =zuordnung[4] - self.magnesium = zuordnung[5] - self.phosphorus = zuordnung[6] - self.potassium = zuordnung[7] - self.sodium = zuordnung[8] - self.zinc = zuordnung[9] - self.copper = zuordnung[10] - self.vit_c = zuordnung[11] - self.thiamin = zuordnung[12] - self.riboflavin = zuordnung[13] - self.niacin =zuordnung[14] - self.panto_acid = zuordnung[15] - self.vit_b6 = zuordnung[16] - self.folate_tot = zuordnung[17] - self.vit_b12 = zuordnung[18] - self.vit_a = zuordnung[19] - self.vit_e = zuordnung[20] - self.vit_d = zuordnung[21] - self.vit_total = zuordnung[22] - self.construction = zuordnung[23] - - def save_status(self, status): + def save_status(self): fh = open(DATA_STATUS,'w') + + status = { + "water": self.Water, + "energie": self.Energie, + "calcium": self.Calcium, + "iron" : self.Iron, + "magnesium": self.Magnesium, + "phosphorus": self.Phosphorus, + "potassium": self.Potassium, + "sodium": self.Sodium, + "zinc": self.Zinc, + "copper": self.Copper, + "vit_c": self.Vit_c, + "thiamin": self.Thiamin, + "riboflavin": self.Riboflavin, + "niacin": self.Niacin, + "panto_acid": self.Panto_acid, + "vit_b6": self.Vit_b6, + "folate_tot": self.Folate_tot, + "vit_b12": self.Vit_b12, + "vit_a": self.Vit_a, + "vit_e": self.Vit_e, + "vit_d": self.Vit_d, + "vit_total": self.Vit_total, + "construction": self.Construction, + "time": self.Time, + "position": self.Position + } json.dump(status,fh) fh.close() - def reset_status2(self): + def reset_status(self): status = { - "water": 0, - "energie": 0, - "calcium": 0, - "iron" : 0, - "magnesium": 0, - "phosphorus": 0, - "potassium": 0, - "sodium": 0, - "zinc": 0, - "copper": 0, - "vit_c": 0, - "thiamin": 0, - "riboflavin": 0, - "niacin": 0, - "panto_acid": 0, - "vit_b6": 0, - "folate_tot": 0, - "vit_b12": 0, - "vit_a": 0, - "vit_e": 0, - "vit_d": 0, - "vit_total": 0, - "construction": 0 + "water": self.Water, + "energie": self.Energie, + "calcium": self.Calcium, + "iron" : self.Iron, + "magnesium": self.Magnesium, + "phosphorus": self.Phosphorus, + "potassium": self.Potassium, + "sodium": self.Sodium, + "zinc": self.Zinc, + "copper": self.Copper, + "vit_c": self.Vit_c, + "thiamin": self.Thiamin, + "riboflavin": self.Riboflavin, + "niacin": self.Niacin, + "panto_acid": self.Panto_acid, + "vit_b6": self.Vit_b6, + "folate_tot": self.Folate_tot, + "vit_b12": self.Vit_b12, + "vit_a": self.Vit_a, + "vit_e": self.Vit_e, + "vit_d": self.Vit_d, + "vit_total": self.Vit_total, + "construction": self.Construction, + "time": self.Time, + "position": self.Position } - fh = open(temp_json,'w') + fh = open(DATA_STATUS,'w') json.dump(status,fh) fh.close() - status = { - "water": self.water, - "energie": self.energie, - "calcium": self.calcium, - "iron" : self.iron, - "magnesium": self.magnesium, - "phosphorus": self.phosphorus, - "potassium": self.potassium, - "sodium": self.sodium, - "zinc": self.zinc, - "copper": self.copper, - "vit_c": self.vit_c, - "thiamin": self.thiamin, - "riboflavin": self.riboflavin, - "niacin": self.niacin, - "panto_acid": self.panto_acid, - "vit_b6": self.vit_b6, - "folate_tot": self.folate_tot, - "vit_b12": self.vit_b12, - "vit_a": self.vit_a, - "vit_e": self.vit_e, - "vit_d": self.vit_d, - "vit_total": self.vit_total, - "construction": self.construction - } return status - - def save_status1(self, water, energie, calcium, iron, magnesium, phosphorus, - potassium, sodium, zinc, copper, vit_c, thiamin, riboflavin, - niacin, panto_acid, vit_b6, folate_tot, vit_b12, vit_a, vit_e, - vit_d, vit_total, construction): - fobj = open(DATA_STATUS, 'wb') - fobj.truncate() - fobj.write( - '|' + water - + '|' + energie - + '|' + calcium - + '|' + iron - + '|' + magnesium - + '|' + phosphorus - + '|' + potassium - + '|' + sodium - + '|' + zinc - + '|' + copper - + '|' + vit_c - + '|' + thiamin - + '|' + riboflavin - + '|' + niacin - + '|' + panto_acid - + '|' + vit_b6 - + '|' + folate_tot - + '|' + vit_b12 - + '|' + vit_a - + '|' + vit_e - + '|' + vit_d - + '|' + vit_total - + '|' + construction - ) - fobj.close() - |