some changes

project/allocation/migrations/0001_initial.py

 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2017-10-21 10:18
+# Generated by Django 1.11.5 on 2017-10-22 19:07
 from __future__ import unicode_literals
 
 from django.db import migrations, models

project/templates/core/home_page.css → project/allocation/static/allocation/home_page.css

@@ -7,9 +7,10 @@
     bottom: 0;
     left: 0;
     right: 0;
-    /*z-index: 1;*/
+    z-index: -1;
     background-image: url('BG.png');
-    background-size: 2000px 700px;
+    /*background-size: 2000px 700px;*/
+    background-size: 100% 75%; 
     background-repeat: no-repeat;
     background-attachment: fixed;
     opacity: 0.60;
@@ -17,27 +18,31 @@
 
 .content {
     position: relative; 
-    margin-top: 300px;
+    margin-top: 16%;
     font-size: 60px;
     opacity: 20;
 }​
 
 .tool1 {
-    margin-top: 680px;
+    /*margin-top: 680px;*/
     background-color: green;
+    z-index: 1;
 }
 
 .tool2 {
-    margin-top: 700px;
+    /*margin-top: 700px;*/
     background-color: #5DBCD2;
+    z-index: 1;
 }
 
 .tool3 {
-    margin-top: 720px;
+    /*margin-top: 720px;*/
     background-color: #5DBCD2;
+    z-index: 1;
 }
 
 .tool4 {
-    margin-top: 720px;
+    /*margin-top: 720px;*/
     background-color: #5DBCD2;
+    z-index: 1;
 }
\ No newline at end of file

project/allocation/templates/allocation/admin1.html

 {% extends "admin/base.html" %}
 {% load i18n admin_urls static admin_list %}
+
+<!-- added by aman -->
+{% load tag %}
+<!--  -->
 {% block branding %}
 <h1 id="site-name">Institute Homepage</h1>
 {% endblock %}
@@ -26,6 +30,20 @@
 {% endblock %}
 
 {% block content %}
-<p><a href="{% url 'allocation:applicant_list' %}">Applicants</a></p>
-<p><a href="{% url 'allocation:choice_list' %}">Choices</a></p>
+<p style="font-size: 30px;"><a href="{% url 'allocation:applicant_list' %}">Applicants</a></p>
+<p style="font-size: 30px;"><a href="{% url 'allocation:choice_list' %}">Choices</a></p>
+
+
+{% if request.get_full_path == "/allocation/admin" %}
+<div style="float:right; vertical-align: top; margin-top: -140px">
+	  <form method="POST" action="/allocation/button_action" enctype="multipart/form-data">
+	    {% csrf_token %}
+	    <input type="hidden" name="prikey" value="{{ request.get_full_path }}">  
+	    <button type="submit" style="width: 180px; height: 40px; font-size: 25px"> Allocate</button>
+	  </form>
+<div>
+
+
+{% endif %}
 {% endblock %}
+

project/allocation/templates/allocation/applicant_list.html

@@ -11,7 +11,14 @@
 
 {% if applicant_list %}
 <ul>
-
+  <li style="float:right; vertical-align: top;">
+	<h3 style="margin-top: -50px"> For uploading Applicant</h3>
+	<form method="POST" action="/allocation/applicant_make" enctype="multipart/form-data">
+    {% csrf_token %}
+    <input type="file" name="myfile" title='Please upload file in .csv format only'>
+    <button type="submit">Upload</button>
+    </form>
+  </li>
   {% for applicant in applicant_list %}
   <li>
     <a href="{% url 'allocation:applicant-detail' applicant.pk %}">{{ applicant.name }}</a> 
@@ -20,6 +27,14 @@
 
 </ul>
 {% else %}
