Commit 00934f9c authored by Gladys Forte's avatar Gladys Forte

mr. clean

parent e558a2e2
...@@ -85,7 +85,6 @@ class AllowedCompanyViewSet(viewsets.ModelViewSet): ...@@ -85,7 +85,6 @@ class AllowedCompanyViewSet(viewsets.ModelViewSet):
return Response(message, status=status.HTTP_400_BAD_REQUEST) return Response(message, status=status.HTTP_400_BAD_REQUEST)
except IntegrityError as e: except IntegrityError as e:
print(str(e))
error = 'Adding the same Department under the same Company is not allowed' error = 'Adding the same Department under the same Company is not allowed'
message = { message = {
'code': 400, 'code': 400,
...@@ -96,8 +95,6 @@ class AllowedCompanyViewSet(viewsets.ModelViewSet): ...@@ -96,8 +95,6 @@ class AllowedCompanyViewSet(viewsets.ModelViewSet):
status=status.HTTP_400_BAD_REQUEST) status=status.HTTP_400_BAD_REQUEST)
except Exception as e: except Exception as e:
# print(str(e))
# error = 'adding the same departments under same Company is not allowed'
message = { message = {
'code': 500, 'code': 500,
'status': 'failed', 'status': 'failed',
......
...@@ -26,7 +26,7 @@ class ReminderTriggerAPIView(views.APIView): ...@@ -26,7 +26,7 @@ class ReminderTriggerAPIView(views.APIView):
Q(date_to__lte=date_now.strftime('%Y-%m-%d 00:00:00.000')) & Q(date_to__lte=date_now.strftime('%Y-%m-%d 00:00:00.000')) &
Q(date_to_send=date_now.strftime('%Y-%m-%d 00:00:00.000')) Q(date_to_send=date_now.strftime('%Y-%m-%d 00:00:00.000'))
) )
# print(today_mail)
list_of_emails = [] list_of_emails = []
for data in today_mail: for data in today_mail:
if data.frm_approver.is_action == True and data.form_code.status == 'Pending': if data.frm_approver.is_action == True and data.form_code.status == 'Pending':
......
...@@ -38,7 +38,6 @@ class headers(serializers.ModelSerializer): ...@@ -38,7 +38,6 @@ class headers(serializers.ModelSerializer):
ret['created'] = instance.created.strftime('%Y-%m-%d-%H:%M:%S') ret['created'] = instance.created.strftime('%Y-%m-%d-%H:%M:%S')
ret['action'] = approver ret['action'] = approver
# ret['requested_to_target_date'] = instance.requested_to_target_date.strftime('%Y-%m-%d-%H:%M:%S') # ret['requested_to_target_date'] = instance.requested_to_target_date.strftime('%Y-%m-%d-%H:%M:%S')
print(ret)
return ret return ret
# except Exception as e: # except Exception as e:
# ret['action_required'] = "No" # ret['action_required'] = "No"
......
...@@ -693,7 +693,6 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet): ...@@ -693,7 +693,6 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
self.perform_update(serializer) self.perform_update(serializer)
new_instance = serializer.data new_instance = serializer.data
print(serializer.errors)
# save history in form header # save history in form header
crhistory_save( crhistory_save(
...@@ -819,8 +818,6 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet): ...@@ -819,8 +818,6 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
new_instance = model_to_dict(form_header) new_instance = model_to_dict(form_header)
# print(serializer.errors)
# save history in form header # save history in form header
crhistory_create_save( crhistory_create_save(
batchno, batchno,
......
...@@ -688,7 +688,6 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -688,7 +688,6 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
old_instance = model_to_dict(instance) old_instance = model_to_dict(instance)
self.perform_update(serializer) self.perform_update(serializer)
new_instance = serializer.data new_instance = serializer.data
print(serializer.errors)
# save history in form header # save history in form header
crhistory_save( crhistory_save(
...@@ -803,8 +802,6 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -803,8 +802,6 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
new_instance = model_to_dict(form_header) new_instance = model_to_dict(form_header)
print(serializer.errors)
# save history in form header # save history in form header
crhistory_create_save( crhistory_create_save(
batchno, batchno,
......
...@@ -17,16 +17,10 @@ class UserListForm(APIView): ...@@ -17,16 +17,10 @@ class UserListForm(APIView):
try: try:
serializer = ChangeRequestList serializer = ChangeRequestList
dept = self.request.query_params['department_code'] dept = self.request.query_params['department_code']
# company = self.request.query_params['company_code']
# allowed = models.AllowedCompany.objects.filter(
# Q(group_pivots=dept) &
# Q()
# )
user_list = models.User.objects.filter( user_list = models.User.objects.filter(
department=dept department=dept
).exclude(id=1) ).exclude(id=1)
# user_list = user_list.exclude(id=request.user.id)
print(user_list.query)
page = self.paginate_queryset(user_list) page = self.paginate_queryset(user_list)
if page is not None: if page is not None:
......
...@@ -72,8 +72,6 @@ class ChangeRequestCompanyFormViewSet(viewsets.ModelViewSet): ...@@ -72,8 +72,6 @@ class ChangeRequestCompanyFormViewSet(viewsets.ModelViewSet):
Q(requested_by_user=id_number) | Q(requested_by_user=id_number) |
Q(frm_stakes__user__code=id_number) Q(frm_stakes__user__code=id_number)
).values() ).values()
# print(id_number)
# print(forms)
allowed = AllowedCompany.objects.filter( allowed = AllowedCompany.objects.filter(
id_number=id_number id_number=id_number
......
...@@ -30,7 +30,6 @@ VENDOR_REJECT_MESSAGE = settings.VENDOR_REJECT_MESSAGE ...@@ -30,7 +30,6 @@ VENDOR_REJECT_MESSAGE = settings.VENDOR_REJECT_MESSAGE
def entity_log_bulk(queryset, entity, tbl): def entity_log_bulk(queryset, entity, tbl):
try: try:
# print(entity)
for data in queryset: for data in queryset:
test = model_to_dict(data) test = model_to_dict(data)
log_save( log_save(
...@@ -461,7 +460,6 @@ def crhistory_save(batch_no, main_action, ...@@ -461,7 +460,6 @@ def crhistory_save(batch_no, main_action,
def crhistory_log_bulk_delete(queryset, entity, tbl, form_code, def crhistory_log_bulk_delete(queryset, entity, tbl, form_code,
batch_no, main_action): batch_no, main_action):
try: try:
# print(entity)
for data in queryset: for data in queryset:
test = model_to_dict(data) test = model_to_dict(data)
crhistory_save(batch_no, crhistory_save(batch_no,
......
...@@ -5,7 +5,6 @@ from django.db.models import Q ...@@ -5,7 +5,6 @@ from django.db.models import Q
class headers(serializers.ModelSerializer): class headers(serializers.ModelSerializer):
def to_representation(self, instance): def to_representation(self, instance):
ret = super().to_representation(instance) ret = super().to_representation(instance)
ret['deparment'] = instance.department.name ret['deparment'] = instance.department.name
...@@ -13,8 +12,6 @@ class headers(serializers.ModelSerializer): ...@@ -13,8 +12,6 @@ class headers(serializers.ModelSerializer):
return ret return ret
class Meta: class Meta:
model = models.User model = models.User
fields = ( fields = (
......
...@@ -88,7 +88,6 @@ class CompanyViewSet(viewsets.ModelViewSet): ...@@ -88,7 +88,6 @@ class CompanyViewSet(viewsets.ModelViewSet):
partial = kwargs.pop('partial', False) partial = kwargs.pop('partial', False)
instance = self.get_object() instance = self.get_object()
print(request.data)
serializer = self.get_serializer(instance, data=request.data, partial=partial) serializer = self.get_serializer(instance, data=request.data, partial=partial)
serializer.is_valid(raise_exception=True) serializer.is_valid(raise_exception=True)
......
...@@ -89,7 +89,6 @@ class NotificationsViewset(meviewsets.ModelViewSet): ...@@ -89,7 +89,6 @@ class NotificationsViewset(meviewsets.ModelViewSet):
def seen(self, request, account_no=None, **kwargs): def seen(self, request, account_no=None, **kwargs):
try: try:
account_no = self.kwargs['account_no'] account_no = self.kwargs['account_no']
print(account_no)
models.Notification.objects.filter(account_no=account_no, models.Notification.objects.filter(account_no=account_no,
id__in=request.data['ids']).update( id__in=request.data['ids']).update(
......
...@@ -451,33 +451,25 @@ class BaseHeader(models.Model): ...@@ -451,33 +451,25 @@ class BaseHeader(models.Model):
Company, Company,
on_delete=models.PROTECT, on_delete=models.PROTECT,
to_field='code') to_field='code')
requested_to_department = models.ForeignKey( requested_to_department = models.ForeignKey(
Department, Department,
on_delete=models.PROTECT, on_delete=models.PROTECT,
to_field='code') to_field='code')
requested_to_user = models.ForeignKey( requested_to_user = models.ForeignKey(
User, User,
on_delete=models.PROTECT, on_delete=models.PROTECT,
to_field='code') to_field='code')
requested_to_template_name = models.CharField(max_length=255) requested_to_template_name = models.CharField(max_length=255)
requested_to_objective = models.CharField( requested_to_objective = models.CharField(
max_length=255, max_length=255,
blank=True, blank=True,
null=True) null=True)
requested_to_priority = models.CharField(max_length=255) requested_to_priority = models.CharField(max_length=255)
description = models.CharField( description = models.CharField(
max_length=255, max_length=255,
blank=True, blank=True,
null=True) null=True)
created = models.DateTimeField(auto_now_add=True) created = models.DateTimeField(auto_now_add=True)
is_active = models.BooleanField(default=True) is_active = models.BooleanField(default=True)
class Meta: class Meta:
...@@ -486,15 +478,12 @@ class BaseHeader(models.Model): ...@@ -486,15 +478,12 @@ class BaseHeader(models.Model):
class BaseApprover(models.Model): class BaseApprover(models.Model):
level = models.IntegerField() level = models.IntegerField()
user = models.ForeignKey( user = models.ForeignKey(
User, User,
blank=True, blank=True,
null=True, null=True,
on_delete=models.PROTECT, on_delete=models.PROTECT,
to_field='code') to_field='code')
# delegation = models.CharField(max_length=50, blank=True, null=True)
delegation = models.ForeignKey( delegation = models.ForeignKey(
Delegation, Delegation,
blank=True, blank=True,
...@@ -542,7 +531,6 @@ class MasterAttachment(models.Model): ...@@ -542,7 +531,6 @@ class MasterAttachment(models.Model):
class BaseAttachment(models.Model): class BaseAttachment(models.Model):
attachment_type = models.CharField(max_length=255) attachment_type = models.CharField(max_length=255)
attachment_name = models.CharField(max_length=255) attachment_name = models.CharField(max_length=255)
file_name = models.CharField( file_name = models.CharField(
max_length=255, max_length=255,
blank=True, blank=True,
...@@ -579,7 +567,6 @@ class BaseDetails(models.Model): ...@@ -579,7 +567,6 @@ class BaseDetails(models.Model):
blank=True, blank=True,
null=True null=True
) )
created = models.DateTimeField( created = models.DateTimeField(
blank=True, blank=True,
null=True) null=True)
...@@ -598,23 +585,19 @@ class ChangeRequestTemplateHeader(BaseHeader): ...@@ -598,23 +585,19 @@ class ChangeRequestTemplateHeader(BaseHeader):
template_no = models.CharField( template_no = models.CharField(
unique=True, unique=True,
max_length=255) max_length=255)
requested_to_template_id = models.CharField( requested_to_template_id = models.CharField(
max_length=255, max_length=255,
unique=True) unique=True)
created_by_user = models.ForeignKey( created_by_user = models.ForeignKey(
User, User,
on_delete=models.PROTECT, on_delete=models.PROTECT,
to_field='code', to_field='code',
related_name='created_by_user') related_name='created_by_user')
created_by_department = models.ForeignKey( created_by_department = models.ForeignKey(
Department, Department,
on_delete=models.PROTECT, on_delete=models.PROTECT,
to_field='code', to_field='code',
related_name='created_by_department') related_name='created_by_department')
requested_to_target_date = models.IntegerField() requested_to_target_date = models.IntegerField()
class Meta: class Meta:
...@@ -787,7 +770,6 @@ class ChangeRequestFormHeader(BaseHeader): ...@@ -787,7 +770,6 @@ class ChangeRequestFormHeader(BaseHeader):
on_delete=models.PROTECT, on_delete=models.PROTECT,
to_field='template_no') to_field='template_no')
status = models.CharField(max_length=50) status = models.CharField(max_length=50)
company_desc = models.CharField( company_desc = models.CharField(
max_length=255, max_length=255,
null=True, null=True,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment