mirror of
https://git.v0id.ovh/n3wt-innov/n3wt-school.git
synced 2026-01-28 23:43:22 +00:00
fix: Remplacement des enum par des modèles pour les payementModes et les
payementPlans
This commit is contained in:
@ -247,10 +247,10 @@ class RegistrationForm(models.Model):
|
||||
blank=True)
|
||||
|
||||
establishment = models.ForeignKey('Establishment.Establishment', on_delete=models.CASCADE, related_name='register_forms')
|
||||
registration_payment = models.IntegerField(choices=PaymentModeType.choices, null=True, blank=True)
|
||||
tuition_payment = models.IntegerField(choices=PaymentModeType.choices, null=True, blank=True)
|
||||
registration_payment_plan = models.IntegerField(choices=PaymentPlanType.choices, null=True, blank=True)
|
||||
tuition_payment_plan = models.IntegerField(choices=PaymentPlanType.choices, null=True, blank=True)
|
||||
registration_payment = models.ForeignKey('School.PaymentModeType', on_delete=models.SET_NULL, null=True, blank=True, related_name='registration_payment_modes_forms')
|
||||
tuition_payment = models.ForeignKey('School.PaymentModeType', on_delete=models.SET_NULL, null=True, blank=True, related_name='tuition_payment_modes_forms')
|
||||
registration_payment_plan = models.ForeignKey('School.PaymentPlanType', on_delete=models.SET_NULL, null=True, blank=True, related_name='registration_payment_plans_forms')
|
||||
tuition_payment_plan = models.ForeignKey('School.PaymentPlanType', on_delete=models.SET_NULL, null=True, blank=True, related_name='tuition_payment_plans_forms')
|
||||
|
||||
def __str__(self):
|
||||
return "RF_" + self.student.last_name + "_" + self.student.first_name
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
from Subscriptions.models import RegistrationForm, Student
|
||||
from School.models import PaymentModeType, PaymentPlanType
|
||||
from django import template
|
||||
import re
|
||||
|
||||
@ -8,22 +7,30 @@ register = template.Library()
|
||||
@register.filter
|
||||
def getRegistrationPaymentPlan(pk):
|
||||
registerForm = RegistrationForm.objects.get(student=pk)
|
||||
return PaymentPlanType(registerForm.registration_payment_plan).label
|
||||
if registerForm.registration_payment_plan:
|
||||
return registerForm.registration_payment_plan.label
|
||||
return ""
|
||||
|
||||
@register.filter
|
||||
def getTuitionPaymentPlan(pk):
|
||||
registerForm = RegistrationForm.objects.get(student=pk)
|
||||
return PaymentPlanType(registerForm.tuition_payment_plan).label
|
||||
if registerForm.tuition_payment_plan:
|
||||
return registerForm.tuition_payment_plan.label
|
||||
return ""
|
||||
|
||||
@register.filter
|
||||
def getRegistrationPaymentMethod(pk):
|
||||
registerForm = RegistrationForm.objects.get(student=pk)
|
||||
return PaymentModeType(registerForm.registration_payment).label
|
||||
if registerForm.registration_payment:
|
||||
return registerForm.registration_payment.label
|
||||
return ""
|
||||
|
||||
@register.filter
|
||||
def getTuitionPaymentMethod(pk):
|
||||
registerForm = RegistrationForm.objects.get(student=pk)
|
||||
return PaymentModeType(registerForm.tuition_payment).label
|
||||
if registerForm.tuition_payment:
|
||||
return registerForm.tuition_payment.label
|
||||
return ""
|
||||
|
||||
@register.filter
|
||||
def getStudentLevel(pk):
|
||||
|
||||
Reference in New Issue
Block a user