+<li style="float:right; vertical-align: top;">
+	<h3 style="margin-top: -50px"> For uploading Applicant</h3>
+	<form method="POST" action="/allocation/applicant_make" enctype="multipart/form-data">
+    {% csrf_token %}
+    <input type="file" name="myfile" title='Please upload file in .csv format only'>
+    <button type="submit">Upload</button>
+    </form>
+</li>
 <p>There are no applicants.</p>
 {% endif %} 
 {% endblock %}

project/allocation/templates/allocation/choice_list.html

@@ -12,14 +12,37 @@
 {% if choice_list %}
 <ul>
 
+  <li style="float:right; vertical-align: top;">
+	<h3 style="margin-top: -50px"> For uploading choices</h3>
+	<form method="POST" action="/allocation/choice_make" enctype="multipart/form-data">
+    {% csrf_token %}
+    <input type="file" name="myfile" title='Please upload file in .csv format only'>
+    <button type="submit">Upload</button>
+    </form>
+  </li>
+  
   {% for choice in choice_list %}
   <li>
     <a href="{% url 'allocation:choice-detail' choice.pk %}">{{ choice.choice_name }}</a> 
   </li>
+
   {% endfor %}
 
 </ul>
+
 {% else %}
+
+<li style="float:right; vertical-align: top;"">
+	<h3 style="margin-top: -50px"> For uploading choices</h3>
+	<form method="POST" action="/allocation/choice_make" enctype="multipart/form-data">
+    {% csrf_token %}
+    <input type="file" name="myfile" title='Please upload file in .csv format only'>
+    <button type="submit">Upload</button>
+    </form>
+</li>
 <p>There are no choices available.</p>
 {% endif %} 
+
+</div>
+
 {% endblock %}

project/allocation/templatetags/tag.py

+from django import template
+
+register = template.Library()
+
+@register.assignment_tag
+def hello_world(name):
+    value = name.split('/')[-4]
+    if value == "institute": return True; return False
\ No newline at end of file

project/allocation/urls.py

