Skip to content

Commit bc4bb66

Browse files
Reena-cellReena-cell
committed
/feature Add ATM page
1 parent 19c11db commit bc4bb66

File tree

7 files changed

+265
-281
lines changed

7 files changed

+265
-281
lines changed

‎apimanager/atms/forms.py‎

Lines changed: 80 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -95,19 +95,19 @@ class CreateAtmForm(forms.Form):
9595
required=False,
9696
)
9797

98-
""" lobby = forms.CharField(
99-
label=' Lobby Opening Hours',
98+
lobby = forms.CharField(
99+
label='Opening Hours',
100100
widget=forms.Textarea(
101101
attrs={
102102
'placeholder': 'None',
103103
'class': 'form-control',
104104
}
105105
),
106106
required=False,
107-
)"""
107+
)
108108
monday = forms.CharField(
109109
label=' Monday',
110-
widget=forms.Textarea(
110+
widget=forms.TextInput(
111111
attrs={
112112
'placeholder': 'None',
113113
'class': 'form-control',
@@ -117,7 +117,7 @@ class CreateAtmForm(forms.Form):
117117
)
118118
tuesday = forms.CharField(
119119
label='Tuesday',
120-
widget=forms.Textarea(
120+
widget=forms.TextInput(
121121
attrs={
122122
'placeholder': 'None',
123123
'class': 'form-control',
@@ -127,7 +127,7 @@ class CreateAtmForm(forms.Form):
127127
)
128128
wednesday = forms.CharField(
129129
label=' Wednesday',
130-
widget=forms.Textarea(
130+
widget=forms.TextInput(
131131
attrs={
132132
'placeholder': 'None',
133133
'class': 'form-control',
@@ -137,7 +137,7 @@ class CreateAtmForm(forms.Form):
137137
)
138138
thursday = forms.CharField(
139139
label=' Thursday',
140-
widget=forms.Textarea(
140+
widget=forms.TextInput(
141141
attrs={
142142
'placeholder': 'None',
143143
'class': 'form-control',
@@ -147,7 +147,7 @@ class CreateAtmForm(forms.Form):
147147
)
148148
friday = forms.CharField(
149149
label=' Friday',
150-
widget=forms.Textarea(
150+
widget=forms.TextInput(
151151
attrs={
152152
'placeholder': 'None',
153153
'class': 'form-control',
@@ -157,7 +157,7 @@ class CreateAtmForm(forms.Form):
157157
)
158158
saturday = forms.CharField(
159159
label=' Saturday',
160-
widget=forms.Textarea(
160+
widget=forms.TextInput(
161161
attrs={
162162
'placeholder': 'None',
163163
'class': 'form-control',
@@ -167,14 +167,23 @@ class CreateAtmForm(forms.Form):
167167
)
168168
sunday = forms.CharField(
169169
label=' Sunday',
170-
widget=forms.Textarea(
170+
widget=forms.TextInput(
171171
attrs={
172172
'placeholder': 'None',
173173
'class': 'form-control',
174174
}
175175
),
176176
required=False,
177177
)
178+
is_accessible = forms.ChoiceField(
179+
label='is accessible',
180+
widget=forms.Select(
181+
attrs={
182+
'class': 'form-control',
183+
}
184+
),
185+
required=False,
186+
)
178187
located_at = forms.CharField(
179188
label='ATM location',
180189
widget=forms.TextInput(
@@ -185,18 +194,45 @@ class CreateAtmForm(forms.Form):
185194
),
186195
required=False,
187196
)
188-
189-
is_accessible = forms.ChoiceField(
190-
label='is accessible',
191-
widget=forms.Select(
192-
attrs={
193-
'class': 'form-control',
194-
}
195-
),
196-
required=False,
197-
)
198-
199-
accessibleFeatures = forms.CharField(
197+
more_info = forms.CharField(
198+
label='More information',
199+
widget=forms.TextInput(
200+
attrs={
201+
'placeholder': 'short walk to the lake from here',
202+
'class': 'form-control',
203+
}
204+
),
205+
required=False,
206+
)
207+
has_deposit_capability = forms.ChoiceField(
208+
label='Deposit Capabilities',
209+
widget=forms.Select(
210+
attrs={
211+
'class': 'form-control',
212+
}
213+
),
214+
required=False,
215+
)
216+
supported_languages = forms.ChoiceField(
217+
label='Supported Languages',
218+
widget=forms.Select(
219+
attrs={
220+
'class': 'form-control',
221+
}
222+
),
223+
required=False,
224+
)
225+
services = forms.CharField(
226+
label='Services',
227+
widget=forms.TextInput(
228+
attrs={
229+
'placeholder': 'Service store',
230+
'class': 'form-control',
231+
}
232+
),
233+
required=False,
234+
)
235+
accessibility_features = forms.CharField(
200236
label='Accessible Features',
201237
widget=forms.TextInput(
202238
attrs={
@@ -206,29 +242,6 @@ class CreateAtmForm(forms.Form):
206242
),
207243
required=False,
208244
)
209-
210-
services = forms.CharField(
211-
label='Services',
212-
widget=forms.TextInput(
213-
attrs={
214-
'placeholder': 'Service store',
215-
'class': 'form-control',
216-
}
217-
),
218-
required=False,
219-
)
220-
221-
more_info = forms.CharField(
222-
label='More information',
223-
widget=forms.TextInput(
224-
attrs={
225-
'placeholder': 'short walk to the lake from here',
226-
'class': 'form-control',
227-
}
228-
),
229-
required=False,
230-
)
231-
232245
supported_currencies = forms.ChoiceField(
233246
label='Supported Currencies',
234247
widget=forms.Select(
@@ -238,7 +251,6 @@ class CreateAtmForm(forms.Form):
238251
),
239252
required=False,
240253
)
241-
242254
notes = forms.ChoiceField(
243255
label='Write Notes',
244256
widget=forms.Select(
@@ -248,7 +260,6 @@ class CreateAtmForm(forms.Form):
248260
),
249261
required=False,
250262
)
251-
252263
location_categories = forms.ChoiceField(
253264
label='Write location Category',
254265
widget=forms.Select(
@@ -258,7 +269,6 @@ class CreateAtmForm(forms.Form):
258269
),
259270
required=False,
260271
)
261-
262272
minimum_withdrawal = forms.CharField(
263273
label='Minimum Withdrawal',
264274
widget=forms.TextInput(
@@ -269,7 +279,26 @@ class CreateAtmForm(forms.Form):
269279
),
270280
required=False,
271281
)
272-
282+
branch_identification = forms.CharField(
283+
label='Branch Identification',
284+
widget=forms.TextInput(
285+
attrs={
286+
'placeholder': 'Enter your Branch Identification',
287+
'class': 'form-control',
288+
}
289+
),
290+
required=False,
291+
)
292+
site_identification = forms.CharField(
293+
label='Site Identification',
294+
widget=forms.TextInput(
295+
attrs={
296+
'placeholder': 'Enter your Site Identification',
297+
'class': 'form-control',
298+
}
299+
),
300+
required=False,
301+
)
273302
site_name = forms.CharField(
274303
label='Site Name',
275304
widget=forms.TextInput(
@@ -280,30 +309,7 @@ class CreateAtmForm(forms.Form):
280309
),
281310
required=False,
282311
)
283-
284-
branch_identification = forms.CharField(
285-
label='Branch Identification',
286-
widget=forms.TextInput(
287-
attrs={
288-
'placeholder': 'Enter your Branch Identification',
289-
'class': 'form-control',
290-
}
291-
),
292-
required=False,
293-
)
294-
295-
site_identification = forms.CharField(
296-
label='Site Identification',
297-
widget=forms.TextInput(
298-
attrs={
299-
'placeholder': 'Enter your Site Identification',
300-
'class': 'form-control',
301-
}
302-
),
303-
required=False,
304-
)
305-
306-
services = forms.CharField(
312+
"""services = forms.CharField(
307313
label='Services',
308314
widget=forms.TextInput(
309315
attrs={
@@ -312,28 +318,7 @@ class CreateAtmForm(forms.Form):
312318
}
313319
),
314320
required=False,
315-
)
316-
317-
supported_languages = forms.ChoiceField(
318-
label='supported_languages',
319-
widget=forms.Select(
320-
attrs={
321-
'class': 'form-control',
322-
}
323-
),
324-
required=False,
325-
)
326-
327-
has_deposit_capability = forms.ChoiceField(
328-
label='Deposit Capabilities',
329-
widget=forms.Select(
330-
attrs={
331-
'class': 'form-control',
332-
}
333-
),
334-
required=False,
335-
)
336-
321+
)"""
337322
cash_withdrawal_national_fee = forms.CharField(
338323
label='Cash Withdrawal National fee',
339324
widget=forms.TextInput(
@@ -344,7 +329,6 @@ class CreateAtmForm(forms.Form):
344329
),
345330
required=False,
346331
)
347-
348332
cash_withdrawal_international_fee = forms.CharField(
349333
label='Cash Withdrawal international fee',
350334
widget=forms.TextInput(
@@ -355,7 +339,6 @@ class CreateAtmForm(forms.Form):
355339
),
356340
required=False,
357341
)
358-
359342
balance_inquiry_fee = forms.CharField(
360343
label='Balance Inquiry Fee',
361344
widget=forms.TextInput(

‎apimanager/atms/templates/atms/index.html‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ <h1>ATMs</h1>
88
{{ form.non_field_errors }}
99
</div>
1010
{% endif %}
11-
1211
<div class="row">
1312
<div class="col-xs-12 col-sm-4">
1413
{% if form.atm_id.errors %}
@@ -32,7 +31,6 @@ <h1>ATMs</h1>
3231
</div>
3332
</div>
3433
</div>
35-
3634
<div class="row">
3735
<div class="col-xs-12 col-sm-4">
3836
{% if form.services.errors %}
@@ -58,7 +56,6 @@ <h1>ATMs</h1>
5856
</div>
5957
</div>
6058
</div>
61-
6259
<div class="row">
6360
<div class="col-xs-12 col-sm-4">
6461
{% if form.meta_license_name.errors %}
@@ -83,7 +80,6 @@ <h1>ATMs</h1>
8380
</div>
8481
</div>
8582
</div>
86-
8783
<div class="row">
8884
<div class="col-xs-12 col-sm-4">
8985
{% if form.is_accessible.errors %}
@@ -94,11 +90,11 @@ <h1>ATMs</h1>
9490
</div>
9591
</div>
9692
<div class="col-xs-12 col-sm-4">
97-
{% if form.accessibleFeatures.errors %}
98-
<div class="alert alert-danger">{{ form.accessibleFeatures.errors }}
93+
{% if form.accessibility_features.errors %}
94+
<div class="alert alert-danger">{{ form.accessibility_features.errors }}
9995
</div>{% endif %}
10096
<div class="form-group">
101-
{{ form.accessibleFeatures.label_tag }} {{ form.accessibleFeatures }}
97+
{{ form.accessibility_features.label_tag }} {{ form.accessibility_features }}
10298
</div>
10399
</div>
104100
<div class="col-xs-12 col-sm-4">
@@ -109,7 +105,6 @@ <h1>ATMs</h1>
109105
</div>
110106
</div>
111107
</div>
112-
113108
<div class="row">
114109
<div class="col-xs-12 col-sm-4">
115110
{% if form.notes.errors %}
@@ -270,7 +265,6 @@ <h1>ATMs</h1>
270265
</li>
271266
<li>ATM Type: {{atm.branch_type}}</li>
272267
<li>More Info: {{atm.more_info}}</li>
273-
<!-- <li>Phone Number: {{atm.phone_number}}</li>-->
274268
<li>Accessible Features: {{atm.accessibleFeatures}}</li>
275269
</ul>
276270
</div>

0 commit comments

Comments
 (0)