Skip to content

Commit 40bf40c

Browse files
Reena-cellReena-cell
committed
/doxfix update requirements.txt
1 parent 72fdf8d commit 40bf40c

File tree

2 files changed

+38
-59
lines changed

2 files changed

+38
-59
lines changed

‎apimanager/atms/views.py‎

Lines changed: 35 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -39,50 +39,19 @@ def get_form(self, *args, **kwargs):
3939
fields['notes'].choices = [('','Choose...'),("String1", "String1"), ("String2", "String2")]
4040
fields['supported_currencies'].choices = [('','Choose...'),("EUR", "EUR"), ("MXN", "MXN"), ("USD", "USD")]
4141
fields['location_categories'].choices = [('','Choose...'),("ATBI", "ATBI"), ("ATBE", "ATBE")]
42-
fields['lobby'].initial = json.dumps({
43-
"monday": [
44-
{
45-
"opening_time": "10:00",
46-
"closing_time": "18:00"
47-
}
48-
],
49-
"tuesday": [
50-
{
51-
"opening_time": "10:00",
52-
"closing_time": "18:00"
53-
}
54-
],
55-
"wednesday": [
56-
{
57-
"opening_time": "10:00",
58-
"closing_time": "18:00"
59-
}
60-
],
61-
"thursday": [
62-
{
63-
"opening_time": "10:00",
64-
"closing_time": "18:00"
65-
}
66-
],
67-
"friday": [
68-
{
69-
"opening_time": "10:00",
70-
"closing_time": "18:00"
71-
}
72-
],
73-
"saturday": [
74-
{
75-
"opening_time": "10:00",
76-
"closing_time": "18:00"
77-
}
78-
],
79-
"sunday": [
80-
{
81-
"opening_time": "10:00",
82-
"closing_time": "18:00"
83-
}
84-
]
85-
}, indent=4)
42+
#fields['lobby'].initial = json.dumps({
43+
fields["monday"].initial={"opening_time": "10:00","closing_time": "18:00"}
44+
fields["tuesday"].initial={
45+
"opening_time": "10:00",
46+
"closing_time": "18:00"
47+
}
48+
49+
fields["wednesday"].initial={"opening_time": "10:00", "closing_time": "18:00"}
50+
fields["thursday"].initial={"opening_time": "10:00", "closing_time": "18:00"}
51+
fields["friday"].initial={"opening_time": "10:00", "closing_time": "18:00"}
52+
fields["saturday"].initial={"opening_time": "10:00", "closing_time": "18:00"}
53+
fields["sunday"].initial={"opening_time": "10:00", "closing_time": "18:00"}
54+
#}, indent=4)
8655