@@ -15,9 +15,9 @@ urlpatterns = [
     url(r'^choice/create$', views.ChoiceCreateView.as_view(), name='choice-create'),
     url(r'^choice/(?P<pk>\d+)/update$', views.ChoiceUpdate.as_view(), name='choice-update'),
     url(r'^choice/(?P<pk>\d+)/delete$', views.ChoiceDelete.as_view(), name='choice-delete'),
-    url(r'^import_db$', views.import_db, name='import_db1'),
+    url(r'^choice_make$', views.choice_make, name='choice_make'),
     url(r'^applicant_make$', views.applicant_make, name='applicant_make'),
-    
+    url(r'^button_action$', views.button_action, name='button_action'),
     #url(r'^admin/choices$', views.ChoiceListView.as_view(), name='choice_list'),
     #url(r'^admin/applicants$', views.ApplicantListView.as_view(), name='applicant_list'),
 

project/allocation/views.py

@@ -19,6 +19,8 @@ from django import forms
 import csv
 from django.urls import reverse_lazy
 
+from alloc import *
+
 # @login_required(login_url='/admin/login')
 # def index(request): #for /allocation
 #   applicant=Applicant.objects.filter(name=request.user.username)[0]
@@ -28,18 +30,22 @@ from django.urls import reverse_lazy
 #   form = ArticleForm(instance=applicant)
 #   return render(request, 'allocation/index.html', {'applicant': applicant, 'form': form})
 
-def index(request):
-    return HttpResponse("Hello, world. You're at the allocation index.")
-
-def index1(request):
-    return render(request,'core/home_page.html')
+def button_action(request):
+    # value = request.POST["prikey"]
+    # value = int(value.split('/')[-3])
+    # name = Institute.objects.get(pk=value).name
+    # allocator(name)
+    # return HttpResponse("success")
+    institute=request.user.username
+    allocator(institute)
+    return HttpResponse("success")
 
 def home(request):
     documents = Document.objects.all()
     return render(request, 'core/home.html', { 'documents': documents })
     return HttpResponse("On home")
 
-def import_db(request):
+def choice_make(request):
     if request.method == "POST":
         csvfile = request.FILES['myfile']
         file_data = csvfile.read().decode("utf-8")
@@ -78,12 +84,11 @@ AppFormset = modelformset_factory(Application,fields=("choice", "priority" ), ex
 
 @login_required(login_url='/admin/login')
 def index(request): #for /allocation
-	applicant=get_object_or_404(Applicant, name=request.user.username)[0]
+	applicant=get_object_or_404(Applicant, name=request.user.username)
 	# form1 = modelform_factory(Applicant, fields=("name", "rank" ))
 	formset = AppFormset(queryset=Application.objects.filter(applicant=applicant),)
 	return render(request, 'allocation/index.html', {'applicant': applicant,  'formset': formset,})
 
-
 # def submit(request):
 #   if request.method == 'POST':
 #       formset = AppFormset(request.POST)
@@ -107,36 +112,36 @@ def submit(request):
 
 @login_required(login_url='/admin/login')
 def admin1(request):
-	institute=get_object_or_404(Institute,name=request.user.username)[0]
+	institute=get_object_or_404(Institute,name=request.user.username)
 	return render(request, 'allocation/admin1.html',{'institute': institute})
 
 
 class ChoiceListView(generic.ListView):
 	model = Choice
 	def get_context_data(self, **kwargs):
-		institute=get_object_or_404(Institute,name=request.user.username)[0]
+		institute=get_object_or_404(Institute,name=self.request.user.username)
 		context = super(ChoiceListView, self).get_context_data(**kwargs)
 		context['institute'] = institute
 		return context
 	def get_queryset(self):
-		institute=get_object_or_404(Institute,name=request.user.username)[0]
+		institute=get_object_or_404(Institute,name=self.request.user.username)
 		return Choice.objects.filter(institute__name=institute.name)
 
 class ApplicantListView(generic.ListView):
 	model = Applicant
 	def get_context_data(self, **kwargs):
-		institute=get_object_or_404(Institute,name=request.user.username)[0]
+		institute=get_object_or_404(Institute,name=self.request.user.username)
 		context = super(ApplicantListView, self).get_context_data(**kwargs)
 		context['institute'] = institute
 		return context
 	def get_queryset(self):
-		institute=get_object_or_404(Institute,name=request.user.username)[0]
+		institute=get_object_or_404(Institute,name=self.request.user.username)
 		return Applicant.objects.filter(institute__name=institute.name)
 
 class ChoiceDetailView(generic.DetailView):
 	model = Choice
 	def get_context_data(self, **kwargs):
-		institute=get_object_or_404(Institute,name=request.user.username)[0]
+		institute=get_object_or_404(Institute,name=self.request.user.username)
 		context = super(ChoiceDetailView, self).get_context_data(**kwargs)
 		context['institute'] = institute
 		return context
@@ -144,11 +149,12 @@ class ChoiceDetailView(generic.DetailView):
 class ApplicantDetailView(generic.DetailView):
 	model = Applicant
 	def get_context_data(self, **kwargs):
-		institute=get_object_or_404(Institute,name=request.user.username)[0]
+		institute=get_object_or_404(Institute,name=self.request.user.username)
 		context = super(ApplicantDetailView, self).get_context_data(**kwargs)
 		context['institute'] = institute
 		return context
 
+
 class ChoiceCreateView(CreateView):
     model = Choice
     fields = ['choice_name', 'capacity', 'institute']
@@ -157,7 +163,7 @@ class ChoiceUpdate(UpdateView):
     model = Choice
     fields = ['choice_name','capacity']
     template_name_suffix = '_update'
-    success_url = 'allocation:choice_list'
+    success_url = reverse_lazy('allocation:choice_list')
 
 class ChoiceDelete(DeleteView):
     model = Choice

project/mysite/urls.py

@@ -16,7 +16,7 @@ Including another URLconf
 from django.conf.urls import url, include
 from django.contrib import admin
 from django.contrib.auth import views
-from allocation import views
+from . import views
 
 
 urlpatterns = [

project/mysite/views.py

+from django.contrib.auth.decorators import login_required
+from django.contrib.auth.models import User
+from django.shortcuts import render, redirect
+from django.contrib.auth import authenticate, login
+
+
+def index1(request):
+    return render(request,'core/home_page.html')
\ No newline at end of file

project/templates/admin/change_form.html

+{% extends "admin/change_form.html" %}
+{% load i18n %} 
+{% load tag %}
+{% block object-tools-items %}
+{{ block.super }}
+
+
+
+{% hello_world request.get_full_path as name %}
+
+{% if name == True %}
+	<li>
+	  <form method="POST" action="/allocation/button_action" enctype="multipart/form-data">
+	    {% csrf_token %}
+	    <input type="hidden" name="prikey" value="{{ request.get_full_path }}">  
+	    <button type="submit"> Allocate</button>
+	  </form>
+	</li>
+{% endif %}
+
+
+
+{% endblock %}
\ No newline at end of file

project/templates/admin/change_list.html

@@ -26,4 +26,15 @@
 {% endif %}
 
 
+<!-- {% if request.get_full_path == "/admin/allocation/institute/1/change/" %}
+<li>
+  <form method="POST" action="/allocation/button_action" enctype="multipart/form-data">
+    {% csrf_token %}
+    <button type="submit"> Allocate</button>
+  </form>
+</li>
+{% endif %} -->
+
+
+
 {% endblock %}

project/templates/core/home_page.html

+{% load static %}
 <html> 
 <head>
-	<link rel="stylesheet" type="text/css" href="allocation/home_page.css">
+  <link rel="stylesheet" type="text/css" href="{% static 'allocation/home_page.css' %}" />
 </head>
 <body>
 <table >
         <tr>
-				<td rowspan="2"><a class="logoText"><img src="logo.png"  width="150" height="150" alt="logo"></a></td>
+        <td rowspan="2"><a class="logoText"><img src="{% static 'allocation/logo.png' %}"  width="100%" height="100%" alt="logo"></a></td>
         <td style="vertical-align: bottom; padding-left:5px; padding-bottom: 2px; font-size: 20px"><a class="logoText" ><B>codeMAFIA</B></a></td>
         </tr>
         <tr>
@@ -17,19 +18,24 @@
     <div class="content"><h1 align="center" style="color:black">General Allocation Portal</h1></div>
   </div>
 
-  <div class="tool1" style="margin-top: 570px; text-align: center; font-size: 30px;">
+  <div class="tool1" style="margin-top: 29%; text-align: center; font-size: 30px;">
   </div>
 
+  
   <div class="tool2" style="margin-top: 10px; text-align: center; font-size: 50px; color: white">
+  <a href = "/allocation/admin">
     Institute login
+  </a>
   </div>
 
   <div class="tool3" style="margin-top: 5px; text-align: center; font-size: 50px; color:white">
+    <a href="/allocation">
       Applicant login
+    </a>
   </div>
 
   <div class="tool4" style="margin-top: 5px; text-align: center; font-size: 50px; color:white">
-  	Admin login
+    Register with us
   </div>
 
 

project/templates/core/simple_upload.html

-{% extends 'base.html' %}
-
-{% load static %}
-
-{% block content %}
-  <form method="post" enctype="multipart/form-data">
-    {% csrf_token %}
-    <input type="file" name="myfile">
-    <button type="submit">Upload</button>
-  </form>
-
-  {% if uploaded_file_url %}
-    <p>File uploaded at: <a href="{{ uploaded_file_url }}">{{ uploaded_file_url }}</a></p>
-  {% endif %}
-
-  <p><a href="{% url 'home' %}">Return to home</a></p>
-{% endblock %}
\ No newline at end of file