Final Changes

FusionIIIT/applications/eis/models.py

@@ -13,8 +13,8 @@ class emp_visits(models.Model):
     place = models.CharField(max_length=500, default=" ")
     purpose = models.CharField(max_length=500, default=" ")
     v_date = models.DateField(null=True,blank=True)
-    start_date = models.DateField(null=True,blank=True)
-    end_date = models.DateField(null=True,blank=True)
+    start_date = models.DateField(null=False,blank=True)
+    end_date = models.DateField(null=False,blank=True)
     entry_date = models.DateField(null=True,blank=True, default=datetime.datetime.now)
 
     def __str__(self):
@@ -29,8 +29,8 @@ class emp_techtransfer(models.Model):
     pf_no = models.IntegerField()
     details = models.CharField(max_length=500, default=" ")
     date_entry = models.DateField(null=True, blank=True, default=datetime.datetime.now)
-    start_date = models.DateField(null=True,blank=True)
-    end_date = models.DateField(null=True,blank=True)
+    start_date = models.DateField(null=False,blank=True)
+    end_date = models.DateField(null=False,blank=True)
 
 
 class emp_session_chair(models.Model):
@@ -46,8 +46,8 @@ class emp_session_chair(models.Model):
     for r in range(1, 13):
         MONTH_CHOICES.append((r, r))
     a_month = models.IntegerField(('Month'), choices=MONTH_CHOICES, null=True, blank=True, default=1)
-    start_date = models.DateField(null=True, blank=True)
-    end_date = models.DateField(null=True, blank=True)
+    start_date = models.DateField(null=False, blank=True)
+    end_date = models.DateField(null=False, blank=True)
     date_entry = models.DateField(null=True, blank=True, default=datetime.datetime.now)
     remarks = models.CharField(default = " ", max_length=1000)
 
@@ -71,8 +71,8 @@ class emp_research_projects(models.Model):
         ('Completed', 'Completed')
     )
     status = models.CharField(max_length = 10, choices = STATUS_TYPE_CHOICES)
-    start_date = models.DateField(null=True, blank=True)
-    finish_date = models.DateField(null=True, blank=True)
+    start_date = models.DateField(null=False, blank=True)
+    finish_date = models.DateField(null=False, blank=True)
     date_submission = models.DateField(null=True, blank=True)
     date_entry = models.DateField(null=True, blank=True, default=datetime.datetime.now)
 
@@ -103,8 +103,8 @@ class emp_research_papers(models.Model):
     is_sci = models.CharField(max_length=6, choices=IS_SCI_TYPE_CHOICES, null=True, blank=True)
     isbn_no = models.CharField(max_length=250, null=True, blank=True)
     doi = models.CharField(max_length=1000,null=True, blank=True)
-    start_date = models.DateField(null=True, blank=True)
-    end_date = models.DateField(null=True, blank=True)
+    start_date = models.DateField(null=False, blank=True)
+    end_date = models.DateField(null=False, blank=True)
     date_acceptance = models.DateField(null=True, blank=True)
     date_publication = models.DateField(null=True, blank=True)
     YEAR_CHOICES = []
@@ -178,8 +178,8 @@ class emp_patents(models.Model):
         MONTH_CHOICES.append((r, r))
     a_month = models.IntegerField(('Month'), choices=MONTH_CHOICES, null=True, blank=True, default=1)
     date_entry = models.DateField(null=True, blank=True, default=datetime.datetime.now)
-    start_date = models.DateField(null=True,blank=True)
-    end_date = models.DateField(null=True,blank=True)
+    start_date = models.DateField(null=False,blank=True)
+    end_date = models.DateField(null=False,blank=True)
     def __str__(self):
         return 'PF No.: {}   Status: {}  Title: {}'.format(self.pf_no,self.status, self.title)
 
@@ -202,8 +202,8 @@ class emp_mtechphd_thesis(models.Model):
         MONTH_CHOICES.append((r, r))
     a_month = models.IntegerField(('Month'), choices=MONTH_CHOICES, null=True, blank=True, default=1)
     date_entry = models.DateField(null=True, blank=True, default=datetime.datetime.now)
-    start_date = models.DateField(null=True,blank=True)
-    end_date = models.DateField(null=True,blank=True)
+    start_date = models.DateField(null=False,blank=True)
+    end_date = models.DateField(null=False,blank=True)
     semester=models.IntegerField(default = 1, blank=True, null=True)
     STATUS_TYPE_CHOICES = (
         ('Awarded', 'Awarded'),
@@ -238,8 +238,8 @@ class emp_keynote_address(models.Model):
     for r in range(1, 13):
         MONTH_CHOICES.append((r, r))
     a_month = models.IntegerField(('Month'), choices=MONTH_CHOICES, null=True, blank=True, default=1)
-    start_date = models.DateField(null=True, blank=True)
-    end_date = models.DateField(null=True, blank=True)
+    start_date = models.DateField(null=False, blank=True)
+    end_date = models.DateField(null=False, blank=True)
     date_entry = models.DateField(null=True, blank=True, default=datetime.datetime.now)
 
     def __str__(self):
@@ -291,8 +291,8 @@ class emp_event_organized(models.Model):
         ('Co-Convener', 'Co-Convener'),
     )
     role = models.CharField(max_length=11, choices=ROLE_TYPE_CHOICES)
