From 2d9741e7c502abcc30d8fb05dab9446c33d5e3dd Mon Sep 17 00:00:00 2001
From: OjusWiZard <ojuswimail@gmail.com>
Date: Fri, 27 Aug 2021 19:53:36 +0530
Subject: [PATCH 1/9] added email data collection form

Signed-off-by: OjusWiZard <ojuswimail@gmail.com>
---
 HTTP_200/settings.py                          |   1 +
 .../templates/admin/wifi/change_list.html     |   6 +-
 HTTP_200/templates/bookmark.html              |   4 +
 HTTP_200/templates/notices/list.html          |   4 +
 HTTP_200/templates/profiles/profile.html      |   4 +
 HTTP_200/templates/wifi/studentemailform.html | 524 ++++++++++++++++++
 HTTP_200/templates/wifi/studentwifiform.html  |   4 +
 HTTP_200/urls.py                              |   2 +-
 apps/notices/decorators.py                    |  10 +-
 apps/wifi/admin.py                            |   9 +-
 apps/wifi/forms.py                            |  10 +-
 apps/wifi/migrations/0003_emaildetail.py      |  28 +
 apps/wifi/models.py                           |  27 +
 apps/wifi/urls.py                             |  11 +-
 apps/wifi/views.py                            |  84 ++-
 requirements/common.txt                       |   2 +-
 16 files changed, 713 insertions(+), 17 deletions(-)
 create mode 100644 HTTP_200/templates/wifi/studentemailform.html
 create mode 100644 apps/wifi/migrations/0003_emaildetail.py

diff --git a/HTTP_200/settings.py b/HTTP_200/settings.py
index 4b365c14..0aa8458a 100644
--- a/HTTP_200/settings.py
+++ b/HTTP_200/settings.py
@@ -263,6 +263,7 @@
 ]
 
 MEDIA_ROOT = os.path.join(TEMPLATE_DIR, 'media')
+MEDIA_URL = '/media/'
 
 SPAGHETTI_SAUCE = {
     'apps': ['auth', 'notices', 'profiles', 'notifications'],
diff --git a/HTTP_200/templates/admin/wifi/change_list.html b/HTTP_200/templates/admin/wifi/change_list.html
index 551ccb76..7235fffa 100644
--- a/HTTP_200/templates/admin/wifi/change_list.html
+++ b/HTTP_200/templates/admin/wifi/change_list.html
@@ -57,7 +57,11 @@
         <ul class="object-tools">
           {% block object-tools-items %}
            <li>
-              <a href="{% url 'excel_writer' %}">Download Excel File
+              <a href="{% url 'excel_writer' %}">Download Wifi Excel File
+              </a>
+            </li>
+            <li>
+              <a href="{% url 'email_excel_writer' %}">Download Email Excel File
               </a>
             </li>
             <li>
diff --git a/HTTP_200/templates/bookmark.html b/HTTP_200/templates/bookmark.html
index 99048877..b2ecfe1a 100644
--- a/HTTP_200/templates/bookmark.html
+++ b/HTTP_200/templates/bookmark.html
@@ -127,6 +127,10 @@
                         <a href="{% url "student-wifi" %}">
                         <i class="fa fa-wifi"></i> &nbsp;Wifi-Form</a>
                     </li>
+                    <li class=" move-in">
+                        <a href="{% url "student-email" %}">
+                        <i class="fa fa-envelope"></i> &nbsp;Email-Form</a>
+                    </li>
                     {% endif %}
                     <li class="active move-in">
                         <a href="{% url "bookmark-list" %}">
diff --git a/HTTP_200/templates/notices/list.html b/HTTP_200/templates/notices/list.html
index 07cdbd6e..06923784 100644
--- a/HTTP_200/templates/notices/list.html
+++ b/HTTP_200/templates/notices/list.html
@@ -125,6 +125,10 @@
                         <a href="{% url "student-wifi" %}">
                         <i class="fa fa-wifi"></i> &nbsp;Wifi-Form</a>
                     </li>
+                    <li class=" move-in">
+                        <a href="{% url "student-email" %}">
+                        <i class="fa fa-envelope"></i> &nbsp;Email-Form</a>
+                    </li>
                     {% endif %}
                     <li class="{% if request.get_full_path == '/notices/bookmark/' %}active{% endif %} move-in">
                         <a href="{% url "bookmark-list" %}">
diff --git a/HTTP_200/templates/profiles/profile.html b/HTTP_200/templates/profiles/profile.html
index 6d15d185..3415bca9 100644
--- a/HTTP_200/templates/profiles/profile.html
+++ b/HTTP_200/templates/profiles/profile.html
@@ -125,6 +125,10 @@
                         <a href="{% url "student-wifi" %}">
                         <i class="fa fa-wifi"></i> &nbsp;Wifi-Form</a>
                     </li>
+                    <li class=" move-in">
+                        <a href="{% url "student-email" %}">
+                        <i class="fa fa-envelope"></i> &nbsp;Email-Form</a>
+                    </li>
                     {% endif %}
                     <li class=" move-in">
                         <a href="{% url "bookmark-list" %}">
diff --git a/HTTP_200/templates/wifi/studentemailform.html b/HTTP_200/templates/wifi/studentemailform.html
new file mode 100644
index 00000000..b1f3e3a3
--- /dev/null
+++ b/HTTP_200/templates/wifi/studentemailform.html
@@ -0,0 +1,524 @@
+{% load staticfiles %}
+
+<html>
+    <head>
+    	<title>
+    		E-mail
+    	</title>
+    	<meta name="viewport" content="width=device-width, initial-scale=1">
+    	<meta name="theme-color" content="#2d2251">
+    	<link rel="shortcut icon" type="image/x-icon" href="{% static "images/favicon.ico"%}">
+    	<link rel="stylesheet" href="http://code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.css">
+    	<link rel="stylesheet" href="{% static "css/default.css" %}">
+    	<link rel="stylesheet" href="{% static "css/main.css" %}">
+    	<link rel="stylesheet" href="{% static "css/style.css" %}">
+    	<link rel="stylesheet" href="{% static "css/font-awesome.css" %}">
+        <script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-53104159-5', 'auto');
+  ga('send', 'pageview');
+
+    </script>
+
+    	
+    </head>
+
+    <body>
+
+
+
+        <div class="loader-container">
+        <div class="loader">
+          <img src="{% static "images/connect.gif"%}">
+        </div>
+        
+      </div>
+
+
+
+    	{% for message in messages %}    
+            <div class="notice-msg">
+                {{ message }}
+            </div>
+        {% endfor %}
+
+    	<div class="overlay-dark-mob">
+    		<div class="cross-mobile"><i class="fa fa-times"></i></div>
+    	</div>
+    	<div class="dot-menu-links">
+    		
+    		<ul>				
+    			   <li>
+                        <a href="{% url "home" %}">Home</a>
+                    </li>
+                    
+                    <li>
+                        <a href="{% url "about" %}">About</a>
+                    </li>
+                    <li>
+                        <a href="{% url "contact" %}">Contact</a>
+                    </li>
+                    
+                    <li>
+                        <a href="http://jssaten.ac.in" target="_blank">JSS Website</a>
+                    </li>
+    			</li>
+    			
+    		</ul>
+    	</div>
+    	
+    		<div class="overlay-dark">
+    		<div class="cross-mobile"><i class="fa fa-times"></i></div>
+    	</div>
+
+    	  <div class="left-nav">
+            <div class="logo">
+               <a href="{% url "home" %}">
+                <img src="{% static "images/logo.PNG"%}">
+            </a>
+            </div>
+
+            <div class="left-nav-inner">
+                <ul>
+                    <li class=" move-in">
+                        <a href="{% url "notice-list" %}">
+                        <i class="fa fa-thumb-tack"></i> &nbsp;All Notices<!-- <span class="number active_number">5</span> --></a>
+                    </li>
+                    <li class=" move-in">
+                        <a href="{% url "relevent-notice-list" %}">
+                        <i class="fa fa-tags"></i> &nbsp;Relevant<!-- <span class="number active_number">5</span> --></a>
+                    </li>
+                    <li class=" move-in">
+                        <a href="{% url "notice-list" %}?category=administration">
+                        <i class="fa fa-university"></i> &nbsp;Administration<!-- <span class="number">6</span> --></a>
+                    </li>
+                    <li class=" move-in">
+                        <a href="{% url "notice-list" %}?category=academics">
+                        <i class="fa fa- fa-pencil-square-o"></i> &nbsp;Academics<!-- <span class="number">2</span> --></a>
+                    </li>
+                    <li class=" move-in">
+                        <a href="{% url "notice-list" %}?category=events">
+                        <i class="fa fa-calendar"></i> &nbsp;Events<!-- <span class="number">2</span> --></a></li>
+                    </a>
+                        <li class=" move-in">
+                            <a href="{% url "notice-list" %}?category=tnp">
+                            <i class="fa fa-graduation-cap"></i> &nbsp;Placement<!-- <span class="number">1</span> --></a>
+                        </li>
+                     
+                        <li class=" move-in">
+                            <a href="{% url "notice-list" %}?category=misc">
+                            <i class="fa fa-list-alt"></i> &nbsp;Misc.<!-- <span class="number">9+</span> --></a>
+                        </li>
+                           <li class="">
+                            <a class="search2">
+                            <i class="fa fa-filter"></i> &nbsp;Filter Notices<!-- <span class="number">1</span> --></a>
+                        </li>
+                        <li class=" move-in">
+                            <a href="{% url "bookmark-list" %}">
+                            <i class="fa fa-star"></i> &nbsp;Starred</a>
+                        </li>
+
+                        <div class="line">
+                        </div>
+                    {% if request.user.groups.all.0.name == 'faculty' or request.user.groups.all.0.name == 'hod' or request.user.groups.all.0.name == 'management' %}
+                    <li class="move-in">
+                        <a href="{% url "faculty-wifi" %}">
+                        <i class="fa fa-wifi"></i> &nbsp;Wifi-Form</a>
+                    </li>
+                    {% else %}
+                    <li class="move-in">
+                        <a href="{% url "student-wifi" %}">
+                        <i class="fa fa-wifi"></i> &nbsp;Wifi-Form</a>
+                    </li>
+                    <li class=" active move-in">
+                        <a href="{% url "student-email" %}">
+                        <i class="fa fa-envelope"></i> &nbsp;Email-Form</a>
+                    </li>
+                    {% endif %}
+                        <li class=" move-in">
+                            <a href="{% url "user-profile" user_id=request.user.username %}">
+                            <i class="fa fa-user"></i> &nbsp;My profile</a>
+                        </li>
+                        {% if request.user.groups.all.0.name == 'faculty' or request.user.groups.all.0.name == 'hod' or request.user.groups.all.0.name == 'management'  %}
+                        <li class=" move-in">
+                            <a href="{% url "my-uploaded-notices" %}">
+                            <i class="fa fa-user-secret"></i> &nbsp;My uploaded notices</a>
+                        </li>
+                        {% endif %}
+                        <li class="  move-in">
+                            <a href="{% url "password_change" %}">
+                            <i class="fa fa-key"></i> &nbsp;Change Password</a>
+                        </li>
+                        <li>
+                            <a href="{% url "account_logout" %}">
+                            <i class="fa fa-inbox"></i> &nbsp;Logout</a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+
+
+
+
+    <div class="relevant-page">
+    		<header class="profile-header">
+    			<div class="row">
+    				<div class="heading-small col sm-col-4">
+    					<h3 class="profile-head"><span class="mobile-menu"><i class="fa fa-bars"></i></span>E-mail Form</h3>
+    				</div>
+    				<div class="head-links-resize col sm-col-8">
+    					<div class="head-links">
+    						<ul>
+    							   <li>
+                                    <a href="{% url "home" %}">Home</a>
+                                </li>
+                                
+                                <li>
+                                    <a href="{% url "about" %}">About</a>
+                                </li>
+                                <li>
+                                    <a href="{% url "contact" %}">Contact</a>
+                                </li>
+                                
+                                <li>
+                                    <a href="http://jssaten.ac.in" target="_blank">JSS Website</a>
+                                </li>
+    							
+    						</ul>
+
+    					</div>
+    					<br>
+
+    						<i class="mob-edit fa fa-pencil"></i> 
+    						<i class="mob-save fa fa-save"></i> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+    						<div class="mob-side-link">
+    						<span class="dot-mob">
+    						</span>
+    						<span class="dot-mob">
+    						</span>
+    						<span class="dot-mob">
+    						</span>
+    					</div>
+
+    				</div>
+    			</div>
+    		</header>
+    			<div class="profile-form" >
+    				
+    				<form id="studentemail-form" enctype="multipart/form-data" action="{% url 'student-email' %}" method="POST">
+
+    				{% csrf_token %}
+    				
+    				<div class=" row">
+    					<div class="top-range col col-4">
+    						<h2><i class="fa fa-user-secret"></i>	&nbsp;Username </h2>
+    						<input type="text" class="input-style " value="{{user.username}}" disabled>
+    					</div>
+    					<div class="top-range col col-4">
+    						<h2><i class="fa fa-user"></i>	&nbsp;First Name <i class="show-icon fa fa-pencil"></i></h2>
+    						<input type="text" class="input-style edit-input" value="{{ user.first_name }}" disabled>
+    					</div>
+    					<div class="top-range col col-4">
+    						<h2><i class="fa fa-user"></i>	&nbsp;Last Name <i class="show-icon fa fa-pencil"></i></h2>
+    						<input type="text" class="input-style edit-input" placeholder="Last Name" value="{{ user.last_name }}" disabled>
+    					</div>
+    				</div>
+
+    					<div class=" row">
+    						<div class="top-range col col-4">
+    							<h2><i class="fa fa-graduation-cap"></i>	&nbsp;Course <i class="show-icon fa fa-pencil"></i></h2>
+    							<input type="text" class="input-style edit-input" value="{{ details.course }}" disabled>
+    						</div>
+
+    						<div class="top-range col col-4">
+    							<h2><i class="fa fa-code-fork"></i>	&nbsp;Branch <i class="show-icon fa fa-pencil"></i></h2>
+    							<input type="text" class="input-style edit-input" value="{{ details.branch }}" disabled>
+    						</div>
+
+    						<div class="top-range col col-4">
+    							<h2><i class="fa fa-envelope"></i>	&nbsp;Year <i class="show-icon fa fa-pencil"></i></h2>
+    							<input type="text" class="input-style edit-input" value="{{ details.year }}" disabled>
+    						</div>
+    					
+    					</div>
+    					<div class="row">
+                        {% if email_data %}
+                            <div class="top-range col col-4">
+                                <h2><i class="fa fa-question"></i> &nbsp;Purpose <i class="show-icon fa fa-pencil"></i></h2>
+                                <input type="text" class="input-style edit-input" name="email_purpose" value="{{ email_data.email_purpose }}" style="margin-top: 5px" placeholder="Why do you want an email?" disabled>
+                            </div>
+                            <div class="top-range col col-4">
+                                <h2><i class="fa fa-file"></i> &nbsp;Attachment <i class="show-icon fa fa-pencil"></i></h2>
+                                <input type="file" class="input-style edit-input" name="attachment" value="{{ mac_address.attachment }}">
+                            </div>
+                            </form>
+                        {% else %}
+                            <form id="studentemail-form" action="{% url 'student-email' %}" method="POST">
+                                {% csrf_token %}
+                            <div class="top-range col col-4">
+                                <h2><i class="fa fa-question"></i> &nbsp;Purpose <i class="show-icon fa fa-pencil"></i></h2>
+                                <input type="text" class="input-style edit-input" name="email_purpose" style="margin-top: 5px" placeholder="Why do you want an email?" required>
+                            </div>
+                            <div class="top-range col col-4">
+                                <h2><i class="fa fa-file"></i> &nbsp;Attachment <i class="show-icon fa fa-pencil"></i></h2>
+                                <input type="file" class="input-style edit-input" name="attachment">
+                            </div>
+                        {% endif %}
+    					</div>
+                        <div class="row">
+                            <div class="top-range col col-1">
+                                <button class="submit-contact" type="submit"> Submit </button> 
+                            </div>
+                        </div>
+                    </div>
+    			</form>
+<footer>
+      <h4>Quick Links</h4>
+      <div class="footer-line"></div>
+      <div class="row">
+        <div class="footer-links">
+          <div class="col col-3">
+            <h4><a href="http://www.jssonline.org/" target="_blank">JSS Mahavidyapeetha</a></h4>
+          </div>
+          <div class="col col-3">
+            <h4><a href="http://jssaten.ac.in/" target="_blank">JSS Website</a></h4>
+          </div>
+          <div class="col col-3">
+            <h4><a href="http://jssstepnoida.org/" target="_blank">JSS STEP</a></h4>
+          </div>
+          <div class="col col-3">
+            <h4><a href="http://jssaten.ac.in/library/" target="_blank">JSS Library</a></h4>
+          </div>
+        </div>
+      </div>
+      <div class="row">
+        <div class="footer-links">
+          <div class="col col-3">
+            <h4><a href="https://ndl.iitkgp.ac.in/" target="_blank">National Digital Library of India</a></h4>
+          </div>
+          <div class="col col-3">
+            <h4><a href="http://aktu.ac.in/" target="_blank">UPTU Website</a></h4>
+          </div>
+          <div class="col col-3">
+            <h4><a href="http://jssaten.ac.in/Academics/MBA/" target="_blank">MBA</a></h4>
+          </div>
+          <div class="col col-3">
+            <h4><a href="http://jssaten.ac.in/Academics/MCA/mca.php" target="_blank">MCA</a></h4>
+          </div>
+        </div>
+      </div>
+      <div class="row">
+        <div class="footer-links">
+          <div class="col col-3">
+            <h4><a href="http://jssaten.ac.in/Academics/CSE/" target="_blank">Computer Science & Engineering</a></h4>
+          </div>
+          <div class="col col-3">
+            <h4><a href="http://jssaten.ac.in/Academics/IT/" target="_blank">Information Technology</a></h4>
+          </div>
+          <div class="col col-3">
+            <h4><a href="http://jssaten.ac.in/Academics/ME/" target="_blank">Mechanical Engineering</a></h4>
+          </div>
+          <div class="col col-3">
+            <h4><a href="http://jssaten.ac.in/Academics/CE/" target="_blank">Civil Engineering</a></h4>
+          </div>
+        </div>
+      </div>
+      <div class="row">
+        <div class="footer-links">
+          <div class="col col-3">
+            <h4><a href="http://jssaten.ac.in/Academics/ECE/" target="_blank">Electronics & Communication Engineering</a></h4>
+          </div>
+          <div class="col col-3">
+            <h4><a href="http://jssaten.ac.in/Academics/EE/" target="_blank">Electrical Engineering</a></h4>
+          </div>
+          <div class="col col-3">
+            <h4><a href="http://jssaten.ac.in/Academics/eee/" target="_blank">Electrical and Electronics Engineering</a></h4>
+          </div>
+          <div class="col col-3">
+            <h4><a href="http://jssaten.ac.in/Academics/ice/Index.php" target="_blank">Instrumentation and Control</a></h4>
+          </div>
+        </div>
+      </div>
+      <div class="sub-footer ">
+        <h4><a href="http://www.hackncs.com" target="_blank"> Nibble Computer Society</a></h4>
+      </div>
+    </footer>
+
+    <div class="form-hid">
+    <input type="hidden" value="{{notices|length}}">
+    </div>
+
+    </div>
+
+    </div>
+
+    <div class="search-container">
+
+        <div class="cross">
+            <i class="fa fa-times">
+            </i>
+        </div>
+        <div class="login-overlay search-overlay"></div>
+
+        <div class="login search-main">
+            
+                <div class="login-head search-head">
+                    <h3>Search for Uploaded Notices.</h3>
+                </div>
+                
+            
+            <div class="login-form search-form">
+                <form action="{% url 'notice-search' %}" method="POST">
+                {% csrf_token %}
+                    <input class="input-style" type="text" placeholder="Title" name="title">
+                    <input class="input-style" type="text" placeholder="Description" name="description">
+                    <input class="input-style" type="text" placeholder="Posted By" name="faculty">
+
+
+
+                    <div class="side-text">Posting Date Between </div>
+                    <div class="row">
+                        <div id="desktop-date"> 
+                            <div class="col sm-col-12">
+                                <input type="text" id="daterangepicker" class="input-style input-calendar" placeholder="dd/mm/yyyy" name="date_desktop">
+                            </div>
+                        </div>
+                        <div id="mobile-date">  
+                            <div class="col sm-col-12">
+                                <input type="text" id="mobile-datepicker-1" class="input-style input-calendar" placeholder="dd/mm/yyyy" name="date_m_start">
+                            </div>
+                            <div class="col sm-col-12">
+                                <input type="text" id="mobile-datepicker-2" class="input-style input-calendar" placeholder="dd/mm/yyyy" name="date_m_end">
+                            </div>
+                        </div>
+                    </div>
+
+
+                    <div class="side-text">Posting for </div>
+                    <div class="row">
+                    
+                    <div class="col col-3">
+                        
+                        <select  placeholder="" name="course" class="input-style" id="create-course1">
+                            
+                            <option value="">All Courses</option>
+                            <option value="BTech">BTech</option>
+                            <option value="MTech">MTech</option>
+                            <option value="MCA">MCA</option>
+                            <option value="MBA">MBA</option>
+
+                        </select>
+                    </div>
+                    <div class="col col-3">
+                        
+                        <select  placeholder="" name="branch" class="input-style" id="create-branch1">
+                            <option value="">All Branches</option>
+                            <option value="CSE">CSE</option>
+                            <option value="IT">IT</option>
+                            <option value="ECE">ECE</option>
+                            <option value="EE">EE</option>
+                            <option value="CE">CE</option>
+                            <option value="IC">IC</option>
+                            <option value="MT">MT</option>
+                            <option value="ME">ME</ssoption>
+
+                            
+                        </select>
+                    </div>
+                    <div class="col col-3">
+                        
+                        <select  placeholder="" name="year" class="input-style" id="create-year1">
+                            <option value="" selected>All Years</option>
+                            <option value="1">1</option>
+                            <option value="2">2</option>
+                            <option value="3">3</option>
+                            <option value="4">4</option>
+
+                            
+                        </select>
+                    </div>
+                    <div class="col col-3">
+                        
+                        <select  placeholder="" name="section" class="input-style" id="create-section1">
+                            <option value="" selected>All Sections</option>
+                            <option value="CSE1">CSE1</option>
+                            <option value="CSE2">CSE2</option>
+                            <option value="IT1">IT1</option>
+                            <option value="IT2">IT2</option>
+                            <option value="ECE1">ECE1</option>
+                            <option value="ECE2">ECE2</option>
+                            <option value="EE1">EE1</option>
+                            <option value="EE2">EE2</option>
+                            <option value="CE1">CE1</option>
+                            <option value="CE2">CE2</option>
+                            <option value="IC1">IC1</option>
+                            <option value="IC2">IC2</option>
+                            <option value="MT1">MT1</option>
+                            <option value="MT2">MT2</option>
+                            <option value="ME1">ME1</option>
+                            <option value="ME2">ME2</option>
+                            
+                        </select>
+                    </div>
+
+
+                    <button type="reset" value="reset"  class="reset reset-search">Reset</button>
+                    <button type="submit" value="submit" class="right">Search</button>
+                    <div class="clear">
+                    </div>
+                    
+                </form>
+            </div>
+        </div>
+        
+    </div>
+
+
+
+    <!-- scripts============ -->
+    <script>
+    document.getElementById('num').addEventListener('input', function (e) {
+     e.target.value = e.target.value.replace(/[^\dA-Z]/g, '');
+    });
+    document.getElementById('num2').addEventListener('input', function (e) {
+     e.target.value = e.target.value.replace(/[^\dA-Z]/g, '');
+    });
+    </script>
+    <script src="{% static "js/jquery.js" %}"></script>
+    <script src="http://code.jquery.com/ui/1.11.4/jquery-ui.js"></script>
+    <script src="{% static "js/jquery.daterange.js" %}"></script>
+    <script src="{% static "js/main.js"  %}"></script>
+
+            <script>
+                var width = $(document).width();
+                if(width>640)
+                {
+                    $("#mobile-date").hide();
+                    $(function () {
+                        $("#daterangepicker").daterange({
+                           dateFormat: "dd/mm/yy", //date format
+                        rangeSeparator: "-" // the string between first and last date
+                        });
+                    });
+                }
+                else{
+                    $("#desktop-date").hide();
+                    $(function() {
+                        $("#mobile-datepicker-1, #mobile-datepicker-2").datepicker();
+                    });
+                }
+                
+
+                $(".search-container").on("scroll", function(){
+                var cale = $(this).find("input.hasDatepicker");
+                $("#ui-datepicker-div").css("top", cale.offset().top +cale.outerHeight());
+     
+            })
+
+    </script>
+    </body>
+    </html>
diff --git a/HTTP_200/templates/wifi/studentwifiform.html b/HTTP_200/templates/wifi/studentwifiform.html
index 99f9c47a..13e28f6a 100644
--- a/HTTP_200/templates/wifi/studentwifiform.html
+++ b/HTTP_200/templates/wifi/studentwifiform.html
@@ -134,6 +134,10 @@
                         <a href="{% url "student-wifi" %}">
                         <i class="fa fa-wifi"></i> &nbsp;Wifi-Form</a>
                     </li>
+                    <li class=" move-in">
+                        <a href="{% url "student-email" %}">
+                        <i class="fa fa-envelope"></i> &nbsp;Email-Form</a>
+                    </li>
                     {% endif %}
                         <li class=" move-in">
                             <a href="{% url "user-profile" user_id=request.user.username %}">
diff --git a/HTTP_200/urls.py b/HTTP_200/urls.py
index 9c46d45b..8081ab31 100644
--- a/HTTP_200/urls.py
+++ b/HTTP_200/urls.py
@@ -35,7 +35,7 @@
     # url(r'', include('rest_framework.urls', namespace='rest_framework'))
     url(r'^students/create/single/$', SingleUser.as_view(), name='single_user_create'),
     url(r'^students/create/$', BulkUser.as_view(), name='bulk_students_create'),
-    url(r'wifi/', include('wifi.urls')),
+    url(r'forms/', include('wifi.urls')),
 
     # api urls
     url(r'^api/profiles/', include("profiles.api.urls", namespace='profiles_api')),
diff --git a/apps/notices/decorators.py b/apps/notices/decorators.py
index d5352045..1f64fdb2 100644
--- a/apps/notices/decorators.py
+++ b/apps/notices/decorators.py
@@ -18,15 +18,15 @@ def wrapper(request, *args, **kwargs):
         except BaseException:
             return function(request, *args, **kwargs)
 
-        if re.split(r'(\d+)', str(user))[2] == "mca" or re.split(r'(\d+)', str(user))[2] == "mba" or re.split(r'(\d+)', str(user))[2] == "MCA" or re.split(r'(\d+)', str(user))[2] == "MBA":
-
-            if user.first_name == "" or user.email == "" or profile.course is None or profile.year is None or profile.contact_no == "None" or profile.address == "None" or profile.father_name == "None" or profile.father_name == "" or profile.address == "" or profile.contact_no == "":
+        try:
+            if user.first_name == "" or user.email == "" or profile.course is None or profile.branch is None or profile.year is None or profile.contact_no == "None" or profile.address == "None" or profile.father_name == "None" or profile.father_name == "" or profile.address == "" or profile.contact_no == "":
+                print("not MBA")
                 messages.warning(request, "Fill in details to continue")
                 return HttpResponseRedirect(reverse("user-profile", kwargs={"user_id": str(request.user.username)}))
             else:
                 return function(request, *args, **kwargs)
-        else:
-            if user.first_name == "" or user.email == "" or profile.course is None or profile.branch is None or profile.year is None or profile.contact_no == "None" or profile.address == "None" or profile.father_name == "None" or profile.father_name == "" or profile.address == "" or profile.contact_no == "":
+        except:
+            if user.first_name == "" or user.email == "" or profile.course is None or profile.year is None or profile.contact_no == "None" or profile.address == "None" or profile.father_name == "None" or profile.father_name == "" or profile.address == "" or profile.contact_no == "":
                 messages.warning(request, "Fill in details to continue")
                 return HttpResponseRedirect(reverse("user-profile", kwargs={"user_id": str(request.user.username)}))
             else:
diff --git a/apps/wifi/admin.py b/apps/wifi/admin.py
index a2a7e967..cb3c3d70 100644
--- a/apps/wifi/admin.py
+++ b/apps/wifi/admin.py
@@ -1,5 +1,5 @@
 from django.contrib import admin
-from .models import WifiDetail
+from .models import WifiDetail, EmailDetail
 
 
 class WifiAdmin(admin.ModelAdmin):
@@ -7,4 +7,11 @@ class WifiAdmin(admin.ModelAdmin):
     search_fields = ('old_laptop_mac_address', 'new_laptop_mac_address', 'user__username',)
 
 
+class EmailAdmin(admin.ModelAdmin):
+    list_display = ('__unicode__', 'email', 'name', 'hod_approved_email', 'created', 'modified')
+    search_fields = ('email', 'name', 'email_purpose')
+    list_filter = ('hod_approved_email',)
+
+
 admin.site.register(WifiDetail, WifiAdmin)
+admin.site.register(EmailDetail, EmailAdmin)
diff --git a/apps/wifi/forms.py b/apps/wifi/forms.py
index ee8fdad8..ad64e406 100644
--- a/apps/wifi/forms.py
+++ b/apps/wifi/forms.py
@@ -1,5 +1,5 @@
 from django import forms
-from .models import WifiDetail
+from .models import WifiDetail, EmailDetail
 
 
 class WifiForm(forms.ModelForm):
@@ -8,3 +8,11 @@ class Meta:
         model = WifiDetail
         fields = ['old_laptop_mac_address', 'new_laptop_mac_address', ]
         exclude = ['user', ]
+
+
+class EmailForm(forms.ModelForm):
+
+    class Meta:
+        model = EmailDetail
+        fields = ['email_purpose', 'attachment']
+        exclude = ['user', ]
diff --git a/apps/wifi/migrations/0003_emaildetail.py b/apps/wifi/migrations/0003_emaildetail.py
new file mode 100644
index 00000000..8fff4302
--- /dev/null
+++ b/apps/wifi/migrations/0003_emaildetail.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+from django.conf import settings
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('wifi', '0002_auto_20190822_1918'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='EmailDetail',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('email_purpose', models.TextField(default=None, max_length=200, null=True, blank=True)),
+                ('attachment', models.FileField(null=True, upload_to=b'forms/email/', blank=True)),
+                ('hod_approved_email', models.BooleanField(default=False)),
+                ('created', models.DateTimeField(auto_now_add=True, verbose_name=b'Created', null=True)),
+                ('modified', models.DateTimeField(auto_now=True, verbose_name=b'Last Modified', null=True)),
+                ('user', models.OneToOneField(to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]
diff --git a/apps/wifi/models.py b/apps/wifi/models.py
index 377ffb08..d400beaf 100644
--- a/apps/wifi/models.py
+++ b/apps/wifi/models.py
@@ -42,3 +42,30 @@ def branch(self):
 
     def __unicode__(self):
         return "%s" % (self.user)
+
+
+class EmailDetail(models.Model):
+    '''
+    It stores information about the email form of all users.
+    '''
+    user = models.OneToOneField(User)
+    email_purpose = models.TextField(max_length=200,
+                                     blank=True,
+                                     null=True,
+                                     default=None)
+    attachment = models.FileField(upload_to='forms/email/',
+                                  blank=True,
+                                  null=True)
+    hod_approved_email = models.BooleanField(default=False)
+
+    created = models.DateTimeField("Created", null=True, auto_now_add=True)
+    modified = models.DateTimeField("Last Modified", null=True, auto_now=True)
+
+    def email(self):
+        return "%s" % (self.user.email)
+
+    def name(self):
+        return "%s" % (self.user.first_name)
+
+    def __unicode__(self):
+        return "%s" % (self.user)
diff --git a/apps/wifi/urls.py b/apps/wifi/urls.py
index 16a829d4..770e42d4 100644
--- a/apps/wifi/urls.py
+++ b/apps/wifi/urls.py
@@ -1,10 +1,11 @@
 from django.conf.urls import url
-from wifi.views import StudentWifiForm, FacultyWifiForm, excel_writer
+from wifi.views import StudentWifiForm, FacultyWifiForm, StudentEmailForm, excel_writer, email_excel_writer
 
 
 urlpatterns = [
-
-	url(r'^student/$', StudentWifiForm.as_view(), name="student-wifi"),
-	url(r'^faculty/$', FacultyWifiForm.as_view(), name="faculty-wifi"),
-	url(r'^download_excel/$', excel_writer.as_view(), name="excel_writer"),
+    url(r'^faculty/$', FacultyWifiForm.as_view(), name="faculty-wifi"),
+    url(r'^student/$', StudentWifiForm.as_view(), name="student-wifi"),
+    url(r'^student/email$', StudentEmailForm.as_view(), name="student-email"),
+    url(r'^download_excel/$', excel_writer.as_view(), name="excel_writer"),
+    url(r'^download_excel/emails$', email_excel_writer.as_view(), name="email_excel_writer"),
 ]
diff --git a/apps/wifi/views.py b/apps/wifi/views.py
index 9a06e9e7..915566ea 100644
--- a/apps/wifi/views.py
+++ b/apps/wifi/views.py
@@ -1,4 +1,4 @@
-from .models import WifiDetail
+from .models import WifiDetail, EmailDetail
 from profiles.models import StudentDetail, FacultyDetail
 from django.contrib.auth.models import User
 from django.http import HttpResponseRedirect
@@ -10,7 +10,7 @@
 from django.contrib import messages
 from django.http import HttpResponse
 from django.shortcuts import render
-from .forms import WifiForm
+from .forms import WifiForm, EmailForm
 
 import xlsxwriter
 
@@ -50,6 +50,41 @@ def post(self, request):
             return HttpResponseRedirect(reverse("student-wifi"))
 
 
+class StudentEmailForm(LoginRequiredMixin, View):
+
+    @method_decorator(default_password_change)
+    @method_decorator(student_profile_complete)
+    def get(self, request):
+        user = User.objects.get(username=request.user.username)
+        details = StudentDetail.objects.get(user=user)
+        try:
+            email_data = EmailDetail.objects.get(user=user)
+            if email_data:
+                return render(request, 'wifi/studentemailform.html', {"user": user, "details": details, "email_data": email_data})
+        except BaseException:
+            return render(request, 'wifi/studentemailform.html', {"user": user, "details": details})
+
+    def post(self, request):
+        user = User.objects.get(username=request.user.username)
+
+        try:
+            email_data = EmailDetail.objects.get(user=user)
+            email_form = EmailForm(request.POST, request.FILES, instance=email_data)
+        except BaseException:
+            email_form = EmailForm(request.POST, request.FILES)
+
+        if email_form.is_valid():
+            email_form = email_form.save(commit=False)
+            email_form.user = user
+            email_form.save()
+            messages.success(request, "Successfully Registered for Email")
+            return HttpResponseRedirect(reverse("relevent-notice-list"))
+        else:
+            print wifi_form.errors
+            messages.error(request, "Enter Valid data in the form.")
+            return HttpResponseRedirect(reverse("student-email"))
+
+
 class FacultyWifiForm(LoginRequiredMixin, View):
 
     @method_decorator(default_password_change)
@@ -130,3 +165,48 @@ def get(self, request):
         response['Content-Type'] = "application/vnd.ms-excel"
         response['Content-Disposition'] = 'attachment; filename="wifi_details.xls"'
         return response
+
+
+class email_excel_writer(LoginRequiredMixin, View):
+    def get(self, request):
+        '''
+        Custom class to download Xls File .
+        '''
+
+        workbook = xlsxwriter.Workbook("email_details.xls")
+        worksheet = workbook.add_worksheet()
+        email = EmailDetail.objects.all()
+        bold = workbook.add_format({'bold': True})
+        worksheet.set_column(1, 160, 7)
+        columns = ["Username", "First Name", "Last Name", "Course", "Branch", "Year", "Purpose for Email", "Attachment", "Date Applied"]
+        row = 0
+        for i, elem in enumerate(columns):
+            worksheet.write(row, i, elem, bold)
+
+        row += 1
+        for users in email:
+            print users
+            date_registered = str(users.created).split(' ')[0]
+            try:
+                user = User.objects.get(username=users.user)
+                student = StudentDetail.objects.get(user=user)
+                worksheet.write(row, 0, user.username)
+                worksheet.write(row, 1, user.first_name)
+                worksheet.write(row, 2, user.last_name)
+                worksheet.write(row, 3, student.course)
+                worksheet.write(row, 4, student.branch)
+                worksheet.write(row, 5, student.year)
+                worksheet.write(row, 6, users.email_purpose)
+                worksheet.write(row, 7, users.attachment.url)
+                worksheet.write(row, 8, date_registered)
+                row += 1
+            except BaseException:
+                user = User.objects.get(username=users.user)
+                faculty = FacultyDetail.objects.get(user=user)
+                worksheet.write(row, 0, user.username)
+
+        workbook.close()
+        response = HttpResponse(file("email_details.xls"))
+        response['Content-Type'] = "application/vnd.ms-excel"
+        response['Content-Disposition'] = 'attachment; filename="email_details.xls"'
+        return response
diff --git a/requirements/common.txt b/requirements/common.txt
index b3644943..275b07e8 100644
--- a/requirements/common.txt
+++ b/requirements/common.txt
@@ -8,7 +8,7 @@ django-haystack==2.4.0
 django-allauth==0.21.0
 django-filter==0.11.0
 PyJWT==1.7.1
-django-braces==1.14.0
+django-braces==1.13.0
 django-autofixture==0.12.1
 django-ckeditor==5.0.2
 django-spaghetti-and-meatballs==0.1.1

From 18b19e6358bda426504f85016bb0d46a8eee0d80 Mon Sep 17 00:00:00 2001
From: OjusWiZard <ojuswimail@gmail.com>
Date: Fri, 24 Sep 2021 02:39:04 +0530
Subject: [PATCH 2/9] shifted to a seperate emailform app

Signed-off-by: OjusWiZard <ojuswimail@gmail.com>
---
 HTTP_200/settings.py                          |   1 +
 .../templates/admin/email/change_list.html    | 106 ++++++++++++++++++
 .../{wifi => email}/studentemailform.html     |   0
 HTTP_200/urls.py                              |   1 +
 apps/emailform/__init__.py                    |   0
 apps/emailform/admin.py                       |  11 ++
 apps/emailform/forms.py                       |  10 ++
 .../migrations/0001_initial.py}               |   1 -
 apps/emailform/migrations/__init__.py         |   0
 apps/emailform/models.py                      |  29 +++++
 apps/emailform/tests.py                       |   3 +
 apps/emailform/urls.py                        |   8 ++
 apps/emailform/views.py                       |  95 ++++++++++++++++
 apps/wifi/admin.py                            |   9 +-
 apps/wifi/forms.py                            |  10 +-
 apps/wifi/models.py                           |  27 -----
 apps/wifi/urls.py                             |   4 +-
 apps/wifi/views.py                            |  84 +-------------
 18 files changed, 269 insertions(+), 130 deletions(-)
 create mode 100644 HTTP_200/templates/admin/email/change_list.html
 rename HTTP_200/templates/{wifi => email}/studentemailform.html (100%)
 create mode 100644 apps/emailform/__init__.py
 create mode 100644 apps/emailform/admin.py
 create mode 100644 apps/emailform/forms.py
 rename apps/{wifi/migrations/0003_emaildetail.py => emailform/migrations/0001_initial.py} (96%)
 create mode 100644 apps/emailform/migrations/__init__.py
 create mode 100644 apps/emailform/models.py
 create mode 100644 apps/emailform/tests.py
 create mode 100644 apps/emailform/urls.py
 create mode 100644 apps/emailform/views.py

diff --git a/HTTP_200/settings.py b/HTTP_200/settings.py
index 0aa8458a..f0018230 100644
--- a/HTTP_200/settings.py
+++ b/HTTP_200/settings.py
@@ -57,6 +57,7 @@
     'debug_toolbar',
     'import_export',
     'wifi',
+    'emailform',
     'rest_framework_docs',
     'rest_framework.authtoken',
     'notifications',
diff --git a/HTTP_200/templates/admin/email/change_list.html b/HTTP_200/templates/admin/email/change_list.html
new file mode 100644
index 00000000..551ccb76
--- /dev/null
+++ b/HTTP_200/templates/admin/email/change_list.html
@@ -0,0 +1,106 @@
+{% extends "admin/base_site.html" %}
+{% load i18n admin_urls admin_static admin_list %}
+{% load static %}
+{% block extrastyle %}
+  {{ block.super }}
+  <link rel="stylesheet" type="text/css" href="{% static "admin/css/changelists.css" %}" />
+  {% if cl.formset %}
+    <link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}" />
+  {% endif %}
+  {% if cl.formset or action_form %}
+    <script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script>
+    <script src="{% static "js/jquery.js"%}"></script>
+    <script src="http://code.jquery.com/ui/1.11.4/jquery-ui.js"></script>
+    <script src="{% static "js/jquery.daterange.js"%}"></script>
+    <script type="text/javascript" src="{% static "js/main.js" %}"></script>
+  {% endif %}
+  {{ media.css }}
+  {% if not actions_on_top and not actions_on_bottom %}
+    <style>
+      #changelist table thead th:first-child {width: inherit}
+    </style>
+  {% endif %}
+{% endblock %}
+
+{% block extrahead %}
+{{ block.super }}
+{{ media.js }}
+{% if action_form %}{% if actions_on_top or actions_on_bottom %}
+<script type="text/javascript">
+(function($) {
+    $(document).ready(function($) {
+        $("tr input.action-select").actions();
+    });
+})(django.jQuery);
+</script>
+{% endif %}{% endif %}
+{% endblock %}
+
+{% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} change-list{% endblock %}
+
+{% if not is_popup %}
+{% block breadcrumbs %}
+<div class="breadcrumbs">
+<a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>
+&rsaquo; <a href="{% url 'admin:app_list' app_label=cl.opts.app_label %}">{{ cl.opts.app_config.verbose_name }}</a>
+&rsaquo; {{ cl.opts.verbose_name_plural|capfirst }}
+</div>
+{% endblock %}
+{% endif %}
+
+{% block coltype %}flex{% endblock %}
+
+{% block content %}
+  <div id="content-main">
+    {% block object-tools %}
+      {% if has_add_permission %}
+        <ul class="object-tools">
+          {% block object-tools-items %}
+           <li>
+              <a href="{% url 'excel_writer' %}">Download Excel File
+              </a>
+            </li>
+            <li>
+              {% url cl.opts|admin_urlname:'add' as add_url %}
+              <a href="{% add_preserved_filters add_url is_popup to_field %}" class="addlink">
+                {% blocktrans with cl.opts.verbose_name as name %}Add {{ name }}{% endblocktrans %}
+              </a>
+            </li>
+          {% endblock %}
+        </ul>
+      {% endif %}
+    {% endblock %}
+    {% if cl.formset.errors %}
+        <p class="errornote">
+        {% if cl.formset.total_error_count == 1 %}{% trans "Please correct the error below." %}{% else %}{% trans "Please correct the errors below." %}{% endif %}
+        </p>
+        {{ cl.formset.non_form_errors }}
+    {% endif %}
+    <div class="module{% if cl.has_filters %} filtered{% endif %}" id="changelist">
+      {% block search %}{% search_form cl %}{% endblock %}
+      {% block date_hierarchy %}{% date_hierarchy cl %}{% endblock %}
+
+      {% block filters %}
+        {% if cl.has_filters %}
+          <div id="changelist-filter">
+            <h2>{% trans 'Filter' %}</h2>
+            {% for spec in cl.filter_specs %}{% admin_list_filter cl spec %}{% endfor %}
+          </div>
+        {% endif %}
+      {% endblock %}
+
+      <form id="changelist-form" action="" method="post"{% if cl.formset.is_multipart %} enctype="multipart/form-data"{% endif %} novalidate>{% csrf_token %}
+      {% if cl.formset %}
+        <div>{{ cl.formset.management_form }}</div>
+      {% endif %}
+
+      {% block result_list %}
+          {% if action_form and actions_on_top and cl.show_admin_actions %}{% admin_actions %}{% endif %}
+          {% result_list cl %}
+          {% if action_form and actions_on_bottom and cl.show_admin_actions %}{% admin_actions %}{% endif %}
+      {% endblock %}
+      {% block pagination %}{% pagination cl %}{% endblock %}
+      </form>
+    </div>
+  </div>
+{% endblock %}
diff --git a/HTTP_200/templates/wifi/studentemailform.html b/HTTP_200/templates/email/studentemailform.html
similarity index 100%
rename from HTTP_200/templates/wifi/studentemailform.html
rename to HTTP_200/templates/email/studentemailform.html
diff --git a/HTTP_200/urls.py b/HTTP_200/urls.py
index 8081ab31..265d284b 100644
--- a/HTTP_200/urls.py
+++ b/HTTP_200/urls.py
@@ -36,6 +36,7 @@
     url(r'^students/create/single/$', SingleUser.as_view(), name='single_user_create'),
     url(r'^students/create/$', BulkUser.as_view(), name='bulk_students_create'),
     url(r'forms/', include('wifi.urls')),
+    url(r'emailforms/', include('emailform.urls')),
 
     # api urls
     url(r'^api/profiles/', include("profiles.api.urls", namespace='profiles_api')),
diff --git a/apps/emailform/__init__.py b/apps/emailform/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/apps/emailform/admin.py b/apps/emailform/admin.py
new file mode 100644
index 00000000..8a691f95
--- /dev/null
+++ b/apps/emailform/admin.py
@@ -0,0 +1,11 @@
+from django.contrib import admin
+from .models import EmailDetail
+
+
+class EmailAdmin(admin.ModelAdmin):
+    list_display = ('__unicode__', 'email', 'name', 'hod_approved_email', 'created', 'modified')
+    search_fields = ('email', 'name', 'email_purpose')
+    list_filter = ('hod_approved_email',)
+
+
+admin.site.register(EmailDetail, EmailAdmin)
diff --git a/apps/emailform/forms.py b/apps/emailform/forms.py
new file mode 100644
index 00000000..f9c4ace0
--- /dev/null
+++ b/apps/emailform/forms.py
@@ -0,0 +1,10 @@
+from django import forms
+from .models import EmailDetail
+
+
+class EmailForm(forms.ModelForm):
+
+    class Meta:
+        model = EmailDetail
+        fields = ['email_purpose', 'attachment']
+        exclude = ['user', ]
diff --git a/apps/wifi/migrations/0003_emaildetail.py b/apps/emailform/migrations/0001_initial.py
similarity index 96%
rename from apps/wifi/migrations/0003_emaildetail.py
rename to apps/emailform/migrations/0001_initial.py
index 8fff4302..528ebad7 100644
--- a/apps/wifi/migrations/0003_emaildetail.py
+++ b/apps/emailform/migrations/0001_initial.py
@@ -9,7 +9,6 @@ class Migration(migrations.Migration):
 
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('wifi', '0002_auto_20190822_1918'),
     ]
 
     operations = [
diff --git a/apps/emailform/migrations/__init__.py b/apps/emailform/migrations/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/apps/emailform/models.py b/apps/emailform/models.py
new file mode 100644
index 00000000..20bf0d03
--- /dev/null
+++ b/apps/emailform/models.py
@@ -0,0 +1,29 @@
+from django.db import models
+from django.contrib.auth.models import User
+
+
+class EmailDetail(models.Model):
+    '''
+    It stores information about the email form of all users.
+    '''
+    user = models.OneToOneField(User)
+    email_purpose = models.TextField(max_length=200,
+                                     blank=True,
+                                     null=True,
+                                     default=None)
+    attachment = models.FileField(upload_to='forms/email/',
+                                  blank=True,
+                                  null=True)
+    hod_approved_email = models.BooleanField(default=False)
+
+    created = models.DateTimeField("Created", null=True, auto_now_add=True)
+    modified = models.DateTimeField("Last Modified", null=True, auto_now=True)
+
+    def email(self):
+        return "%s" % (self.user.email)
+
+    def name(self):
+        return "%s" % (self.user.first_name)
+
+    def __unicode__(self):
+        return "%s" % (self.user)
diff --git a/apps/emailform/tests.py b/apps/emailform/tests.py
new file mode 100644
index 00000000..7ce503c2
--- /dev/null
+++ b/apps/emailform/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/apps/emailform/urls.py b/apps/emailform/urls.py
new file mode 100644
index 00000000..0878940e
--- /dev/null
+++ b/apps/emailform/urls.py
@@ -0,0 +1,8 @@
+from django.conf.urls import url
+from emailform.views import StudentEmailForm, email_excel_writer
+
+
+urlpatterns = [
+    url(r'^email$', StudentEmailForm.as_view(), name="student-email"),
+    url(r'^download_excel$', email_excel_writer.as_view(), name="email_excel_writer"),
+]
diff --git a/apps/emailform/views.py b/apps/emailform/views.py
new file mode 100644
index 00000000..e1cd6288
--- /dev/null
+++ b/apps/emailform/views.py
@@ -0,0 +1,95 @@
+from .models import EmailDetail
+from profiles.models import StudentDetail, FacultyDetail
+from django.contrib.auth.models import User
+from django.http import HttpResponseRedirect
+from braces.views import LoginRequiredMixin
+from django.views.generic import View
+from django.core.urlresolvers import reverse
+from notices.decorators import student_profile_complete, default_password_change
+from django.utils.decorators import method_decorator
+from django.contrib import messages
+from django.http import HttpResponse
+from django.shortcuts import render
+from .forms import EmailForm
+
+import xlsxwriter
+
+
+class StudentEmailForm(LoginRequiredMixin, View):
+
+    @method_decorator(default_password_change)
+    @method_decorator(student_profile_complete)
+    def get(self, request):
+        user = User.objects.get(username=request.user.username)
+        details = StudentDetail.objects.get(user=user)
+        try:
+            email_data = EmailDetail.objects.get(user=user)
+            if email_data:
+                return render(request, 'email/studentemailform.html', {"user": user, "details": details, "email_data": email_data})
+        except BaseException:
+            return render(request, 'email/studentemailform.html', {"user": user, "details": details})
+
+    def post(self, request):
+        user = User.objects.get(username=request.user.username)
+
+        try:
+            email_data = EmailDetail.objects.get(user=user)
+            email_form = EmailForm(request.POST, request.FILES, instance=email_data)
+        except BaseException:
+            email_form = EmailForm(request.POST, request.FILES)
+
+        if email_form.is_valid():
+            email_form = email_form.save(commit=False)
+            email_form.user = user
+            email_form.save()
+            messages.success(request, "Successfully Registered for Email")
+            return HttpResponseRedirect(reverse("relevent-notice-list"))
+        else:
+            print email_form.errors
+            messages.error(request, "Enter Valid data in the form.")
+            return HttpResponseRedirect(reverse("student-email"))
+
+
+class email_excel_writer(LoginRequiredMixin, View):
+    def get(self, request):
+        '''
+        Custom class to download Xls File .
+        '''
+
+        workbook = xlsxwriter.Workbook("email_details.xls")
+        worksheet = workbook.add_worksheet()
+        email = EmailDetail.objects.all()
+        bold = workbook.add_format({'bold': True})
+        worksheet.set_column(1, 160, 7)
+        columns = ["Username", "First Name", "Last Name", "Course", "Branch", "Year", "Purpose for Email", "Attachment", "Date Applied"]
+        row = 0
+        for i, elem in enumerate(columns):
+            worksheet.write(row, i, elem, bold)
+
+        row += 1
+        for users in email:
+            print users
+            date_registered = str(users.created).split(' ')[0]
+            try:
+                user = User.objects.get(username=users.user)
+                student = StudentDetail.objects.get(user=user)
+                worksheet.write(row, 0, user.username)
+                worksheet.write(row, 1, user.first_name)
+                worksheet.write(row, 2, user.last_name)
+                worksheet.write(row, 3, student.course)
+                worksheet.write(row, 4, student.branch)
+                worksheet.write(row, 5, student.year)
+                worksheet.write(row, 6, users.email_purpose)
+                worksheet.write(row, 7, users.attachment.url)
+                worksheet.write(row, 8, date_registered)
+                row += 1
+            except BaseException:
+                user = User.objects.get(username=users.user)
+                faculty = FacultyDetail.objects.get(user=user)
+                worksheet.write(row, 0, user.username)
+
+        workbook.close()
+        response = HttpResponse(file("email_details.xls"))
+        response['Content-Type'] = "application/vnd.ms-excel"
+        response['Content-Disposition'] = 'attachment; filename="email_details.xls"'
+        return response
diff --git a/apps/wifi/admin.py b/apps/wifi/admin.py
index cb3c3d70..a2a7e967 100644
--- a/apps/wifi/admin.py
+++ b/apps/wifi/admin.py
@@ -1,5 +1,5 @@
 from django.contrib import admin
-from .models import WifiDetail, EmailDetail
+from .models import WifiDetail
 
 
 class WifiAdmin(admin.ModelAdmin):
@@ -7,11 +7,4 @@ class WifiAdmin(admin.ModelAdmin):
     search_fields = ('old_laptop_mac_address', 'new_laptop_mac_address', 'user__username',)
 
 
-class EmailAdmin(admin.ModelAdmin):
-    list_display = ('__unicode__', 'email', 'name', 'hod_approved_email', 'created', 'modified')
-    search_fields = ('email', 'name', 'email_purpose')
-    list_filter = ('hod_approved_email',)
-
-
 admin.site.register(WifiDetail, WifiAdmin)
-admin.site.register(EmailDetail, EmailAdmin)
diff --git a/apps/wifi/forms.py b/apps/wifi/forms.py
index ad64e406..ee8fdad8 100644
--- a/apps/wifi/forms.py
+++ b/apps/wifi/forms.py
@@ -1,5 +1,5 @@
 from django import forms
-from .models import WifiDetail, EmailDetail
+from .models import WifiDetail
 
 
 class WifiForm(forms.ModelForm):
@@ -8,11 +8,3 @@ class Meta:
         model = WifiDetail
         fields = ['old_laptop_mac_address', 'new_laptop_mac_address', ]
         exclude = ['user', ]
-
-
-class EmailForm(forms.ModelForm):
-
-    class Meta:
-        model = EmailDetail
-        fields = ['email_purpose', 'attachment']
-        exclude = ['user', ]
diff --git a/apps/wifi/models.py b/apps/wifi/models.py
index d400beaf..377ffb08 100644
--- a/apps/wifi/models.py
+++ b/apps/wifi/models.py
@@ -42,30 +42,3 @@ def branch(self):
 
     def __unicode__(self):
         return "%s" % (self.user)
-
-
-class EmailDetail(models.Model):
-    '''
-    It stores information about the email form of all users.
-    '''
-    user = models.OneToOneField(User)
-    email_purpose = models.TextField(max_length=200,
-                                     blank=True,
-                                     null=True,
-                                     default=None)
-    attachment = models.FileField(upload_to='forms/email/',
-                                  blank=True,
-                                  null=True)
-    hod_approved_email = models.BooleanField(default=False)
-
-    created = models.DateTimeField("Created", null=True, auto_now_add=True)
-    modified = models.DateTimeField("Last Modified", null=True, auto_now=True)
-
-    def email(self):
-        return "%s" % (self.user.email)
-
-    def name(self):
-        return "%s" % (self.user.first_name)
-
-    def __unicode__(self):
-        return "%s" % (self.user)
diff --git a/apps/wifi/urls.py b/apps/wifi/urls.py
index 770e42d4..a866f20d 100644
--- a/apps/wifi/urls.py
+++ b/apps/wifi/urls.py
@@ -1,11 +1,9 @@
 from django.conf.urls import url
-from wifi.views import StudentWifiForm, FacultyWifiForm, StudentEmailForm, excel_writer, email_excel_writer
+from wifi.views import StudentWifiForm, FacultyWifiForm, excel_writer
 
 
 urlpatterns = [
     url(r'^faculty/$', FacultyWifiForm.as_view(), name="faculty-wifi"),
     url(r'^student/$', StudentWifiForm.as_view(), name="student-wifi"),
-    url(r'^student/email$', StudentEmailForm.as_view(), name="student-email"),
     url(r'^download_excel/$', excel_writer.as_view(), name="excel_writer"),
-    url(r'^download_excel/emails$', email_excel_writer.as_view(), name="email_excel_writer"),
 ]
diff --git a/apps/wifi/views.py b/apps/wifi/views.py
index 915566ea..9a06e9e7 100644
--- a/apps/wifi/views.py
+++ b/apps/wifi/views.py
@@ -1,4 +1,4 @@
-from .models import WifiDetail, EmailDetail
+from .models import WifiDetail
 from profiles.models import StudentDetail, FacultyDetail
 from django.contrib.auth.models import User
 from django.http import HttpResponseRedirect
@@ -10,7 +10,7 @@
 from django.contrib import messages
 from django.http import HttpResponse
 from django.shortcuts import render
-from .forms import WifiForm, EmailForm
+from .forms import WifiForm
 
 import xlsxwriter
 
@@ -50,41 +50,6 @@ def post(self, request):
             return HttpResponseRedirect(reverse("student-wifi"))
 
 
-class StudentEmailForm(LoginRequiredMixin, View):
-
-    @method_decorator(default_password_change)
-    @method_decorator(student_profile_complete)
-    def get(self, request):
-        user = User.objects.get(username=request.user.username)
-        details = StudentDetail.objects.get(user=user)
-        try:
-            email_data = EmailDetail.objects.get(user=user)
-            if email_data:
-                return render(request, 'wifi/studentemailform.html', {"user": user, "details": details, "email_data": email_data})
-        except BaseException:
-            return render(request, 'wifi/studentemailform.html', {"user": user, "details": details})
-
-    def post(self, request):
-        user = User.objects.get(username=request.user.username)
-
-        try:
-            email_data = EmailDetail.objects.get(user=user)
-            email_form = EmailForm(request.POST, request.FILES, instance=email_data)
-        except BaseException:
-            email_form = EmailForm(request.POST, request.FILES)
-
-        if email_form.is_valid():
-            email_form = email_form.save(commit=False)
-            email_form.user = user
-            email_form.save()
-            messages.success(request, "Successfully Registered for Email")
-            return HttpResponseRedirect(reverse("relevent-notice-list"))
-        else:
-            print wifi_form.errors
-            messages.error(request, "Enter Valid data in the form.")
-            return HttpResponseRedirect(reverse("student-email"))
-
-
 class FacultyWifiForm(LoginRequiredMixin, View):
 
     @method_decorator(default_password_change)
@@ -165,48 +130,3 @@ def get(self, request):
         response['Content-Type'] = "application/vnd.ms-excel"
         response['Content-Disposition'] = 'attachment; filename="wifi_details.xls"'
         return response
-
-
-class email_excel_writer(LoginRequiredMixin, View):
-    def get(self, request):
-        '''
-        Custom class to download Xls File .
-        '''
-
-        workbook = xlsxwriter.Workbook("email_details.xls")
-        worksheet = workbook.add_worksheet()
-        email = EmailDetail.objects.all()
-        bold = workbook.add_format({'bold': True})
-        worksheet.set_column(1, 160, 7)
-        columns = ["Username", "First Name", "Last Name", "Course", "Branch", "Year", "Purpose for Email", "Attachment", "Date Applied"]
-        row = 0
-        for i, elem in enumerate(columns):
-            worksheet.write(row, i, elem, bold)
-
-        row += 1
-        for users in email:
-            print users
-            date_registered = str(users.created).split(' ')[0]
-            try:
-                user = User.objects.get(username=users.user)
-                student = StudentDetail.objects.get(user=user)
-                worksheet.write(row, 0, user.username)
-                worksheet.write(row, 1, user.first_name)
-                worksheet.write(row, 2, user.last_name)
-                worksheet.write(row, 3, student.course)
-                worksheet.write(row, 4, student.branch)
-                worksheet.write(row, 5, student.year)
-                worksheet.write(row, 6, users.email_purpose)
-                worksheet.write(row, 7, users.attachment.url)
-                worksheet.write(row, 8, date_registered)
-                row += 1
-            except BaseException:
-                user = User.objects.get(username=users.user)
-                faculty = FacultyDetail.objects.get(user=user)
-                worksheet.write(row, 0, user.username)
-
-        workbook.close()
-        response = HttpResponse(file("email_details.xls"))
-        response['Content-Type'] = "application/vnd.ms-excel"
-        response['Content-Disposition'] = 'attachment; filename="email_details.xls"'
-        return response

From 14af91df3aff2ff96a6b1720e07079a7fbdd643c Mon Sep 17 00:00:00 2001
From: OjusWiZard <ojuswimail@gmail.com>
Date: Fri, 24 Sep 2021 15:38:45 +0530
Subject: [PATCH 3/9] changed hod approval field name

Signed-off-by: OjusWiZard <ojuswimail@gmail.com>
---
 .../migrations/0002_auto_20210924_1514.py     | 19 +++++++++++++++++++
 apps/emailform/models.py                      |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 apps/emailform/migrations/0002_auto_20210924_1514.py

diff --git a/apps/emailform/migrations/0002_auto_20210924_1514.py b/apps/emailform/migrations/0002_auto_20210924_1514.py
new file mode 100644
index 00000000..ead7e9cb
--- /dev/null
+++ b/apps/emailform/migrations/0002_auto_20210924_1514.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('emailform', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='emaildetail',
+            old_name='hod_approved_email',
+            new_name='hod_approval',
+        ),
+    ]
diff --git a/apps/emailform/models.py b/apps/emailform/models.py
index 20bf0d03..e9467ece 100644
--- a/apps/emailform/models.py
+++ b/apps/emailform/models.py
@@ -14,7 +14,7 @@ class EmailDetail(models.Model):
     attachment = models.FileField(upload_to='forms/email/',
                                   blank=True,
                                   null=True)
