Merge pull request #406 in RMS/api-main-service from RMSv2 to staging

* commit '65591090':
  level fix
  level
  validate pass fix

app/accesslayer/views.py

@@ -117,7 +117,7 @@ class ForgotPassword(APIView):
             user = request.user.email
         except Exception as e:
             user = str(settings.CATCH_EMAIL)
-
+        
         existingUser = User.objects.filter(
             email=email,
             username=username).first()
@@ -194,7 +194,7 @@ class ValidateForgotPasswordResetToken(APIView):
         if existingToken:
             if not existingToken.is_active:
                 raise Exception('Request is no longer active')
-            elif existingToken.timeout_at > date_now:
+            elif existingToken.timeout_at < date_now:
                 raise Exception('Token already expired')
             
             return Response(data={

app/applicationlayer/cms/auto_email/reminder.py

@@ -55,7 +55,7 @@ class ReminderTriggerAPIView(views.APIView):
                 list_of_emails.append(data.frm_approver.code)
                 
                 # requestor details
-
+                
                 requestor_name = data.frm_approver.form_code.requested_by_user.name
                 requestor_recipient = data.frm_approver.form_code.requested_by_user.email
 

app/applicationlayer/cms/form/approver/serializers.py

@@ -32,16 +32,16 @@ class ChangeRequestFormApproversSerializer(
                         ret['editable_comp'] = False
                     else:
                         ret['editable_comp'] = True
-                    
+
                     if instance.tmp_approver.department  or instance.tmp_approver.delegation.lower() == 'requestor':
                         ret['editable_dept'] = False
                     else:
                         ret['editable_dept'] = True
 
                 else:
-                    ret['editable_user'] = False
-                    ret['editable_comp'] = False
-                    ret['editable_dept'] = False
+                    ret['editable_user'] = True
+                    ret['editable_comp'] = True
+                    ret['editable_dept'] = True
             else:
                 ret['editable_user'] = False
                 ret['editable_comp'] = False
@@ -76,9 +76,9 @@ class ChangeRequestFormApproversSerializer(
                         ret['editable_dept'] = True
 
                 else:
-                    ret['editable_user'] = False
-                    ret['editable_comp'] = False
-                    ret['editable_dept'] = False
+                    ret['editable_user'] = True
+                    ret['editable_comp'] = True
+                    ret['editable_dept'] = True
             else:
                 ret['editable_user'] = False
                 ret['editable_comp'] = False

app/applicationlayer/cms/form/approver/views.py

@@ -13,7 +13,7 @@ from app.applicationlayer.utils import (
 
 class ChangeRequestFormApproversViewset(viewsets.ModelViewSet):
 
-    queryset = models.ChangeRequestFormApprovers.objects.all()
+    queryset = models.ChangeRequestFormApprovers.objects.all().order_by('level')
     serializer_class = serializers.ChangeRequestFormApproversSerializer
     pagination_class = CustomPagination
     lookup_field = 'code'

app/entities/migrations/0023_auto_20191021_1706.py

+# Generated by Django 2.2 on 2019-10-21 17:06
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0022_auto_20191021_1107'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='changerequestformapprovers',
+            options={'ordering': ['level']},
+        ),
+    ]

app/entities/models.py

@@ -767,6 +767,7 @@ class ChangeRequestFormApprovers(BaseApprover):
 
     class Meta:
         db_table = 'change_request_form_approvers'
+        ordering = ['level']
     
     def __str__(self):
         return f'{self.code}'