Skip to content

Commit

Permalink
Merge pull request #1597 from FusionIIIT/ac-1
Browse files Browse the repository at this point in the history 
AC-1 --> latest_staging
  • Loading branch information
@prabhatsuman
prabhatsuman authored May 4, 2024
2 parents 3f60f80 + 7f3765c commit 00c64b6
Show file tree
Hide file tree
Showing 58 changed files with 784 additions and 1,780 deletions.
57 changes: 57 additions & 0 deletions FusionIIIT/applications/programme_curriculum/forms.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
from django.forms.models import ModelChoiceField
from .models import Programme, Discipline, Curriculum, Semester, Course, Batch, CourseSlot, PROGRAMME_CATEGORY_CHOICES,NewProposalFile,Proposal_Tracking
from django.utils.translation import gettext_lazy as _
from django.contrib.auth.models import User
from applications.globals.models import (DepartmentInfo, Designation,ExtraInfo, Faculty, HoldsDesignation)
from applications.filetracking.sdk.methods import *


class ProgrammeForm(ModelForm):
class Meta:
Expand Down Expand Up @@ -315,3 +319,56 @@ class Meta:
'remarks' : 'remarks',

}

def clean(self):

r_id = self.cleaned_data.get('receive_id')
r_des = self.cleaned_data.get('receive_design')
des=HoldsDesignation.objects.filter(user=r_id)
print(des)
data2=''
msg1=''
if des:
data2 = ', '.join(str(i) for i in des)
msg1 = f'{r_id} has only these working designations: {data2}'

else:
msg1=f'{r_id} has no working designations'
data = HoldsDesignation.objects.select_related('designation').filter(user=r_id,designation=r_des)

if not data:
msg = 'Invalid reciever id and reciever designation'
raise ValidationError({'receive_id': [msg, msg1]})

name=""
name = name+str(r_des)
if "hod" in name.lower() :
pass
elif "professor" in name.lower() :
pass
elif "dean academic" in name.lower():
pass
else:
msg3 = f"You can't send Proposal Form to the user {r_id}-{r_des}"
raise ValidationError({'receive_id': [msg3]})




return self.cleaned_data


# def sed(self):
# r_id = self.cleaned_data.get('receive_id')
# return r_id
# def __init__(self, *args, **kwargs):
# super().__init__(*args, **kwargs)
# des = HoldsDesignation.objects.select_related('working','designation').filter(user=5333)
# self.fields['receive_design'].queryset = Designation.objects.filter(id=list(des.designation))


# def clean(self):
# cleaned_data = super().clean()
# user_id = cleaned_data.get('receive_id')
# if user_id:
# self.fields['receive_design'].queryset = HoldsDesignation.objects.select_related('designation').filter(user_id=user_id)
5 changes: 5 additions & 0 deletions FusionIIIT/applications/programme_curriculum/models.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,7 @@ class NewProposalFile(models.Model):
upload_date = models.DateTimeField(auto_now_add=True)
is_read = models.BooleanField(default = False)
is_update= models.BooleanField(default = False)
is_archive = models.BooleanField(default = False)
class Meta:
unique_together = ('code', 'uploader','name') # if code and faculty code matches to another proposal name will take care of it

Expand All @@ -412,6 +413,10 @@ class Proposal_Tracking(models.Model):
is_added = models.BooleanField(default = False)
is_submitted = models.BooleanField(default = False)
is_rejected = models.BooleanField(default = False)
sender_archive = models.BooleanField(default = False)
receiver_archive = models.BooleanField(default = False)



class Meta:
# unique_together = ('file_id', 'current_id','receive_id','receive_design')
Expand Down
5 changes: 5 additions & 0 deletions FusionIIIT/applications/programme_curriculum/urls.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@
path('forward_course_forms/<ProposalId>/',views.forward_course_forms,name='forward_course_forms'),
path('view_inward_files/<ProposalId>/',views.view_inward_files,name='view_inward_files'),
path('outward_files/',views.outward_files,name='outward_files'),
path('tracking_archive/<ProposalId>/',views.tracking_archive,name='tracking_archive'),
path('tracking_unarchive/<ProposalId>/',views.tracking_unarchive,name='tracking_unarchive'),
path('file_archive/<FileId>/',views.file_archive,name='file_archive'),
path('file_unarchive/<FileId>/',views.file_unarchive,name='file_unarchive'),


