Merge branch 'RMSv2' of http://42.61.118.105:7990/scm/rms/api-main-service into red-develop

app/accesslayer/authentication.py

@@ -12,7 +12,7 @@ class AppTokenAuthentication(TokenAuthentication):
 
         user, token = super(AppTokenAuthentication,
                             self).authenticate_credentials(key)
-
+        
         if token.created < datetime.now() - timedelta(minutes=int(settings.SESSION_TIMEOUT)):
             token.delete()
             raise exceptions.AuthenticationFailed('Token has expired')

app/applicationlayer/cms/auto_email/reminder.py

+# from app.entities import models
+# from app.applicationlayer import paginators
+# from datetime import datetime
+# from rest_framework.response import Response
+# from rest_framework import status, views
+
+# from cms.applicationlayer.utilities import email
+
+# from mongoengine.queryset.visitor import Q
+# import requests
+# from django.conf import settings
+# from datetime import timedelta
+
+
+# EMAIL = settings.EMAIL
+
+
+# class ReminderAPIView(views.APIView):
+
+#     def get(self, request):
+#         print(request.META['HTTP_ACCOUNT_NO'])
+#         date_format = datetime.now()
+#         next_day = date_format + timedelta(days=1)
+#         today_mail = models.EmailNotification.objects.filter(
+#             Q(date_from__lte=date_format.strftime('%Y-%m-%d')) &
+#             Q(date_to__gte=date_format.strftime('%Y-%m-%d')) &
+#             Q(date_to_send=date_format.strftime('%Y-%m-%d 00:00:00.000'))
+#         )[0:25]
+#         print(len(today_mail))
+#         list_of_emails = []
+#         for data in today_mail:
+#             approver = requests.post(EMAIL, data=data['approver'])
+#             requestor = requests.post(EMAIL, data=data['requestor'])
+#             list_of_emails.append(data['approver'])
+#             list_of_emails.append(data['requestor'])
+#         today_mail.update(date_to_send=next_day)
+#         return Response(
+#             {"list of emails": list_of_emails},
+#             status=status.HTTP_200_OK
+#         )

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

@@ -513,7 +513,8 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
                 'action': None,
                 'remarks': None,
                 'date_sent': None,
-                'action_date': None
+                'action_date': None,
+                'is_action': False
             }
 
             approver_data.append(approver_add)
@@ -618,9 +619,10 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
                 'remarks': None,
                 'date_sent': None,
                 'action_date': None,
-                'created': datetime.now()
+                'created': datetime.now(),
+                'is_action': False
             }
-
+            
             approver_data.append(approver_add)
 
         change_request.form_add_edit_delete(
@@ -718,10 +720,11 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
             models.ChangeRequestFormApprovers.objects.filter(
                 Q(form_code=form_code) & Q(level=int(next_level))
                 ).update(
-                    date_sent=datetime.now()
+                    date_sent=datetime.now(),
+                    is_action=True
                 )
 
-            # update is_action for current level
+            # update current approver details
             models.ChangeRequestFormApprovers.objects.filter(
                 Q(form_code=form_code) & Q(level=int(level))
                 ).update(
@@ -816,10 +819,11 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
             models.ChangeRequestFormApprovers.objects.filter(
                 Q(level=int(next_level))
                 ).update(
-                    date_sent=datetime.now()
+                    date_sent=datetime.now(),
+                    is_action=True
             )
-
-            # update is_action for current level
+            
+            # update current approver details
             models.ChangeRequestFormApprovers.objects.filter(
                 Q(form_code=form_code) & Q(level=int(level))
                 ).update(
@@ -1124,7 +1128,8 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
         models.ChangeRequestFormApprovers.objects.filter(
             Q(form_code=form_code) & Q(level=int(min_level))
             ).update(
-                date_sent=datetime.now()
+                date_sent=datetime.now(),
+                is_action=True
             )
 
         serializer = self.get_serializer(instance)
@@ -1385,7 +1390,8 @@ class ChangeRequestFormPost(APIView):
                 models.ChangeRequestFormApprovers.objects.filter(
                     Q(form_code=frm_id) & Q(level=int(min_level))
                     ).update(
-                        date_sent=datetime.now()
+                        date_sent=datetime.now(),
+                        is_action=True
                     )
             
             message = {

app/entities/migrations/0015_auto_20191008_1125.py

+# Generated by Django 2.2 on 2019-10-08 11:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0014_changerequestformapprovers_is_action'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='changerequestformapprovers',
+            name='is_action',
+            field=models.BooleanField(default=False),
+        ),
+    ]

app/entities/models.py

@@ -743,7 +743,7 @@ class ChangeRequestFormApprovers(BaseApprover):
         blank=True,
         null=True)
     is_action = models.BooleanField(
-        default=True)
+        default=False)
 
     class Meta:
         db_table = 'change_request_form_approvers'
@@ -1005,3 +1005,51 @@ class AllowedCompany(models.Model):
 
     class Meta:
         db_table = 'allowed_company'
