diff --git a/CDC_Backend/APIs/companyViews.py b/CDC_Backend/APIs/companyViews.py index de5c329..6774a13 100644 --- a/CDC_Backend/APIs/companyViews.py +++ b/CDC_Backend/APIs/companyViews.py @@ -232,8 +232,14 @@ def addPlacement(request): # Convert to date object opening.tentative_date_of_joining = datetime.datetime.strptime(data[TENTATIVE_DATE_OF_JOINING], '%d-%m-%Y').date() - opening.establishment_date = datetime.datetime.strptime(data[ESTABLISHMENT_DATE], - '%d-%m-%Y').date() # newly added field + establishment_date_str = data.get('ESTABLISHMENT_DATE', '') + if establishment_date_str: + try: + opening.establishment_date = datetime.datetime.strptime(establishment_date_str, '%d-%m-%Y').date() + except ValueError: + opening.establishment_date = None + else: + opening.establishment_date = None # Only Allowing Fourth Year for Placement opening.allowed_batch = [FOURTH_YEAR,] @@ -471,8 +477,7 @@ def addInternship(request): if data[WORK_TYPE] == 'Work from home': internship.is_work_from_home = True else: - internship.is_work_from_home = False - + internship.is_work_from_home = False if ALLOWED_BATCH in data and (data[ALLOWED_BATCH] is None or json.loads(data[ALLOWED_BATCH]) == ""): raise ValueError('Allowed Batches cannot be empty') elif ALLOWED_BATCH in data and set(json.loads(data[ALLOWED_BATCH])).issubset(BATCHES): diff --git a/CDC_Backend/APIs/constants.py b/CDC_Backend/APIs/constants.py index 4bb9152..ed2bfaf 100644 --- a/CDC_Backend/APIs/constants.py +++ b/CDC_Backend/APIs/constants.py @@ -10,13 +10,13 @@ ['EP', 'EP'], ['CIVIL', 'CIVIL'], ['CHEMICAL', 'CHEMICAL'], - ['BSMS', 'BSMS'], ] ELIGIBLE_CHOICES = [ ["Btech", "Btech"], ["MS", "MS"], ["MTech", "MTech"], ["PHD", "PHD"], + ["BSMS", "BSMS"], ] BRANCHES = [ "CSE", @@ -25,7 +25,7 @@ "EP", "CIVIL", "CHEMICAL", - "BSMS", + "MNC", ] ELIGIBLE =[ "Btech", diff --git a/CDC_Backend/templates/company_email_verification.html b/CDC_Backend/templates/company_email_verification.html index 9c12f7e..8bd9b3a 100644 --- a/CDC_Backend/templates/company_email_verification.html +++ b/CDC_Backend/templates/company_email_verification.html @@ -1,137 +1,196 @@ - - - - + + + + Email Template - - - + + + - - + +
- - - - - + + + + +
- + diff --git a/CDC_Backend/templates/company_jnf_response.html b/CDC_Backend/templates/company_jnf_response.html index 9c12dd7..6003baf 100644 --- a/CDC_Backend/templates/company_jnf_response.html +++ b/CDC_Backend/templates/company_jnf_response.html @@ -118,12 +118,12 @@
- CDC Logo + CDC Logo
- + +
+ diff --git a/CDC_Backend/templates/images/Approved.png b/CDC_Backend/templates/images/Approved.png deleted file mode 100644 index 8b04467..0000000 Binary files a/CDC_Backend/templates/images/Approved.png and /dev/null differ diff --git a/CDC_Backend/templates/images/CDC-Logo.png b/CDC_Backend/templates/images/CDC-Logo.png deleted file mode 100644 index 8601f68..0000000 Binary files a/CDC_Backend/templates/images/CDC-Logo.png and /dev/null differ diff --git a/CDC_Backend/templates/images/Confirmed.png b/CDC_Backend/templates/images/Confirmed.png deleted file mode 100644 index 2cf7d4e..0000000 Binary files a/CDC_Backend/templates/images/Confirmed.png and /dev/null differ diff --git a/CDC_Backend/templates/images/Instagram_icon.png b/CDC_Backend/templates/images/Instagram_icon.png deleted file mode 100644 index 61c75cb..0000000 Binary files a/CDC_Backend/templates/images/Instagram_icon.png and /dev/null differ diff --git a/CDC_Backend/templates/images/LinkedIn_logo_initials.png b/CDC_Backend/templates/images/LinkedIn_logo_initials.png deleted file mode 100644 index f00664f..0000000 Binary files a/CDC_Backend/templates/images/LinkedIn_logo_initials.png and /dev/null differ diff --git a/CDC_Backend/templates/images/Rejected.png b/CDC_Backend/templates/images/Rejected.png deleted file mode 100644 index ee3a79c..0000000 Binary files a/CDC_Backend/templates/images/Rejected.png and /dev/null differ diff --git a/CDC_Backend/templates/images/email_2058176.png b/CDC_Backend/templates/images/email_2058176.png deleted file mode 100644 index 83318e5..0000000 Binary files a/CDC_Backend/templates/images/email_2058176.png and /dev/null differ diff --git a/CDC_Backend/templates/images/image3.jpg b/CDC_Backend/templates/images/image3.jpg deleted file mode 100644 index 5d4bd9e..0000000 Binary files a/CDC_Backend/templates/images/image3.jpg and /dev/null differ diff --git a/CDC_Backend/templates/images/message.png b/CDC_Backend/templates/images/message.png deleted file mode 100644 index de30dbf..0000000 Binary files a/CDC_Backend/templates/images/message.png and /dev/null differ diff --git a/CDC_Backend/templates/images/mobile.png b/CDC_Backend/templates/images/mobile.png deleted file mode 100644 index 169c3d3..0000000 Binary files a/CDC_Backend/templates/images/mobile.png and /dev/null differ diff --git a/CDC_Backend/templates/images/notification.png b/CDC_Backend/templates/images/notification.png deleted file mode 100644 index df84a49..0000000 Binary files a/CDC_Backend/templates/images/notification.png and /dev/null differ diff --git a/CDC_Backend/templates/images/reminder.png b/CDC_Backend/templates/images/reminder.png deleted file mode 100644 index fd6925c..0000000 Binary files a/CDC_Backend/templates/images/reminder.png and /dev/null differ diff --git a/CDC_Backend/templates/images/tracking.png b/CDC_Backend/templates/images/tracking.png deleted file mode 100644 index 5f71443..0000000 Binary files a/CDC_Backend/templates/images/tracking.png and /dev/null differ diff --git a/CDC_Backend/templates/images/twitter.png b/CDC_Backend/templates/images/twitter.png deleted file mode 100644 index ec84b19..0000000 Binary files a/CDC_Backend/templates/images/twitter.png and /dev/null differ diff --git a/CDC_Backend/templates/notify_students_new_opening.html b/CDC_Backend/templates/notify_students_new_opening.html index 6a18c88..f703b40 100644 --- a/CDC_Backend/templates/notify_students_new_opening.html +++ b/CDC_Backend/templates/notify_students_new_opening.html @@ -107,11 +107,11 @@
- CDC Logo + CDC Logo