Skip to content

Commit

Permalink
EDIT Model same_clothes's MAX_LENGTHS becuase of ERROR
Browse files Browse the repository at this point in the history
  • Loading branch information
dizwe committed Sep 1, 2017
1 parent 341207d commit 5372afc
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 23 deletions.
1 change: 0 additions & 1 deletion Fitter/settings/prod_aws.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
},
}


"""S3"""
INSTALLED_APPS += ['storages']

Expand Down
30 changes: 15 additions & 15 deletions fitterKakao/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@ class SizeInfo(models.Model):
sex = models.CharField(max_length=5, choices=SEX_CHOICES, default=WOMAN)
weight = models.IntegerField(default=0)
height = models.IntegerField(default=0)
shoulder = models.CharField(max_length=30, default=None)
chest = models.CharField(max_length=30, default=None)
arm = models.CharField(max_length=30, default=None)
waist = models.CharField(max_length=30, default=None)
bottom_waist = models.CharField(max_length=30, default=None)
crotch = models.CharField(max_length=30, default=None)
thigh = models.CharField(max_length=30, default=None)
length = models.CharField(max_length=30, default=None)
hem = models.CharField(max_length=30, default=None)
hip = models.CharField(max_length=30, default=None)
crotch_height = models.CharField(max_length=30, default=None)
middle_thigh = models.CharField(max_length=30, default=None)
knee = models.CharField(max_length=30, default=None)
calf = models.CharField(max_length=30, default=None)
nipple = models.CharField(max_length=30, default=None)
shoulder = models.CharField(max_length=40, default=None)
chest = models.CharField(max_length=40, default=None)
arm = models.CharField(max_length=40, default=None)
waist = models.CharField(max_length=40, default=None)
bottom_waist = models.CharField(max_length=40, default=None)
crotch = models.CharField(max_length=40, default=None)
thigh = models.CharField(max_length=40, default=None)
length = models.CharField(max_length=40, default=None)
hem = models.CharField(max_length=40, default=None)
hip = models.CharField(max_length=40, default=None)
crotch_height = models.CharField(max_length=40, default=None)
middle_thigh = models.CharField(max_length=40, default=None)
knee = models.CharField(max_length=40, default=None)
calf = models.CharField(max_length=40, default=None)
nipple = models.CharField(max_length=40, default=None)

def __str__(self): # Change title as name(메소드처럼)
return r"%s %s %s" % (self.sex, str(self.height), str(self.weight))
Expand Down
16 changes: 9 additions & 7 deletions fitterKakao/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ def make_question_generator(whole_d):
for weight in weight_range: # 해보니 그렇던데?/여자
yield sex, height, weight


def read_json(fname, encoder):
with open(fname, encoding=encoder) as data_file:
json_data = json.load(data_file)
Expand Down Expand Up @@ -60,7 +59,7 @@ def data_add(request):

@user_passes_test(lambda u: u.is_superuser)
def data_del(request):
# SizeInfo.objects.all().delete()
SizeInfo.objects.all().delete()
return HttpResponse("DEL DONE")


Expand All @@ -78,7 +77,7 @@ def size_list_to_dict(suggested_size):
@login_required
def suppose_size(request, kinds, tag_num):
try:
"""개인의 데이터"""
"""개인의 데이터 읽어오기"""
person = Person.objects.filter(name=request.user)
# 나중에 이거 [0]하는 부분 바꿔야함!
person_info_dict = person.values('sex', 'height', 'weight', 'shoulder_a', 'chest_a', 'sleeve_a', 'waist_a',
Expand All @@ -89,7 +88,7 @@ def suppose_size(request, kinds, tag_num):

# ['shoulder', 'chest', 'arm', 'waist'
# 'bottom_waist', 'crotch', 'thigh', 'length', 'hem', 'hip',
# 'crotch_height', 'middle_thigh', 'knee', 'calf', 'nipple'] 순서
# 'crotch_height', 'middle_thigh', 'knee', 'calf', 'nipple'] 순서 질문지
question = []
for answer in ['shoulder_a', 'chest_a', 'sleeve_a', 'waist_a',
'waist_a', 'crotch_a', 'thigh_a', 'length_a', 'hem_a', 'hip_a',
Expand All @@ -99,19 +98,21 @@ def suppose_size(request, kinds, tag_num):
else:
question.append(person_info_dict[answer])

"""데이터 찾기"""
"""DB 에서 데이터 찾기"""
suggested_size_filter = \
SizeInfo.objects.filter(sex=user_sex).filter(height=user_height).filter(weight=user_weight)

"""예상 사이즈 추천하고 실측 데이터로 바꾸기"""
parameter_list = ['shoulder', 'chest', 'arm', 'waist',
'bottom_waist', 'crotch', 'thigh', 'length', 'hem', 'hip',
'crotch_height', 'middle_thigh', 'knee', 'calf', 'nipple']

"""예상 사이즈 추천하고 실측 데이터로 바꾸기"""

suggested_size = []
for parameter, q in zip(parameter_list, question):
# size info 에서 신체 부위별로 데이터 얻어오기
parameter_dict = suggested_size_filter.values(parameter).first()[parameter]
# 데이터가 dict 형식이므로 dict로 바꾸기
print(parameter_dict.replace("'", '"'))
parameter_dict = json.loads(parameter_dict.replace("'", '"'))
suggested_size.append(parameter_dict[str(q)])

Expand Down Expand Up @@ -211,6 +212,7 @@ def __init__(self, *args, **kwargs):
same_clothes = same_clothes_form.save(commit=False)
same_clothes.save()
just_saved = SameClothes.objects.get(pk=same_clothes.pk)

for form in clothes_formset.forms:
clothes = form.save(commit=False)
clothes.nick = just_saved
Expand Down

0 comments on commit 5372afc

Please sign in to comment.