added changes to submit sample notebook & approve/dispprove sample notebook

3 files changed, 32 insertions, 11 deletions

diff --git a/tbc/templates/tbc/disapprove-sample.html b/tbc/templates/tbc/disapprove-sample.html
new file mode 100644
index 0000000..2632edb
--- /dev/null
+++ b/tbc/templates/tbc/disapprove-sample.html
@@ -0,0 +1,17 @@
+{% extends 'base.html' %}
+{% load static %}
+{% block content %}
+<center><h3>Diapprove Sample Notebook</h3>
+<hr>
+<h4>Notifing Chages for book {{ proposal.accepted.title }} to {{ proposal.user.user.first_name }} {{ proposal.user.user.last_name }}</h4></center>
+<form action="/disapprove-sample-notebook/{{ proposal.id }}" method=POST enctype="multipart/form-data">
+{% csrf_token %}
+    <table>
+        <tr><td>To</td></tr>
+        <tr><td><input type="text" value="{{ proposal.user.user.email }}" readonly></td></tr>
+        <tr><td>Changes Required</td></tr>
+        <tr><td><textarea rows="15" cols="100" name="changes_required" style="width:100%;"></textarea></td></tr>
+        <tr><td><input class="btn btn-primary" type="submit" value="Send"></td></tr>
+    </table>
+</form>
+{% endblock %}
diff --git a/tbc/templates/tbc/review-proposal.html b/tbc/templates/tbc/review-proposal.html
index 3c8366b..c451db6 100644
--- a/tbc/templates/tbc/review-proposal.html
+++ b/tbc/templates/tbc/review-proposal.html
@@ -35,9 +35,9 @@
     <center><h3>Old Proposals</h3></center>
     <ol>
     {% for proposal in old_proposals %}
-        <li><h5>Propsal from {{ proposal.user.user.first_name }} {{ proposal.user.user.last_name }}</h5></li>
+        <li><h5>Propsal from {{ proposal.proposal.user.user.first_name }} {{ proposal.proposal.user.user.last_name }}</h5></li>
             <div class="accordion" id="accordion2">
-                {% for textbook in proposal.textbooks.all %}
+                {% for textbook in proposal.proposal.textbooks.all %}
                     <div class="accordion-group">
                         <div class="accordion-heading">
                             <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapse{{forloop.counter}}">
@@ -58,18 +58,22 @@
                 {% endfor %}
                 <h5>
                     <b>Status:</b> 
-                    {% ifequal proposal.status "samples" %}
-                        Contributor is required to submit sample notebook
+                    {% ifequal proposal.proposal.status "samples" %}
+                        Sample notebook phase
                     {% endifequal %}
-                    {% ifequal proposal.status "book alloted" %}
+                    {% ifequal proposal.proposal.status "book alloted" %}
                         Book has been alloted. Contributor is required to submmit the codes for entire book.
                     {% endifequal %}
                 </h5>
-                <h5><b>Book Accepted/Alloted:</b> {{ proposal.accepted.title }}</h5>
-                {% ifequal proposal.status "samples" %}
-                    <h5><a href="{% static 'uploads/' %}{{ chapter.notebook }}">sample notebook</a><br></h5>
-                    <a class="btn btn-primary" href="{% url 'tbc:DisapproveProposal' proposal.id %}">Disapprove Samples</a>
-                    <a class="btn btn-primary" href="{% url 'tbc:RejectProposal' proposal.id %}">Alot Book</a>
+                <h5><b>Book Accepted/Alloted:</b> {{ proposal.proposal.accepted.title }}</h5>
+                {% ifequal proposal.proposal.status "samples" %}
+                    {% if proposal.sample.sample_notebook %}
+                        <h5><a href="{% static 'uploads/' %}{{ proposal.sample.sample_notebook }}">sample notebook</a><br></h5>
+                    {% else %}
+                        <h5>Contributor has not submitted sample notebook yet.</h5>
+                    {% endif %}
+                    <a class="btn btn-primary" href="{% url 'tbc:DisapproveProposal' proposal.proposal.id %}">Disapprove Samples</a>
+                    <a class="btn btn-primary" href="{% url 'tbc:RejectProposal' proposal.proposal.id %}">Alot Book</a>
                 {% endifequal %}
             </div>
     {% endfor %}
diff --git a/tbc/templates/tbc/submit-sample.html b/tbc/templates/tbc/submit-sample.html
index fde3079..b26e8ae 100644
--- a/tbc/templates/tbc/submit-sample.html
+++ b/tbc/templates/tbc/submit-sample.html
@@ -24,7 +24,7 @@ function validate_content()
 
 {% block content %}
 <div id="content-wrap" style="max-width:600px;">
-    <p>You are uploading sample notebook for the book {{ proposal.accepted.title }} by {{ proposal.accepted.author }}</p>
+    <h5>You are uploading sample notebook for the book {{ proposal.accepted }} by {{ proposal.accepted.author }}</h5>
     <p>Only .ipynb files are acceptable</p>
     <form action="/submit-sample/{{ proposal.id }}" method=POST enctype="multipart/form-data" onSubmit="return validate_content();">
     {% csrf_token %}