diff options
| -rw-r--r-- | tbc/models.py | 2 | ||||
| -rw-r--r-- | tbc/static/templates/guidelines.html | 33 | ||||
| -rw-r--r-- | tbc/static/templates/how.html | 63 | ||||
| -rwxr-xr-x | tbc/templates/base.html | 81 | ||||
| -rw-r--r-- | tbc/templates/tbc/aicte-books.html | 1 | ||||
| -rw-r--r-- | tbc/templates/tbc/books_under_progress.html | 181 | ||||
| -rwxr-xr-x | tbc/templates/tbc/login.html | 15 | ||||
| -rw-r--r-- | tbc/templates/tbc/register.html | 10 | ||||
| -rw-r--r-- | tbc/templates/tbc/update-code.html | 45 | ||||
| -rwxr-xr-x | tbc/views.py | 199 |
10 files changed, 391 insertions, 239 deletions
diff --git a/tbc/models.py b/tbc/models.py index bd06c93..5c052a1 100644 --- a/tbc/models.py +++ b/tbc/models.py @@ -161,8 +161,6 @@ class SampleNotebook(models.Model): class ActivityLog(LogEntry): proposal_id = models.IntegerField(null=True) conversation = models.TextField(null=True) - def __unicode__(self): - return 'Activity log for %d' %(proposal_id) class AicteBook(models.Model): diff --git a/tbc/static/templates/guidelines.html b/tbc/static/templates/guidelines.html index 8555b44..6d283b4 100644 --- a/tbc/static/templates/guidelines.html +++ b/tbc/static/templates/guidelines.html @@ -1,14 +1,23 @@ -<h4>Guidelines for Coding</h4> <ul> - <li>Strictly use Python 2.7.X version for coding</li> - <li>IPython Notebook version 1.1.0 or higher should be used (which supports user input)</li> - <li>Each chapter should be an individual IPython Notebook</li> - <li>Do not copy problem statement from the Textbook in the code (write it in your own words)</li> - <li>Round-off the final answers according to the textbook</li> - <li>Do not use reference Figures/Diagrams given in the book anywhere in your code. All the outputs must be displayed in appropriate format (along with units mentioned)</li> - <li>Appropriate comments should be put, which will make the code easily understandable. The comments should help in highlighting the flow of logic being used. For example, the equation like R = V/I can have comment as "Ohm's Law" along with it.</li> - <li>All the plots must be named and have appropriate labels on its axes</li> - <li>The symbols used in the code should be same as those being used in the textbook</li> - <li>Check for using correct formulae while using in-built functions. (For example, the angles must be converted to degree (or radians) before calculating the sine or cosine etc.)</li> - <li>Material of any kind (pdf of book or image of a certain page) will not be provided to the participant. It is the participant's responsibility to arrange for the same.</li> + <li>Strictly use Python 2.7.X version for coding + <li>IPython Notebook version 1.1.0 or higher should be used (which supports user input) + <li>Each chapter should be an individual IPython Notebook + <li>A notebook should start with Chapter number followed by chapter name which should be in font size of ‘heading 1’ available in IPytho Notebook + <li>The above point should be followed by a cell which consists of Example number and the page number which should be in font size of ‘heading 2’ available in IPytho Notebook + <li>Same variables should be used in the codes as given in the textbook. In few cases, if this point doesn’t hold true, then the contributor may use any variable of his/her choice but an appropriate comment is necessary giving a description of the quantity. + <li>Libraries must be imported in all examples. Import specific libraries only and avoid import *. + <li>Round-off the final answers according to the textbook + <li>All the calculations must be performed according to the textbook. + <li>Do not use reference Figures/Diagrams given in the book anywhere in your code. All the outputs must be displayed in appropriate format (along with units mentioned). + <li>Appropriate comments should be put, which will make the code easily understandable. The comments should help in highlighting the flow of logic being used. For example, the equation like R = V/I can have comment as "Ohm's Law" along with it. + <li>All the plots must be named and have appropriate labels on its axes. + <li>The plots/graphs should not open in a separate window; rather they should be a part of the output. A command ‘%pylab inline’ does the work. + <li>The symbols used in the code should be same as those being used in the textbook + <li>Check for using correct formulae while using in-built functions. (For example, the angles must be converted to degree (or radians) before calculating the sine or cosine etc.) + <li>The codes should follow the naming convention as given below, for example, For chapter number 4, the file name must be chapter4.ipynb + <li>The codes will not be approved if the naming convention is not followed as instructed. + <li>If the textbook contains error in calculations/results, mention the same as a comment at the end. + <li>Do not include problem statement/text from the book in the code. + <li>All the outputs must be displayed in appropriate format (along with units mentioned). + <li>Material of any kind (pdf of book or image of a certain page) will not be provided to the participant. It is the participant's responsibility to arrange for the same. </ul> diff --git a/tbc/static/templates/how.html b/tbc/static/templates/how.html index 6cc976a..a235f6a 100644 --- a/tbc/static/templates/how.html +++ b/tbc/static/templates/how.html @@ -1,36 +1,27 @@ -{% load static %} - -<ol> - <li>Contributor selects 3 textbooks and sends proposal through mail to <strong>textbook[at]fossee[dot]in</strong> in the preferred order.</li> - <ul> - <li>Contributor is requested to visit the website and ensure that the books proposed have not been completed or undertaken by some other contributor. This is to avoid multiple contributors working on the same books. - <ul> - <li>List of <a href="http://tbc-python.fossee.in/completed-books/" target="_blank">Completed Books</a></li> - <li>List of <a href="http://tbc-python.fossee.in/books-under-progress/" target="_blank">Books Under Progress</a></li> - </ul> - </li> - <li>Please make sure that the book proposed has at least 60 examples. </li> - <li>The Edition and the ISBN number of all the textbooks should also be mentioned.</li> - <li><b>Please note that no mentors are allowed under this internship.</b></li> - </ul> - <li>This mail should carry information about the Contributor. Details should be mentioned as under: </li> - <ul> - <li>For Students</li> - <ul> - <li>Full name of the student</li> - <li>Course name</li> - <li>College/Institute/University name</li> - </ul> - <li>For Others</li> - <ul> - <li>Full name of the Individual</li> - <li>Designation</li> - <li>Organization name</li> - </ul> - </ul> - <li> Reviewer will have a look at the proposed books, select an appropriate book and allot to the contributor. At this stage, the contributor will be asked to send sample examples (through mail) i.e. solved examples from any one chapter as an IPython Notebook.Kindly - refer to the <a href="http://tbc-python.fossee.in/sample-notebook/" target="_blank">Sample IPython Notebook</a></li> - <li>Reviewer reviews the sample notebook and if not satisfied, the contributor will be notified to make necessary corrections and send the sample notebook again.</li> - <li>Once the reviewer is satisfied with the sample notebook, he/she will give a consent to the contributor to complete the book in 2 months.</li> - <li>The contributor has to submit the codes on the interface when intimated by the reviewer.</li> - <li>The entire submission will then be reviewed and the contributor will be notified about corrections, if required. The review of the book will typically take approximately 25 working days to finish. Each time the codes are submitted, it will be queued up with other review requests and will result in subsequent delays. When no more corrections are required, the book is termed as completed and the contributor will be notified to fill the <a href="http://tbc-python.fossee.in/internship-forms/" target="_blank">Internship Forms</a></li> +<ul> + <li>You are required to learn Python/IPython</li> + <ol> + <li>You may refer <a href="http://ipython.org/install.html">this link</a> for IPython installation</li> + <li>For learning Python/IPython you may refer the <a href="http://spoken-tutorial.org/tutorial-search/?search_foss=Python&search_language=English">spoken tutorials</a> available. + </ol> + <li>Submit book proposal + <ol> + <li>Log on <a href="http://tbc-python.fossee.in/">here</a>. If you do not have an account, please <a href="http://tbc-python.fossee.in/register/">create a new account</a> by filling all the required details. + <li>Propose your preferred choice of books, using the <a href="http://tbc-python.fossee.in/submit-aicte-proposal/">proposal form</a>. + <li>Ensure that the proposed books are not in <a href="http://tbc-python.fossee.in/completed-books/">Completed Books</a> or <a href="http://tbc-python.fossee.in/books-under-progress/">Books in Progress.</a> + </ol> + <li>Book proposal criteria and sample codes + <ol> + <li>Make sure that the <b>proposed book has at least 60 solved examples</b> which can be coded in Python. + <li><b>Exclude theoretical examples</b> such as derivations or problems which have no scope of computation. + <li>The examples must be intricate with proper usage of libraries and scientific tools and not just calculations. Please have a look at <a href="http://tbc-python.fossee.in/book-details/318/" target="_blank">this book</a>. + </ol> + <li>Reviewer will review the proposed books & select the appropriate one. Contributor at this stage will be asked to <a href="http://tbc-python.fossee.in/submit-sample">submit sample IPython notebook</a> i.e. solved examples from any one chapter as an IPython Notebook. Kindly refer to the <a href="http://tbc-python.fossee.in/sample-notebook/" target="_blank">Sample IPython Notebook</a>.</a> Please follow proper naming conventions while uploading the sample notebook. Ex.: Chapter 4: Principles of Steady-State Heat Transfer. + <li>Reviewer will review the sample notebook and if not satisfied, the contributor will be notified to make necessary corrections and send the sample notebook again. + </ol> + <li>Once sample notebook is approved, time period of 2 months will be given to code all the solved examples of the alloted textbook. + <li>Once the contributor finishes coding all the solved examples of the book, the codes can be submitted <a href="http://tbc-python.fossee.in/confirm-book-details">here</a>. Please follow naming conventions while uploading the book. Ex.: Chapter 4: Principles of Steady-State Heat Transfer. + <li>The review of the book will typically take approximately 25 working days to finish & the contributor will be notified if ther are any corrections required. Each time the codes are submitted, it will be queued up with other review requests and will result in subsequent delays. When no more corrections are required, the book is termed as completed and the contributor will be notified to fill the <a herf="http://tbc-python.fossee.in/internship-forms/">Internship Forms</a> + <li>Duly filled internship forms have to be submitted at address mentioned here. Honorarium will be processed only after the forms are received. + <li><b>Note: The Submit Book(OLD) is the link for only those contributors who had proposed books earlier through mail and now are uploading for publishing.</b> +</ul> diff --git a/tbc/templates/base.html b/tbc/templates/base.html index a6e5856..9e7ae28 100755 --- a/tbc/templates/base.html +++ b/tbc/templates/base.html @@ -58,6 +58,26 @@ position: relative; top: -2px; } + .badge-custom { + padding: 1.5px 7px 1.5px; + font-size: 12.025px; + font-weight: bold; + white-space: nowrap; + color: #ffffff; + background-color: #f89406; + -webkit-border-radius: 9px; + -moz-border-radius: 9px; + border-radius: 15px; + } + + .tooltip-inner { + background-color: #1ABC9C; + width: 150px; + } + + .tooltip.bottom .tooltip-arrow { + border-bottom: 5px solid #1ABC9C; + } </style> {% block css %} @@ -79,7 +99,7 @@ <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <a class="brand" href="/">Python Textbook Companion</a> + <a class="brand" href="/">Python Textbook Companion <sup><span style="font-size:12px; color: white;">beta</span></sup></a> <div class="nav-collapse collapse"> <ul class="nav pull-right"> @@ -91,7 +111,7 @@ <li><a href="http://python.fossee.in" target="_blank">Python Team</a></li> </ul> </li> - <li class="dropdown"> + <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Textbooks<b class="caret"></b></a> <ul class="dropdown-menu"> <li><a href="{% url 'tbc:CompletedBooks' %}">Completed Books</a></li> @@ -101,18 +121,35 @@ <li><a href="{% url 'tbc:InternshipForms' %}">Internship Forms</a></li> {% if user %} - <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user.first_name }}<b class="caret"></b></a> - <ul class="dropdown-menu"> - <li><a href="{% url 'tbc:SubmitBook' %}">Submit Book (OLD)</a></li> - <li><a href="{% url 'tbc:ListAICTE' %}">Submit Proposal</a></li> - <li><a href="{% url 'tbc:SubmitSample' %}">Submit Sample Notebook</a></li> - <li><a href="{% url 'tbc:ConfirmBookDetails' %}">Submit Codes</a></li> - <li><a href="{% url 'tbc:GetCertificate' %}">Get Certificate</a></li> - <li><a href="{% url 'tbc:UpdatePassword' %}">Update Password</a></li> - <li><a href="{% url 'tbc:UserLogout' %}">Logout</a></li> - </ul> - </li> + {% if proposal_position %} + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user.first_name }}<span class="badge-custom" rel="tooltip" title="Pending Proposal Position: {{ proposal_position }}" data-placement="bottom" style="margin-left:5px; margin-right:5px; display: inline-block">{{ proposal_position }}</span> + <b class="caret"></b></a> + <ul class="dropdown-menu"> + <li><a href="{% url 'tbc:SubmitBook' %}">Submit Book (OLD)</a></li> + <li><a href="{% url 'tbc:ListAICTE' %}">Submit Proposal</a></li> + <li><a href="{% url 'tbc:SubmitSample' %}">Submit Sample Notebook</a></li> + <li><a href="{% url 'tbc:ConfirmBookDetails' %}">Submit Codes</a></li> + <li><a href="{% url 'tbc:GetCertificate' %}">Get Certificate</a></li> + <li><a href="{% url 'tbc:UpdatePassword' %}">Update Password</a></li> + <li><a href="{% url 'tbc:UserLogout' %}">Logout</a></li> + </ul> + </li> + + {% else %} + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user.first_name }}<b class="caret"></b></a> + <ul class="dropdown-menu"> + <li><a href="{% url 'tbc:SubmitBook' %}">Submit Book (OLD)</a></li> + <li><a href="{% url 'tbc:ListAICTE' %}">Submit Proposal</a></li> + <li><a href="{% url 'tbc:SubmitSample' %}">Submit Sample Notebook</a></li> + <li><a href="{% url 'tbc:ConfirmBookDetails' %}">Submit Codes</a></li> + <li><a href="{% url 'tbc:GetCertificate' %}">Get Certificate</a></li> + <li><a href="{% url 'tbc:UpdatePassword' %}">Update Password</a></li> + <li><a href="{% url 'tbc:UserLogout' %}">Logout</a></li> + </ul> + </li> + {% endif %} {% endif %} {% if reviewer %} @@ -187,7 +224,7 @@ <center> <div class="alert" style="width:650px;height:40px;"> <a class="close" data-dismiss="alert" href="#">×</a> - <p>Thank you for showing interest in contributing to Python TBC. <br>We have recevied your proposal. Please be patient we will get back to you within few days.</p> + <p>Thank you for showing interest in contributing to Python TBC. <br>We have received your proposal. Please be patient we will get back to you within few days.</p> </div> </center> <div class="clearfix"></div> @@ -228,6 +265,15 @@ </center> <div class="clearfix"></div> {% endif %} + {% if bookupdate %} + <center> + <div class="alert" style="width:400px;height:25px;"> + <a class="close" data-dismiss="alert" href="#">×</a> + <p>Thank You ! Codes have been updated successfully !</p> + </div> + </center> + <div class="clearfix"></div> + {% endif %} <div class="row-fluid"> <h3 style='float: left;margin-left: 50px; display: inline-block;'>Recent Submissions</h3> <div style="float:right; margin-right: 50px; width: 400px;"> @@ -301,6 +347,11 @@ g.defer=true; g.async=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); })(); </script> +<script type="text/javascript"> + $(document).ready(function(){ + $("[rel=tooltip]").tooltip(); + }); +</script> <noscript><p><img src="http://analytics.spoken-tutorial.org/piwik.php?idsite=15" style="border:0;" alt="" /></p></noscript> <!-- End Piwik Code --> </body> diff --git a/tbc/templates/tbc/aicte-books.html b/tbc/templates/tbc/aicte-books.html index 5ed4021..a15d686 100644 --- a/tbc/templates/tbc/aicte-books.html +++ b/tbc/templates/tbc/aicte-books.html @@ -5,7 +5,6 @@ <script type="text/javascript"> function submitCategory() { - alert("hello"); document.forms.aictebooks.submit(); } </script> diff --git a/tbc/templates/tbc/books_under_progress.html b/tbc/templates/tbc/books_under_progress.html index 01c9a2f..859e240 100644 --- a/tbc/templates/tbc/books_under_progress.html +++ b/tbc/templates/tbc/books_under_progress.html @@ -1,85 +1,104 @@ {% extends "base.html" %} +{% block script %} +<script type="text/javascript"> +function submitCategory() +{ + document.forms.underprogress.submit(); +} +</script> +{% endblock %} + {% block content %} -<center><h2> Books Under Progress </h2></center><br/> -<ol> - <li>Electronics Communication by Dennis Roddy and John Coolen (4th Edition) - <li>Fundamentals of Data Structures in C++ by Ellis Horowitz, Sartaj Sahni & Dinesh Mehta(2nd Edition) - <li>Transport Processes and Unit Operations by C. J. Geankoplis(3rd Edition) - <li>Modern Physics by B. L. Theraja(16th Edition) - <li>Optical Fiber Communications Principles and practice by John M. Senior(3rd Edition) - <li>Programming in C by R. Subburaj(1st Edition) - <li>Basic Electrical Engineering with numerical problems(Volume-1) by P. S. Dhogal(1st Edition) - <li>Engineering thermodynamics by P. K. Nag(4th Edition) - <li>Principles of Electronic Communication Systems by Louis E. Freznel(3rd Edition) - <li>Thermodynamics: An Engineering approach by Michael A. boles & Yunus A. cengel(5th Edition) - <li>Solid State Electronic Devices by Ben Streetman & sanjay Banerjee(EE Edition) - <li>Digital Communications by S. Sharma(6th edition) - <li>Fundamentals of Computing and Programming in C by V. Ramesh Babu, R. Samyuktha, M. Munirathnam - <li>Aircraft Structures For Engineering Students (4th edition) - <li>A First Course in Programming with C by T. Jeyapoovan (1st Edition) - <li>Heat And Mass Transfer - A Practical Approach by Y. A. Cengel (3rd edition) - <li>Thermodynamics BY K. M. Gupta (1st edition) - <li>Applied physics by P. K. Palanisamy (8th edition) - <li>Analysis and Design of Analog Integrated Circuits by Paul R. Gray, Paul J. Hurst, Stephen H. Lewis and Robert G. Meyer (5th edition) - <li>Electronic Devices and Circuits by S.Salivahanan ,N.Suresh Kumar , A.Vallavaraj (2nd edition) - <li>Electronic Instrumentation and Measurements by David A. Bell (2nd edition) - <li>Mechanics of Materials by beer and johnston (6th edition) - <li>Thermodynamics by C.P Arora (1st Edition) - <li>Magnifying C by Arpita Goyal (1st Editon) - <li>C Programming: A Modern Approach by K.N King (2nd Edition) - <li>Fundamentals of Electrical Machines by M.A. Salam (2nd Editon) - <li>Chemical Engineering-Fluid Flow,Heat Transfer And Mass Transfer Vol-1 by J. M. Coulson, J. F. Richardson, J. R. Backhurst And J. H. Harker (6th edition) - <li>Elements Of Chemical Reaction Engineering by H. S. Fogler (3rd edition) - <li>Programming in ANSI C by E. Balagurusamy (4th edition) - <li>Fundamental of Internal Combustion Engine by H N Gupta (1st edition) - <li>Optical Fiber Communication by Gerd Keiser (4th edition) - <li>Thermodynamics by Obert (3rd edition) - <li>Heat Transfer: Principles And Applications by B. K. Dutta (1st edition) - <li>Thermodynamics for chemists by Glasstone & Samuel (8th edition) - <li>Numerical Methods : With Programs in C (2nd Edition) - <li>Linear Integrated circuits by D.Roy Choudhury and Shail B. Jain (4th edition) - <li>Introduction To Chemical Engineering Thermodynamics by J. M. Smith, H. C. Van Ness And M. M. Abbott (6th edition) - <li>Worked Examples In Engineering In Si Units, Volume III, Electrical Engineering by M. Bates (1st Edition) - <li>Principles of Physics by P .V. Naik (2nd edition) - <li>Thermodynamics by J. P. Holman (4th edition) - <li>Statics And Strength Of Materials by I. J. Levinson - <li>Teach yourself C++ by Herbert Schildt (3rd edition) - <li>Turbomachinery Design And Theory by R. S. R. Gorla And A. A. Khan (1st edition) - <li>Diffusion: Mass Transfer In Fluid Systems by E. L. Cussler (2nd edition) - <li>Fluid Mechanics and Hydraulic Machines by B. K. Sarkar (1st Edition) - <li>Fluid Mechanics by A. K. Choudhary and Om Prakash (2nd Edition) - <li>Basic Engineering Thermodynamics by A. Venkatesh (1st edition) - <li>Introduction To Fluid Mechanics by R. W. Fox And A. T. McDonald (5th edition) - <li>Chemical Engineering Thermodynamics by T. E. Daubert (1st Edition) - <li>Elements Of Heat Transfer by M. Jacob And G. A. Hawkins (3rd Edition) - <li>Fluid Flow For The Practicing Chemical Engineer by J. P. Abulencia And L. Theodore (1st Edition) - <li>Engineering Economics by R. Panneerselvam (1st Edition) - <li>C Programming for the Absolute beginner Michael Vine (2nd Edition) - <li>Modern Physics by Kenneth Krane (2nd edition) - <li>Essentials of programming in C for Life Sciences by S. Parthasarathy (1st edition) - <li>DC Machines and Synchronous Machines by U. A. Bakshi and M. V. Bakshi (1st Edition) - <li>C: How to program by H.M. Deitel and P.J. Deitel (3rd edition) - <li>Electric Machinery And Transformers by I. L. Kosow (2nd edition) - <li>Data Structures using C by ISRD group (2nd edition) - <li>Engineering Physics by Shyam Sing & Rajeev Singh (1st Edition) - <li>Let Us C++ by Yashwant Kanetkar (2nd Edition) - <li>Power Plant Engineering by P.K. Nag (3rd Edition) - <li>Engineering Physics - I by G. SenthilKumar - <li>Elements of Mechanical Engineering by N.M. Bhatt & J.R. Mehta (6th Edition) - <li>Gas Dynamics & Jet Propulsion by P. Murugaperumal (1st Edition) - <li>Internal Combustion Engines by H.B. Keswani (4th Edition) - <li>Irrigation & Water Power Engineering by B.C. Punmia (16th Edition) - <li>Fundamentals of Aerodynamic by J.D. Anderson Jr. (3rd Editon) - <li>Thyristors Theory & Applications by R.K. Sugandhi & K.K. Sugandhi (2nd Edition) - <li>Fundamentals Of Data Structure In C by S. Sahni , S. Anderson-freed And E. Horowitz (2nd edition) - <li>Unix: Concepts And Applications by S. Das (4th edition) - <li>Data Structures Using C And C++ by Y. Langsam, M. Augenstein And A. M. Tenenbaum - <li>Teach Yourself C in 24 hours by Tony Zhang - <li>Electronic Measurements and Instrumentation by R. K. Rajput (2nd edition) - <li>Introduction to Thermal Systems Engineering: Thermodynamics, Fluid Mechanics, and Heat Transfer by Moran, Shapiro, Munson, Dewitt - <li>Applied physics by Neeraj Mehta - <li>Advance Semiconductor Devices by S. Sharma (1st edition) - <li>Textbook Of Heat Transfer by S.P.Sukhatme (4th edition) - <li>Modern Physics by B.L.Theraja (16th edition) + <center> + <h2> Books Under Progress </h2> + <hr> + <h4>Select Category</h4> + <form name="underprogress" action="/books-under-progress/" method=POST enctype="multipart/form-data"> + {% csrf_token %} + <select name="category" id="category" onchange="submitCategory();"> + <option value="all">All</option> + <option value="fluid mechanics">Fluid Mechanics</option> + <option value="control systems">Control Theory & Control Systems</option> + <option value="chemical engineering">Chemical Engineering</option> + <option value="thermodynamics">Thermodynamics</option> + <option value="mechanical engineering">Mechanical Engineering</option> + <option value="signal processing">Signal Processing</option> + <option value="digital communications">Digital Communications</option> + <option value="electrical technology">Electrical Technology</option> + <option value="maths & science">Mathematics & Pure Science</option> + <option value="analog electronics">Analog Electronics</option> + <option value="digital electronics">Digital Electronics</option> + <option value="computer programming">Computer Programming</option> + <option value="others">Others</option> + </select> + </form> + </center><br/> + + <table class="table table-bordered table-hover"> + <th>Sr #</th> + <th>Book</th> + {% for book in books_under_progress %} + <tr> + <td> + {{ forloop.counter }} + </td> + <td> + <a href="{% url 'tbc:BookDetails' book.id %}">{{ book.title }} by {{ book.author }}</a> + </td> + </tr> + {% endfor %} + </table> + <hr> + <h4>The books listed below are also under progess</h4> + <hr> + <ol> + <li>Electronics Communication By: Dennis Roddy & John Coolen, Fourth Edition + <li>Digital Communications by S. Sharma, 6th edition + <li>Fundamentals of Computing & Programming in C by V. Ramesh Babu, R. Samyuktha, M. Munirathnam + <li>A First Course in programming with C by T. Jeyapoovan, 1st edition + <li>Heat And Mass Transfer - A Practical Approach by Y. A. Cengel, 3rd edition + <li>Analysis and Design of Analog Integrated Circuits by Paul R. Gray, Paul J. Hurst, Stephen H. Lewis and Robert G. Meyer, 5th edition + <li>Mechanics of Materials by beer and johnston, 6th edition + <li>Programming in ANSI C by E. Balagurusamy, 4th edition + <li>Coulson And Richardson's Chemical Engineering, Volume 2 by J. F. Richardson, J. R. Backhurst And J. H. Harker, 5th edition + <li>Thermodynamics by Obert, 3rd edition + <li>Introduction To Chemical Engineering Thermodynamics by J. M. Smith, H. C. Van Ness And M. M. Abbott, 6th edition + <li>Thermodynamics by J. P. Holman, 4th edition + <li>Teach yourself C++ by Herbert Schildt, 3rd edition + <li>Turbomachinery Design And Theory by R. S. R. Gorla And A. A. Khan, 1st edition + <li>Diffusion: Mass Transfer In Fluid Systems by E. L. Cussler, 2nd edition + <li>Fluid Mechanics and Hydraulic Machines by B. K. Sarkar, 1st Edition + <li>Fluid Mechanics by A. K. Choudhary and Om Prakash , 2nd Edition + <li>Basic Engineering Thermodynamics by A. Venkatesh, 1st edition + <li>Chemical Engineering Thermodynamics by T. E. Daubert, 1st Edition + <li>Elements Of Heat Transfer by M. Jacob And G. A. Hawkins, 3rd Edition + <li>Fluid Flow For The Practicing Chemical Engineer by J. P. Abulencia And L. Theodore , 1st Edition + <li>Essentials of programming in C for Life Sciences by S. Parthasarathy, 1st edition + <li>DC Machines and Synchronous Machines by U. A. Bakshi and M. V. Bakshi, 1st Edition + <li>C: How to program by H.M. Deitel and P.J. Deitel, 3rd edition + <li>Electric Machinery And Transformers by I. L. Kosow, 2nd edition + <li>Data Structures using C by ISRD group, 2nd edition + <li>Let Us C++ by Yashwant Kanetkar, 2nd edition + <li>Power Plant Engineering by P. K. Nag, 3rd edition + <li>Elements of Mechanical Engineering by N. M. Bhatt and J. R. Mehta , 6th Edition + <li>Gas Dynamics and Jet Propulsion by P. Murugaperumal, 1st edition + <li>Internal Combustion Engines 4th Edition by H. B. Keswani + <li>Irrigation and Water Power Engineering by B. C. Punmia , 16th Edition + <li>Fundamentals Of Aerodynamic by J. D. Anderson Jr. , 3rd edition + <li>Thyristors Theory And Applications by R. K. Sugandhi And K. K. Sugandhi , 2nd edition + <li>Fundamentals Of Data Structure In C by S. Sahni , S. Anderson-freed And E. Horowitz, 2nd edition + <li>Unix: Concepts And Applications by S. Das , 4th edition + <li>Data Structures Using C And C++ by Y. Langsam, M. Augenstein And A. M. Tenenbaum + <li>Electronic Measurements and Instrumentation by R. K. Rajput, 2nd edition + <li>Advance Semiconductor Devices by S. Sharma, 1st edition + <li>Textbook Of Heat Transfer by S.P.Sukhatme, 4th edition + <li>Engineering Physics Uma Mukherji + <li>C MADE EASY Herbert Schildt + <li>Concepts of Thermodynamics by Obert Edward F + <li>Fluid mechanics by Pao, Richard H F + </ol> +<script> + document.getElementById('category').value = "{{ category }}"; +</script> {% endblock %} diff --git a/tbc/templates/tbc/login.html b/tbc/templates/tbc/login.html index c3bbfab..fc71732 100755 --- a/tbc/templates/tbc/login.html +++ b/tbc/templates/tbc/login.html @@ -52,16 +52,25 @@ </center> {% endif %} +{% if require_login %} + <center> + <div class="alert" style="width:350px;height:23px;"> + <a class="close" data-dismiss="alert" href="#">×</a> + <p>The requested page requires login !</p> + </div> + </center> + <div class="clearfix"></div> +{% endif %} + + <div id="content-wrap" style="max-width: 400px;"> <h3>Login</h3> <hr> - {% if require_login %} - <p>The requsted page requires login.</p> - {% endif %} <form action="/login/" method=POST enctype="multipart/form-data"> {% csrf_token %} {{ form.as_p }} <input class="btn btn-primary"type=submit value=Login> + <a href="{% url 'tbc:UserRegister' %}" class="btn btn-primary">Sign Up</a> <a href="{% url 'tbc:ForgotPassword' %}" class="btn btn-primary">Forgot Password</a> </form> </div> diff --git a/tbc/templates/tbc/register.html b/tbc/templates/tbc/register.html index 68323fb..97bf423 100644 --- a/tbc/templates/tbc/register.html +++ b/tbc/templates/tbc/register.html @@ -1,5 +1,15 @@ {% extends 'base.html' %} {% block content %} + +{% if DuplicateEmail %} + <center> + <div class="alert" style="width:360px;height:23px;"> + <a class="close" data-dismiss="alert" href="#">×</a> + <p>Sorry ! User with same email address already exists.</p> + </div> + </center> +{% endif %} + <div id="content-wrap" style="max-width:600px;"> <h3>Registration</h3> <hr> diff --git a/tbc/templates/tbc/update-code.html b/tbc/templates/tbc/update-code.html index ee1d5b5..536617b 100644 --- a/tbc/templates/tbc/update-code.html +++ b/tbc/templates/tbc/update-code.html @@ -9,6 +9,47 @@ $(document).ready(function() { }); }); </script> +<script> +function validate_content() +{ + no_notebooks = {{ no_notebooks }}; + for(i=1;i<=no_notebooks;i++) + { + name = document.getElementById("chapter"+i).value; + extension = document.getElementById("notebook"+i).value; + extension = extension.split("."); + if (extension == "" || name == "") + { + alert("Chapter names & file fields cannot be empty !!"); + return false; + } + if(extension.slice(Math.max(extension.length - 1, 1)) == "ipynb") + continue; + else + alert("Oops !! You can upload only Ipython Notebooks (.ipynb extension)"); + return false; + } + for(i=1;i<=3;i++) + { + caption = document.getElementById("caption"+i).value; + extension = document.getElementById("image"+i).value; + extension = extension.split("."); + if (extension == "" || caption == "") + { + alert("Captions and file fields cannot be empty"); + return false; + } + + if(extension.slice(Math.max(extension.length - 1, 1)) == "png") + continue; + else + alert("Only .png files are allowed for screenshots"); + return false; + } + return true; +} +</script> + {% endblock %} {% block content %} <div id="content-wrap" style="max-width:600px;"> @@ -18,7 +59,7 @@ $(document).ready(function() { {% csrf_token %} {% for chapter in chapters %} <input class="chapters" type=text id=chapter{{forloop.counter}} name=chapter{{forloop.counter}} value="{{ chapter.name }}"> - <input type=file name=notebook{{forloop.counter}}> + <input type=file name=notebook{{forloop.counter}} id=notebook{{forloop.counter}}> {% endfor %} <br> <hr> @@ -33,7 +74,7 @@ $(document).ready(function() { <input type=file id=image{{forloop.counter}} name=image{{forloop.counter}}> {% endfor %} <br><br> - <center><input class="btn btn-primary" type=submit value=submit></center> + <center><input class="btn btn-primary" type=submit value=submit onClick="return validate_content();"></center> </form> </div> {% endblock %} diff --git a/tbc/views.py b/tbc/views.py index a8c2757..cee3f04 100755 --- a/tbc/views.py +++ b/tbc/views.py @@ -6,6 +6,7 @@ from django.views.decorators.csrf import csrf_exempt from django.core.context_processors import csrf from django.contrib.auth import authenticate, login, logout from django.contrib.admin.models import CHANGE +from django.contrib.auth.decorators import login_required from models import * from tbc.forms import * import os @@ -37,7 +38,7 @@ def add_log(user, object, flag, message, proposal_id=None, chat='No message'): def email_send(to,subject,msg): try: smtpObj = smtplib.SMTP('localhost') - mail_from = "textbook@fosse.in" + mail_from = "textbook@fossee.in" message = MIMEText(msg) message['Subject'] = subject message['From'] = mail_from @@ -48,7 +49,7 @@ def email_send(to,subject,msg): def is_reviewer(user): - if user.groups.filter(name='reviewer').count() == 1: + if user.groups.filter(name='reviewer').exists(): return True @@ -114,16 +115,36 @@ def Home(request): context['sample_notebook'] = True if 'cannot_submit_sample' in request.GET: context['cannot_submit_sample'] =True + if 'bookupdate' in request.GET: + context['bookupdate'] =True books = Book.objects.filter(approved=True).order_by("-id")[0:6] for book in books: - images.append(ScreenShots.objects.filter(book=book)[0]) + try: + images.append(ScreenShots.objects.filter(book=book)[0]) + except: + return HttpResponse(book) context['images'] = images book_images = [] for i in range(len(books)): obj = {'book':books[i], 'image':images[i]} book_images.append(obj) context['items'] = book_images + + #Check if user is logged in and fetch user's pending proposal ID + if context.get('user'): + curr_user = request.user + user_profile = Profile.objects.filter(user=curr_user) + + pending_proposal_list = list(Proposal.objects.filter(status="pending")) + try: + pending_user_proposal = Proposal.objects.get(user=user_profile, status="pending") + except: + pending_user_proposal = None + + if pending_user_proposal: + context['proposal_position'] = pending_proposal_list.index(pending_user_proposal) + 1 + return render_to_response('base.html', context) @@ -174,12 +195,20 @@ def UserLogin(request): def UserRegister(request): context = {} + context.update(csrf(request)) if request.method == 'POST': form = UserRegisterForm(request.POST) if form.is_valid(): - user = form.save() - add_log(user, user, CHANGE, 'Registered') - return HttpResponseRedirect('/login/?signup=done') + email = request.POST['email'] + check_email = User.objects.filter(email=email) + if check_email: + context['form'] = form + context['DuplicateEmail'] = True + return render_to_response('tbc/register.html', context) + else: + user = form.save() + add_log(user, user, CHANGE, 'Registered') + return HttpResponseRedirect('/login/?signup=done') else: context = {} context.update(csrf(request)) @@ -187,7 +216,6 @@ def UserRegister(request): return render_to_response('tbc/register.html', context) else: form = UserRegisterForm() - context.update(csrf(request)) context['form'] = form return render_to_response('tbc/register.html', context) @@ -249,14 +277,7 @@ def ForgotPassword(request): user.set_password(password) user.save() subject = "PythonTBC: Password Reset" - message = "Dear "+user.first_name+",\n"+\ - "Your password for PythonTBC interface has been reset."+\ - "Your credentials are:\n"+\ - "Username: "+user.username+\ - "\nPassword: "+password+\ - "\n\nKindly login with the given password and update your password through the below given link."+\ - "\nLink: http://tbc-python.fossee.in/update-password."+\ - "\n\nThank You !" + message = """Dear """+user.first_name+""",\nYour password for Python TBC interface has been reset. Your credentials are:\nUsername: """+user.username+"""\nPassword: """+password+"""\n\nKindly login with the given password and update your password through the link given below.\nLink: http://tbc-python.fossee.in/update-password.\n\nThank You !\n\nRegards,\n Python TBC Team,\nFOSSEE - IIT Bombay.""" email_send(email, subject, message) form = UserLoginForm() context['form'] = form @@ -309,9 +330,13 @@ def UpdatePassword(request): def SubmitBook(request): context = {} - curr_user = request.user - if not _checkProfile(curr_user): - return HttpResponseRedirect("/profile/?update=profile") + if request.user.is_anonymous(): + return HttpResponseRedirect("/login/?require_login=true") + else: + curr_user = request.user + if curr_user.is_authenticated(): + if not _checkProfile(curr_user): + return HttpResponseRedirect("/profile/?update=profile") if request.method == 'POST': form = BookForm(request.POST) @@ -319,7 +344,7 @@ def SubmitBook(request): data = form.save(commit=False) profile = Profile.objects.get(user=request.user.id) data.contributor = profile - data.reviewer = Reviewer.objects.get(pk=1) + data.reviewer = Reviewer.objects.get(pk=2) data.save() context['user'] = curr_user curr_book = Book.objects.order_by("-id")[0] @@ -365,16 +390,7 @@ def SubmitCodeOld(request, book_id=None): chapter.screen_shots.add(screenshot) chapter.save() subject = "Python-TBC: Book Submission" - message = "Hi "+curr_book.reviewer.name+",\n"+\ - "A book has been submitted on the Python TBC interface.\n"+\ - "Details of the Book & Contributor:\n"+\ - "Contributor: "+curr_book.contributor.user.first_name+" "+curr_book.contributor.user.last_name+"\n"+\ - "Book Title: "+curr_book.title+"\n"+\ - "Author: "+curr_book.author+"\n"+\ - "Publisher: "+curr_book.publisher_place+"\n"+\ - "ISBN: "+curr_book.isbn+"\n"+\ - "Follow the link to review the book: \n"+\ - "http://tbc-python.fossee.in/book-review/"+str(curr_book.id) + message = """Hi """+curr_book.reviewer.name+""",\nA book has been submitted on the Python TBC interface.\n Details of the book & contributor:\n Contributor: """+curr_book.contributor.user.first_name+""" """+curr_book.contributor.user.last_name+"""\nBook Title"""+curr_book.title+"""\nAuthor: """+curr_book.title+"""\nAuthor: """+curr_book.author+"""\n Publisher: """+curr_book.publisher_place+"""\nISBN: """+curr_book.isbn+"""\nFollow the link to riview the book:\nhttp://tbc-python.fosse.in/book-review/"""+str(curr_book.id) email_send(curr_book.reviewer.email, subject, message) return HttpResponseRedirect('/?up=done') else: @@ -462,7 +478,10 @@ def SubmitProposal(request): def ListAICTE(request): - curr_user = request.user + if request.user.is_anonymous(): + return HttpResponseRedirect('/login/?require_login=True') + else: + curr_user = request.user if not _checkProfile(curr_user): return HttpResponseRedirect("/profile/?update=profile") user_profile = Profile.objects.get(user=curr_user.id) @@ -487,7 +506,10 @@ def ListAICTE(request): def SubmitAICTEProposal(request, aicte_book_id=None): - curr_user = request.user + if request.user.is_anonymous(): + return HttpResponseRedirect('/login/?require_login=True') + else: + curr_user = request.user if not _checkProfile(curr_user): return HttpResponseRedirect("/profile/?update=profile") user_profile = Profile.objects.get(user=curr_user.id) @@ -572,12 +594,15 @@ def ReviewProposals(request, proposal_id=None, textbook_id=None): new_book.year_of_pub = accepted_book.year_of_pub new_book.no_chapters = accepted_book.no_chapters new_book.contributor = proposal.user - new_book.reviewer = Reviewer.objects.get(pk=1) + new_book.reviewer = Reviewer.objects.get(pk=2) new_book.save() proposal.status = "samples" proposal.accepted = new_book proposal.save() add_log(user, proposal, CHANGE, 'Proposal accepted', proposal.id) + subject = "Python-TBC: Proposal Reviewed" + message = """Dear """+proposal.user.user.first_name+""", \n\nYour recent proposal for Python TBC has been reviewed and the book titled """+proposal.accepted.title+""" by """+proposal.accepted.author+""" has been approved. You may now submit the sample notebook on the interface. Once the sample notebook is approved, the book will be alloted to you.\n\nRegards,\nPython TBC Team\nFOSSEE - IIT Bombay""" + email_send(proposal.user.user.email, subject, message) return HttpResponseRedirect("/proposal-review") else: new_proposals = Proposal.objects.filter(status="pending") @@ -610,10 +635,7 @@ def DisapproveProposal(request, proposal_id=None): if request.method == 'POST': changes_required = request.POST['changes_required'] subject = "Python-TBC: Corrections Required in the sample notebook" - message = "Hi, "+proposal.user.user.first_name+",\n"+\ - "Sample notebook for the book titled, "+proposal.accepted.title+"\ - requires following changes: \n"+\ - changes_required + message = """Hi, """+proposal.user.user.first_name+""",\nSample notebook submitted by you for the book titled, """+proposal.accepted.title+""",\nrequires following changes: \n"""+changes_required+"""\n\nKindly make the necessary changes and upload the sample notebook again.\n\nThank You !\n\n Regards,\nPython TBC Team\nFOSSEE - IIT Bombay""" add_log(request.user, proposal, CHANGE, 'Sample disapproved', proposal_id, chat=subject + '\n' + changes_required) context.update(csrf(request)) @@ -632,8 +654,7 @@ def AllotBook(request, proposal_id=None): proposal.status = "book alloted" proposal.save() subject = "Python-TBC: Book Alloted" - message = "Hi "+proposal.user.user.first_name+",\n"+\ - "The book has been alloted to you." + message = """Hi """+proposal.user.user.first_name+""",\n The sample examples for the book '"""+proposal.accepted.title+"""' are correct. Hence, the book is now allotted to you. A time period of 2 months from today is allotted to you for completion of the book. Convert all the solved/worked examples of all the chapters. You can get back to us for any queries.\n\nGood Luck!\n\nRegards,\nPython TBC Team\nFOSSEE - IIT Bombay""" add_log(request.user, proposal, CHANGE, 'Book alloted', proposal_id) email_send(proposal.user.user.email, subject, message) return HttpResponseRedirect("/book-review/?book_alloted=done") @@ -653,8 +674,7 @@ def RejectProposal(request, proposal_id=None): proposal.save() remarks = request.POST['remarks'] subject = "Python-TBC: Rejection of Proposal" - message = "Dear "+proposal.user.user.first_name+"\nYour proposal has been\ - rejected. "+request.POST.get('remarks') + message = """Dear """+proposal.user.user.first_name+"""\nYour recent proposal for contributing in Python TBC has been rejected for the following reasons\n"""+request.POST.get('remarks')+"""\n\nHowever, your last proposal will be saved and you can edit the same proposal or propose a fresh one again.\n\nRegards\nPython TBC Team\nFOSSEE - IIT Bombay""" add_log(request.user, proposal, CHANGE, 'Proposal rejected', proposal.id, chat=subject + '\n' + remarks) email_send(proposal.user.user.email, subject, message) @@ -667,7 +687,10 @@ def RejectProposal(request, proposal_id=None): def SubmitSample(request, proposal_id=None, old_notebook_id=None): context = {} - user = request.user + if request.user.is_anonymous(): + return HttpResponseRedirect('/login/?require_login=True') + else: + user = request.user if not _checkProfile(user): return HttpResponseRedirect("/profile/?update=profile") context.update(csrf(request)) @@ -711,7 +734,10 @@ def SubmitSample(request, proposal_id=None, old_notebook_id=None): def ConfirmBookDetails(request): context = {} - current_user = request.user + if request.user.is_anonymous(): + return HttpResponseRedirect('/login/?require_login=True') + else: + current_user = request.user if not _checkProfile(current_user): return HttpResponseRedirect("/profile/?update=profile") user_profile = Profile.objects.get(user=current_user) @@ -727,6 +753,7 @@ def ConfirmBookDetails(request): context['book'] = book_to_update context['chapters'] = chapters context['screenshots'] = screen_shots + context['no_notebooks'] = book_to_update.no_chapters return render_to_response('tbc/update-code.html', context) if request.method == 'POST': book_form = BookForm(request.POST, instance=book_to_update) @@ -756,7 +783,10 @@ def ConfirmBookDetails(request): def SubmitCode(request): - user = request.user + if request.user.is_anonymous(): + return HttpResponseRedirect('/login/?require_login=True') + else: + user = request.user if not _checkProfile(user): return HttpResponseRedirect("/profile/?update=profile") curr_profile = Profile.objects.get(user=user) @@ -795,7 +825,7 @@ def SubmitCode(request): curr_proposal.save() add_log(user, curr_book, CHANGE, 'Codes & Screenshots Resubmitted', curr_proposal.id) - return HttpResponseRedirect('/') + return HttpResponseRedirect('/?bookupdate=done') if request.method == 'POST': for i in range(1, curr_book.no_chapters+1): chapter = Chapters() @@ -819,16 +849,7 @@ def SubmitCode(request): proposal.status = "codes submitted" proposal.save() subject = "Python-TBC: Book Submission" - message = "Hi "+curr_book.reviewer.name+",\n"+\ - "A book has been submitted on the Python TBC interface.\n"+\ - "Details of the Book & Contributor:\n"+\ - "Contributor: "+curr_book.contributor.user.first_name+" "+curr_book.contributor.user.last_name+"\n"+\ - "Book Title: "+curr_book.title+"\n"+\ - "Author: "+curr_book.author+"\n"+\ - "Publisher: "+curr_book.publisher_place+"\n"+\ - "ISBN: "+curr_book.isbn+"\n"+\ - "Follow the link to review the book: \n"+\ - "http://tbc-python.fossee.in/book-review/"+str(curr_book.id) + message = """Hi """+curr_book.reviewer.name+""",\nA book has been submitted on the Python TBC interface.\n Detailf othe book & contributor:\n Contributor: """+curr_book.contributor.user.first_name+""" """+curr_book.contributor.user.last_name+"""\nBook Title"""+curr_book.title+"""\nAuthor: """+curr_book.title+"""\nAuthor: """+curr_book.author+"""\n Publisher: """+curr_book.publisher_place+"""\nISBN: """+curr_book.isbn+"""\nFollow the link to riview the book:\nhttp://tbc-python.fosse.in/book-review/"""+str(curr_book.id) log_chat = subject + '\n' + 'Book ' + curr_book.title + \ ' has been submitted on the Python TBC interface.' add_log(user, curr_book, CHANGE, 'Chapters and Screenshots added', @@ -846,7 +867,10 @@ def SubmitCode(request): def UpdateContent(request, book_id=None): context = {} - user = request.user + if request.user.is_anonymous(): + return HttpResponseRedirect('/login/?require_login=True') + else: + user = request.user current_book = Book.objects.get(id=book_id) chapters_to_update = Chapters.objects.filter(book=current_book) screenshots_to_update = ScreenShots.objects.filter(book=current_book) @@ -865,16 +889,7 @@ def UpdateContent(request, book_id=None): screenshot.save() proposal = Proposal.objects.get(accepted=current_book) subject = "Python-TBC: Book Updated" - message = "Hi "+current_book.reviewer.name+",\n"+\ - "Submission for a book has been updated on the Python TBC interface.\n"+\ - "Details of the Book & Contributor:\n"+\ - "Contributor: "+current_book.contributor.user.first_name+" "+current_book.contributor.user.last_name+"\n"+\ - "Book Title: "+current_book.title+"\n"+\ - "Author: "+current_book.author+"\n"+\ - "Publisher: "+current_book.publisher_place+"\n"+\ - "ISBN: "+current_book.isbn+"\n"+\ - "Follow the link to review the book: \n"+\ - "http://dev.fossee.in/book-review/"+str(current_book.id) + message = """Hi """+curr_book.reviewer.name+""",\nSubmission for a book has been updated on the Python TBC interface.\n Detailf othe book & contributor: \nContributor: """+curr_book.contributor.user.first_name+""" """+curr_book.contributor.user.last_name+"""\nBook Title"""+curr_book.title+"""\nAuthor: """+curr_book.title+"""\nAuthor: """+curr_book.author+"""\n Publisher: """+curr_book.publisher_place+"""\nISBN: """+curr_book.isbn+"""\nFollow the link to riview the book:\nhttp://tbc-python.fosse.in/book-review/"""+str(curr_book.id) log_chat = subject + '\n' + current_book.title +\ ' book has been updated on the Python TBC interface.' add_log(user, current_book, CHANGE, 'book updated', proposal.id, @@ -1015,20 +1030,11 @@ def ApproveBook(request, book_id=None): fp.close() os.popen("cp -r '"+book_title+"' '"+copy_path+"'") subject = "Python-TBC: Book Completion" - message = "Hi "+book.contributor.user.first_name+",\n"+\ - "Congratulations !\n"+\ - "The book - "+book.title+" is now complete.\n"+\ - "Please visit the below given link to download the forms to be filled to complete the formalities.\n"+\ - "http://tbc-python.fossee.in/internship-forms"+"\n"+\ - "The forms should be duly filled(fill only sections which are applicable) & submit at the following address:\n"+\ - "Dr. Prabhu Ramachandran, \n"+\ - "Department of Aerospace Engineering,\n"+\ - "IIT Bombay, Powai, Mumbai - 400076\n"+\ - "Kindly, write Python Texbook Companion on top of the envelope.\n\n\n"+\ - "Regards,\n"+"Python TBC,\n"+"FOSSEE, IIT - Bombay" + message = """Hi """+book.contributor.user.first_name+""",\n +Congratulations !\nThe book - """+book.title+""" is now complete & published.\nPlease visit the link given below to download the forms to be filled to complete the formalities.\nhttp://tbc-python.fossee.in/internship-forms\nThe forms should be duly filled (fill only the sections which are applicable) & submitted at the following address:\nDr. Prabhu Ramachandran,\nDepartment of Aerospace Engineering,\nIIT Bombay, Powai, Mumbai - 400076\nKindly write Python Textbook Companion on top of the envelope.\nIf you already sent the forms then you may kindly ignore this mail.\n\nThank You for your contribution !\nRegards,\n Python TBC Team,\nFOSSEE - IIT Bombay""" add_log(user, book, CHANGE, msg, proposal.id, chat=subject + '\n' + message) - email_send(book.reviewer.email, subject, message) + email_send(book.contributor.user.email, subject, message) context['user'] = user return HttpResponseRedirect("/book-review/?book_review=done") elif request.method == 'POST' and request.POST['approve_notify'] == "notify": @@ -1044,17 +1050,24 @@ def NotifyChanges(request, book_id=None): context = {} if is_reviewer(request.user): book = Book.objects.get(id=book_id) - proposal = Proposal.objects.get(accepted=book) if request.method == 'POST': - proposal.status = "codes disapproved" - proposal.save() + try: + proposal = Proposal.objects.get(accepted=book) + proposal.status = 'codes disapproved' + proposal.save() + msg = "Notified Changes" + except Proposal.DoesNotExist: + proposal = Proposal() + proposal.user = book.contributor + proposal.accepted = book + proposal.status = 'codes disapproved' + proposal.save() + msg = "Notified changes for old book" changes_required = request.POST['changes_required'] subject = "Python-TBC: Corrections Required" - message = "Hi, "+book.contributor.user.first_name+",\n"+\ - "Book titled, "+book.title+" requires following changes: \n"+\ - changes_required + message = """Hi, """+book.contributor.user.first_name+""",\n\nBook titled, '"""+book.title+"""' requires following changes\n"""+changes_required+"""\n\nKindly make the required corrections and submit the codes again.\n\nRegards,\nPython TBC Team\nFOSSEE - IIT Bombay""" context.update(csrf(request)) - add_log(request.user, book, CHANGE, 'Changes notification', + add_log(request.user, book, CHANGE, msg, proposal.id, chat=subject+'\n'+changes_required) email_send(book.contributor.user.email, subject, message) return HttpResponseRedirect("/book-review/?mail_notify=done") @@ -1149,7 +1162,7 @@ def CompletedBooks(request): def BooksUnderProgress(request): context = {} - images = [] + context.update(csrf(request)) if request.user.is_anonymous(): context['anonymous'] = True else: @@ -1157,11 +1170,24 @@ def BooksUnderProgress(request): context['reviewer'] = request.user else: context['user'] = request.user + if request.method == "POST": + category = request.POST['category'] + if category == "all": + books_under_progress = Book.objects.filter(approved=False) + else: + books_under_progress = Book.objects.filter(category=category, + approved=False) + else: + books_under_progress = Book.objects.filter(approved=False) + context['books_under_progress'] = books_under_progress return render_to_response('tbc/books_under_progress.html', context) def GetCertificate(request, book_id=None): - user = request.user + if request.user.is_anonymous(): + return HttpResponseRedirect('/login/?require_login=True') + else: + user = request.user user_profile = Profile.objects.get(user=user) books = Book.objects.filter(contributor=user_profile, approved=True) context = {} @@ -1246,7 +1272,6 @@ def RedirectToIpynb(request, notebook_path=None): # ajax views @csrf_exempt def ajax_matching_books(request): - print "here" titles = request.POST["titles"] titles = json.loads(titles) matches = [] |