Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions events/formsv2.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class TrainingRequestForm(forms.ModelForm):
foss_category = forms.ChoiceField(choices=[('', '---------'), (0, 'Foss available only for Training'), (1, 'Foss available for Training and Test')])
course = forms.ModelChoiceField(empty_label='---------', queryset=CourseMap.objects.filter(category=0).select_related('foss', 'course'))
batch = forms.ModelChoiceField(empty_label='---------', queryset=StudentBatch.objects.none())
fossmdlmap = forms.ModelChoiceField( label="Test Type", queryset=FossMdlCourses.objects.all().select_related('level', 'language'), required=False, empty_label='---------',)
fossmdlmap = forms.ModelChoiceField( label="Test Type", queryset=FossMdlCourses.objects.filter(is_active=True).select_related('level', 'language'), required=False, empty_label='---------',)

training_planner = forms.CharField()
class Meta(object):
Expand Down Expand Up @@ -101,8 +101,7 @@ def __init__(self, *args, **kwargs):
fossmdlmap = kwargs.pop('fossmdlmap', None)
if fossmdlmap:
self.fields['fossmdlmap'].queryset = (
FossMdlCourses.objects.all()
)
FossMdlCourses.objects.filter(is_active=True))

if kwargs and 'data' in kwargs:
# Generating students batch list based on department
Expand Down
10 changes: 5 additions & 5 deletions events/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,14 @@ def send_bulk_student_reset_mail(ac, batches, count, new_password, user):

def get_fossmdlcourse(foss_id, fossmdlmap_id=None):
if fossmdlmap_id is not None:
return FossMdlCourses.objects.get(id = fossmdlmap_id)
return FossMdlCourses.objects.get(id = fossmdlmap_id,is_active=True)
try:
fossmdlcourse = FossMdlCourses.objects.get(foss_id = foss_id)
fossmdlcourse = FossMdlCourses.objects.get(foss_id = foss_id,is_active=True)
except FossMdlCourses.MultipleObjectsReturned:
advanced=3 #default
english=22 #default
try:
fossmdlcourse = FossMdlCourses.objects.get(foss_id=foss_id, language_id=english, level_id=advanced)
fossmdlcourse = FossMdlCourses.objects.get(foss_id=foss_id, language_id=english, level_id=advanced,is_active=True)
except FossMdlCourses.DoesNotExist:
fossmdlcourse = FossMdlCourses.objects.get(foss_id=foss_id, language__isnull=True, level__isnull=True)
return fossmdlcourse
fossmdlcourse = FossMdlCourses.objects.get(foss_id=foss_id, language__isnull=True, level__isnull=True,is_active=True)
return fossmdlcourse
25 changes: 25 additions & 0 deletions events/migrations/0059_auto_20260916_2154.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.29 on 2026-09-16 16:24
from __future__ import unicode_literals

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('events', '0058_auto_20260818_1620'),
]

operations = [
migrations.AddField(
model_name='fossmdlcourses',
name='is_active',
field=models.BooleanField(default=True),
),
migrations.AlterField(
model_name='academicpaymentstatus',
name='subscription',
field=models.CharField(choices=[('', '-----'), ('365', 'One_Year'), ('182', 'Six_Months'), ('455', 'Fifteen_Months')], max_length=50),
),
]
2 changes: 2 additions & 0 deletions events/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,8 @@ class FossMdlCourses(models.Model):
mdlquiz_id = models.PositiveIntegerField()
language = models.ForeignKey(Language, on_delete=models.PROTECT, null=True, blank=True)
level = models.ForeignKey(Level, on_delete=models.PROTECT, null=True, blank=True)
is_active = models.BooleanField(default=True)


def __str__(self):
if self.language is None:
Expand Down
2 changes: 1 addition & 1 deletion events/viewsv2.py
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ def get_language_level_option(request):
pass
if course_id:
cm = CourseMap.objects.get(id=course_id)
fmdl = FossMdlCourses.objects.filter(foss_id=cm.foss_id)
fmdl = FossMdlCourses.objects.filter(foss_id=cm.foss_id,is_active=True)
for item in fmdl:
item_name = str(item).strip().lower()
if not include_basic and "basic" in item_name:
Expand Down