Commit fdfd4efb976634eddb75037d4cce0413d845bc28
1 parent
7ca753f37e
Exists in
master
made student modal bigger
Showing
2 changed files
with
71 additions
and
81 deletions
Show diff stats
imports/client/views/org/admin/students/add/StudentForm.js
... | ... | @@ -37,7 +37,7 @@ const StudentForm = props => ( |
37 | 37 | <fieldset title="1"> |
38 | 38 | <legend className="text-semibold">Personal data</legend> |
39 | 39 | <Row> |
40 | - <Col xs={12} sm={6}> | |
40 | + <Col xs={12} sm={4}> | |
41 | 41 | <FormGroup controlId="admissionId"> |
42 | 42 | <Label required>Admission Id</Label> |
43 | 43 | <FormControl |
... | ... | @@ -51,7 +51,7 @@ const StudentForm = props => ( |
51 | 51 | )} |
52 | 52 | </FormGroup> |
53 | 53 | </Col> |
54 | - <Col xs={12} sm={6}> | |
54 | + <Col xs={12} sm={4}> | |
55 | 55 | <FormGroup controlId="firstName"> |
56 | 56 | <Label required>First Name</Label> |
57 | 57 | <FormControl |
... | ... | @@ -65,41 +65,39 @@ const StudentForm = props => ( |
65 | 65 | )} |
66 | 66 | </FormGroup> |
67 | 67 | </Col> |
68 | + <Col xs={12} sm={4}> | |
69 | + <FormGroup controlId="lastName"> | |
70 | + <Label required>Last Name</Label> | |
71 | + <FormControl | |
72 | + type="text" | |
73 | + value={props.getValue('lastName')} | |
74 | + placeholder="Last Name" | |
75 | + onChange={e => props.setValue('lastName', e.target.value)} | |
76 | + /> | |
77 | + {props.isSubmitted() && props.errors && props.errors.lastName && ( | |
78 | + <ErrorLabel> {props.errors.lastName} </ErrorLabel> | |
79 | + )} | |
80 | + </FormGroup> | |
81 | + </Col> | |
68 | 82 | </Row> |
69 | 83 | <Row> |
70 | - <Col xs={12} sm={6}> | |
71 | - <FormGroup controlId="lastName"> | |
72 | - <Label required>Last Name</Label> | |
73 | - <FormControl | |
74 | - type="text" | |
75 | - value={props.getValue('lastName')} | |
76 | - placeholder="Last Name" | |
77 | - onChange={e => props.setValue('lastName', e.target.value)} | |
78 | - /> | |
79 | - {props.isSubmitted() && props.errors && props.errors.lastName && ( | |
80 | - <ErrorLabel> {props.errors.lastName} </ErrorLabel> | |
81 | - )} | |
82 | - </FormGroup> | |
83 | - </Col> | |
84 | - <Col xs={12} sm={6}> | |
85 | - <FormGroup controlId="formControlsSelect"> | |
86 | - <Label>Gender</Label> | |
87 | - <FormControl componentClass="select" | |
88 | - placeholder="select" | |
89 | - value={props.getValue('gender')} | |
90 | - onChange={e => props.setValue('gender', e.target.value)} | |
91 | - > | |
92 | - <option value="male">Male</option> | |
93 | - <option value="female">Female</option> | |
94 | - </FormControl> | |
95 | - {props.isSubmitted() && props.errors && props.errors.gender && ( | |
96 | - <ErrorLabel> {props.errors.gender} </ErrorLabel> | |
97 | - )} | |
98 | - </FormGroup> | |
99 | - </Col> | |
100 | - </Row> | |
101 | - <Row> | |
102 | - <Col xs={12} sm={6}> | |
84 | + <Col xs={12} sm={4}> | |
85 | + <FormGroup controlId="formControlsSelect"> | |
86 | + <Label>Gender</Label> | |
87 | + <FormControl componentClass="select" | |
88 | + placeholder="select" | |
89 | + value={props.getValue('gender')} | |
90 | + onChange={e => props.setValue('gender', e.target.value)} | |
91 | + > | |
92 | + <option value="male">Male</option> | |
93 | + <option value="female">Female</option> | |
94 | + </FormControl> | |
95 | + {props.isSubmitted() && props.errors && props.errors.gender && ( | |
96 | + <ErrorLabel> {props.errors.gender} </ErrorLabel> | |
97 | + )} | |
98 | + </FormGroup> | |
99 | + </Col> | |
100 | + <Col xs={12} sm={4}> | |
103 | 101 | <FormGroup controlId="email"> |
104 | 102 | <Label required>Email</Label> |
105 | 103 | <FormControl |
... | ... | @@ -113,7 +111,7 @@ const StudentForm = props => ( |
113 | 111 | )} |
114 | 112 | </FormGroup> |
115 | 113 | </Col> |
116 | - <Col xs={12} sm={6}> | |
114 | + <Col xs={12} sm={4}> | |
117 | 115 | <FormGroup> |
118 | 116 | <Label required>Date of birth</Label> |
119 | 117 | <DatePicker |
... | ... | @@ -130,16 +128,13 @@ const StudentForm = props => ( |
130 | 128 | </FormGroup> |
131 | 129 | </Col> |
132 | 130 | </Row> |
133 | - <Row> | |
134 | - | |
135 | - </Row> | |
136 | 131 | </fieldset> |
137 | 132 | )} |
138 | 133 | {props.currentStep === 1 && ( |
139 | 134 | <fieldset title="Academic"> |
140 | 135 | <legend className="text-semibold">Academic</legend> |
141 | 136 | <Row> |
142 | - <Col xs={12} sm={6}> | |
137 | + <Col xs={12} sm={4}> | |
143 | 138 | <FormGroup controlId="rollNo"> |
144 | 139 | <Label required>Roll No</Label> |
145 | 140 | <FormControl |
... | ... | @@ -153,7 +148,7 @@ const StudentForm = props => ( |
153 | 148 | )} |
154 | 149 | </FormGroup> |
155 | 150 | </Col> |
156 | - <Col xs={12} sm={6}> | |
151 | + <Col xs={12} sm={4}> | |
157 | 152 | <FormGroup controlId="class"> |
158 | 153 | <Label required>Class</Label> |
159 | 154 | <FormControl |
... | ... | @@ -167,9 +162,7 @@ const StudentForm = props => ( |
167 | 162 | )} |
168 | 163 | </FormGroup> |
169 | 164 | </Col> |
170 | - </Row> | |
171 | - <Row> | |
172 | - <Col xs={12} sm={6}> | |
165 | + <Col xs={12} sm={4}> | |
173 | 166 | <FormGroup controlId="section"> |
174 | 167 | <Label required>Section</Label> |
175 | 168 | <FormControl |
... | ... | @@ -183,7 +176,9 @@ const StudentForm = props => ( |
183 | 176 | )} |
184 | 177 | </FormGroup> |
185 | 178 | </Col> |
186 | - <Col xs={12} sm={6}> | |
179 | + </Row> | |
180 | + <Row> | |
181 | + <Col xs={12} sm={4}> | |
187 | 182 | <FormGroup controlId="community"> |
188 | 183 | <Label required>Community</Label> |
189 | 184 | <FormControl |
... | ... | @@ -197,9 +192,7 @@ const StudentForm = props => ( |
197 | 192 | )} |
198 | 193 | </FormGroup> |
199 | 194 | </Col> |
200 | - </Row> | |
201 | - <Row> | |
202 | - <Col xs={12} sm={6}> | |
195 | + <Col xs={12} sm={4}> | |
203 | 196 | <FormGroup controlId="bloodGroup"> |
204 | 197 | <Label required>bloodGroup</Label> |
205 | 198 | <FormControl |
... | ... | @@ -213,7 +206,7 @@ const StudentForm = props => ( |
213 | 206 | )} |
214 | 207 | </FormGroup> |
215 | 208 | </Col> |
216 | - <Col xs={12} sm={6}> | |
209 | + <Col xs={12} sm={4}> | |
217 | 210 | <FormGroup controlId="phone"> |
218 | 211 | <Label required>Phone</Label> |
219 | 212 | <FormControl |
... | ... | @@ -234,7 +227,7 @@ const StudentForm = props => ( |
234 | 227 | <fieldset title="Address"> |
235 | 228 | <legend className="text-semibold">Address</legend> |
236 | 229 | <Row> |
237 | - <Col xs={12} sm={6}> | |
230 | + <Col xs={12} sm={4}> | |
238 | 231 | <FormGroup controlId="address"> |
239 | 232 | <Label required>Address</Label> |
240 | 233 | <FormControl |
... | ... | @@ -248,7 +241,7 @@ const StudentForm = props => ( |
248 | 241 | )} |
249 | 242 | </FormGroup> |
250 | 243 | </Col> |
251 | - <Col xs={12} sm={6}> | |
244 | + <Col xs={12} sm={4}> | |
252 | 245 | <FormGroup controlId="city"> |
253 | 246 | <Label required>City</Label> |
254 | 247 | <FormControl |
... | ... | @@ -262,9 +255,7 @@ const StudentForm = props => ( |
262 | 255 | )} |
263 | 256 | </FormGroup> |
264 | 257 | </Col> |
265 | - </Row> | |
266 | - <Row> | |
267 | - <Col xs={12} sm={6}> | |
258 | + <Col xs={12} sm={4}> | |
268 | 259 | <FormGroup controlId="state"> |
269 | 260 | <Label required>State</Label> |
270 | 261 | <FormControl |
... | ... | @@ -285,7 +276,7 @@ const StudentForm = props => ( |
285 | 276 | <fieldset title="2"> |
286 | 277 | <legend className="text-semibold">Parent information</legend> |
287 | 278 | <Row> |
288 | - <Col xs={12} sm={6}> | |
279 | + <Col xs={12} sm={4}> | |
289 | 280 | <FormGroup controlId="parentName"> |
290 | 281 | <Label required>Parent Name</Label> |
291 | 282 | <FormControl |
... | ... | @@ -299,7 +290,7 @@ const StudentForm = props => ( |
299 | 290 | )} |
300 | 291 | </FormGroup> |
301 | 292 | </Col> |
302 | - <Col xs={12} sm={6}> | |
293 | + <Col xs={12} sm={4}> | |
303 | 294 | <FormGroup controlId="parentEmail"> |
304 | 295 | <Label required>Parent Email</Label> |
305 | 296 | <FormControl |
... | ... | @@ -313,9 +304,7 @@ const StudentForm = props => ( |
313 | 304 | )} |
314 | 305 | </FormGroup> |
315 | 306 | </Col> |
316 | - </Row> | |
317 | - <Row> | |
318 | - <Col xs={12} sm={6}> | |
307 | + <Col xs={12} sm={4}> | |
319 | 308 | <FormGroup controlId="relation"> |
320 | 309 | <Label required>Relation</Label> |
321 | 310 | <FormControl |
... | ... | @@ -329,7 +318,9 @@ const StudentForm = props => ( |
329 | 318 | )} |
330 | 319 | </FormGroup> |
331 | 320 | </Col> |
332 | - <Col xs={12} sm={6}> | |
321 | + </Row> | |
322 | + <Row> | |
323 | + <Col xs={12} sm={4}> | |
333 | 324 | <FormGroup controlId="profession"> |
334 | 325 | <Label required>Profession</Label> |
335 | 326 | <FormControl |
... | ... | @@ -343,9 +334,7 @@ const StudentForm = props => ( |
343 | 334 | )} |
344 | 335 | </FormGroup> |
345 | 336 | </Col> |
346 | - </Row> | |
347 | - <Row> | |
348 | - <Col xs={12} sm={6}> | |
337 | + <Col xs={12} sm={4}> | |
349 | 338 | <FormGroup controlId="parentGender"> |
350 | 339 | <Label>Parent Gender</Label> |
351 | 340 | <FormControl componentClass="select" |
... | ... | @@ -361,7 +350,7 @@ const StudentForm = props => ( |
361 | 350 | )} |
362 | 351 | </FormGroup> |
363 | 352 | </Col> |
364 | - <Col xs={12} sm={6}> | |
353 | + <Col xs={12} sm={4}> | |
365 | 354 | <FormGroup controlId="parentPhone"> |
366 | 355 | <Label required>Parent Phone</Label> |
367 | 356 | <FormControl |
... | ... | @@ -377,7 +366,7 @@ const StudentForm = props => ( |
377 | 366 | </Col> |
378 | 367 | </Row> |
379 | 368 | <Row> |
380 | - <Col xs={12} sm={6}> | |
369 | + <Col xs={12} sm={4}> | |
381 | 370 | <FormGroup controlId="parentAddress"> |
382 | 371 | <Label required>Parent Address</Label> |
383 | 372 | <FormControl |
... | ... | @@ -391,7 +380,7 @@ const StudentForm = props => ( |
391 | 380 | )} |
392 | 381 | </FormGroup> |
393 | 382 | </Col> |
394 | - <Col xs={12} sm={6}> | |
383 | + <Col xs={12} sm={4}> | |
395 | 384 | <FormGroup controlId="parentCity"> |
396 | 385 | <Label required>Parent City</Label> |
397 | 386 | <FormControl |
... | ... | @@ -405,23 +394,23 @@ const StudentForm = props => ( |
405 | 394 | )} |
406 | 395 | </FormGroup> |
407 | 396 | </Col> |
397 | + <Col xs={12} sm={4}> | |
398 | + <FormGroup controlId="parentState"> | |
399 | + <Label required>Parent State</Label> | |
400 | + <FormControl | |
401 | + type="text" | |
402 | + value={props.getValue('parentState')} | |
403 | + placeholder="600031" | |
404 | + onChange={e => props.setValue('parentState', e.target.value)} | |
405 | + /> | |
406 | + {props.isSubmitted() && props.errors && props.errors.parentState && ( | |
407 | + <ErrorLabel> {props.errors.parentState} </ErrorLabel> | |
408 | + )} | |
409 | + </FormGroup> | |
410 | + </Col> | |
408 | 411 | </Row> |
409 | 412 | <Row> |
410 | - <Col xs={12} sm={6}> | |
411 | - <FormGroup controlId="parentState"> | |
412 | - <Label required>Parent State</Label> | |
413 | - <FormControl | |
414 | - type="text" | |
415 | - value={props.getValue('parentState')} | |
416 | - placeholder="600031" | |
417 | - onChange={e => props.setValue('parentState', e.target.value)} | |
418 | - /> | |
419 | - {props.isSubmitted() && props.errors && props.errors.parentState && ( | |
420 | - <ErrorLabel> {props.errors.parentState} </ErrorLabel> | |
421 | - )} | |
422 | - </FormGroup> | |
423 | - </Col> | |
424 | - <Col xs={12} sm={6}> | |
413 | + <Col xs={12} sm={4}> | |
425 | 414 | <FormGroup controlId="parentZipcode"> |
426 | 415 | <Label required>Parent Zipcode</Label> |
427 | 416 | <FormControl | ... | ... |
imports/client/views/org/admin/students/add/addStudent.js
... | ... | @@ -43,6 +43,7 @@ export class AddStudent extends Component { |
43 | 43 | show={this.state.show} |
44 | 44 | onHide={this.hideModal} |
45 | 45 | dialogClassName="custom-modal" |
46 | + bsSize="large" | |
46 | 47 | > |
47 | 48 | <Modal.Header closeButton> |
48 | 49 | <Modal.Title id="contained-modal-title-lg">Add Student</Modal.Title> | ... | ... |