sa-4 : 4 : all-changes-till-now #1070

Smeetiiitdmj · 2023-02-09T14:06:59Z

Issue that this pull request solves

Closes: #1013

Proposed changes

Solved issues as well as completed the tasks assigned.

Types of changes

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

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

FusionIIIT-Bot · 2023-02-09T14:07:48Z

Congratulations for making your first Pull Request at Fusion!! 🎉 Someone from our team will review it soon.

rishiktejatanugula

Approved @akshatnema

akshatnema

Kindly answer the queries made.

akshatnema · 2023-02-16T17:29:33Z

FusionIIIT/applications/placement_cell/views.py

+    # if int(str(profile.id)[:2]) == 20:
+    #     if (now.month>4):
+    #       roll = 1+now.year-int(str(profile.id)[:4])
+    #     else:
+    #       roll = now.year-int(str(profile.id)[:4])
+    # else:
+    #     if (now.month>4):
+    #       roll = 1+(now.year)-int("20"+str(profile.id)[0:2])
+    #     else:
+    #       roll = (now.year)-int("20"+str(profile.id)[0:2])


Suggested change

# if int(str(profile.id)[:2]) == 20:

# if (now.month>4):

# roll = 1+now.year-int(str(profile.id)[:4])

# else:

# roll = now.year-int(str(profile.id)[:4])

# else:

# if (now.month>4):

# roll = 1+(now.year)-int("20"+str(profile.id)[0:2])

# else:

# roll = (now.year)-int("20"+str(profile.id)[0:2])

# if int(str(profile.id)[:2]) == 20:

# if (now.month>4):

# roll = 1+now.year-int(str(profile.id)[:4])

# else:

# roll = now.year-int(str(profile.id)[:4])

# else:

# if (now.month>4):

# roll = 1+(now.year)-int("20"+str(profile.id)[0:2])

# else:

# roll = (now.year)-int("20"+str(profile.id)[0:2])

Kindly remove these comments if not needed.

akshatnema · 2023-02-16T17:29:55Z

FusionIIIT/applications/placement_cell/views.py

+    # print("Student------>",vars(student_info))
+    batch=student_info.batch
+    # print("Year----->",user.date_joined.year)
+    # print("User----->",vars(user))
+    # print("Profile---->",vars(profile))


same goes for the comments in these lines too.

akshatnema · 2023-02-16T17:30:55Z

requirements.txt

 xlrd==2.0.1
 XlsxWriter==1.3.7
-xlwt==1.3.0
+xlwt==1.3.0


The changes in the requirements file are not acceptable. Kindly remove these changes from the file.

@Smeetiiitdmj These changes are not removed yet. Kindly remove these changes.

Kindly check now, I have committed

akshatnema · 2023-02-16T17:32:18Z

FusionIIIT/templates/placementModule/placementstatistics.html

+                                            <td style="border:1px solid black; text-align:center">{{ rec.id }}</td>
+                                            {% comment %} <td style="border:1px solid black;">{{ rec.placement_type }}</td> {% endcomment %}
+                                            <td style="border:1px solid black; text-align:center">{{ rec.name }}</td>
+                                            <td style="border:1px solid black; text-align:center">{{ rec.ctc }}</td>
+                                            {% comment %} <td style="border:1px solid black; text-align:center">{{ rec.year }}</td> {% endcomment %}
+                                            {% comment %} <td style="border:1px solid black;">{{ rec.test_score }}</td> {% endcomment %}
+                                            {% comment %} <td style="border:1px solid black;">{{ rec.test_type }}</td> {% endcomment %}
+                                            {% comment %} <td>


Why so many lines in the UI are commented in the HTML files?

akshatnema · 2023-02-16T17:32:41Z

FusionIIIT/templates/placementModule/placementstatistics.html

+                                            {% comment %} <th style="border:1px solid black; ">Year</th> {% endcomment %}
+                                            {% comment %} <th style="border:1px solid black;">Test Score</th>
+                                            <th style="border:1px solid black;">Test Type</th> {% endcomment %}


Same goes for here too.

akshatnema · 2023-02-16T17:33:33Z

FusionIIIT/applications/placement_cell/models.py

+    # id = models.OneToOneField(ExtraInfo, on_delete=models.CASCADE, primary_key=True)
+    # id = models.OneToOneField(ExtraInfo, on_delete=models.CASCADE, primary_key=True)


Suggested change

# id = models.OneToOneField(ExtraInfo, on_delete=models.CASCADE, primary_key=True)

# id = models.OneToOneField(ExtraInfo, on_delete=models.CASCADE, primary_key=True)

# id = models.OneToOneField(ExtraInfo, on_delete=models.CASCADE, primary_key=True)

# id = models.OneToOneField(ExtraInfo, on_delete=models.CASCADE, primary_key=True)

remove the code comments if not needed.

akshatnema · 2023-02-16T17:33:49Z

FusionIIIT/applications/placement_cell/models.py

 # imports
 import datetime
-
+from applications.globals.models import ExtraInfo


the module has been imported but not used.

Smeetiiitdmj

Changes are committed

akshatnema · 2023-03-03T06:07:22Z

@SmeetChavan this is a duplicate PR. changes are already merged in sa-4 via #1115. Closing this PR.

SmeetChavan and others added 6 commits January 17, 2023 16:04

Fixed path reference

9434b3d

Updated requirements.txt to avoid errors while installing

5c9e703

Changed Search Table and Download Issue Solve

186904c

All the changes till now

8bd4c3c

All the changes till now

c2cf808

All the changes till now

128ed59

rishiktejatanugula reviewed Feb 16, 2023

View reviewed changes

Smeetiiitdmj added 2 commits February 16, 2023 22:58

All the changes till now 16th Feb

9ad9942

All the changes till now

5f1cdeb

akshatnema requested changes Feb 16, 2023

View reviewed changes

Smeetiiitdmj and others added 3 commits February 16, 2023 23:57

Removed unnecessary comments

532be11

Merge branch 'sa-4' into smeet

edf8ad4

Update requirements.txt

b87ff5a

Smeetiiitdmj commented Mar 3, 2023

View reviewed changes

akshatnema closed this Mar 3, 2023

		# id = models.OneToOneField(ExtraInfo, on_delete=models.CASCADE, primary_key=True)
		# id = models.OneToOneField(ExtraInfo, on_delete=models.CASCADE, primary_key=True)

sa-4 : 4 : all-changes-till-now #1070

sa-4 : 4 : all-changes-till-now #1070

Uh oh!

Conversation

Smeetiiitdmj commented Feb 9, 2023

Issue that this pull request solves

Proposed changes

Solved issues as well as completed the tasks assigned.

Types of changes

Checklist

Screenshots

Uh oh!

FusionIIIT-Bot commented Feb 9, 2023

Uh oh!

rishiktejatanugula left a comment

Choose a reason for hiding this comment

Uh oh!

akshatnema left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Smeetiiitdmj left a comment

Choose a reason for hiding this comment

Uh oh!

akshatnema commented Mar 3, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants