Merged
Conversation
tech-akash
changed the title
Collaborator
|
@tech-akash give the reference PR's where the changes visible in the migrations file of this PR are done. |
Author
|
Collaborator
|
@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. |
PranshuNayak
approved these changes
Apr 9, 2023
samay-rgb
approved these changes
Apr 9, 2023
akshatnema
requested changes
Apr 10, 2023
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) |
Collaborator
There was a problem hiding this comment.
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) |
Comment on lines
389
to
392
| # upload_time=datetime.datetime.now(), | ||
| # description=description, | ||
| # document_name=name, | ||
| # doc=doc |
Collaborator
There was a problem hiding this comment.
Suggested change
| # upload_time=datetime.datetime.now(), | |
| # description=description, | |
| # document_name=name, | |
| # doc=doc |
Remove this comment
akshatnema
requested changes
Apr 10, 2023
akshatnema
approved these changes
Apr 10, 2023
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Issue that this pull request solves
Closes: # (issue number)
Proposed changes
Brief description of what is fixed or changed
Types of changes
Put an
xin the boxes that applyChecklist
Put an
xin the boxes that applyScreenshots
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