You can now return loaned movies

project/controllers/loan.py

@@ -45,7 +45,6 @@ def reminderEmail(user=None):
 @app.route('/loan-movie', methods=['POST'])
 @security('user')
 def createLoan(user=None):
-	import smtplib
 	from datetime import datetime
 	borrower = request.form['email']
 	return_date = request.form['date'] or None
@@ -71,3 +70,27 @@ def createLoan(user=None):
 	borrowed_lib.addUnit(movie)
 
 	return jsonify(response='success',type="reload")
+
+@app.route('/return-movie', methods=['POST'])
+@security('user')
+def returnMovie(user=None):
+	movie_id = request.form['id']
+	
+	if not movie_id:
+		return jsonify(response='error',message='Invalid Movie given'),404
+	from project.model.Movie import Movie
+	movie = Movie.objects(id=movie_id).first()
+	if not movie:
+		return jsonify(response='error',message='Invalid Movie given'),404
+	
+	from project.model.Loan import Loan
+	loan = Loan.objects(user=user,movie=movie).first()
+	if not loan:
+		return jsonify(response='error',message='This movie has not been loaned out and cannot be returned'),404	
+
+	from project.model.Library import Library
+	borrowed_lib = Library.objects(user=user,unit="Movie",name="Borrowed").first()
+	borrowed_lib.removeUnit(movie)
+	loan.delete()
+
+	return jsonify(response='success',type="reload")		
\ No newline at end of file

project/templates/library/library.html

@@ -33,6 +33,7 @@
                                 <button type="button" class="btn btn-default btn-small lend-movie" data-toggle="modal" data-target="#loan-form" data-id='{{ movie.id }}'>Lend</button>
                               {% else %}  
                                 This movie is loaned to {{ loan.email }} and is due back on {{ loan.expected_return_date.strftime('%m-%d-%Y') }}
+                                <button type="button" class="btn btn-default btn-small return-movie" data-toggle="modal" data-target="#return-form" data-id='{{ movie.id }}'>Return</button>
                               {% endif %}
                               {% if library.name != "Master" or loan == None %}
                                 <button type="button" class="btn btn-default btn-small remove-movie" data-id='{{ loop.index }}'>Remove</button>
@@ -61,6 +62,7 @@
                                   <button type="button" class="btn btn-default btn-small lend-movie" data-toggle="modal" data-target="#loan-form" data-id='{{ movie.id }}'>Lend</button>
                               {% else %}  
                                 This movie is loaned to {{ loan.borrower_email }} and is due back on {{ loan.expected_return_date.strftime('%m-%d-%Y') }}
+                                <button type="button" class="btn btn-default btn-small return-movie" data-toggle="modal" data-target="#return-form" data-id='{{ movie.id }}'>Return</button>
                               {% endif %}
                               {% if library.name != "Master" or loan == None %}
                                 <button type="button" class="btn btn-default btn-small remove-movie" data-id='{{ loop.index }}'>Remove</button>
@@ -120,6 +122,37 @@
 
                 }
             });
+
+            var returnPath = '{{ url_for("returnMovie") }}';
+            $('.return-movie').on('click',function(event){
+                var movie_id = $(this).data('id');
+                var message = "Are you sure you want return this movie? ";
+                if(confirm(message)){
+                    event.stopPropagation();
+                    event.preventDefault();
+                    $.ajax({
+                        url: returnPath,
+                        data: {id:movie_id},
+                        method: 'POST',
+                        success: function(data,status,jqXHR){
+                            if(data['response'] == 'success'){
+                                if(data['type'] == 'redirect'){
+                                    window.document.location = data['path'];
+                                } else if (data['type'] == 'reload') {
+                                    window.document.location.reload();
+                                }
+                            }
+                        },
+                        error: function(jqXHR, textStatus, errorThrown){
+                            response = jqXHR.responseJSON;
+                            if('message' in response){
+                                alert(response['message']);
+                            }
+                        }
+                    });
+
+                }
+            });
         });
     </script>
 {% endblock %}