-    hod_approved_email = models.BooleanField(default=False)
+    hod_approval = models.BooleanField(default=False)
 
     created = models.DateTimeField("Created", null=True, auto_now_add=True)
     modified = models.DateTimeField("Last Modified", null=True, auto_now=True)

From c2480ab154f5ca30f98172e99ab48ffc812ac560 Mon Sep 17 00:00:00 2001
From: OjusWiZard <ojuswimail@gmail.com>
Date: Fri, 24 Sep 2021 15:39:20 +0530
Subject: [PATCH 4/9] changed email form app name

Signed-off-by: OjusWiZard <ojuswimail@gmail.com>
---
 apps/emailform/__init__.py | 1 +
 apps/emailform/admin.py    | 4 ++--
 apps/emailform/apps.py     | 7 +++++++
 3 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 apps/emailform/apps.py

diff --git a/apps/emailform/__init__.py b/apps/emailform/__init__.py
index e69de29b..5f38b64e 100644
--- a/apps/emailform/__init__.py
+++ b/apps/emailform/__init__.py
@@ -0,0 +1 @@
+default_app_config = 'emailform.apps.AuthConfig'
diff --git a/apps/emailform/admin.py b/apps/emailform/admin.py
index 8a691f95..db19a411 100644
--- a/apps/emailform/admin.py
+++ b/apps/emailform/admin.py
@@ -3,9 +3,9 @@
 
 
 class EmailAdmin(admin.ModelAdmin):
