AC-5: Integrate all new awards forms and update existing awards and their schemas#1230
AC-5: Integrate all new awards forms and update existing awards and their schemas#1230akshatnema merged 15 commits intoFusionIIIT:testfrom
Conversation
|
Approve @akshatnema |
akshatnema
left a comment
There was a problem hiding this comment.
Remove these type of comments from the PR.
FusionIIIT/templates/scholarshipsModule/forms/dandm_gold_medal.html
Outdated
Show resolved
Hide resolved
FusionIIIT/templates/scholarshipsModule/scholarships_student.html
Outdated
Show resolved
Hide resolved
FusionIIIT/templates/scholarshipsModule/scholarships_student.html
Outdated
Show resolved
Hide resolved
|
Review required from @PranshuNayak and @samay-rgb. |
PranshuNayak
left a comment
There was a problem hiding this comment.
@gaur-abhi524 please remove indentation changes from models.py .
|
@PranshuNayak can you mention the parts that need to be changed |
|
@gaur-abhi524 just make sure that the models which have been changed or added are only highlighted so that we can easily review them. |
There was a problem hiding this comment.
@gaur-abhi524 there are duplicate migrations in 0002 and 0003. Please push a single migration file for your changes , and don't modify the initial 0001
There was a problem hiding this comment.
@gaur-abhi524 I have found migrations against 4 models.
newly created tables - DM_Proficiency_gold, IIITDM_Proficiency
modified tables - Director Gold, Director Silver
Since the file size is too large it's not possible to validate the migrations against each field, please cross-check at your end and verify.
Also only merging this PR will not create the database tables on 214 it needs to be deployed, so wait for some time if the table is not visible on 214.
FusionIIIT/templates/scholarshipsModule/scholarships_student.html
Outdated
Show resolved
Hide resolved
| <!--<a class="item" data-tab="four"> | ||
| View Application Status | ||
| <i class="right floated chevron right icon"></i> | ||
| </a> | ||
| <a class="item" data-tab="five"> | ||
| Browse Award Catalogue | ||
| <i class="right floated chevron right icon"></i> | ||
| </a>--> |
There was a problem hiding this comment.
| <!--<a class="item" data-tab="four"> | |
| View Application Status | |
| <i class="right floated chevron right icon"></i> | |
| </a> | |
| <a class="item" data-tab="five"> | |
| Browse Award Catalogue | |
| <i class="right floated chevron right icon"></i> | |
| </a>--> |
| <!--<div class="ui tab segment" data-tab="first"> | ||
| {% block winners %} | ||
| {% include 'scholarshipsModule/winners.html' with winners=winners %} | ||
| {% endblock %} | ||
| </div> | ||
| {% comment %}The Personal Details end here!{% endcomment %} | ||
|
|
||
| {% comment %}The Publications starts here!{% endcomment %} | ||
|
|
||
| {% comment %}The Publications notionalprize ends here!{% endcomment %} | ||
|
|
||
| {% comment %}The Publications about spacs starts here!{% endcomment %} | ||
| <div class="ui tab segment" data-tab="two"> | ||
| {% block aboutspacs %} | ||
| {% include 'scholarshipsModule/aboutspacs.html' with hd=hd hd1=hd1 %} | ||
| {% endblock %} | ||
| </div> | ||
| {% comment %}The Publications about spacs ends here!{% endcomment %} |
There was a problem hiding this comment.
| <!--<div class="ui tab segment" data-tab="first"> | |
| {% block winners %} | |
| {% include 'scholarshipsModule/winners.html' with winners=winners %} | |
| {% endblock %} | |
| </div> | |
| {% comment %}The Personal Details end here!{% endcomment %} | |
| {% comment %}The Publications starts here!{% endcomment %} | |
| {% comment %}The Publications notionalprize ends here!{% endcomment %} | |
| {% comment %}The Publications about spacs starts here!{% endcomment %} | |
| <div class="ui tab segment" data-tab="two"> | |
| {% block aboutspacs %} | |
| {% include 'scholarshipsModule/aboutspacs.html' with hd=hd hd1=hd1 %} | |
| {% endblock %} | |
| </div> | |
| {% comment %}The Publications about spacs ends here!{% endcomment %} |
| <!-- <div class="ui tab segment" data-tab="four"> | ||
| {% block viewmcm %} | ||
| {% include 'scholarshipsModule/viewstatus.html' with winners=winners mcm=mcm gold=gold silver=silver dandm=dandm %} | ||
| {% endblock %} | ||
| </div>--> |
There was a problem hiding this comment.
| <!-- <div class="ui tab segment" data-tab="four"> | |
| {% block viewmcm %} | |
| {% include 'scholarshipsModule/viewstatus.html' with winners=winners mcm=mcm gold=gold silver=silver dandm=dandm %} | |
| {% endblock %} | |
| </div>--> |
| <!-- <div class="field"> --> | ||
| <!-- <label>Brief Description:</label> --> | ||
| <!-- <p>This includes the following. <br/> --> | ||
| <!-- (a) Give the details of the list of papers you have studied for doing the project.<br/> --> | ||
| <!-- (b) Whether any publication, conference proceeding, conference paper presentation etc? If --> | ||
| <!-- yes, give proper details<br/> --> | ||
| <!-- (c) If some experimental setup, show the estimated cost:<br/> --> | ||
| <!-- (d) If some theoretical model development, discuss in brief:<br/> --> | ||
| <!-- (e) If some simulation results, what software/s did you use? <br/><br/> --> | ||
| <!-- </p> --> | ||
| <!-- </div> --> |
There was a problem hiding this comment.
| <!-- <div class="field"> --> | |
| <!-- <label>Brief Description:</label> --> | |
| <!-- <p>This includes the following. <br/> --> | |
| <!-- (a) Give the details of the list of papers you have studied for doing the project.<br/> --> | |
| <!-- (b) Whether any publication, conference proceeding, conference paper presentation etc? If --> | |
| <!-- yes, give proper details<br/> --> | |
| <!-- (c) If some experimental setup, show the estimated cost:<br/> --> | |
| <!-- (d) If some theoretical model development, discuss in brief:<br/> --> | |
| <!-- (e) If some simulation results, what software/s did you use? <br/><br/> --> | |
| <!-- </p> --> | |
| <!-- </div> --> |
Proposed changes
All the previous forms for applying for convocation medals were changed and new models were made for every award with new and updated schema
Types of changes
Put an
xin the boxes that applyChecklist
Put an
xin the boxes that apply