# urls for api view
path('api/programmes_ug/', v2.view_ug_programmes, name='view_ug_programmes_api'),
Expand Down
309 changes: 227 additions & 82 deletions FusionIIIT/applications/programme_curriculum/views.py
View file

Large diffs are not rendered by default.

26 changes: 26 additions & 0 deletions FusionIIIT/templates/notifications/programme_curriculum.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{% load static %}
{% block sidepanel %}
{% load notifications_tags %}
{% for notice in notifications %}
{% if notice.unread %}
{% if notice.data.module == "Programme and Curriculum" %}
<div class="ui icon message">
<i class="inbox icon"></i>
<div class="content">
<div class="header">
<a href="{% url 'notifications:mark_as_read_and_redirect' notice.slug %}">
{{ notice.data.module }}
</a>
</div>
<p>{{ notice.verb }}</p>
</div>
<div class="ui right floated">
<a href="{% url 'notifications:delete' notice.slug %}">
<i class="close icon"></i>
</a>
</div>
</div>
{% endif%}
{% endif %}
{% endfor %}
{% endblock %}
23 changes: 0 additions & 23 deletions FusionIIIT/templates/programme_curriculum/acad_admin/add_batch_form.html
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,4 @@
{% extends 'programme_curriculum/acad_admin/common.html' %}

{% block sidetabmenu %}
<div class="ui medium fluid vertical pointing menu"
style="max-width: 320px;">

<a class="item" href="{% url 'programme_curriculum:admin_view_all_programmes' %}">Programmes & Curriculums
<i class="right floated chevron right icon"></i>
</a>
<a class="item" href="{% url 'programme_curriculum:admin_view_all_working_curriculums' %}">Working Curriculums
<i class="right floated chevron right icon"></i>
</a>
<a class="item" href="{% url 'programme_curriculum:admin_view_all_discplines' %}">Discipline
<i class="right floated chevron right icon"></i>
</a>
<a class="item" href="{% url 'programme_curriculum:admin_view_all_batches' %}">Batch
<i class="right floated chevron right icon"></i>
</a>
<a class="item" href="{% url 'programme_curriculum:admin_view_all_courses' %}">Courses
<i class="right floated chevron right icon"></i>
</a>
</div>
{% endblock %}

{% block content %}
<div class="ui segment" >
<div class="header"><h1>Batch Form</h1></div>
Expand Down
20 changes: 1 addition & 19 deletions FusionIIIT/templates/programme_curriculum/acad_admin/add_courseslot_form.html
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,7 @@
{% extends 'programme_curriculum/acad_admin/common.html' %}

{% block sidetabmenu %}
<div class="ui medium fluid vertical pointing menu"
style="max-width: 320px;">

<a class="item" href="{% url 'programme_curriculum:admin_view_all_programmes' %}">Programmes & Curriculums
<i class="right floated chevron right icon"></i>
</a>
<a class="item" href="{% url 'programme_curriculum:admin_view_all_working_curriculums' %}">Working Curriculums
<i class="right floated chevron right icon"></i>
</a>
<a class="item" href="{% url 'programme_curriculum:admin_view_all_discplines' %}">Discipline
<i class="right floated chevron right icon"></i>
</a>
<a class="item" href="{% url 'programme_curriculum:admin_view_all_batches' %}">Batch
<i class="right floated chevron right icon"></i>
</a>
<a class="item" href="{% url 'programme_curriculum:admin_view_all_courses' %}">Courses
<i class="right floated chevron right icon"></i>
</a>
</div>

{% endblock %}

{% block content %}
Expand Down
23 changes: 0 additions & 23 deletions FusionIIIT/templates/programme_curriculum/acad_admin/add_curriculum_form.html
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,4 @@
{% extends 'programme_curriculum/acad_admin/common.html' %}

{% block sidetabmenu %}
<div class="ui medium fluid vertical pointing menu"
style="max-width: 320px;">

<a class="item" href="{% url 'programme_curriculum:admin_view_all_programmes' %}">Programmes & Curriculums
<i class="right floated chevron right icon"></i>
</a>
<a class="item" href="{% url 'programme_curriculum:admin_view_all_working_curriculums' %}">Working Curriculums
<i class="right floated chevron right icon"></i>
</a>
<a class="item" href="{% url 'programme_curriculum:admin_view_all_discplines' %}">Discipline
<i class="right floated chevron right icon"></i>
</a>
<a class="item" href="{% url 'programme_curriculum:admin_view_all_batches' %}">Batch
<i class="right floated chevron right icon"></i>
</a>
<a class="item" href="{% url 'programme_curriculum:admin_view_all_courses' %}">Courses
<i class="right floated chevron right icon"></i>
</a>
</div>
{% endblock %}

{% block content %}
<div class="ui segment" >
<div class="header"><h1>Curriculum Form</h1></div>
Expand Down
23 changes: 0 additions & 23 deletions FusionIIIT/templates/programme_curriculum/acad_admin/add_discipline_form.html
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,4 @@
{% extends 'programme_curriculum/acad_admin/common.html' %}

{% block sidetabmenu %}
<div class="ui medium fluid vertical pointing menu"
style="max-width: 320px;">

<a class="item" href="{% url 'programme_curriculum:admin_view_all_programmes' %}">Programmes & Curriculums
<i class="right floated chevron right icon"></i>
</a>
<a class="item" href="{% url 'programme_curriculum:admin_view_all_working_curriculums' %}">Working Curriculums
<i class="right floated chevron right icon"></i>
</a>
<a class="item" href="{% url 'programme_curriculum:admin_view_all_discplines' %}">Discipline
<i class="right floated chevron right icon"></i>
</a>
<a class="item" href="{% url 'programme_curriculum:admin_view_all_batches' %}">Batch
<i class="right floated chevron right icon"></i>
</a>
<a class="item" href="{% url 'programme_curriculum:admin_view_all_courses' %}">Courses
<i class="right floated chevron right icon"></i>
</a>
</div>
{% endblock %}

{% block content %}
<div class="ui segment" >
<div class="header"><h1>Discipline Form</h1></div>
Expand Down
23 changes: 0 additions & 23 deletions FusionIIIT/templates/programme_curriculum/acad_admin/add_programme_form.html
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,4 @@
{% extends 'programme_curriculum/acad_admin/common.html' %}

{% block sidetabmenu %}
<div class="ui medium fluid vertical pointing menu"
style="max-width: 320px;">

<a class="item" href="{% url 'programme_curriculum:admin_view_all_programmes' %}">Programmes & Curriculums
<i class="right floated chevron right icon"></i>
</a>
<a class="item" href="{% url 'programme_curriculum:admin_view_all_working_curriculums' %}">Working Curriculums
<i class="right floated chevron right icon"></i>
</a>
<a class="item" href="{% url 'programme_curriculum:admin_view_all_discplines' %}">Discipline
<i class="right floated chevron right icon"></i>
</a>
<a class="item" href="{% url 'programme_curriculum:admin_view_all_batches' %}">Batch
<i class="right floated chevron right icon"></i>
</a>
<a class="item" href="{% url 'programme_curriculum:admin_view_all_courses' %}">Courses
<i class="right floated chevron right icon"></i>
</a>
</div>
{% endblock %}

{% block content %}
<div class="ui segment" >
<div class="header"><h1>Programme Form</h1></div>
Expand Down
23 changes: 0 additions & 23 deletions FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_a_course.html
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,4 @@
{% extends 'programme_curriculum/acad_admin/common.html' %}

{% block sidetabmenu %}
<div class="ui medium fluid vertical pointing menu"
style="max-width: 320px;">

<a class="item" href="{% url 'programme_curriculum:admin_view_all_programmes' %}">Programmes & Curriculums
<i class="right floated chevron right icon"></i>
</a>
<a class="item" href="{% url 'programme_curriculum:admin_view_all_working_curriculums' %}">Working Curriculums
<i class="right floated chevron right icon"></i>
</a>
<a class="item" href="{% url 'programme_curriculum:admin_view_all_discplines' %}">Discipline
<i class="right floated chevron right icon"></i>
</a>
<a class="item" href="{% url 'programme_curriculum:admin_view_all_batches' %}">Batch
<i class="right floated chevron right icon"></i>
</a>
<a class="item" href="{% url 'programme_curriculum:admin_view_all_courses' %}">Courses
<i class="right floated chevron right icon"></i>
</a>
</div>
{% endblock %}

{% block content %}
<div class="ui bottom attached tab segment active" data-tab="afirst">
<div class="content">
Expand Down
23 changes: 0 additions & 23 deletions FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_a_courseslot.html
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,4 @@
{% extends 'programme_curriculum/acad_admin/common.html' %}

{% block sidetabmenu %}
<div class="ui medium fluid vertical pointing menu"
style="max-width: 320px;">

<a class="item" href="{% url 'programme_curriculum:admin_view_all_programmes' %}">Programmes & Curriculums
<i class="right floated chevron right icon"></i>
</a>
<a class="item" href="{% url 'programme_curriculum:admin_view_all_working_curriculums' %}">Working Curriculums
<i class="right floated chevron right icon"></i>
</a>
<a class="item" href="{% url 'programme_curriculum:admin_view_all_discplines' %}">Discipline
<i class="right floated chevron right icon"></i>
</a>
<a class="item" href="{% url 'programme_curriculum:admin_view_all_batches' %}">Batch
<i class="right floated chevron right icon"></i>
</a>
<a class="item" href="{% url 'programme_curriculum:admin_view_all_courses' %}">Courses
<i class="right floated chevron right icon"></i>
</a>
</div>
{% endblock %}

{% block content %}
<div class="ui top attached tabular large menu">
<a class="item active" data-tab="afirst">{{ course_slot.name }}</a>
Expand Down
23 changes: 0 additions & 23 deletions ...IIIT/templates/programme_curriculum/acad_admin/admin_view_a_semester_of_a_curriculum.html
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,4 @@
{% extends 'programme_curriculum/acad_admin/common.html' %}

{% block sidetabmenu %}
<div class="ui medium fluid vertical pointing menu"
style="max-width: 320px;">

<a class="item" href="{% url 'programme_curriculum:admin_view_all_programmes' %}">Programmes & Curriculums
<i class="right floated chevron right icon"></i>
</a>
<a class="item" href="{% url 'programme_curriculum:admin_view_all_working_curriculums' %}">Working Curriculums
<i class="right floated chevron right icon"></i>
</a>
<a class="item" href="{% url 'programme_curriculum:admin_view_all_discplines' %}">Discipline
<i class="right floated chevron right icon"></i>
</a>
<a class="item" href="{% url 'programme_curriculum:admin_view_all_batches' %}">Batch
<i class="right floated chevron right icon"></i>
</a>
<a class="item" href="{% url 'programme_curriculum:admin_view_all_courses' %}">Courses
<i class="right floated chevron right icon"></i>
</a>
</div>
{% endblock %}

{% block content %}
<div class="ui top attached tabular large menu">
<a class="item active" data-tab="afirst">Semester {{ semester.semester_no }} Info</a>
Expand Down
23 changes: 0 additions & 23 deletions FusionIIIT/templates/programme_curriculum/acad_admin/admin_view_all_batches.html
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,4 @@
{% extends 'programme_curriculum/acad_admin/common.html' %}

{% block sidetabmenu %}
<div class="ui medium fluid vertical pointing menu"
style="max-width: 320px;">

<a class="item" href="{% url 'programme_curriculum:admin_view_all_programmes' %}">Programmes & Curriculums
<i class="right floated chevron right icon"></i>
</a>
<a class="item" href="{% url 'programme_curriculum:admin_view_all_working_curriculums' %}">Working Curriculums
<i class="right floated chevron right icon"></i>
</a>
<a class="item" href="{% url 'programme_curriculum:admin_view_all_discplines' %}">Discipline
<i class="right floated chevron right icon"></i>
</a>
<a class="active item" href="{% url 'programme_curriculum:admin_view_all_batches' %}"><B>Batch</B>
<i class="right floated chevron right icon"></i>
</a>
<a class="item" href="{% url 'programme_curriculum:admin_view_all_courses' %}">Courses
<i class="right floated chevron right icon"></i>
</a>
</div>
{% endblock %}

{% block content %}
<div class="ui top attached tabular large menu">
<a class="item active" data-tab="afirst">Batches</a>
Expand Down
Loading

0 comments on commit 00c64b6

Please sign in to comment.