-    list_display = ('__unicode__', 'email', 'name', 'hod_approved_email', 'created', 'modified')
+    list_display = ('__unicode__', 'email', 'name', 'hod_approval', 'created', 'modified')
     search_fields = ('email', 'name', 'email_purpose')
-    list_filter = ('hod_approved_email',)
+    list_filter = ('hod_approval',)
 
 
 admin.site.register(EmailDetail, EmailAdmin)
diff --git a/apps/emailform/apps.py b/apps/emailform/apps.py
new file mode 100644
index 00000000..66e39de7
--- /dev/null
+++ b/apps/emailform/apps.py
@@ -0,0 +1,7 @@
+from django.apps import AppConfig
+from django.utils.translation import ugettext_lazy as _
+
+
+class AuthConfig(AppConfig):
+    name = 'emailform'
+    verbose_name = _("Email Form")

From b073cac99230214f5e466009d3821bd5a45effbd Mon Sep 17 00:00:00 2001
From: OjusWiZard <ojuswimail@gmail.com>
Date: Fri, 24 Sep 2021 16:26:31 +0530
Subject: [PATCH 5/9] added hod approval checkbox in the template form

Signed-off-by: OjusWiZard <ojuswimail@gmail.com>
---
 HTTP_200/settings.py                          | 26 +++++++++----------
 .../templates/email/studentemailform.html     | 23 +++++++++++++---
 apps/emailform/forms.py                       |  2 +-
 3 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/HTTP_200/settings.py b/HTTP_200/settings.py
index f0018230..f52f487d 100644
--- a/HTTP_200/settings.py
+++ b/HTTP_200/settings.py
@@ -113,24 +113,24 @@
 
 # Database
 # https://docs.djangoproject.com/en/1.8/ref/settings/#databases
-# DATABASES = {
-#      'default': {
-#          'ENGINE': 'django.db.backends.sqlite3',
-#          'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
-#      }
-#  }
-
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.mysql',
-        'NAME': config_keys.DATABASE_NAME,
-        'USER': config_keys.MYSQL_USERNAME,
-        'PASSWORD': config_keys.MYSQL_PASSWORD,
-        'HOST': config_keys.HOST,   # Or an IP Address that your DB is hosted on
-        'PORT': config_keys.PORT,
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
     }
 }
 
+# DATABASES = {
+#     'default': {
+#         'ENGINE': 'django.db.backends.mysql',
+#         'NAME': config_keys.DATABASE_NAME,
+#         'USER': config_keys.MYSQL_USERNAME,
+#         'PASSWORD': config_keys.MYSQL_PASSWORD,
+#         'HOST': config_keys.HOST,   # Or an IP Address that your DB is hosted on
+#         'PORT': config_keys.PORT,
+#     }
+# }
+
 # Internationalization
 # https://docs.djangoproject.com/en/1.8/topics/i18n/
 
