Skip to content

Conversation

tech-akash
Copy link

Issue that this pull request solves

Closes: # (issue number)

Proposed changes

Brief description of what is fixed or changed

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.

Screenshots

Please attach the screenshots of the changes made in case of change in user interface

Other information

Any other information that is important to this pull request

@tech-akash tech-akash changed the base branch from main to test April 6, 2023 11:15
@tech-akash tech-akash changed the title ac-3: Prof can submit Marks to assignment and made site responsive ac-3: changed Migrations Apr 6, 2023
@PranshuNayak
Copy link
Collaborator

@tech-akash give the reference PR's where the changes visible in the migrations file of this PR are done.

@tech-akash
Copy link
Author

@tech-akash give the reference PR's where the changes visible in the migrations file of this PR are done.

#1075 #1156

@PranshuNayak
Copy link
Collaborator

PranshuNayak commented Apr 8, 2023

@tech-akash the migrations files are ok. The PR containing the corresponding code changes in models.py i.e. #1156 needs to be merged first, but that PR should not contain any migration file, it should only contain the code changes. After that PR is merged without migrations file this PR can be merged. So do the necessary changes in that #1156 first.

Comment on lines 189 to 203
# #details of the solution uploaded by the student
# class StudentAssignment(models.Model):
# student_id = models.ForeignKey(Student, on_delete=models.CASCADE)
# assignment_id = models.ForeignKey(Assignment, on_delete=models.CASCADE)
# upload_time = models.DateTimeField(auto_now=True)
# upload_url = models.TextField(max_length=200)
# score = models.IntegerField(null=True) #score is submitted by faculty
# feedback = models.CharField(max_length=100, null=True) #feedback by the faculty for the solution of the assignment submitted
# assign_name = models.CharField(max_length=100)

# def __str__(self):
# return '{} - {} - {} - {} - {}'.format(
# self.pk, self.student_id,
# self.assignment_id, self.score,
# self.feedback)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Remove this comment from the PR

# self.feedback)
def assignment_submit_name(instance, filename):
name, ext = filename.split('.')
# obj=Curriculum.objects.get(course_id=instance.course_id)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Same here

Comment on lines 389 to 392
# upload_time=datetime.datetime.now(),
# description=description,
# document_name=name,
# doc=doc
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
# upload_time=datetime.datetime.now(),
# description=description,
# document_name=name,
# doc=doc

Remove this comment

@akshatnema akshatnema merged commit fa2d9bb into FusionIIIT:test Apr 10, 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.

4 participants