+
+
+# class EmailNotification(models.Model):
+#     cr_number = models.CharField(
+#         null=True,
+#         blank=True)
+#     approver = models.CharField(
+#         null=True,
+#         blank=True)
+#     requestor = models.CharField(
+#         null=True,
+#         blank=True)
+#     date_from = models.DateTimeField(
+#         null=True,
+#         blank=True)
+#     date_to = models.DateTimeField(
+#         null=True,
+#         blank=True)
+#     date_to_send = models.DateTimeField(
+#         null=True,
+#         blank=True)
+
+#     class Meta:
+#         db_table = 'email_notification'
+
+
+# class CancelDateCR(Document):
+#     meta = {'collection': 'cancel_date_change_request'}
+    
+#     cr_number = fields.StringField(required=True)
+#     trigger_date = fields.DateTimeField(required=True)
+#     deleted_at = fields.DateTimeField(required=False, null=True)
+#     is_sent = fields.BooleanField(default=False)
+
+#     date_submitted_last_approver = fields.StringField(required=False)
+#     approver_pending_action = fields.StringField(required=False)
+#     email_content = fields.DictField(required=True)
+
+#     class Meta:
+#         db_table = 'email_notification'
+
+
+# class TargetDateOverdue(Document):
+#     meta = {'collection': 'target_date_overdue'}
+#     cr_number = fields.StringField(required=True)
+#     trigger_date = fields.DateTimeField(required=True)
+#     is_sent = fields.BooleanField(default=False)
+#     email_content = fields.DictField(required=True)
\ No newline at end of file

app/helper/email_service/sender.py

@@ -23,7 +23,7 @@ def account_created(args):
     FC = FC.replace('{url}', settings.FRONT_END_URL + '/cms/profile') #changed
     try:
         send_mail(
-            subject='OB RMS: Welcome!',
+            subject='Resource Management System: Welcome!',
             message='',
             from_email=settings.EMAIL_DEFAULT_SENDER,
             recipient_list=(recipient,),
@@ -66,7 +66,7 @@ def forgot_password(args):
     FC = FC.replace('{url}', url)
 
     send_mail(
-        subject='OB RMS: Reset Password',
+        subject='Resource Management System: Reset Password',
         message='',
         from_email=settings.EMAIL_DEFAULT_SENDER,
         recipient_list=[recipient, admin,],
@@ -75,7 +75,7 @@ def forgot_password(args):
 
     try:
         send_mail(
-            subject='OB RMS: Welcome!',
+            subject='Resource Management System: Reset Password',
             message='',
             from_email=settings.EMAIL_DEFAULT_SENDER,
             recipient_list=recipient,
@@ -136,7 +136,7 @@ def admin_changepassword(args):
     FC = FC.replace('{url}', settings.FRONT_END_URL)
 
     send_mail(
-        subject='OB RMS: Password Changed',
+        subject='Resource Management System: Password Changed',
         message='',
         from_email=settings.EMAIL_DEFAULT_SENDER,
         recipient_list=[recipient, admin,],

app/helper/email_service/templates/RMS-ACTIONREQUIRED.html

@@ -3,7 +3,7 @@
 <head>
 <title>RMS: Approval Notification</title>
 </head>
-<body style="font-family: arial;">
+<body style="font-family: Sans-Serif;">
 
 <h3>Resource Management System &#40;RMS&#41;</h3>
 <h3 style="color:#888888;">Change Request Approval Notification</h3><br>

env.template.ini

@@ -10,7 +10,7 @@ FRONT_END_URL =
 AUTH_ACCESSS_TOKEN_TIMEOUT = 
 USER_DEFAULT_PASSWORD = 
 CATCH_EMAIL = gladys@tirsolutions.com
-CR_LINK = http://staging.rms.oneberrysystem.com/cms/change-request/form/view
+CR_LINK = http://stagingrms.oneberrysystem.com/cms/change-request/form/view
 REALTIMESERVER_IP = 127.0.0.1:8000
 CORS_ORIGIN_ALLOW_ALL = False
 
@@ -22,11 +22,11 @@ DATABASE_PASSWORD =
 DATABASE_HOST = 
 DATABASE_PORT = 
 SESSION_TIMEOUT = 
-FRONT_END_URL = http://staging.rms.oneberrysystem.com
+FRONT_END_URL = http://stagingrms.oneberrysystem.com
 AUTH_ACCESSS_TOKEN_TIMEOUT = 
 USER_DEFAULT_PASSWORD = 
 CATCH_EMAIL = gladys@tirsolutions.com
-CR_LINK = http://staging.rms.oneberrysystem.com/cms/change-request/form/view
+CR_LINK = http://stagingrms.oneberrysystem.com/cms/change-request/form/view
 REALTIMESERVER_IP = 127.0.0.1:8000
 CORS_ORIGIN_ALLOW_ALL = False
 
@@ -55,11 +55,11 @@ DATABASE_PASSWORD =
 DATABASE_HOST = 
 DATABASE_PORT = 
 SESSION_TIMEOUT = 30
-FRONT_END_URL = http://staging.rms.oneberrysystem.com
+FRONT_END_URL = http://stagingrms.oneberrysystem.com
 AUTH_ACCESSS_TOKEN_TIMEOUT = 3600
 USER_DEFAULT_PASSWORD = password
 CATCH_EMAIL = gladys@tirsolutions.com
-CR_LINK = http://staging.rms.oneberrysystem.com/cms/change-request/form/view
+CR_LINK = http://stagingrms.oneberrysystem.com/cms/change-request/form/view
 REALTIMESERVER_IP = 127.0.0.1:8000
 CORS_ORIGIN_ALLOW_ALL = False