mageshsugu
commented
7 years ago Ok madam I will check and merge tomorrow On Feb 27, 2017 4:40 PM, "jenefabrando" notifications@github.com wrote:
Aadhaar Report for state & district logins and DEE Progress Report for district login.Also made changes in CBSE group code reflecting in student profile and pdf download.Redirection of child updation to respective student profile.
You can view, comment on, or merge this pull request online at:
https://github.com/tnemis/live-server/pull/34 Commit Summary
- CBSE Group Code
- CBSE School Constraints
- PDF download for individual as well as classwise list
- CD
- CBSE group code
- Aadhaar Report
- RESOLVED CONFLICTS- AADHAAR REPORT
File Changes
- M baseapp/models.py https://github.com/tnemis/live-server/pull/34/files#diff-0 (10)
- A emis/site_media/media/3301090200200054.svg https://github.com/tnemis/live-server/pull/34/files#diff-1 (105)
- D emis/site_media/media/images/child_pics/Madhanur/ 33041703707/3304170370700898_IXF8aVOmccZrNfHwS3IskNSEQ3oFVvF2.jpg https://github.com/tnemis/live-server/pull/34/files#diff-2 (0)
- D emis/site_media/media/images/child_pics/Madhanur/ 33041703707/3304170370700898_ljFQ8XiFj2D0y5FVEIZOpba1ytyvIdIC.jpg https://github.com/tnemis/live-server/pull/34/files#diff-3 (0)
- D emis/site_media/media/images/child_pics/Madhanur/ 33041703707/3304170370700899_hr6d8wePR9Pm4knL20JD2thoTHDq1kdD.jpg https://github.com/tnemis/live-server/pull/34/files#diff-4 (0)
- D emis/site_media/media/images/child_pics/Madhanur/ 33041703707/3304170370700899_zyhXYPsaEt8LLtLOh69wyhpHWnKXfgU9.jpg https://github.com/tnemis/live-server/pull/34/files#diff-5 (0)
- D emis/site_media/media/images/child_pics/Madhanur/ 33041703707/3304170370700900_UPc5D12EbcAsKAx2PWQtVVEtsSwX4Ktn.jpg https://github.com/tnemis/live-server/pull/34/files#diff-6 (0)
- D emis/site_media/media/images/child_pics/Madhanur/ 33041703707/3304170370700900_vYDR7ntusciyoyArhcqnJx4NKZLpgWI9.jpg https://github.com/tnemis/live-server/pull/34/files#diff-7 (0)
- A emis/site_media/static/img/Student_application_form.pdf https://github.com/tnemis/live-server/pull/34/files#diff-8 (0)
- A emis/static/img/Student_application_form.pdf https://github.com/tnemis/live-server/pull/34/files#diff-9 (0)
- M emis/templates/base.html https://github.com/tnemis/live-server/pull/34/files#diff-10 (35)
- M manage.py https://github.com/tnemis/live-server/pull/34/files#diff-11 (0)
- M progress/init.py https://github.com/tnemis/live-server/pull/34/files#diff-12 (0)
- M progress/admin.py https://github.com/tnemis/live-server/pull/34/files#diff-13 (0)
- M progress/models.py https://github.com/tnemis/live-server/pull/34/files#diff-14 (42)
- M progress/reports.py https://github.com/tnemis/live-server/pull/34/files#diff-15 (11)
- A progress/templates/block/b_l_cbse_aadhar.html https://github.com/tnemis/live-server/pull/34/files#diff-16 (25)
- A progress/templates/block/b_l_dse_govt_a_aadhar.html https://github.com/tnemis/live-server/pull/34/files#diff-17 (25)
- A progress/templates/block/b_l_dse_govt_aadhar.html https://github.com/tnemis/live-server/pull/34/files#diff-18 (25)
- A progress/templates/block/b_l_dse_govt_ua_aadhar.html https://github.com/tnemis/live-server/pull/34/files#diff-19 (25)
- M progress/templates/block/base.html https://github.com/tnemis/live-server/pull/34/files#diff-20 (0)
- A progress/templates/block/block_matric_aadhaar_report.html https://github.com/tnemis/live-server/pull/34/files#diff-21 (25)
- M progress/templates/block/block_progress_report.html https://github.com/tnemis/live-server/pull/34/files#diff-22 (0)
- A progress/templates/block/dee_govt_block_aadhaar_report.html https://github.com/tnemis/live-server/pull/34/files#diff-23 (25)
- A progress/templates/block/dee_pvt_aided_block_aadhaar_report.html https://github.com/tnemis/live-server/pull/34/files#diff-24 (25)
- A progress/templates/block/dee_pvt_unaided_blockaadhaar report.html https://github.com/tnemis/live-server/pull/34/files#diff-25 (25)
- M progress/templates/district/base.html https://github.com/tnemis/live-server/pull/34/files#diff-26 (0)
- A progress/templates/district/d_l_cbse_aadhaar.html https://github.com/tnemis/live-server/pull/34/files#diff-27 (16)
- A progress/templates/district/d_l_dse_govt_a_aadhaar.html https://github.com/tnemis/live-server/pull/34/files#diff-28 (16)
- A progress/templates/district/d_l_dse_govt_aadhaar.html https://github.com/tnemis/live-server/pull/34/files#diff-29 (16)
- A progress/templates/district/d_l_dse_govt_ua_aadhaar.html https://github.com/tnemis/live-server/pull/34/files#diff-30 (16)
- A progress/templates/district/dee_govt_dist_aadhaar_report.html https://github.com/tnemis/live-server/pull/34/files#diff-31 (16)
- A progress/templates/district/dee_pvt_aided_distaadhaar report.html https://github.com/tnemis/live-server/pull/34/files#diff-32 (16)
- A progress/templates/district/dee_pvt_unaided_distaadhaar report.html https://github.com/tnemis/live-server/pull/34/files#diff-33 (16)
- M progress/templates/district/district_dse_progress_report.html https://github.com/tnemis/live-server/pull/34/files#diff-34 (15)
- A progress/templates/district/district_matric_aadhaar_report.html https://github.com/tnemis/live-server/pull/34/files#diff-35 (16)
- M progress/templates/district/district_matric_progress_report.html https://github.com/tnemis/live-server/pull/34/files#diff-36 (0)
- M progress/templates/district/district_progress_report.html https://github.com/tnemis/live-server/pull/34/files#diff-37 (0)
- A progress/templates/school/dee_govt_schl_aadhaar_report.html https://github.com/tnemis/live-server/pull/34/files#diff-38 (57)
- A progress/templates/school/dee_pvt_aided_schl_aadhaar_report.html https://github.com/tnemis/live-server/pull/34/files#diff-39 (57)
- A progress/templates/school/dee_pvt_unaided_schlaadhaar report.html https://github.com/tnemis/live-server/pull/34/files#diff-40 (57)
- A progress/templates/school/s_l_cbse_aadhaar.html https://github.com/tnemis/live-server/pull/34/files#diff-41 (56)
- A progress/templates/school/s_l_dse_a_aadhaar.html https://github.com/tnemis/live-server/pull/34/files#diff-42 (56)
- A progress/templates/school/s_l_dse_govt_aadhaar.html https://github.com/tnemis/live-server/pull/34/files#diff-43 (57)
- A progress/templates/school/s_l_dse_ua_aadhaar.html https://github.com/tnemis/live-server/pull/34/files#diff-44 (56)
- A progress/templates/school/school_aadhar_report.html https://github.com/tnemis/live-server/pull/34/files#diff-45 (56)
- M progress/templates/school/school_udise_report.html https://github.com/tnemis/live-server/pull/34/files#diff-46 (0)
- A progress/templates/state/aadhaar_cbse_state.html https://github.com/tnemis/live-server/pull/34/files#diff-47 (28)
- A progress/templates/state/aadhaar_dee_govt.html https://github.com/tnemis/live-server/pull/34/files#diff-48 (28)
- A progress/templates/state/aadhaar_dee_pvt_aided.html https://github.com/tnemis/live-server/pull/34/files#diff-49 (26)
- A progress/templates/state/aadhaar_dee_pvt_unaided.html https://github.com/tnemis/live-server/pull/34/files#diff-50 (26)
- A progress/templates/state/aadhaar_dse_g_state.html https://github.com/tnemis/live-server/pull/34/files#diff-51 (28)
- A progress/templates/state/aadhaar_dse_p_a_state.html https://github.com/tnemis/live-server/pull/34/files#diff-52 (28)
- A progress/templates/state/aadhaar_dse_p_ua_state.html https://github.com/tnemis/live-server/pull/34/files#diff-53 (28)
- A progress/templates/state/aadhaar_matric.html https://github.com/tnemis/live-server/pull/34/files#diff-54 (28)
- A progress/templates/state/aadhaar_report.html https://github.com/tnemis/live-server/pull/34/files#diff-55 (39)
- A progress/templates/state/s_l_aadhaar_dee_report.html https://github.com/tnemis/live-server/pull/34/files#diff-56 (21)
- M progress/templates/state/state_dse_progress_report.html https://github.com/tnemis/live-server/pull/34/files#diff-57 (0)
- M progress/templates/state/state_matric_progress_report.html https://github.com/tnemis/live-server/pull/34/files#diff-58 (0)
- M progress/templates/state/state_progress_report.html https://github.com/tnemis/live-server/pull/34/files#diff-59 (0)
- M progress/templates/state/state_progress_report_dee.html https://github.com/tnemis/live-server/pull/34/files#diff-60 (0)
- M progress/tests.py https://github.com/tnemis/live-server/pull/34/files#diff-61 (0)
- M progress/urls.py https://github.com/tnemis/live-server/pull/34/files#diff-62 (144)
- M progress/views.py https://github.com/tnemis/live-server/pull/34/files#diff-63 (806)
- M students/base_views.py https://github.com/tnemis/live-server/pull/34/files#diff-64 (2)
- M students/models.py https://github.com/tnemis/live-server/pull/34/files#diff-65 (7)
- M students/templates/students/child_detail/base.html https://github.com/tnemis/live-server/pull/34/files#diff-66 (9)
- M students/templates/students/child_detail/childdetail classwise_list.html https://github.com/tnemis/live-server/pull/34/files#diff-67 (22)
- M students/templates/students/child_detail/child_detail_form.html https://github.com/tnemis/live-server/pull/34/files#diff-68 (215)
- M students/templates/students/child_detail/childdetail pool_detail.html https://github.com/tnemis/live-server/pull/34/files#diff-69 (116)
- M students/templates/students/child_detail/childdetail transfer.html https://github.com/tnemis/live-server/pull/34/files#diff-70 (24)
- A students/templates/students/child_detail/classwise_pdf.html https://github.com/tnemis/live-server/pull/34/files#diff-71 (67)
- M students/templates/students/child_detail/object_table_detail.html https://github.com/tnemis/live-server/pull/34/files#diff-72 (50)
- M students/templates/students/child_detail/object_table_list.html https://github.com/tnemis/live-server/pull/34/files#diff-73 (133)
- A students/templates/students/child_detail/print_child.html https://github.com/tnemis/live-server/pull/34/files#diff-74 (176)
- M students/urls.py https://github.com/tnemis/live-server/pull/34/files#diff-75 (29)
- M students/views/child_detail_views.py https://github.com/tnemis/live-server/pull/34/files#diff-76 (275)
Patch Links:
- https://github.com/tnemis/live-server/pull/34.patch
- https://github.com/tnemis/live-server/pull/34.diff
— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub https://github.com/tnemis/live-server/pull/34, or mute the thread https://github.com/notifications/unsubscribe-auth/AHpyFa7EDfpRDVPKxWNU2WGdtESykeHhks5rgq8vgaJpZM4MM-iA .
emisteam
Aadhaar Report for state & district logins and DEE Progress Report for district login.Also made changes in CBSE group code reflecting in student profile and pdf download.Redirection of child updation to respective student profile.