Department

FusionIIIT/applications/office_module/admin.py

@@ -1,5 +1,4 @@
 from django.contrib import admin
-
 from .models import *
 
 admin.site.register(Requisitions)
@@ -15,3 +14,11 @@
 admin.site.register(registrar_establishment_section)
 admin.site.register(registrar_director_section)
 admin.site.register(Assistantship)
+
+admin.site.register(LTC)
+admin.site.register(CPDA)
+admin.site.register(Auto_fair_claim)
+admin.site.register(Teaching_credits1)
+admin.site.register(Assigned_Teaching_credits)
+admin.site.register(Lab1)
+admin.site.register(TA_assign)

FusionIIIT/applications/office_module/apps.py

@@ -2,4 +2,4 @@
 
 
 class OfficeModuleConfig(AppConfig):
-    name = 'applications.office_module'
+    name = 'applications.office_module'

FusionIIIT/applications/office_module/custom_filers.py

@@ -0,0 +1,5 @@
+from django import template
+
+@register.filter
+def strip_double_quotes(quoted_string):
+    return quoted_string.replace('"', '')

FusionIIIT/applications/office_module/forms.py

@@ -1,8 +1,6 @@
 from django import forms
-
 from .models import *
 
-
 class Requisitionform(forms.ModelForm):
 	class Meta:
 		model=Requisitions

FusionIIIT/applications/office_module/models.py

@@ -1,19 +1,14 @@
-import datetime
-
 from django.db import models
-
-from applications.academic_information.models import (Course, Grades,
-                                                      Instructor, Meeting, Spi,
-                                                      Student)
-from applications.academic_procedures.models import Thesis
+import datetime
+from datetime import datetime
+from applications.academic_information.models import Student, Grades, Meeting
+from applications.globals.models import Staff, Faculty, ExtraInfo, Designation,HoldsDesignation, DepartmentInfo
 from applications.filetracking.models import Tracking
-from applications.globals.models import (DepartmentInfo, Designation,
-                                         ExtraInfo, Faculty, HoldsDesignation,
-                                         Staff)
 from applications.leave.models import Leave
-
 from .models_office_students import *
+from applications.academic_information.models import Student, Instructor, Spi, Grades, Course
 
+from applications.academic_procedures.models import Thesis
 
 class Constants:
     DAY_CHOICES = (
@@ -102,7 +97,7 @@ class Constants:
         ('rail', 'RAIL')
       )
 
-    TICK_TYPE = (
+    PHD_COURSES = (
         ('Computer Graphics', 'Computer Graphics'),
         ('Machine Learning', 'Machine Learning'),
         ('Image Processing','Image Processing'),
@@ -162,6 +157,14 @@ class Constants:
 
 )
 
+FEST_TYPE = (
+    ('0', "Abhikalpan"),
+    ('1', "Gusto"),
+    ('2', "Tarang"),
+    ('3', "Inter-IIIT"),
+
+)
+
 
 
 class Assistantship(models.Model):
@@ -492,12 +495,12 @@ class Teaching_credits1(models.Model):
     name = models.CharField(max_length=100)
     programme = models.CharField(max_length=100)
     branch = models.CharField(max_length=100)
-    course1 = models.CharField(choices=Constants.TICK_TYPE,
-                                      max_length=100, default='NO')
-    course2 = models.CharField(choices=Constants.TICK_TYPE,
-                                      max_length=100, default='NO')
-    course3 = models.CharField(choices=Constants.TICK_TYPE,
-                                      max_length=100, default='NO')
+    course1 = models.CharField(choices=Constants.PHD_COURSES,
+                                      max_length=100)
+    course2 = models.CharField(choices=Constants.PHD_COURSES,
+                                      max_length=100)
+    course3 = models.CharField(choices=Constants.PHD_COURSES,
+                                      max_length=100)
     tag = models.IntegerField(default=0)
     class Meta:
         db_table = 'Teaching_credits1'
@@ -507,29 +510,40 @@ def __str__(self):
 
 class Assigned_Teaching_credits(models.Model):
     roll_no = models.ForeignKey(Teaching_credits1, on_delete=models.CASCADE)
-    assigned_course = models.CharField(max_length=100,default='NO')
+    assigned_course = models.CharField(max_length=100)
     class Meta:
         db_table = 'Assigned_Teaching_credits'
+    def __str__(self):
+        return str(self.roll_no)
 
 
-class Lab(models.Model):
-    lab = models.CharField(max_length=10)
+class Lab1(models.Model):
+    lab_name = models.CharField(max_length=50, primary_key=True) #Lab name
     lab_instructor = models.CharField(max_length=30)
     day = models.CharField(max_length=10,choices=Constants.DAY_CHOICES, default='Monday')
-    s_time = models.CharField(max_length=6, default='0:00')
-    e_time = models.CharField(max_length=6, default='0:00')
+    s_time = models.TimeField(default ='10:00:00')
+    e_time = models.TimeField(default ='12:00:00')
+
+    #e_time = models.DateTimeField(max_length=6, default='0:00')
     class Meta:
         db_table = 'Lab'
 
     def __str__(self):
-        return str(self.lab)
+        return str(self.lab_name)
 
 class TA_assign(models.Model):
-    roll_no = models.ForeignKey(ExtraInfo, on_delete=models.CASCADE, related_name='TA_id')
-    lab = models.ForeignKey(Lab, on_delete=models.CASCADE)
+    #roll_no = models.ForeignKey(ExtraInfo, on_delete=models.CASCADE, related_name='TA_id')
+    lab_name = models.ForeignKey(Lab1, on_delete=models.CASCADE)
+    roll_no = models.IntegerField(primary_key=True)
+    name = models.CharField(max_length=100, default ='student_name')
+
+    #lab_name = models.CharField(max_length=50, primary_key=True) #Lab name
     balance = models.IntegerField(default=2)
+    start_date = models.DateField()
+    end_date = models.DateTimeField()
+
     class Meta:
         db_table = 'TA_assign'
 
     def __str__(self):
-        return str(self.id)
+        return str(self.roll_no)

FusionIIIT/applications/office_module/models_office_students.py

@@ -1,69 +1,69 @@
-import datetime
-
-from django.db import models
-from django.utils.translation import gettext as _
-
-from applications.globals.models import ExtraInfo
-
-
-class Constants:
-
-    APPROVAL_TYPE = (
-        ('APPROVED', 'Approved'),
-        ('PENDING', 'Pending'),
-    )
-
-    HALL_NO = (
-        ('HALL-1','hall-1'),
-        ('HALL-3','hall-3'),
-        ('HALL-4','hall-4'),
-    )
-
-    CLUB_TYPE = (
-        ('TECHNICAL', 'technical'),
-        ('CULTURAL', 'cultural'),
-        ('SPORTS', 'sports'),
-    )
-
-
-
-class DeanS_approve_committes(models.Model):
-    id = models.AutoField(primary_key=True)
-    convener=models.ForeignKey(ExtraInfo, on_delete=models.CASCADE ,related_name='convener')
-    faculty_incharge=models.ForeignKey(ExtraInfo, on_delete=models.CASCADE ,related_name='facultyincharge')
-    date_approved=models.DateField(null=True, blank=True)
-    description=models.CharField(max_length=200)
-
-    def __str__(self):
-        return self.convener + '-' + self.dateofapproval
-
-class hostel_guestroom_approval(models.Model):
-    id = models.AutoField(primary_key=True)
-    intender=models.ForeignKey(ExtraInfo, on_delete=models.CASCADE)
-    hall_no=models.CharField(max_length=5, choices=Constants.HALL_NO ,default='')
-    arrival_date=models.DateField(_("Date"), default=datetime.date.today)
-    departure_date=models.DateField(null=True, blank=True)
-    status=models.CharField(max_length=20, choices=Constants.APPROVAL_TYPE ,default='Pending')
-
-    def __str__(self):
-        return self.hall_no + '-' + self.status
-
-
-class hostel_allotment(models.Model):
-    id = models.AutoField(primary_key=True)
-    hall_no=models.CharField(max_length=5, choices=Constants.HALL_NO ,default='')
-    allotment_file=models.FileField(upload_to='uploads/')
-    description=models.CharField(max_length=200)
-    
-    def __str__(self):
-        return '{} - {}'.format(self.hall_no, self.allotment_file)
-
-class Budget(models.Model):
-    id=models.AutoField(primary_key=True)
-    budget_type=models.CharField(max_length=20)
-    club_type=models.CharField(max_length=20, choices=Constants.CLUB_TYPE, default='')
-    budget_allocated=models.PositiveIntegerField(default=0)
-    budget_expenditure=models.PositiveIntegerField(default=0)
-    budget_available=models.PositiveIntegerField(default=0)
-    # def __str__(self):
-    #         return self.budget_type + '-' + self.budget_allocated
+import datetime
+
+from django.db import models
+from django.utils.translation import gettext as _
+from applications.globals.models import ExtraInfo
+
+
+
+class Constants:
+
+    APPROVAL_TYPE = (
+        ('APPROVED', 'Approved'),
+        ('PENDING', 'Pending'),
+    )
+
+    HALL_NO = (
+        ('HALL-1','hall-1'),
+        ('HALL-3','hall-3'),
+        ('HALL-4','hall-4'),
+    )
+
+    CLUB_TYPE = (
+        ('TECHNICAL', 'technical'),
+        ('CULTURAL', 'cultural'),
+        ('SPORTS', 'sports'),
+    )
+
+
+
+class DeanS_approve_committes(models.Model):
+    id = models.AutoField(primary_key=True)
+    convener=models.ForeignKey(ExtraInfo, on_delete=models.CASCADE ,related_name='convener')
+    faculty_incharge=models.ForeignKey(ExtraInfo, on_delete=models.CASCADE ,related_name='facultyincharge')
+    date_approved=models.DateField(null=True, blank=True)
+    description=models.CharField(max_length=200)
+
+    def __str__(self):
+        return self.convener + '-' + self.dateofapproval
+
+class hostel_guestroom_approval(models.Model):
+    id = models.AutoField(primary_key=True)
+    intender=models.ForeignKey(ExtraInfo, on_delete=models.CASCADE)
+    hall_no=models.CharField(max_length=5, choices=Constants.HALL_NO ,default='')
+    arrival_date=models.DateField(_("Date"), default=datetime.date.today)
+    departure_date=models.DateField(null=True, blank=True)
+    status=models.CharField(max_length=20, choices=Constants.APPROVAL_TYPE ,default='Pending')
+
+    def __str__(self):
+        return self.hall_no + '-' + self.status
+
+
+class hostel_allotment(models.Model):
+    id = models.AutoField(primary_key=True)
+    hall_no=models.CharField(max_length=5, choices=Constants.HALL_NO ,default='')
+    allotment_file=models.FileField(upload_to='uploads/')
+    description=models.CharField(max_length=200)
+
+    def __str__(self):
+        return '{} - {}'.format(self.hall_no, self.allotment_file)
+
+class Budget(models.Model):
+    id=models.AutoField(primary_key=True)
+    budget_type=models.CharField(max_length=20)
+    club_type=models.CharField(max_length=20, choices=Constants.CLUB_TYPE, default='')
+    budget_allocated=models.PositiveIntegerField(default=0)
+    budget_expenditure=models.PositiveIntegerField(default=0)
+    budget_available=models.PositiveIntegerField(default=0)
+    # def __str__(self):
+    #         return self.budget_type + '-' + self.budget_allocated

FusionIIIT/applications/office_module/urls.py

@@ -1,6 +1,5 @@
 from django.conf.urls import url
 from django.views.decorators.csrf import csrf_exempt
-
 from . import views
 
 app_name = 'office'
@@ -35,6 +34,11 @@
     url(r'^officeOfHOD/$', views.officeOfHOD, name='officeOfHOD'),
     url(r'^officeOfHOD/submit/$',views.teaching_form,name='teaching_form'),
     url(r'^officeOfHOD/work/$',views.hod_work,name='hod_work'),
+    url(r'^officeOfHOD/lab/$',views.lab_details,name='lab_details'),
+    url(r'^officeOfHOD/assign_ta/$',views.assign_ta,name='assign_ta'),
+
+
+
     url(r'^genericModule/', views.genericModule, name='genericModule'),
     url(r'^deleteitem/(?P<id>[0-9]+)',views.delete_item, name='delete_item'),
     url(r'^deletevendor/(?P<id>[0-9]+)',views.delete_vendor, name='delete_vendor'),