-    start_date = models.DateField(null=True, blank=True)
-    end_date = models.DateField(null=True, blank=True)
+    start_date = models.DateField(null=False, blank=True)
+    end_date = models.DateField(null=False, blank=True)
     date_entry = models.DateField(null=True, blank=True, default=datetime.datetime.now)
 
     def __str__(self):
@@ -306,8 +306,8 @@ class emp_consultancy_projects(models.Model):
     title = models.CharField(max_length=1000)
     client = models.CharField(max_length=1000)
     financial_outlay = models.IntegerField()
-    start_date = models.DateField(null=True, blank=True)
-    end_date = models.DateField(null=True, blank=True)
+    start_date = models.DateField(null=False, blank=True)
+    end_date = models.DateField(null=False, blank=True)
     duration = models.CharField(max_length=500, null=True, blank=True)
     date_entry = models.DateField(null=True, blank=True, default=datetime.datetime.now)
     STATUS_TYPE_CHOICES = (
@@ -334,8 +334,8 @@ class emp_confrence_organised(models.Model):
     for r in range(1, 13):
         MONTH_CHOICES.append((r, r))
     a_month = models.IntegerField(('Month'), choices=MONTH_CHOICES, null=True, blank=True, default=1)
-    start_date = models.DateField(null=True, blank=True)
-    end_date = models.DateField(null=True, blank=True)
+    start_date = models.DateField(null=False, blank=True)
+    end_date = models.DateField(null=False, blank=True)
     date_entry = models.DateField(default=datetime.datetime.now, null=True, blank=True)
     ROLE1_TYPE_CHOICES = (
         ('Advisary Committee', 'Advisary Committee'),

FusionIIIT/applications/eis/views.py

@@ -582,6 +582,7 @@ def pg_insert(request):
         eis = emp_mtechphd_thesis()
     else:
         eis = get_object_or_404(emp_mtechphd_thesis, id=request.POST.get('pg_id'))
+    eis.user = request.user
     eis.pf_no = pf
     eis.title = request.POST.get('title')
     eis.s_year = request.POST.get('s_year')
@@ -601,6 +602,7 @@ def phd_insert(request):
         eis = emp_mtechphd_thesis()
     else:
         eis = get_object_or_404(emp_mtechphd_thesis, id=request.POST.get('phd_id'))
+    eis.user = request.user
     eis.pf_no = pf
     eis.degree_type = 2
     eis.title = request.POST.get('title')
@@ -621,6 +623,7 @@ def fvisit_insert(request):
         eis = emp_visits()
     else:
         eis = get_object_or_404(emp_visits, id=request.POST.get('fvisit_id'))
+    eis.user = request.user
     eis.pf_no = pf
     eis.v_type = 2
     eis.country = request.POST.get('country').upper()
@@ -646,6 +649,7 @@ def ivisit_insert(request):
         eis = emp_visits()
     else:
         eis = get_object_or_404(emp_visits, id=request.POST.get('ivisit_id'))
+    eis.user = request.user
     eis.pf_no = pf
     eis.v_type = 1
     eis.country = request.POST.get('country2')
@@ -870,6 +874,7 @@ def conference_insert(request):
     user = get_object_or_404(ExtraInfo, user=request.user)
     pf = user.id
     eis = emp_research_papers()
+    eis.user = request.user
     eis.pf_no = pf
     eis.rtype = 'Conference'
     eis.authors = request.POST.get('authors3')
@@ -1025,6 +1030,7 @@ def book_insert(request):
     user = get_object_or_404(ExtraInfo, user=request.user)
     pf = user.id
     eis = emp_published_books()
+    eis.user = request.user
     eis.pf_no = pf
     eis.p_type = request.POST.get('book_p_type')
     eis.title = request.POST.get('book_title')
@@ -1051,6 +1057,7 @@ def consym_insert(request):
     user = get_object_or_404(ExtraInfo, user=request.user)
     pf = user.id
     eis = emp_confrence_organised()
+    eis.user = request.user
     eis.pf_no = pf
     eis.name = request.POST.get('conference_name')
     eis.venue = request.POST.get('conference_venue')
@@ -1127,6 +1134,7 @@ def event_insert(request):
     else:
         eis = get_object_or_404(emp_event_organized, id=request.POST.get('event_id'))
     eis.pf_no = pf
+    eis.user = request.user
     eis.type = request.POST.get('event_type')
     if(eis.type == 'Any Other'):
         if(request.POST.get('myDIV')!= None or request.POST.get('myDIV') != ""):
@@ -1186,6 +1194,7 @@ def award_insert(request):
     else:
         eis = get_object_or_404(emp_achievement, id=request.POST.get('ach_id'))
     eis.pf_no = pf
+    eis.user = request.user
     eis.a_type = request.POST.get('type')
     if(request.POST.get('a_day') != None and request.POST.get('a_day') != ""):
         eis.a_day = request.POST.get('a_day')
@@ -1206,6 +1215,7 @@ def talk_insert(request):
         eis = emp_expert_lectures()
     else:
         eis = get_object_or_404(emp_expert_lectures, id=request.POST.get('lec_id'))
+    eis.user = request.user
     eis.pf_no = pf
     eis.l_type = request.POST.get('type')
     eis.place = request.POST.get('place')
@@ -1229,6 +1239,7 @@ def chaired_insert(request):
         eis = emp_session_chair()
     else:
         eis = get_object_or_404(emp_session_chair, id=request.POST.get('ses_id'))
+    eis.user = request.user
     eis.pf_no = pf
     eis.event = request.POST.get('event')
     eis.name = request.POST.get('name')
@@ -1253,6 +1264,7 @@ def keynote_insert(request):
         eis = emp_keynote_address()
     else:
         eis = get_object_or_404(emp_keynote_address, id=request.POST.get('keyid'))
+    eis.user = request.user
     eis.pf_no = pf
     eis.type = request.POST.get('type')
     eis.name = request.POST.get('name')
@@ -1277,6 +1289,7 @@ def project_insert(request):
         eis = emp_research_projects()
     else:
         eis = get_object_or_404(emp_research_projects, id=request.POST.get('project_id'))
+    eis.user = request.user
     eis.pf_no = pf
     eis.pi = request.POST.get('pi')
     eis.co_pi = request.POST.get('co_pi')
@@ -1312,13 +1325,16 @@ def project_insert(request):
     return redirect('/profile/?page4=1')
 
 def consult_insert(request):
+    print("=======================")
     user = get_object_or_404(ExtraInfo, user=request.user)
     pf = user.id
-
+    print(">>>>>>>.",user,type(user))
+    print(">>>>>>>",request.user,type(request.user))
     if (request.POST.get('consultancy_id')==None or request.POST.get('consultancy_id')==""):
         eis = emp_consultancy_projects()
     else:
         eis = get_object_or_404(emp_consultancy_projects, id=request.POST.get('consultancy_id'))
+    eis.user = request.user
     eis.pf_no = pf
     eis.consultants = request.POST.get('consultants')
     eis.client = request.POST.get('client')
@@ -1351,6 +1367,7 @@ def patent_insert(request):
         eis = emp_patents()
     else:
         eis = get_object_or_404(emp_patents, id=request.POST.get('patent_id'))
+    eis.user = request.user
     eis.pf_no = pf
     eis.p_no = request.POST.get('p_no')
     eis.earnings = request.POST.get('earnings')

FusionIIIT/applications/establishment/models.py

@@ -1,7 +1,9 @@
+from pickle import TRUE
 from django.db import models
 from django.contrib.auth.models import User
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
+from django.core.exceptions import ValidationError
 from applications.globals.models import ExtraInfo, HoldsDesignation, Designation
 
 class Constants:
@@ -137,7 +139,7 @@ class Ltc_application(models.Model):
     applicant = models.ForeignKey(User, on_delete=models.CASCADE)
     pf_number = models.CharField(max_length=50, default='')
     basic_pay = models.IntegerField(blank=True)
-    leave_start = models.DateField()
+    leave_start = models.DateField(null=True)
     leave_end = models.DateField()
     family_departure_date = models.DateField()
     leave_nature = models.CharField(max_length=50, default='')
@@ -259,8 +261,8 @@ class Appraisal(models.Model):
     publications = models.CharField(max_length=200, blank=True, null=True, default='')
     conferences_meeting_attended = models.CharField(max_length=200, blank=True, null=True, default='')
     conferences_meeting_organized = models.CharField(max_length=200, blank=True, null=True, default='')
-    admin_assign=models.CharField(max_length=20, blank=True, null=True, default='')
-    sevice_to_ins=models.CharField(max_length=20, blank=True, null=True, default='')
+    admin_assign=models.CharField(max_length=200, blank=True, null=True, default='')
+    sevice_to_ins=models.CharField(max_length=200, blank=True, null=True, default='')
     extra_info = models.CharField(max_length=200, blank=True, null=True, default='')
     faculty_comments= models.CharField(max_length=200, blank=True, null=True, default='')
     start_date = models.DateField(null=True,blank=True)

FusionIIIT/applications/establishment/urls.py

@@ -5,9 +5,9 @@
 
 urlpatterns = [
     url(r'^$', views.establishment, name='establishment'),
-    url(r'^leave/', include('applications.leave.urls')),
+    # url(r'^leave/', include('applications.leave.urls')),
     url(r'cpda/', views.cpda, name='cpda'),
     url(r'ltc/', views.ltc, name='ltc'),
     url(r'appraisal/', views.appraisal, name='appraisal')
-    
+
 ]