8756
fields['address'].initial = json.dumps({
8857
"line_1":"No 1 the Road",
@@ -106,9 +75,8 @@ def form_valid(self, form):
10675
try:
10776
data = form.cleaned_data
10877
urlpath = '/banks/{}/atms'.format(data['bank_id'])
109-
print(urlpath)
11078
payload = {
111-
"id": data["atm_id"],
79+
"id": data["atm_id"],
11280
"bank_id": data["bank_id"],
11381
"name": data["name"],
11482
"address": json.loads(data['address']),
@@ -122,36 +90,45 @@ def form_valid(self, form):
12290
"name": data["meta_license_name"] if data["meta_license_name"]!="" else "license name"
12391
}
12492
},
125-
"lobby": json.loads(data['lobby']),
93+
#"lobby": json.loads(data['lobby']),
94+
"monday":data["monday"] if data["monday"]!= "" else "false",
95+
"tuesday":data["tuesday"] if data["tuesday"]!= "" else "false",
96+
"wednesday":data["wednesday"] if data["wednesday"]!= "" else "false",
97+
"thursday":data["thursday"] if data["thursday"]!= "" else "false",
98+
"friday":data["friday"] if data["friday"]!= "" else "false",
99+
"saturday":data["saturday"] if data["saturday"]!= "" else "false",
100+
"sunday":data["sunday"] if data["sunday"]!= "" else "false",
126101
"is_accessible": data["is_accessible"] if data["is_accessible"]!="" else "false",
127102
"has_deposit_capability": data["has_deposit_capability"] if data["has_deposit_capability"]!="" else "false",
128103
"supported_languages": data["supported_languages"] if data["supported_languages"]!="" else "false",
129104
"supported_currencies": data["supported_currencies"] if data["supported_currencies"]!="" else "false",
130105
"notes": data["notes"] if data["notes"]!="" else "false",
131106
"location_categories": data["location_categories"] if data["location_categories"]!="" else "false",
132-
"accessibleFeatures": data["accessibleFeatures"] if data["accessibleFeatures"]!="" else "accessible features name",
107+
"accessible_features": data["accessibleFeatures"] if data["accessibleFeatures"]!="" else "false",
133108
"minimum_withdrawal": data["minimum_withdrawal"] if data["minimum_withdrawal"]!="" else "false",
134109
"branch_identification": data["branch_identification"] if data["branch_identification"]!="" else "false",
135110
"site_identification": data["site_identification"] if data["site_identification"]!="" else "false",
136111
"site_name": data["site_name"] if data["site_name"]!="" else "false",
137112
"cash_withdrawal_national_fee": data["cash_withdrawal_national_fee"] if data["cash_withdrawal_national_fee"]!="" else "false",
138113
"cash_withdrawal_international_fee": data["cash_withdrawal_international_fee"] if data["cash_withdrawal_international_fee"]!="" else "false",
139114
"balance_inquiry_fee": data["balance_inquiry_fee"] if data["balance_inquiry_fee"]!="" else "false",
140-
"more_info": data["more_info"] if data["more_info"]!="" else "more info",
141-
"located_at": data["located_at"] if data["located_at"]!="" else "located_at",
142-
"services": data["services"] if data["services"]!="" else "services",
115+
"more_info": data["more_info"] if data["more_info"]!="" else "false",
116+
"located_at": data["located_at"] if data["located_at"]!="" else "false",
117+
"services": data["services"] if data["services"]!="" else "false",
143118
}
144119
result = self.api.post(urlpath, payload=payload)
120+
print(result, "Mohit are you listening me, tell me?")
145121
except APIError as err:
146-
error_once_only(self.request, err)
122+
messages.error(self.request, err)
147123
return super(IndexAtmsView, self).form_invalid(form)
148124
except Exception as err:
149-
error_once_only(self.request, "Unknown Error")
125+
messages.error(self.request, err)
150126
return super(IndexAtmsView, self).form_invalid(form)
151127
if 'code' in result and result['code']>=400:
152-
messages.error(self.request, result['message'])
128+
messages.error(self.request, "result Unknown Error")
153129
return super(IndexAtmsView, self).form_valid(form)
154-
msg = 'atm {} for Bank {} has been created successfully!'.format(result['id'], result['bank_id'])
130+
#msg = ("Record has been created successfully!")
131+
msg = 'atm {} for Bank {} has been created successfully!', result['bank_id']
155132
messages.success(self.request, msg)
156133
return super(IndexAtmsView, self).form_valid(form)
157134

@@ -160,6 +137,7 @@ def get_banks(self):
160137
try:
161138
urlpath = '/banks'
162139
result = api.get(urlpath)
140+
print(result, "get_banks")
163141
if 'banks' in result:
164142
return [bank['id'] for bank in sorted(result['banks'], key=lambda d: d['id'])]
165143
else:
@@ -178,6 +156,7 @@ def get_atms(self, context):
178156
urlpath = '/banks/{}/atms'.format(bank_id)
179157

180158
result = api.get(urlpath)
159+
print(result,"get_atms")
181160
if 'atms' in result:
182161
atms_list.extend(result['atms'])
183162
except APIError as err:
@@ -287,7 +266,7 @@ def form_valid(self, form):
287266
data = form.cleaned_data
288267
urlpath = '/banks/{}/atms/{}'.format(data["bank_id"],data["atm_id"])
289268
payload = {
290-
#"id": data["atm_id"],
269+
"id": data["atm_id"],
291270
"bank_id": data["bank_id"],
292271
"name": data["name"],
293272
"address": json.loads(data['address']),

‎requirements.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#Django==1.11.7
22
Django==2.2.13
3-
oauthlib==2.0.0
4-
requests==2.20.0
5-
requests-oauthlib==0.6.2
3+
oauthlib==3.2.0
4+
requests==2.27.1
5+
requests-oauthlib==1.3.1
66
PyJWT==1.5.3
77
gunicorn==19.6.0
88
matplotlib

0 commit comments

Comments
 (0)