diff --git a/HTTP_200/templates/email/studentemailform.html b/HTTP_200/templates/email/studentemailform.html
index b1f3e3a3..561393ed 100644
--- a/HTTP_200/templates/email/studentemailform.html
+++ b/HTTP_200/templates/email/studentemailform.html
@@ -252,9 +252,20 @@ <h2><i class="fa fa-question"></i> &nbsp;Purpose <i class="show-icon fa fa-penci
                                 <input type="text" class="input-style edit-input" name="email_purpose" value="{{ email_data.email_purpose }}" style="margin-top: 5px" placeholder="Why do you want an email?" disabled>
                             </div>
                             <div class="top-range col col-4">
-                                <h2><i class="fa fa-file"></i> &nbsp;Attachment <i class="show-icon fa fa-pencil"></i></h2>
-                                <input type="file" class="input-style edit-input" name="attachment" value="{{ mac_address.attachment }}">
+                                <h2><i class="fa fa-file"></i> &nbsp;Application Attachment <i class="show-icon fa fa-pencil"></i></h2>
+                                <input type="file" class="input-style edit-input" name="attachment">
                             </div>
+                            {% if email_data.hod_approval %}
+                                <div class="top-range col col-4">
+                                    <h2><i class="fa fa-tick"></i> &nbsp;HOD Approved <i class="show-icon fa fa-pencil"></i></h2>
+                                    <input type="checkbox" class="input-style edit-input" name="hod_approval" style="margin-top: 5px" checked>
+                                </div>
+                            {% else %}
+                                <div class="top-range col col-4">
+                                    <h2><i class="fa fa-tick"></i> &nbsp;HOD Approved <i class="show-icon fa fa-pencil"></i></h2>
+                                    <input type="checkbox" class="input-style edit-input" name="hod_approval" style="margin-top: 5px">
+                                </div>
+                            {% endif %}
                             </form>
                         {% else %}
                             <form id="studentemail-form" action="{% url 'student-email' %}" method="POST">
@@ -264,8 +275,12 @@ <h2><i class="fa fa-question"></i> &nbsp;Purpose <i class="show-icon fa fa-penci
                                 <input type="text" class="input-style edit-input" name="email_purpose" style="margin-top: 5px" placeholder="Why do you want an email?" required>
                             </div>
                             <div class="top-range col col-4">
-                                <h2><i class="fa fa-file"></i> &nbsp;Attachment <i class="show-icon fa fa-pencil"></i></h2>
-                                <input type="file" class="input-style edit-input" name="attachment">
+                                <h2><i class="fa fa-file"></i> &nbsp;Application Attachment <i class="show-icon fa fa-pencil"></i></h2>
+                                <input type="file" class="input-style edit-input" name="attachment" required>
+                            </div>
+                            <div class="top-range col col-4">
+                                <h2><i class="fa fa-tick"></i> &nbsp;HOD Approved <i class="show-icon fa fa-pencil"></i></h2>
+                                <input type="checkbox" class="input-style edit-input" name="hod_approval" style="margin-top: 5px" required>
                             </div>
                         {% endif %}
     					</div>
diff --git a/apps/emailform/forms.py b/apps/emailform/forms.py
index f9c4ace0..25151373 100644
--- a/apps/emailform/forms.py
+++ b/apps/emailform/forms.py
@@ -6,5 +6,5 @@ class EmailForm(forms.ModelForm):
 
     class Meta:
         model = EmailDetail
-        fields = ['email_purpose', 'attachment']
+        fields = ['email_purpose', 'attachment', 'hod_approval']
         exclude = ['user', ]

From 39ee39d003d69271570b784518058a5f2487e661 Mon Sep 17 00:00:00 2001
From: OjusWiZard <ojuswimail@gmail.com>
Date: Sat, 25 Sep 2021 01:53:24 +0530
Subject: [PATCH 6/9] disabled email details editing

Signed-off-by: OjusWiZard <ojuswimail@gmail.com>
---
 HTTP_200/templates/email/studentemailform.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/HTTP_200/templates/email/studentemailform.html b/HTTP_200/templates/email/studentemailform.html
index 561393ed..391ef77b 100644
--- a/HTTP_200/templates/email/studentemailform.html
+++ b/HTTP_200/templates/email/studentemailform.html
@@ -253,17 +253,17 @@ <h2><i class="fa fa-question"></i> &nbsp;Purpose <i class="show-icon fa fa-penci
                             </div>
                             <div class="top-range col col-4">
                                 <h2><i class="fa fa-file"></i> &nbsp;Application Attachment <i class="show-icon fa fa-pencil"></i></h2>
-                                <input type="file" class="input-style edit-input" name="attachment">
+                                <input type="file" class="input-style edit-input" name="attachment" disabled>
                             </div>
                             {% if email_data.hod_approval %}
                                 <div class="top-range col col-4">
-                                    <h2><i class="fa fa-tick"></i> &nbsp;HOD Approved <i class="show-icon fa fa-pencil"></i></h2>
-                                    <input type="checkbox" class="input-style edit-input" name="hod_approval" style="margin-top: 5px" checked>
+                                    <h2><i class="fa fa-check"></i> &nbsp;HOD's Approved <i class="show-icon fa fa-pencil"></i></h2>
+                                    <input type="checkbox" class="input-style edit-input" name="hod_approval" style="margin-top: 5px" checked disabled>
                                 </div>
                             {% else %}
                                 <div class="top-range col col-4">
-                                    <h2><i class="fa fa-tick"></i> &nbsp;HOD Approved <i class="show-icon fa fa-pencil"></i></h2>
-                                    <input type="checkbox" class="input-style edit-input" name="hod_approval" style="margin-top: 5px">
+                                    <h2><i class="fa fa-check"></i> &nbsp;HOD's Approved <i class="show-icon fa fa-pencil"></i></h2>
+                                    <input type="checkbox" class="input-style edit-input" name="hod_approval" style="margin-top: 5px" disabled>
                                 </div>
                             {% endif %}
                             </form>
@@ -279,7 +279,7 @@ <h2><i class="fa fa-file"></i> &nbsp;Application Attachment <i class="show-icon
                                 <input type="file" class="input-style edit-input" name="attachment" required>
                             </div>
                             <div class="top-range col col-4">
-                                <h2><i class="fa fa-tick"></i> &nbsp;HOD Approved <i class="show-icon fa fa-pencil"></i></h2>
+                                <h2><i class="fa fa-check"></i> &nbsp;HOD's Approved <i class="show-icon fa fa-pencil"></i></h2>
                                 <input type="checkbox" class="input-style edit-input" name="hod_approval" style="margin-top: 5px" required>
                             </div>
                         {% endif %}

From 24609e0ebe57ae0df4f1d9e79216ad994f257df8 Mon Sep 17 00:00:00 2001
From: OjusWiZard <ojuswimail@gmail.com>
Date: Mon, 27 Sep 2021 19:00:18 +0530
Subject: [PATCH 7/9] cleanup

Signed-off-by: OjusWiZard <ojuswimail@gmail.com>
---
 HTTP_200/settings.py                          |  26 ++---
 .../templates/admin/email/change_list.html    | 106 ------------------
 .../templates/admin/wifi/change_list.html     |   6 +-
 HTTP_200/urls.py                              |   2 +-
 apps/emailform/urls.py                        |   3 +-
 apps/emailform/views.py                       |  45 --------
 apps/wifi/urls.py                             |   3 +-
 7 files changed, 18 insertions(+), 173 deletions(-)
 delete mode 100644 HTTP_200/templates/admin/email/change_list.html

diff --git a/HTTP_200/settings.py b/HTTP_200/settings.py
index f52f487d..f0018230 100644
--- a/HTTP_200/settings.py
+++ b/HTTP_200/settings.py
@@ -113,24 +113,24 @@
 
 # Database
 # https://docs.djangoproject.com/en/1.8/ref/settings/#databases
+# DATABASES = {
+#      'default': {
+#          'ENGINE': 'django.db.backends.sqlite3',
+#          'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+#      }
+#  }
+
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+        'ENGINE': 'django.db.backends.mysql',
+        'NAME': config_keys.DATABASE_NAME,
+        'USER': config_keys.MYSQL_USERNAME,
+        'PASSWORD': config_keys.MYSQL_PASSWORD,
+        'HOST': config_keys.HOST,   # Or an IP Address that your DB is hosted on
+        'PORT': config_keys.PORT,
     }
 }
 
-# DATABASES = {
-#     'default': {
-#         'ENGINE': 'django.db.backends.mysql',
-#         'NAME': config_keys.DATABASE_NAME,
-#         'USER': config_keys.MYSQL_USERNAME,
-#         'PASSWORD': config_keys.MYSQL_PASSWORD,
-#         'HOST': config_keys.HOST,   # Or an IP Address that your DB is hosted on
-#         'PORT': config_keys.PORT,
-#     }
-# }
-
 # Internationalization
 # https://docs.djangoproject.com/en/1.8/topics/i18n/
 
diff --git a/HTTP_200/templates/admin/email/change_list.html b/HTTP_200/templates/admin/email/change_list.html
deleted file mode 100644
index 551ccb76..00000000
--- a/HTTP_200/templates/admin/email/change_list.html
+++ /dev/null
@@ -1,106 +0,0 @@
-{% extends "admin/base_site.html" %}
-{% load i18n admin_urls admin_static admin_list %}
-{% load static %}
-{% block extrastyle %}
-  {{ block.super }}
-  <link rel="stylesheet" type="text/css" href="{% static "admin/css/changelists.css" %}" />
-  {% if cl.formset %}
-    <link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}" />
-  {% endif %}
-  {% if cl.formset or action_form %}
-    <script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script>
-    <script src="{% static "js/jquery.js"%}"></script>
-    <script src="http://code.jquery.com/ui/1.11.4/jquery-ui.js"></script>
-    <script src="{% static "js/jquery.daterange.js"%}"></script>
-    <script type="text/javascript" src="{% static "js/main.js" %}"></script>
-  {% endif %}
-  {{ media.css }}
-  {% if not actions_on_top and not actions_on_bottom %}
-    <style>
-      #changelist table thead th:first-child {width: inherit}
-    </style>
-  {% endif %}
-{% endblock %}
-
-{% block extrahead %}
-{{ block.super }}
-{{ media.js }}
-{% if action_form %}{% if actions_on_top or actions_on_bottom %}
-<script type="text/javascript">
-(function($) {
-    $(document).ready(function($) {
-        $("tr input.action-select").actions();
-    });
-})(django.jQuery);
-</script>
-{% endif %}{% endif %}
-{% endblock %}
-
-{% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} change-list{% endblock %}
-
-{% if not is_popup %}
-{% block breadcrumbs %}
-<div class="breadcrumbs">
-<a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>
-&rsaquo; <a href="{% url 'admin:app_list' app_label=cl.opts.app_label %}">{{ cl.opts.app_config.verbose_name }}</a>
-&rsaquo; {{ cl.opts.verbose_name_plural|capfirst }}
-</div>
-{% endblock %}
-{% endif %}
-
-{% block coltype %}flex{% endblock %}
-
-{% block content %}
-  <div id="content-main">
-    {% block object-tools %}
-      {% if has_add_permission %}
-        <ul class="object-tools">
-          {% block object-tools-items %}
-           <li>
-              <a href="{% url 'excel_writer' %}">Download Excel File
-              </a>
-            </li>
-            <li>
-              {% url cl.opts|admin_urlname:'add' as add_url %}
-              <a href="{% add_preserved_filters add_url is_popup to_field %}" class="addlink">
-                {% blocktrans with cl.opts.verbose_name as name %}Add {{ name }}{% endblocktrans %}
-              </a>
-            </li>
-          {% endblock %}
-        </ul>
-      {% endif %}
-    {% endblock %}
-    {% if cl.formset.errors %}
-        <p class="errornote">
-        {% if cl.formset.total_error_count == 1 %}{% trans "Please correct the error below." %}{% else %}{% trans "Please correct the errors below." %}{% endif %}
-        </p>
-        {{ cl.formset.non_form_errors }}
-    {% endif %}
-    <div class="module{% if cl.has_filters %} filtered{% endif %}" id="changelist">
-      {% block search %}{% search_form cl %}{% endblock %}
-      {% block date_hierarchy %}{% date_hierarchy cl %}{% endblock %}
-
-      {% block filters %}
-        {% if cl.has_filters %}
-          <div id="changelist-filter">
-            <h2>{% trans 'Filter' %}</h2>
-            {% for spec in cl.filter_specs %}{% admin_list_filter cl spec %}{% endfor %}
-          </div>
-        {% endif %}
-      {% endblock %}
-
-      <form id="changelist-form" action="" method="post"{% if cl.formset.is_multipart %} enctype="multipart/form-data"{% endif %} novalidate>{% csrf_token %}
-      {% if cl.formset %}
-        <div>{{ cl.formset.management_form }}</div>
-      {% endif %}
-
-      {% block result_list %}
-          {% if action_form and actions_on_top and cl.show_admin_actions %}{% admin_actions %}{% endif %}
-          {% result_list cl %}
-          {% if action_form and actions_on_bottom and cl.show_admin_actions %}{% admin_actions %}{% endif %}
-      {% endblock %}
-      {% block pagination %}{% pagination cl %}{% endblock %}
-      </form>
-    </div>
-  </div>
-{% endblock %}
diff --git a/HTTP_200/templates/admin/wifi/change_list.html b/HTTP_200/templates/admin/wifi/change_list.html
index 7235fffa..551ccb76 100644
--- a/HTTP_200/templates/admin/wifi/change_list.html
+++ b/HTTP_200/templates/admin/wifi/change_list.html
@@ -57,11 +57,7 @@
         <ul class="object-tools">
           {% block object-tools-items %}
            <li>
-              <a href="{% url 'excel_writer' %}">Download Wifi Excel File
-              </a>
-            </li>
-            <li>
-              <a href="{% url 'email_excel_writer' %}">Download Email Excel File
+              <a href="{% url 'excel_writer' %}">Download Excel File
               </a>
             </li>
             <li>
diff --git a/HTTP_200/urls.py b/HTTP_200/urls.py
index 265d284b..edead407 100644
--- a/HTTP_200/urls.py
+++ b/HTTP_200/urls.py
@@ -35,7 +35,7 @@
     # url(r'', include('rest_framework.urls', namespace='rest_framework'))
     url(r'^students/create/single/$', SingleUser.as_view(), name='single_user_create'),
     url(r'^students/create/$', BulkUser.as_view(), name='bulk_students_create'),
-    url(r'forms/', include('wifi.urls')),
+    url(r'wifi/', include('wifi.urls')),
     url(r'emailforms/', include('emailform.urls')),
 
     # api urls
diff --git a/apps/emailform/urls.py b/apps/emailform/urls.py
index 0878940e..f4092953 100644
--- a/apps/emailform/urls.py
+++ b/apps/emailform/urls.py
@@ -1,8 +1,7 @@
 from django.conf.urls import url
-from emailform.views import StudentEmailForm, email_excel_writer
+from emailform.views import StudentEmailForm
 
 
 urlpatterns = [
     url(r'^email$', StudentEmailForm.as_view(), name="student-email"),
-    url(r'^download_excel$', email_excel_writer.as_view(), name="email_excel_writer"),
 ]
diff --git a/apps/emailform/views.py b/apps/emailform/views.py
index e1cd6288..1fdae300 100644
--- a/apps/emailform/views.py
+++ b/apps/emailform/views.py
@@ -48,48 +48,3 @@ def post(self, request):
             print email_form.errors
             messages.error(request, "Enter Valid data in the form.")
             return HttpResponseRedirect(reverse("student-email"))
-
-
-class email_excel_writer(LoginRequiredMixin, View):
-    def get(self, request):
-        '''
-        Custom class to download Xls File .
-        '''
-
-        workbook = xlsxwriter.Workbook("email_details.xls")
-        worksheet = workbook.add_worksheet()
-        email = EmailDetail.objects.all()
-        bold = workbook.add_format({'bold': True})
-        worksheet.set_column(1, 160, 7)
-        columns = ["Username", "First Name", "Last Name", "Course", "Branch", "Year", "Purpose for Email", "Attachment", "Date Applied"]
-        row = 0
-        for i, elem in enumerate(columns):
-            worksheet.write(row, i, elem, bold)
-
-        row += 1
-        for users in email:
-            print users
-            date_registered = str(users.created).split(' ')[0]
-            try:
-                user = User.objects.get(username=users.user)
-                student = StudentDetail.objects.get(user=user)
-                worksheet.write(row, 0, user.username)
-                worksheet.write(row, 1, user.first_name)
-                worksheet.write(row, 2, user.last_name)
-                worksheet.write(row, 3, student.course)
-                worksheet.write(row, 4, student.branch)
-                worksheet.write(row, 5, student.year)
-                worksheet.write(row, 6, users.email_purpose)
-                worksheet.write(row, 7, users.attachment.url)
-                worksheet.write(row, 8, date_registered)
-                row += 1
-            except BaseException:
-                user = User.objects.get(username=users.user)
-                faculty = FacultyDetail.objects.get(user=user)
-                worksheet.write(row, 0, user.username)
-
-        workbook.close()
-        response = HttpResponse(file("email_details.xls"))
-        response['Content-Type'] = "application/vnd.ms-excel"
-        response['Content-Disposition'] = 'attachment; filename="email_details.xls"'
-        return response
diff --git a/apps/wifi/urls.py b/apps/wifi/urls.py
index a866f20d..02701699 100644
--- a/apps/wifi/urls.py
+++ b/apps/wifi/urls.py
@@ -3,7 +3,8 @@
 
 
 urlpatterns = [
-    url(r'^faculty/$', FacultyWifiForm.as_view(), name="faculty-wifi"),
+
     url(r'^student/$', StudentWifiForm.as_view(), name="student-wifi"),
+    url(r'^faculty/$', FacultyWifiForm.as_view(), name="faculty-wifi"),
     url(r'^download_excel/$', excel_writer.as_view(), name="excel_writer"),
 ]

From ecb6018c91264f2482407541bb322493fdc1055b Mon Sep 17 00:00:00 2001
From: OjusWiZard <ojuswimail@gmail.com>
Date: Fri, 1 Oct 2021 18:38:38 +0530
Subject: [PATCH 8/9] resolved flake8 failures

Signed-off-by: OjusWiZard <ojuswimail@gmail.com>
---
 apps/emailform/tests.py    | 2 --
 apps/emailform/views.py    | 5 +----
 apps/notices/decorators.py | 3 +--
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/apps/emailform/tests.py b/apps/emailform/tests.py
index 7ce503c2..a39b155a 100644
--- a/apps/emailform/tests.py
+++ b/apps/emailform/tests.py
@@ -1,3 +1 @@
-from django.test import TestCase
-
 # Create your tests here.
diff --git a/apps/emailform/views.py b/apps/emailform/views.py
index 1fdae300..aa1316de 100644
--- a/apps/emailform/views.py
+++ b/apps/emailform/views.py
@@ -1,5 +1,5 @@
 from .models import EmailDetail
-from profiles.models import StudentDetail, FacultyDetail
+from profiles.models import StudentDetail
 from django.contrib.auth.models import User
 from django.http import HttpResponseRedirect
 from braces.views import LoginRequiredMixin
@@ -8,12 +8,9 @@
 from notices.decorators import student_profile_complete, default_password_change
 from django.utils.decorators import method_decorator
 from django.contrib import messages
-from django.http import HttpResponse
 from django.shortcuts import render
 from .forms import EmailForm
 
-import xlsxwriter
-
 
 class StudentEmailForm(LoginRequiredMixin, View):
 
diff --git a/apps/notices/decorators.py b/apps/notices/decorators.py
index 1f64fdb2..c6d1b478 100644
--- a/apps/notices/decorators.py
+++ b/apps/notices/decorators.py
@@ -4,7 +4,6 @@
 from django.core.urlresolvers import reverse
 from django.contrib.auth.hashers import check_password
 from django.contrib import messages
-import re
 
 
 def student_profile_complete(function):
@@ -25,7 +24,7 @@ def wrapper(request, *args, **kwargs):
                 return HttpResponseRedirect(reverse("user-profile", kwargs={"user_id": str(request.user.username)}))
             else:
                 return function(request, *args, **kwargs)
-        except:
+        except AttributeError:
             if user.first_name == "" or user.email == "" or profile.course is None or profile.year is None or profile.contact_no == "None" or profile.address == "None" or profile.father_name == "None" or profile.father_name == "" or profile.address == "" or profile.contact_no == "":
                 messages.warning(request, "Fill in details to continue")
                 return HttpResponseRedirect(reverse("user-profile", kwargs={"user_id": str(request.user.username)}))

From e17892038eb0a0936844c52795c99158dfc02af3 Mon Sep 17 00:00:00 2001
From: OjusWiZard <ojuswimail@gmail.com>
Date: Fri, 1 Oct 2021 19:15:25 +0530
Subject: [PATCH 9/9] fixed template minor errors

Signed-off-by: OjusWiZard <ojuswimail@gmail.com>
---
 HTTP_200/templates/email/studentemailform.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/HTTP_200/templates/email/studentemailform.html b/HTTP_200/templates/email/studentemailform.html
index 391ef77b..4434f3c6 100644
--- a/HTTP_200/templates/email/studentemailform.html
+++ b/HTTP_200/templates/email/studentemailform.html
@@ -253,7 +253,7 @@ <h2><i class="fa fa-question"></i> &nbsp;Purpose <i class="show-icon fa fa-penci
                             </div>
                             <div class="top-range col col-4">
                                 <h2><i class="fa fa-file"></i> &nbsp;Application Attachment <i class="show-icon fa fa-pencil"></i></h2>
-                                <input type="file" class="input-style edit-input" name="attachment" disabled>
+                                <input type="file" class="input-style edit-input" name="attachment">
                             </div>
                             {% if email_data.hod_approval %}
                                 <div class="top-range col col-4">
@@ -286,7 +286,7 @@ <h2><i class="fa fa-check"></i> &nbsp;HOD's Approved <i class="show-icon fa fa-p
     					</div>
                         <div class="row">
                             <div class="top-range col col-1">
-                                <button class="submit-contact" type="submit"> Submit </button> 
+                                <button class="submit-contact" type="submit" style="float: left;"> Submit </button> 
                             </div>
                         </div>
                     </div>