mirror of
https://github.com/spiral-project/ihatemoney.git
synced 2025-05-06 05:01:48 +02:00
Remove useless variable and check json format
This commit is contained in:
parent
0cbb71ee44
commit
f5ec1b0136
1 changed files with 16 additions and 3 deletions
|
@ -400,9 +400,8 @@ def edit_project():
|
||||||
def upload_json():
|
def upload_json():
|
||||||
form = UploadForm()
|
form = UploadForm()
|
||||||
if form.validate_on_submit():
|
if form.validate_on_submit():
|
||||||
file = form.file.data.stream.read()
|
|
||||||
try:
|
try:
|
||||||
import_project(file, g.project)
|
import_project(form.file.data.stream, g.project)
|
||||||
flash(_("Project successfully uploaded"))
|
flash(_("Project successfully uploaded"))
|
||||||
except ValueError:
|
except ValueError:
|
||||||
flash(_("Invalid JSON"), category="error")
|
flash(_("Invalid JSON"), category="error")
|
||||||
|
@ -412,8 +411,22 @@ def upload_json():
|
||||||
|
|
||||||
|
|
||||||
def import_project(file, project):
|
def import_project(file, project):
|
||||||
|
json_file = json.load(file)
|
||||||
|
|
||||||
|
# Check if JSON is correct
|
||||||
|
attr = ["what", "payer_name", "payer_weight", "amount", "date", "owers"]
|
||||||
|
attr.sort()
|
||||||
|
for e in json_file:
|
||||||
|
if len(e) != len(attr):
|
||||||
|
raise ValueError
|
||||||
|
list_attr = []
|
||||||
|
for i in e:
|
||||||
|
list_attr.append(i)
|
||||||
|
list_attr.sort()
|
||||||
|
if list_attr != attr:
|
||||||
|
raise ValueError
|
||||||
|
|
||||||
# From json : export list of members
|
# From json : export list of members
|
||||||
json_file = json.loads(file)
|
|
||||||
members_json = get_members(json_file)
|
members_json = get_members(json_file)
|
||||||
members = project.members
|
members = project.members
|
||||||
members_already_here = list()
|
members_already_here = list()
|
||||||
|
|
Loading…
Reference in a new issue