Skip to content

Comments

AC-5: Integrate all new awards forms and update existing awards and their schemas#1230

Merged
akshatnema merged 15 commits intoFusionIIIT:testfrom
gaur-abhi524:updateSchema
Apr 11, 2023
Merged

AC-5: Integrate all new awards forms and update existing awards and their schemas#1230
akshatnema merged 15 commits intoFusionIIIT:testfrom
gaur-abhi524:updateSchema

Conversation

@gaur-abhi524
Copy link

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 x in the boxes that apply

  • Bugfix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Other (please describe):

Checklist

Put an x in the boxes that apply

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have created new branch for this pull request
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • My changes does not break the current system and it passes all the current test cases.

@Abhishek-PratapSingh
Copy link

Approve @akshatnema

Copy link
Collaborator

@akshatnema akshatnema left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove these type of comments from the PR.

@akshatnema
Copy link
Collaborator

Review required from @PranshuNayak and @samay-rgb.

Copy link
Collaborator

@PranshuNayak PranshuNayak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gaur-abhi524 please remove indentation changes from models.py .

@PranshuNayak PranshuNayak requested a review from samay-rgb April 10, 2023 17:44
@gaur-abhi524
Copy link
Author

@PranshuNayak can you mention the parts that need to be changed

@PranshuNayak
Copy link
Collaborator

PranshuNayak commented Apr 10, 2023

@gaur-abhi524 just make sure that the models which have been changed or added are only highlighted so that we can easily review them.

Copy link
Collaborator

@PranshuNayak PranshuNayak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@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

Copy link
Collaborator

@PranshuNayak PranshuNayak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@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.

@gaur-abhi524 gaur-abhi524 requested a review from akshatnema April 11, 2023 07:49
Comment on lines 56 to 63
<!--<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>-->
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<!--<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>-->

Comment on lines 78 to 95
<!--<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 %}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<!--<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 %}

Comment on lines 111 to 115
<!-- <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>-->
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<!-- <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>-->

Comment on lines 232 to 242
<!-- <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> -->
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<!-- <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> -->

@akshatnema akshatnema merged commit 006532e into FusionIIIT:test Apr 11, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants