Skip to content

C
CS699_project
Commit f0657d40 authored by ASHISH KUMAR GOYAL's avatar ASHISH KUMAR GOYAL
Browse files
Options

Merge branch 'master' of https://git.cse.iitb.ac.in/yadny/CS699_project

parents 8e866a62 e16b3a36
Hide whitespace changes
Inline Side-by-side
Showing with 227 additions and 5 deletions
hostel_mess/hostel_mess/settings.py
View file @ f0657d40
......@@ -38,7 +38,7 @@ INSTALLED_APPS = [
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
'usermgmt',
'usermgmt'
]
MIDDLEWARE = [
......
hostel_mess/templates/rebates.html 0 → 100644
View file @ f0657d40
{% load static %}
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="description" content="">
<meta name="author" content="">
<title>View Requests</title>
<!-- Custom fonts for this template-->
<link href="{% static 'vendor/fontawesome-free/css/all.min.css' %}" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i" rel="stylesheet">
<!-- Custom styles for this template-->
<link href="{% static 'css/sb-admin-2.min.css' %}" rel="stylesheet">
</head>
<body id="page-top">
<!-- Page Wrapper -->
<div id="wrapper">
<!-- Sidebar -->
<ul class="navbar-nav bg-gradient-primary sidebar sidebar-dark accordion toggled" id="accordionSidebar">
<!-- Divider -->
<hr class="sidebar-divider my-0">
<!-- Nav Item - Dashboard -->
<li class="nav-item active">
<a class="nav-link" href="viewreq.html">
<i class="fas fa-fw fa-tachometer-alt"></i>
<span>HOME</span></a>
</li>
<!-- Divider -->
<hr class="sidebar-divider">
<!-- Heading -->
<div class="sidebar-heading">
REQUESTS
</div>
<!-- Nav Item - Pages Collapse Menu -->
<li class="nav-item">
<a class="nav-link collapsed" href="#" data-toggle="collapse" data-target="#collapseTwo" aria-expanded="true" aria-controls="collapseTwo">
<i class="fas fa-fw fa-cog"></i>
<span><b>MAKE REQUESTS</b></span>
</a>
<div id="collapseTwo" class="collapse" aria-labelledby="headingTwo" data-parent="#accordionSidebar">
<div class="bg-white py-2 collapse-inner rounded">
<h6 class="collapse-header"><b>Raise Request for:</b></h6>
<a class="collapse-item" href="rebates.html"><b>REBATES</b></a>
<a class="collapse-item" href="overheads.html"><b>OVERHEAD</b></a>
</div>
</div>
</li>
<li class="nav-item">
<a class="nav-link" href="viewreq.html">
<i class="fas fa-fw fa-table"></i>
<span><b>VIEW REQUESTS</b></span></a>
</li>
<!-- Divider -->
<hr class="sidebar-divider">
<!-- Heading -->
<div class="sidebar-heading">
INFORMATION
</div>
<!-- Nav Item - Tables -->
<li class="nav-item">
<a class="nav-link" href="history.html">
<i class="fas fa-fw fa-table"></i>
<span><b>HISTORY</b></span></a>
</li>
<!-- Divider -->
<hr class="sidebar-divider d-none d-md-block">
<!-- Sidebar Toggler (Sidebar) -->
<div class="text-center d-none d-md-inline">
<button class="rounded-circle border-0" id="sidebarToggle"></button>
</div>
</ul>
<!-- End of Sidebar -->
<!-- Content Wrapper -->
<div id="content-wrapper" class="d-flex flex-column">
<!-- Main Content -->
<div id="content">
<!-- Topbar -->
<nav class="navbar navbar-expand navbar-light bg-white topbar mb-4 static-top shadow">
<!-- Sidebar Toggle (Topbar) -->
<button id="sidebarToggleTop" class="btn btn-link d-md-none rounded-circle mr-3">
<i class="fa fa-bars"></i>
</button>
<!-- Topbar Navbar -->
<ul class="navbar-nav ml-auto">
<li>
<div>
{{ user.username }}
</div>
</li>
&nbsp;&nbsp;&nbsp;
<li>
<a class="nav-item" href="#" data-toggle="modal" data-target="#logoutModal">
<i class="fas fa-sign-out-alt fa-sm fa-fw mr-2 text-gray-400"></i>
Logout
</a>
</li>
</ul>
</nav>
<!-- End of Topbar -->
<!-- Begin Page Content -->
<div class="container-fluid">
<div class="row d-flex justify-content-center">
<div class="col-md-6">
<form>
<div class="form-group">
<label for="exampleFormControlInput1"><b>FROM (DATE)</b></label>
<input type="Date" class="form-control" id="exampleFormControlInput1">
</div>
<div class="form-group">
<label for="exampleFormControlInput1"><b>TO (DATE)</b></label>
<input type="Date" class="form-control" id="exampleFormControlInput1">
</div>
<button type="submit" class="btn btn-primary"><b>Submit</b></button>
</form>
</div>
</div>
</div>
<!-- /.container-fluid -->
</div>
<!-- End of Main Content -->
<!-- Footer -->
<footer class="sticky-footer bg-white">
<div class="container my-auto">
<div class="copyright text-center my-auto">
<span>Copyright &copy; Technocrats 2019</span>
</div>
</div>
</footer>
<!-- End of Footer -->
</div>
<!-- End of Content Wrapper -->
</div>
<!-- End of Page Wrapper -->
<!-- Scroll to Top Button-->
<a class="scroll-to-top rounded" href="#page-top">
<i class="fas fa-angle-up"></i>
</a>
<!-- Logout Modal-->
<div class="modal fade" id="logoutModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel">Ready to Leave?</h5>
<button class="close" type="button" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">×</span>
</button>
</div>
<div class="modal-body">Select "Logout" below if you are ready to end your current session.</div>
<div class="modal-footer">
<button class="btn btn-secondary" type="button" data-dismiss="modal">Cancel</button>
<a class="btn btn-primary" href="login.html">Logout</a>
</div>
</div>
</div>
</div>
<!-- Bootstrap core JavaScript-->
<script src="{% static 'vendor/jquery/jquery.min.js' %}"></script>
<script src="{% static 'vendor/bootstrap/js/bootstrap.bundle.min.js' %}"></script>
<!-- Core plugin JavaScript-->
<script src="{% static 'vendor/jquery-easing/jquery.easing.min.js' %}"></script>
<!-- Custom scripts for all pages-->
<script src="{% static 'js/sb-admin-2.min.js' %}"></script>
<!-- Page level plugins -->
<script src="{% static 'vendor/chart.js/Chart.min.js' %}"></script>
<!-- Page level custom scripts -->
<script src="{% static 'js/demo/chart-area-demo.js' %}"></script>
<script src="{% static 'js/demo/chart-pie-demo.js' %}"></script>
</body>
</html>
hostel_mess/templates/viewreq.html
View file @ f0657d40
......@@ -27,7 +27,7 @@
<div id="wrapper">
<!-- Sidebar -->
<ul class="navbar-nav bg-gradient-primary sidebar sidebar-dark accordion" id="accordionSidebar">
<ul class="navbar-nav bg-gradient-primary sidebar sidebar-dark accordion toggled" id="accordionSidebar">
<!-- Divider -->
<hr class="sidebar-divider my-0">
......@@ -56,7 +56,7 @@
<div id="collapseTwo" class="collapse" aria-labelledby="headingTwo" data-parent="#accordionSidebar">
<div class="bg-white py-2 collapse-inner rounded">
<h6 class="collapse-header"><b>Raise Request for:</b></h6>
<a class="collapse-item" href="rebates.html"><b>REBATES</b></a>
<a class="collapse-item" href="{% url 'rebate' %}" method="GET"><b>REBATES</b></a>
<a class="collapse-item" href="overheads.html"><b>OVERHEAD</b></a>
</div>
</div>
......@@ -133,6 +133,8 @@
<!-- Begin Page Content -->
<div class="container-fluid">
<!-- DataTales Example -->
<div class="row d-flex justify-content-center">
<div class="col-md-6">
<div class="card shadow mb-4">
<div class="card-header py-3">
<h6 class="m-0 font-weight-bold text-primary"><b>STATUS OF PREVIOUS REQUESTS</b></h6>
......@@ -172,6 +174,8 @@
</div>
<!--DATA table ends here -->
</div>
</div>
</div>
<!-- /.container-fluid -->
</div>
......
hostel_mess/usermgmt/models.py
View file @ f0657d40
......@@ -15,6 +15,7 @@ class Student(models.Model):
class RebateReq(models.Model):
student = models.OneToOneField(Student,on_delete=models.CASCADE)
fromDate = models.DateField(max_length=10, help_text="format : DDMMYYYY", null=True)
toDate = models.DateField(max_length=10, help_text="format : DDMMYYYY", null=True)
status = models.CharField(max_length = 1, choices = [('Y','yes'),('N','no'), ('W','wait')])
......@@ -32,6 +33,7 @@ class Meal(models.Model):
class OverheadReq(models.Model):
student = models.OneToOneField(Student, on_delete=models.CASCADE)
mealType = models.OneToOneField(Meal,on_delete=models.CASCADE)
date = models.DateField(max_length=10, help_text="format : DDMMYYYY", null=True, auto_now_add=True)
status = models.CharField(max_length = 1, choices = [('Y','yes'),('N','no'), ('W','wait')])
count = models.IntegerField(default = 1)
......
hostel_mess/usermgmt/urls.py
View file @ f0657d40
......@@ -15,8 +15,8 @@ urlpatterns = [
path('worker/', views.worker_homepage_view, name='worker-homepage'),
## student functions below:
path('rebate/',views.rebate),
path('overhead/',views.overhead),
path('rebate/',views.rebate, name='rebate'),
path('overhead/',views.overhead, name='overhead'),
#this is to be redirected to homepage
path('viewreq/',views.viewreq),
## worker's functions below:
......
hostel_mess/usermgmt/views.py
View file @ f0657d40
......@@ -54,6 +54,8 @@ def manager_homepage_view(request):
def worker_homepage_view(request):
return render(request, 'viewreq.html', context=None)
@login_required
def rebate(request):
return render(request, 'rebates.html')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment