ui reform part 4

prakhar-da-gama · Apr 5, 2019 · ea61fb8 · ea61fb8
1 parent c1ef3ef
commit ea61fb8
Show file tree

Hide file tree

Showing 8 changed files with 490 additions and 782 deletions.
diff --git a/FusionIIIT/Fusion/fusion.db b/FusionIIIT/Fusion/fusion.db
diff --git a/FusionIIIT/applications/central_mess/models.py b/FusionIIIT/applications/central_mess/models.py
@@ -247,7 +247,7 @@ def __str__(self):
 class Feedback(models.Model):
     student_id = models.ForeignKey(Student, on_delete=models.CASCADE)
     mess = models.CharField(max_length=10, choices=MESS_OPTION, default='mess1')
-    mess_rating = models.PositiveSmallIntegerField(default='5')
+    # mess_rating = models.PositiveSmallIntegerField(default='5')
     fdate = models.DateField(default=datetime.date.today)
     description = models.TextField()
     feedback_type = models.CharField(max_length=20, choices=FEEDBACK_TYPE)

diff --git a/FusionIIIT/templates/messModule/mess.html b/FusionIIIT/templates/messModule/mess.html
@@ -87,7 +87,7 @@
         {% comment %}The ... starts here!{% endcomment %}
         <div class="ui tab segment" data-tab="seventh">
             {% block respondtoleave %}
-            {% include 'messModule/respondtoleave.html' %}
+            {% include 'messModule/respondtorequests.html' %}
             {% endblock %}
         </div>
         {% comment %}The ... ends here!{% endcomment %}

diff --git a/FusionIIIT/templates/messModule/messactivities.html b/FusionIIIT/templates/messModule/messactivities.html
@@ -157,12 +157,15 @@
                         <br>
                     </form>
                     <br>
+                    <!--
                     <form method="post" target="_blank" action="{% url 'mess:billdownload' %}">
                         {% csrf_token %}
                         <button type="submit" class="ui primary button right floated">
                             Download Bill
                         </button>
+                        <br>
                     </form>
+                    -->
                 </div>
                 <!--
         <form method="post">

diff --git a/FusionIIIT/templates/messModule/requests.html b/FusionIIIT/templates/messModule/requests.html